From 0666626af1496de3279a1abcb0173cc1a32bddde Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Wed, 30 Jan 2008 13:31:41 +0100 Subject: [PATCH] --- yaml --- r: 80047 b: refs/heads/master c: 6d48583ba9ade609634e694fc35ea62b7a8adaaa h: refs/heads/master i: 80045: 2ccc2381bf803774c8dbff1bd441523f0938f757 80043: 89d20ccd9eebca3df9ceb8b55ce81dd6a3733406 80039: 2a48c0798b28dae129095da723718768d147b9d2 80031: 60dd7675de1f271cd53aee06956632f7a604e846 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/kprobes.c | 12 +------ trunk/arch/x86/mm/Makefile_32 | 2 +- trunk/arch/x86/mm/Makefile_64 | 2 +- trunk/arch/x86/mm/extable.c | 62 +++++++++++++++++++++++++++++++++ trunk/arch/x86/mm/extable_32.c | 35 ------------------- trunk/arch/x86/mm/extable_64.c | 34 ------------------ 7 files changed, 66 insertions(+), 83 deletions(-) create mode 100644 trunk/arch/x86/mm/extable.c delete mode 100644 trunk/arch/x86/mm/extable_32.c delete mode 100644 trunk/arch/x86/mm/extable_64.c diff --git a/[refs] b/[refs] index b56e6ffb3827..e6bda69eac7a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46265df040533f57c191bb2b019d6b25c3bf1f34 +refs/heads/master: 6d48583ba9ade609634e694fc35ea62b7a8adaaa diff --git a/trunk/arch/x86/kernel/kprobes.c b/trunk/arch/x86/kernel/kprobes.c index 8de82c8cedd6..7848bf74e2ab 100644 --- a/trunk/arch/x86/kernel/kprobes.c +++ b/trunk/arch/x86/kernel/kprobes.c @@ -904,19 +904,9 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr) * In case the user-specified fault handler returned * zero, try to fix up. */ -#ifdef CONFIG_X86_64 - { - const struct exception_table_entry *fixup; - fixup = search_exception_tables(regs->ip); - if (fixup) { - regs->ip = fixup->fixup; - return 1; - } - } -#else if (fixup_exception(regs)) return 1; -#endif + /* * fixup routine could not handle it, * Let do_page_fault() fix it. diff --git a/trunk/arch/x86/mm/Makefile_32 b/trunk/arch/x86/mm/Makefile_32 index a01aca79dc69..6a5e981981f7 100644 --- a/trunk/arch/x86/mm/Makefile_32 +++ b/trunk/arch/x86/mm/Makefile_32 @@ -2,7 +2,7 @@ # Makefile for the linux i386-specific parts of the memory manager. # -obj-y := init_32.o pgtable_32.o fault_32.o ioremap_32.o extable_32.o pageattr_32.o mmap.o +obj-y := init_32.o pgtable_32.o fault_32.o ioremap_32.o extable.o pageattr_32.o mmap.o obj-$(CONFIG_NUMA) += discontig_32.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o diff --git a/trunk/arch/x86/mm/Makefile_64 b/trunk/arch/x86/mm/Makefile_64 index b5a74486c3aa..09c997fe5856 100644 --- a/trunk/arch/x86/mm/Makefile_64 +++ b/trunk/arch/x86/mm/Makefile_64 @@ -2,7 +2,7 @@ # Makefile for the linux x86_64-specific parts of the memory manager. # -obj-y := init_64.o fault_64.o ioremap_64.o extable_64.o pageattr_64.o mmap.o +obj-y := init_64.o fault_64.o ioremap_64.o extable.o pageattr_64.o mmap.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o obj-$(CONFIG_NUMA) += numa_64.o obj-$(CONFIG_K8_NUMA) += k8topology_64.o diff --git a/trunk/arch/x86/mm/extable.c b/trunk/arch/x86/mm/extable.c new file mode 100644 index 000000000000..7e8db53528a7 --- /dev/null +++ b/trunk/arch/x86/mm/extable.c @@ -0,0 +1,62 @@ +#include +#include +#include + + +int fixup_exception(struct pt_regs *regs) +{ + const struct exception_table_entry *fixup; + +#ifdef CONFIG_PNPBIOS + if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) { + extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; + extern u32 pnp_bios_is_utter_crap; + pnp_bios_is_utter_crap = 1; + printk(KERN_CRIT "PNPBIOS fault.. attempting recovery.\n"); + __asm__ volatile( + "movl %0, %%esp\n\t" + "jmp *%1\n\t" + : : "g" (pnp_bios_fault_esp), "g" (pnp_bios_fault_eip)); + panic("do_trap: can't hit this"); + } +#endif + + fixup = search_exception_tables(regs->ip); + if (fixup) { + regs->ip = fixup->fixup; + return 1; + } + + return 0; +} + +#ifdef CONFIG_X86_64 +/* + * Need to defined our own search_extable on X86_64 to work around + * a B stepping K8 bug. + */ +const struct exception_table_entry * +search_extable(const struct exception_table_entry *first, + const struct exception_table_entry *last, + unsigned long value) +{ + /* B stepping K8 bug */ + if ((value >> 32) == 0) + value |= 0xffffffffUL << 32; + + while (first <= last) { + const struct exception_table_entry *mid; + long diff; + + mid = (last - first) / 2 + first; + diff = mid->insn - value; + if (diff == 0) + return mid; + else if (diff < 0) + first = mid+1; + else + last = mid-1; + } + return NULL; +} +#endif diff --git a/trunk/arch/x86/mm/extable_32.c b/trunk/arch/x86/mm/extable_32.c deleted file mode 100644 index 41685461f8b2..000000000000 --- a/trunk/arch/x86/mm/extable_32.c +++ /dev/null @@ -1,35 +0,0 @@ -/* - * linux/arch/i386/mm/extable.c - */ - -#include -#include -#include - -int fixup_exception(struct pt_regs *regs) -{ - const struct exception_table_entry *fixup; - -#ifdef CONFIG_PNPBIOS - if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) - { - extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; - extern u32 pnp_bios_is_utter_crap; - pnp_bios_is_utter_crap = 1; - printk(KERN_CRIT "PNPBIOS fault.. attempting recovery.\n"); - __asm__ volatile( - "movl %0, %%esp\n\t" - "jmp *%1\n\t" - : : "g" (pnp_bios_fault_esp), "g" (pnp_bios_fault_eip)); - panic("do_trap: can't hit this"); - } -#endif - - fixup = search_exception_tables(regs->ip); - if (fixup) { - regs->ip = fixup->fixup; - return 1; - } - - return 0; -} diff --git a/trunk/arch/x86/mm/extable_64.c b/trunk/arch/x86/mm/extable_64.c deleted file mode 100644 index 79ac6e7100af..000000000000 --- a/trunk/arch/x86/mm/extable_64.c +++ /dev/null @@ -1,34 +0,0 @@ -/* - * linux/arch/x86_64/mm/extable.c - */ - -#include -#include -#include -#include - -/* Simple binary search */ -const struct exception_table_entry * -search_extable(const struct exception_table_entry *first, - const struct exception_table_entry *last, - unsigned long value) -{ - /* Work around a B stepping K8 bug */ - if ((value >> 32) == 0) - value |= 0xffffffffUL << 32; - - while (first <= last) { - const struct exception_table_entry *mid; - long diff; - - mid = (last - first) / 2 + first; - diff = mid->insn - value; - if (diff == 0) - return mid; - else if (diff < 0) - first = mid+1; - else - last = mid-1; - } - return NULL; -}