[PATCH] x86-64: fix unwind annotations in recent NMI changes

[Jan Beulich]

While in one case a plain annotation is necessary, in the other case
the stack adjustment can simply be folded into the immediately
preceding RESTORE_ALL, thus getting the correct annotation for free.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>

---
 arch/x86/kernel/entry_64.S |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- 3.8-rc4/arch/x86/kernel/entry_64.S
+++ 3.8-rc4-x86_64-NMI-unwind/arch/x86/kernel/entry_64.S
@@ -1781,6 +1781,7 @@ first_nmi:
 	 * Leave room for the "copied" frame
 	 */
 	subq $(5*8), %rsp
+	CFI_ADJUST_CFA_OFFSET 5*8
 
 	/* Copy the stack frame to the Saved frame */
 	.rept 5
@@ -1863,10 +1864,8 @@ end_repeat_nmi:
 nmi_swapgs:
 	SWAPGS_UNSAFE_STACK
 nmi_restore:
-	RESTORE_ALL 8
-
-	/* Pop the extra iret frame */
-	addq $(5*8), %rsp
+	/* Pop the extra iret frame at once */
+	RESTORE_ALL 6*8
 
 	/* Clear the NMI executing stack variable */
 	movq $0, 5*8(%rsp)



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/