x86/asm/entry/64: Rename 'old_rsp' to 'rsp_scratch'
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 11 lines · tip-bot for Ingo Molnar
Commit-ID: c38e503804b0402c510f82437069f7769fa0cea9 Gitweb: http://git.kernel.org/tip/c38e503804b0402c510f82437069f7769fa0cea9 Author: Ingo Molnar <[email protected]> AuthorDate: Tue, 17 Mar 2015 14:42:59 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 17 Mar 2015 16:01:42 +0100x86/asm/entry/64: Rename '
old_rsp' to 'rsp_scratch'Make clear that the usage of
PER_CPU(old_rsp)is purely temporary, by renaming it to 'rsp_scratch'.
Thanks. This is much better.
--Andy
Quoted 98 lines
Cc Alexei Starovoitov <[email protected]>Cc Andy Lutomirski <[email protected]>Cc Borislav Petkov <[email protected]>Cc Denys Vlasenko <[email protected]>Cc Frederic Weisbecker <[email protected]>Cc H. Peter Anvin <[email protected]>Cc Kees Cook <[email protected]>Cc Linus Torvalds <[email protected]>Cc Oleg Nesterov <[email protected]>Cc Steven Rostedt <[email protected]>Cc Will Drewry <[email protected]>Signed-off-by Ingo Molnar <[email protected]>--- arch/x86/kernel/entry_64.S | 10 +++++----- arch/x86/kernel/process_64.c | 2 +- arch/x86/xen/xen-asm_64.S | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-)arch/x86/kernel/entry_64.S +5
-5@@ -237,16 +237,16 @@ ENTRY(system_call) GLOBAL(system_call_after_swapgs) /* - * We use 'old_rsp' as a scratch register, hence this block must execute + * We use 'rsp_scratch' as a scratch register, hence this block must execute * atomically in the face of possible interrupt-driven task preemption, - * so we can enable interrupts only after we're done with using old_rsp: + * so we can enable interrupts only after we're done with using rsp_scratch: */ - movq %rsp,PER_CPU_VAR(old_rsp) + movq %rsp,PER_CPU_VAR(rsp_scratch) /* kernel_stack is set so that 5 slots (iret frame) are preallocated */ movq PER_CPU_VAR(kernel_stack),%rsp ALLOC_PT_GPREGS_ON_STACK 8 /* +8: space for orig_ax */ movq %rcx,RIP(%rsp) - movq PER_CPU_VAR(old_rsp),%rcx + movq PER_CPU_VAR(rsp_scratch),%rcx movq %r11,EFLAGS(%rsp) movq %rcx,RSP(%rsp) /*@@ -657,7 +657,7 @@ common_interrupt: ASM_CLAC addq $-0x80,(%rsp) /* Adjust vector to [-256,-1] range */ interrupt do_IRQ - /* 0(%rsp): old_rsp */ + /* 0(%rsp): rsp_scratch */ ret_from_intr: DISABLE_INTERRUPTS(CLBR_NONE) TRACE_IRQS_OFFarch/x86/kernel/process_64.c +1
-1@@ -52,7 +52,7 @@ asmlinkage extern void ret_from_fork(void); -__visible DEFINE_PER_CPU (unsigned long ,old_rsp ); +__visible DEFINE_PER_CPU (unsigned long ,rsp_scratch );/* Prints also some state that isn't saved in the pt_regs */ void __show_regs (struct pt_regs *regs,int all)arch/x86/xen/xen-asm_64.S +4
-4@@ -68,11 +68,11 @@ ENTRY(xen_sysret64) * We're already on the usermode stack at this point, but * still with the kernel gs, so we can easily switch back */ - movq %rsp, PER_CPU_VAR(old_rsp) + movq %rsp, PER_CPU_VAR(rsp_scratch) movq PER_CPU_VAR(kernel_stack), %rsp pushq $__USER_DS - pushq PER_CPU_VAR(old_rsp) + pushq PER_CPU_VAR(rsp_scratch) pushq %r11 pushq $__USER_CS pushq %rcx@@ -87,11 +87,11 @@ ENTRY(xen_sysret32) * We're already on the usermode stack at this point, but * still with the kernel gs, so we can easily switch back */ - movq %rsp, PER_CPU_VAR(old_rsp) + movq %rsp, PER_CPU_VAR(rsp_scratch) movq PER_CPU_VAR(kernel_stack), %rsp pushq $__USER32_DS - pushq PER_CPU_VAR(old_rsp) + pushq PER_CPU_VAR(rsp_scratch) pushq %r11 pushq $__USER32_CS pushq %rcx
Signature · 2 lines
Andy Lutomirski AMA Capital Management, LLC
Quoted 11 lines · tip-bot for Ingo Molnar
Commit-ID: c38e503804b0402c510f82437069f7769fa0cea9 Gitweb: http://git.kernel.org/tip/c38e503804b0402c510f82437069f7769fa0cea9 Author: Ingo Molnar <[email protected]> AuthorDate: Tue, 17 Mar 2015 14:42:59 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 17 Mar 2015 16:01:42 +0100x86/asm/entry/64: Rename '
old_rsp' to 'rsp_scratch'Make clear that the usage of
PER_CPU(old_rsp)is purely temporary, by renaming it to 'rsp_scratch'.
...
Review common_interrupt: · line 661
Quoted 7 lines
(quoted diff) +1
-1@@ -657,7 +657,7 @@ common_interrupt: ASM_CLAC addq $-0x80,(%rsp) /* Adjust vector to [-256,-1] range */ interrupt do_IRQ - /* 0(%rsp): old_rsp */ + /* 0(%rsp): rsp_scratch */ ret_from_intr:
Here the "old_rsp" word in comment did not refer to old_rsp variable.
Rather, it literally means "old %rsp register value (before we possibly switched to per-CPU interrupt stack)".
The stack switch is hidden in "interrupt do_IRQ" macro invocation.
I think here "old_rsp" needs to be replaced by "old rsp" or "old %rsp".
Quoted 23 lines · Denys Vlasenko
Quoted 11 lines · tip-bot for Ingo Molnar
Commit-ID: c38e503804b0402c510f82437069f7769fa0cea9 Gitweb: http://git.kernel.org/tip/c38e503804b0402c510f82437069f7769fa0cea9 Author: Ingo Molnar <[email protected]> AuthorDate: Tue, 17 Mar 2015 14:42:59 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 17 Mar 2015 16:01:42 +0100x86/asm/entry/64: Rename '
old_rsp' to 'rsp_scratch'Make clear that the usage of
PER_CPU(old_rsp)is purely temporary, by renaming it to 'rsp_scratch'....
Review common_interrupt: · line 661
Quoted 7 lines
(quoted diff) +1
-1@@ -657,7 +657,7 @@ common_interrupt: ASM_CLAC addq $-0x80,(%rsp) /* Adjust vector to [-256,-1] range */ interrupt do_IRQ - /* 0(%rsp): old_rsp */ + /* 0(%rsp): rsp_scratch */ ret_from_intr:Here the "
old_rsp" word in comment did not refer toold_rspvariable.
Quoted 6 lines
Rather, it literally means "old %rsp register value (before we possibly switched to per-CPU interrupt stack)".
The stack switch is hidden in "interrupt
do_IRQ" macro invocation.I think here "
old_rsp" needs to be replaced by "old rsp" or "old %rsp".
Indeed - and I applied your comment-fix patch.
Thanks,
Ingo