[RESEND][PATCH] x86: don't destroy %rbp on kernel-mode faults

[RESEND][PATCH] x86: don't destroy %rbp on kernel-mode faults

[Vegard Nossum]

Hi,

I sent this patch earlier, but it was never queued. It has been acked by
Arjan and acked informally by Andi. I hope this can make it for 2.6.27.

(It's been tested on two x86_64s.)


Vegard


From: Vegard Nossum <vegard.nossum@gmail.com>
Date: Thu, 26 Jun 2008 13:26:50 +0200
Subject: [PATCH] x86: don't destroy %rbp on kernel-mode faults

>From the code:

    "B stepping K8s sometimes report an truncated RIP for IRET exceptions
    returning to compat mode. Check for these here too."

The code then proceeds to truncate the upper 32 bits of %rbp. This means
that when do_page_fault() is finally called, its prologue,

    do_page_fault:
        push %rbp
        movl %rsp, %rbp

will put the truncated base pointer on the stack. This means that the
stack tracer will not be able to follow the base-pointer changes and
will see all subsequent stack frames as unreliable.

This patch changes the code to use a different register (%rcx) for the
checking and leaves %rbp untouched.

Cc: Andi Kleen <andi@firstfloor.org>
Cc: Ingo Molnar <mingo@elte.hu>
Acked-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
---
 arch/x86/kernel/entry_64.S |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 556a8df..fa1c9eb 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -926,11 +926,11 @@ error_kernelspace:
 	   iret run with kernel gs again, so don't set the user space flag.
 	   B stepping K8s sometimes report an truncated RIP for IRET 
 	   exceptions returning to compat mode. Check for these here too. */
-	leaq irq_return(%rip),%rbp
-	cmpq %rbp,RIP(%rsp) 
+	leaq irq_return(%rip),%rcx
+	cmpq %rcx,RIP(%rsp)
 	je   error_swapgs
-	movl %ebp,%ebp	/* zero extend */
-	cmpq %rbp,RIP(%rsp) 
+	movl %ecx,%ecx	/* zero extend */
+	cmpq %rcx,RIP(%rsp)
 	je   error_swapgs
 	cmpq $gs_change,RIP(%rsp)
         je   error_swapgs
-- 
1.5.4.1

Re: [RESEND][PATCH] x86: don't destroy %rbp on kernel-mode faults

[Ingo Molnar]

* Vegard Nossum <vegard.nossum@gmail.com> wrote:

> >From the code:
> 
>     "B stepping K8s sometimes report an truncated RIP for IRET exceptions
>     returning to compat mode. Check for these here too."
> 
> The code then proceeds to truncate the upper 32 bits of %rbp. This means
> that when do_page_fault() is finally called, its prologue,
> 
>     do_page_fault:
>         push %rbp
>         movl %rsp, %rbp
> 
> will put the truncated base pointer on the stack. This means that the
> stack tracer will not be able to follow the base-pointer changes and
> will see all subsequent stack frames as unreliable.
> 
> This patch changes the code to use a different register (%rcx) for the
> checking and leaves %rbp untouched.

applied to tip/x86/debug - thanks Vegard!

	Ingo

Re: [RESEND][PATCH] x86: don't destroy %rbp on kernel-mode faults

[Andi Kleen]

Vegard Nossum <vegard.nossum@gmail.com> writes:

> Hi,
>
> I sent this patch earlier, but it was never queued. It has been acked by
> Arjan and acked informally by Andi. I hope this can make it for 2.6.27.

Just to clarify the "informal ack" was (paraphrased): 

All the .S code was always designed to support dwarf2 unwinding and
not frame pointers and there are a lot more places that don't care
about frame pointers. So even if you fix it here it'll still break in
other places.

-Andi