Commit 29955909 authored Jul 11, 2017 by Andy Lutomirski Committed by Ingo Molnar Jul 18, 2017

x86/entry/64: Initialize the top of the IRQ stack before switching stacks



The OOPS unwinder wants the word at the top of the IRQ stack to
point back to the previous stack at all times when the IRQ stack
is in use.  There's currently a one-instruction window in ENTER_IRQ_STACK
during which this isn't the case.  Fix it by writing the old RSP to the
top of the IRQ stack before jumping.

This currently writes the pointer to the stack twice, which is a bit
ugly.  We could get rid of this by replacing irq_stack_ptr with
irq_stack_ptr_minus_eight (better name welcome).  OTOH, there may be
all kinds of odd microarchitectural considerations in play that
affect performance by a few cycles here.

Reported-by: Mike Galbraith <efault@gmx.de>
Reported-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: live-patching@vger.kernel.org
Link: http://lkml.kernel.org/r/aae7e79e49914808440ad5310ace138ced2179ca.1499786555.git.jpoimboe@redhat.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 1d3e53e8

arch/x86/entry/entry_64.S

+23 −1

Original line number	Diff line number	Diff line
		@@ -469,6 +469,7 @@ END(irq_entries_start)
		DEBUG_ENTRY_ASSERT_IRQS_OFF
		movq %rsp, \old_rsp
		incl PER_CPU_VAR(irq_count)
		jnz .Lirq_stack_push_old_rsp_\@

		/*
		* Right now, if we just incremented irq_count to zero, we've
		@@ -478,9 +479,30 @@ END(irq_entries_start)
		* it must be extremely careful to limit its stack usage. This
		* could include kprobes and a hypothetical future IST-less #DB
		* handler.
		*
		* The OOPS unwinder relies on the word at the top of the IRQ
		* stack linking back to the previous RSP for the entire time we're
		* on the IRQ stack. For this to work reliably, we need to write
		* it before we actually move ourselves to the IRQ stack.
		*/

		movq \old_rsp, PER_CPU_VAR(irq_stack_union + IRQ_STACK_SIZE - 8)
		movq PER_CPU_VAR(irq_stack_ptr), %rsp

		#ifdef CONFIG_DEBUG_ENTRY
		/*
		* If the first movq above becomes wrong due to IRQ stack layout
		* changes, the only way we'll notice is if we try to unwind right
		* here. Assert that we set up the stack right to catch this type
		* of bug quickly.
		*/
		cmpq -8(%rsp), \old_rsp
		je .Lirq_stack_okay\@
		ud2
		.Lirq_stack_okay\@:
		#endif

		cmovzq PER_CPU_VAR(irq_stack_ptr), %rsp
		.Lirq_stack_push_old_rsp_\@:
		pushq \old_rsp
		.endm