From: Greg Kroah-Hartman Date: Wed, 22 Apr 2020 11:06:11 +0000 (+0200) Subject: 5.6-stable patches X-Git-Tag: v4.19.118~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b0077dabf625f19e3961c33caba35b3a3ed79157;p=thirdparty%2Fkernel%2Fstable-queue.git 5.6-stable patches added patches: x86-xen-fix-booting-32-bit-pv-guest.patch --- diff --git a/queue-5.6/series b/queue-5.6/series index c9a4911696e..beff2235b23 100644 --- a/queue-5.6/series +++ b/queue-5.6/series @@ -164,3 +164,4 @@ bpf-fix-buggy-r0-retval-refinement-for-tracing-helpers.patch bpf-test_verifier-bpf_get_stack-return-value-add-0.patch bpf-test_progs-add-test-to-catch-retval-refine-error-handling.patch bpf-test_verifier-switch-bpf_get_stack-s-0-s-r8-test.patch +x86-xen-fix-booting-32-bit-pv-guest.patch diff --git a/queue-5.6/x86-xen-fix-booting-32-bit-pv-guest.patch b/queue-5.6/x86-xen-fix-booting-32-bit-pv-guest.patch new file mode 100644 index 00000000000..a04b114d3d1 --- /dev/null +++ b/queue-5.6/x86-xen-fix-booting-32-bit-pv-guest.patch @@ -0,0 +1,35 @@ +From d6f34f4c6b4a962eb7a86c923fea206f866a40be Mon Sep 17 00:00:00 2001 +From: Juergen Gross +Date: Thu, 9 Apr 2020 09:00:01 +0200 +Subject: x86/xen: fix booting 32-bit pv guest + +From: Juergen Gross + +commit d6f34f4c6b4a962eb7a86c923fea206f866a40be upstream. + +Commit 2f62f36e62daec ("x86/xen: Make the boot CPU idle task reliable") +introduced a regression for booting 32 bit Xen PV guests: the address +of the initial stack needs to be a virtual one. + +Fixes: 2f62f36e62daec ("x86/xen: Make the boot CPU idle task reliable") +Signed-off-by: Juergen Gross +Reviewed-by: Boris Ostrovsky +Link: https://lore.kernel.org/r/20200409070001.16675-1-jgross@suse.com +Signed-off-by: Juergen Gross +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/xen/xen-head.S | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/x86/xen/xen-head.S ++++ b/arch/x86/xen/xen-head.S +@@ -38,7 +38,7 @@ SYM_CODE_START(startup_xen) + #ifdef CONFIG_X86_64 + mov initial_stack(%rip), %rsp + #else +- mov pa(initial_stack), %esp ++ mov initial_stack, %esp + #endif + + #ifdef CONFIG_X86_64