x86, 64-bit: Move K8 B step iret fixup to fault entry asm (v2)
PATCH 1/1 x86, 64-bit: Move K8 B step iret fixup to fault entry asm (v2)
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.
--- 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(-)
arch/x86/include/asm/uaccess.h +0 -1
@@ -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
arch/x86/kernel/entry_64.S +8 -3
@@ -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)
arch/x86/mm/extable.c +0 -31
@@ -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
Signature · 1 line
1.6.2.5
Quoted 6 lines · Brian Gerst
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_swapgsto 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:
Quoted 73 lines
Signed-off-by Brian Gerst <[email protected]>--- 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(-)arch/x86/include/asm/uaccess.h +0
-1@@ -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 arch/x86/kernel/entry_64.S +8
-3@@ -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)arch/x86/mm/extable.c +0
-21@@ -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;
arch/x86/mm/extable.c int fixup_exception(struct pt_regs *regs) · line 68
Quoted 10 lines
arch/x86/mm/extable.c +0
-10-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
Quoted 6 lines · Ingo Molnar
Quoted 3 lines · Brian Gerst
Move the handling of truncated %rip from an iret fault to the fault entry path.
Quoted 6 lines
Quoted 3 lines
This allows x86-64 to use the standard
search_extable()function.v2: Fixed jump to
error_swapgsto be unconditional.v1 is already in the tip:x86/asm topic tree. Mind sending a delta fix against:
Will do.
Quoted 87 lines
http://people.redhat.com/mingo/tip.git/README
?
Also, i'm having second thoughts about the change:
Quoted 81 lines
Signed-off-by Brian Gerst <[email protected]>---
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(-)arch/x86/include/asm/uaccess.h +0
-1@@ -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" #endifarch/x86/kernel/entry_64.S +0
-0@@ -1491,12 +1491,17 @@ error_kernelspace:leaq irq_return(%rip),%rcx
cmpq %rcx,RIP+8(%rsp)
jeerror_swapgs
- movl %ecx,%ecx /* zero extend */
- cmpq %rcx,RIP+8(%rsp)
- jeerror_swapgs
+ movl %ecx,%eax /* zero extend */
+ cmpq %rax,RIP+8(%rsp)
+ jebstep_iret
cmpq $gs_change,RIP+8(%rsp)
jeerror_swapgs
jmperror_stiarch/x86/kernel/entry_64.S +5
-0+ +bstep_iret: + /* Fix truncated RIP */ + movq %rcx,RIP+8(%rsp) + jmp error_swapgsEND(error_entry)
arch/x86/mm/extable.c +0
-29@@ -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;
Quoted 8 lines
arch/x86/mm/extable.c int fixup_exception(struct pt_regs *regs) · line 68
Quoted 2 lines
arch/x86/mm/extable.c +0
-2-} -#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
PATCH 1/1 x86, 64-bit: Fix bstep_iret jump
In reply to Ingo MolnarThis jump should be unconditional.
--- arch/x86/kernel/entry_64.S | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/entry_64.S +1 -1
@@ -1501,7 +1501,7 @@ error_kernelspace: bstep_iret: /* Fix truncated RIP */ movq %rcx,RIP+8(%rsp) - je error_swapgs + jmp error_swapgs END(error_entry)
Signature · 1 line
1.6.2.5
[tip:x86/asm] x86, 64-bit: Fix bstep_iret jump
Commit-ID: 97829de5a3b88899c5f3ac8802d11868bf4180ba Gitweb: http://git.kernel.org/tip/97829de5a3b88899c5f3ac8802d11868bf4180ba Author: Brian Gerst <[email protected]> AuthorDate: Tue, 3 Nov 2009 14:02:05 -0500 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 3 Nov 2009 20:50:02 +0100
x86, 64-bit: Fix bstep_iret jump
This jump should be unconditional.
LKML-Reference: <[email protected]>
--- arch/x86/kernel/entry_64.S | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/entry_64.S +1 -1
@@ -1501,7 +1501,7 @@ error_kernelspace: bstep_iret: /* Fix truncated RIP */ movq %rcx,RIP+8(%rsp) - je error_swapgs + jmp error_swapgs END(error_entry)