Commit 29caf2f9 authored by Harvey Harrison's avatar Harvey Harrison Committed by Ingo Molnar

x86: add is_f00f_bug helper to fault_32|64.c

Further towards unifying these files, add another helper
in same spirit as is_errata93.
Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 9af993a9
...@@ -211,8 +211,6 @@ void dump_pagetable(unsigned long address) ...@@ -211,8 +211,6 @@ void dump_pagetable(unsigned long address)
printk("\n"); printk("\n");
} }
void do_invalid_op(struct pt_regs *, unsigned long);
static inline pmd_t *vmalloc_sync_one(pgd_t *pgd, unsigned long address) static inline pmd_t *vmalloc_sync_one(pgd_t *pgd, unsigned long address)
{ {
unsigned index = pgd_index(address); unsigned index = pgd_index(address);
...@@ -288,6 +286,26 @@ static int is_errata93(struct pt_regs *regs, unsigned long address) ...@@ -288,6 +286,26 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
return 0; return 0;
} }
void do_invalid_op(struct pt_regs *, unsigned long);
static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
{
#ifdef CONFIG_X86_F00F_BUG
unsigned long nr;
/*
* Pentium F0 0F C7 C8 bug workaround.
*/
if (boot_cpu_data.f00f_bug) {
nr = (address - idt_descr.address) >> 3;
if (nr == 6) {
do_invalid_op(regs, 0);
return 1;
}
}
#endif
return 0;
}
/* /*
* Handle a fault on the vmalloc or module mapping area * Handle a fault on the vmalloc or module mapping area
...@@ -570,21 +588,8 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code) ...@@ -570,21 +588,8 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)
return; return;
} }
#ifdef CONFIG_X86_F00F_BUG if (is_f00f_bug(regs, address))
/* return;
* Pentium F0 0F C7 C8 bug workaround.
*/
if (boot_cpu_data.f00f_bug) {
unsigned long nr;
nr = (address - idt_descr.address) >> 3;
if (nr == 6) {
do_invalid_op(regs, 0);
return;
}
}
#endif
no_context: no_context:
/* Are we prepared to handle this kernel fault? */ /* Are we prepared to handle this kernel fault? */
......
...@@ -256,6 +256,27 @@ static int is_errata93(struct pt_regs *regs, unsigned long address) ...@@ -256,6 +256,27 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
return 0; return 0;
} }
void do_invalid_op(struct pt_regs *, unsigned long);
static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
{
#ifdef CONFIG_X86_F00F_BUG
unsigned long nr;
/*
* Pentium F0 0F C7 C8 bug workaround.
*/
if (boot_cpu_data.f00f_bug) {
nr = (address - idt_descr.address) >> 3;
if (nr == 6) {
do_invalid_op(regs, 0);
return 1;
}
}
#endif
return 0;
}
static noinline void pgtable_bad(unsigned long address, struct pt_regs *regs, static noinline void pgtable_bad(unsigned long address, struct pt_regs *regs,
unsigned long error_code) unsigned long error_code)
{ {
...@@ -581,6 +602,9 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs, ...@@ -581,6 +602,9 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
return; return;
} }
if (is_f00f_bug(regs, address))
return;
no_context: no_context:
/* Are we prepared to handle this kernel fault? */ /* Are we prepared to handle this kernel fault? */
if (fixup_exception(regs)) if (fixup_exception(regs))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment