| Submitter | Brian Gerst |
|---|---|
| Date | 2009-11-03 17:55:36 |
| Message ID | <1257270936-5496-1-git-send-email-brgerst@gmail.com> |
| Download | mbox | patch |
| Permalink | /patch/57346/ |
| State | New |
| Headers | show |
Comments
* Brian Gerst <brgerst@gmail.com> wrote: > Move the handling of truncated %rip from an iret fault to the fault > entry path. > > This allows x86-64 to use the standard search_extable() function. > > v2: Fixed jump to error_swapgs to be unconditional. v1 is already in the tip:x86/asm topic tree. Mind sending a delta fix against: http://people.redhat.com/mingo/tip.git/README ? Also, i'm having second thoughts about the change: > Signed-off-by: Brian Gerst <brgerst@gmail.com> > --- > arch/x86/include/asm/uaccess.h | 1 - > arch/x86/kernel/entry_64.S | 11 ++++++++--- > arch/x86/mm/extable.c | 31 ------------------------------- > 3 files changed, 8 insertions(+), 35 deletions(-) > > diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h > index d2c6c93..abd3e0e 100644 > --- a/arch/x86/include/asm/uaccess.h > +++ b/arch/x86/include/asm/uaccess.h > @@ -570,7 +570,6 @@ extern struct movsl_mask { > #ifdef CONFIG_X86_32 > # include "uaccess_32.h" > #else > -# define ARCH_HAS_SEARCH_EXTABLE > # include "uaccess_64.h" > #endif > > diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S > index b5c061f..1579a6c 100644 > --- a/arch/x86/kernel/entry_64.S > +++ b/arch/x86/kernel/entry_64.S > @@ -1491,12 +1491,17 @@ error_kernelspace: > leaq irq_return(%rip),%rcx > cmpq %rcx,RIP+8(%rsp) > je error_swapgs > - movl %ecx,%ecx /* zero extend */ > - cmpq %rcx,RIP+8(%rsp) > - je error_swapgs > + movl %ecx,%eax /* zero extend */ > + cmpq %rax,RIP+8(%rsp) > + je bstep_iret > cmpq $gs_change,RIP+8(%rsp) > je error_swapgs > jmp error_sti > + > +bstep_iret: > + /* Fix truncated RIP */ > + movq %rcx,RIP+8(%rsp) > + jmp error_swapgs > END(error_entry) > > > diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c > index 61b41ca..d0474ad 100644 > --- a/arch/x86/mm/extable.c > +++ b/arch/x86/mm/extable.c > @@ -35,34 +35,3 @@ int fixup_exception(struct pt_regs *regs) > > 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 is this the only way how we can end up having a truncated 64-bit RIP passed in to search_exception_tables()/search_extable()? Before your commit we basically had a last-ditch safety net in 64-bit kernels that zero-extended truncated RIPs - no matter how they got there (via known or unknown erratums). Thanks, Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On Tue, Nov 3, 2009 at 1:10 PM, Ingo Molnar <mingo@elte.hu> wrote: > > * Brian Gerst <brgerst@gmail.com> wrote: > >> Move the handling of truncated %rip from an iret fault to the fault >> entry path. >> >> This allows x86-64 to use the standard search_extable() function. >> >> v2: Fixed jump to error_swapgs to be unconditional. > > v1 is already in the tip:x86/asm topic tree. Mind sending a delta fix > against: Will do. > http://people.redhat.com/mingo/tip.git/README > > ? > > Also, i'm having second thoughts about the change: > >> Signed-off-by: Brian Gerst <brgerst@gmail.com> >> --- >> arch/x86/include/asm/uaccess.h | 1 - >> arch/x86/kernel/entry_64.S | 11 ++++++++--- >> arch/x86/mm/extable.c | 31 ------------------------------- >> 3 files changed, 8 insertions(+), 35 deletions(-) >> >> diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h >> index d2c6c93..abd3e0e 100644 >> --- a/arch/x86/include/asm/uaccess.h >> +++ b/arch/x86/include/asm/uaccess.h >> @@ -570,7 +570,6 @@ extern struct movsl_mask { >> #ifdef CONFIG_X86_32 >> # include "uaccess_32.h" >> #else >> -# define ARCH_HAS_SEARCH_EXTABLE >> # include "uaccess_64.h" >> #endif >> >> diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S >> index b5c061f..1579a6c 100644 >> --- a/arch/x86/kernel/entry_64.S >> +++ b/arch/x86/kernel/entry_64.S >> @@ -1491,12 +1491,17 @@ error_kernelspace: >> leaq irq_return(%rip),%rcx >> cmpq %rcx,RIP+8(%rsp) >> je error_swapgs >> - movl %ecx,%ecx /* zero extend */ >> - cmpq %rcx,RIP+8(%rsp) >> - je error_swapgs >> + movl %ecx,%eax /* zero extend */ >> + cmpq %rax,RIP+8(%rsp) >> + je bstep_iret >> cmpq $gs_change,RIP+8(%rsp) >> je error_swapgs >> jmp error_sti >> + >> +bstep_iret: >> + /* Fix truncated RIP */ >> + movq %rcx,RIP+8(%rsp) >> + jmp error_swapgs >> END(error_entry) >> >> >> diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c >> index 61b41ca..d0474ad 100644 >> --- a/arch/x86/mm/extable.c >> +++ b/arch/x86/mm/extable.c >> @@ -35,34 +35,3 @@ int fixup_exception(struct pt_regs *regs) >> >> 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 > > is this the only way how we can end up having a truncated 64-bit RIP > passed in to search_exception_tables()/search_extable()? Before your > commit we basically had a last-ditch safety net in 64-bit kernels that > zero-extended truncated RIPs - no matter how they got there (via known > or unknown erratums). That kind of erratum would logically only happen on a transition to 32-bit mode (or even 16-bit mode?), and the only other place this could happen is the sysret or sysexit paths, neither of which have exception handlers. If it were happening in those places, you would see the truncated RIP in oops reports, since the original (truncated) RIP in pt_regs doesn't get changed by the current code. -- Brian Gerst -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Patch
diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h index d2c6c93..abd3e0e 100644 --- a/arch/x86/include/asm/uaccess.h +++ b/arch/x86/include/asm/uaccess.h @@ -570,7 +570,6 @@ extern struct movsl_mask { #ifdef CONFIG_X86_32 # include "uaccess_32.h" #else -# define ARCH_HAS_SEARCH_EXTABLE # include "uaccess_64.h" #endif diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index b5c061f..1579a6c 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -1491,12 +1491,17 @@ error_kernelspace: leaq irq_return(%rip),%rcx cmpq %rcx,RIP+8(%rsp) je error_swapgs - movl %ecx,%ecx /* zero extend */ - cmpq %rcx,RIP+8(%rsp) - je error_swapgs + movl %ecx,%eax /* zero extend */ + cmpq %rax,RIP+8(%rsp) + je bstep_iret cmpq $gs_change,RIP+8(%rsp) je error_swapgs jmp error_sti + +bstep_iret: + /* Fix truncated RIP */ + movq %rcx,RIP+8(%rsp) + jmp error_swapgs END(error_entry) diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c index 61b41ca..d0474ad 100644 --- a/arch/x86/mm/extable.c +++ b/arch/x86/mm/extable.c @@ -35,34 +35,3 @@ int fixup_exception(struct pt_regs *regs) 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
Move the handling of truncated %rip from an iret fault to the fault entry path. This allows x86-64 to use the standard search_extable() function. v2: Fixed jump to error_swapgs to be unconditional. Signed-off-by: Brian Gerst <brgerst@gmail.com> --- arch/x86/include/asm/uaccess.h | 1 - arch/x86/kernel/entry_64.S | 11 ++++++++--- arch/x86/mm/extable.c | 31 ------------------------------- 3 files changed, 8 insertions(+), 35 deletions(-)