KVM: PPC: Move KVM trampolines before __end_interrupts (a58ddea5) · Commits · 戴 / test

When using a relocatable kernel we need to make sure that the trampline code and the interrupt handlers are both copied to low memory. The only way to do this reliably is to put them in the copied section. This patch should make relocated kernels work with KVM. KVM-Stable-Tag Signed-off-by:

Alexander Graf <agraf@suse.de> Signed-off-by:

Avi Kivity <avi@redhat.com>

arch/powerpc/kernel/exceptions-64s.S

+6 −0

Original line number	Diff line number	Diff line
		@@ -299,6 +299,12 @@ slb_miss_user_pseries:
		b . /* prevent spec. execution */
		#endif /* __DISABLED__ */

		/* KVM's trampoline code needs to be close to the interrupt handlers */

		#ifdef CONFIG_KVM_BOOK3S_64_HANDLER
		#include "../kvm/book3s_rmhandlers.S"
		#endif

		.align 7
		.globl __end_interrupts
		__end_interrupts:

arch/powerpc/kernel/head_64.S

+0 −6

Original line number	Diff line number	Diff line
		@@ -166,12 +166,6 @@ exception_marker:
		#include "exceptions-64s.S"
		#endif

		/* KVM trampoline code needs to be close to the interrupt handlers */

		#ifdef CONFIG_KVM_BOOK3S_64_HANDLER
		#include "../kvm/book3s_rmhandlers.S"
		#endif

		_GLOBAL(generic_secondary_thread_init)
		mr r24,r3

Admin message