]> git.baikalelectronics.ru Git - kernel.git/commit
Revert "x86/retpoline: Simplify vmexit_fill_RSB()"
authorDavid Woodhouse <dwmw@amazon.co.uk>
Mon, 19 Feb 2018 10:50:56 +0000 (10:50 +0000)
committerIngo Molnar <mingo@kernel.org>
Tue, 20 Feb 2018 08:38:26 +0000 (09:38 +0100)
commit3260edd99df48eb2643697d2a13ae3fadc97092d
tree603d37297f7655ff02522f9fbee940d22ac83236
parentc03694ecb0d3ca59566cada7a5538f775b328a92
Revert "x86/retpoline: Simplify vmexit_fill_RSB()"

This reverts commit 07281ade47f9c0d940ddb231ab8581c8dee015ee. By putting
the RSB filling out of line and calling it, we waste one RSB slot for
returning from the function itself, which means one fewer actual function
call we can make if we're doing the Skylake abomination of call-depth
counting.

It also changed the number of RSB stuffings we do on vmexit from 32,
which was correct, to 16. Let's just stop with the bikeshedding; it
didn't actually *fix* anything anyway.

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: arjan.van.de.ven@intel.com
Cc: bp@alien8.de
Cc: dave.hansen@intel.com
Cc: jmattson@google.com
Cc: karahmed@amazon.de
Cc: kvm@vger.kernel.org
Cc: pbonzini@redhat.com
Cc: rkrcmar@redhat.com
Link: http://lkml.kernel.org/r/1519037457-7643-4-git-send-email-dwmw@amazon.co.uk
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/entry/entry_32.S
arch/x86/entry/entry_64.S
arch/x86/include/asm/asm-prototypes.h
arch/x86/include/asm/nospec-branch.h
arch/x86/lib/Makefile
arch/x86/lib/retpoline.S