Re: [PATCH 02/39] x86/entry/32: Rename TSS_sysenter_sp0 to TSS_entry_stack

2018-07-12 Thread Andy Lutomirski



> On Jul 11, 2018, at 4:29 AM, Joerg Roedel  wrote:
> 
> From: Joerg Roedel 
> 
> The stack address doesn't need to be stored in tss.sp0 if
> we switch manually like on sysenter. Rename the offset so
> that it still makes sense when we change its location.
> 
> We will also use this stack for all kernel-entry points, not
> just sysenter. Reflect that in the name as well.

Reviewed-by: Andy Lutomirski 

But, if there’s another version, please fix this comment:

> 
> 
> 
>/* Offset from the sysenter stack to tss.sp0 */

Here

> -DEFINE(TSS_sysenter_sp0, offsetof(struct cpu_entry_area, 
> tss.x86_tss.sp0) -
> +DEFINE(TSS_entry_stack, offsetof(struct cpu_entry_area, tss.x86_tss.sp0) 
> -
>   offsetofend(struct cpu_entry_area, entry_stack_page.stack));
> 
> #ifdef CONFIG_STACKPROTECTOR
> -- 
> 2.7.4
> 


[PATCH 02/39] x86/entry/32: Rename TSS_sysenter_sp0 to TSS_entry_stack

2018-07-11 Thread Joerg Roedel
From: Joerg Roedel 

The stack address doesn't need to be stored in tss.sp0 if
we switch manually like on sysenter. Rename the offset so
that it still makes sense when we change its location.

We will also use this stack for all kernel-entry points, not
just sysenter. Reflect that in the name as well.

Signed-off-by: Joerg Roedel 
---
 arch/x86/entry/entry_32.S| 2 +-
 arch/x86/kernel/asm-offsets_32.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S
index c371bfe..39fdda3 100644
--- a/arch/x86/entry/entry_32.S
+++ b/arch/x86/entry/entry_32.S
@@ -412,7 +412,7 @@ ENTRY(xen_sysenter_target)
  * 0(%ebp) arg6
  */
 ENTRY(entry_SYSENTER_32)
-   movlTSS_sysenter_sp0(%esp), %esp
+   movlTSS_entry_stack(%esp), %esp
 .Lsysenter_past_esp:
pushl   $__USER_DS  /* pt_regs->ss */
pushl   %ebp/* pt_regs->sp (stashed in bp) */
diff --git a/arch/x86/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c
index a4a3be3..ab2d949 100644
--- a/arch/x86/kernel/asm-offsets_32.c
+++ b/arch/x86/kernel/asm-offsets_32.c
@@ -47,7 +47,7 @@ void foo(void)
BLANK();
 
/* Offset from the sysenter stack to tss.sp0 */
-   DEFINE(TSS_sysenter_sp0, offsetof(struct cpu_entry_area, 
tss.x86_tss.sp0) -
+   DEFINE(TSS_entry_stack, offsetof(struct cpu_entry_area, 
tss.x86_tss.sp0) -
   offsetofend(struct cpu_entry_area, entry_stack_page.stack));
 
 #ifdef CONFIG_STACKPROTECTOR
-- 
2.7.4