x86/mm: fix poking_init() for Xen PV guests
PATCH 1/1 x86/mm: fix poking_init() for Xen PV guests
Commit 3f4c8211d982 ("x86/mm: Use mm_alloc() in poking_init()") broke the kernel for running as Xen PV guest.
It seems as if the new address space is never activated before being used, resulting in Xen rejecting to accept the new CR3 value (the PGD isn't pinned).
Fix that by adding the now missing call of paravirt_arch_dup_mmap() to poking_init(). That call was previously done by dup_mm()->dup_mmap() and it is a NOP for all cases but for Xen PV, where it is just doing the pinning of the PGD.
--- arch/x86/mm/init.c | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/mm/init.c +3 -0
@@ -804,6 +804,9 @@ void __init poking_init(void) poking_mm =mm_alloc ();BUG_ON (!poking_mm); +/* Xen PV guests need the PGD to be pinned. */ +paravirt_arch_dup_mmap (NULL , poking_mm); +/* * Randomize the poking address, but make sure that the following page * will be mapped at the same PMD. We need 2 pages, so find space for 3,
Signature · 1 line
2.35.3
The following commit has been merged into the x86/urgent branch of tip:
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 8a6b240fef388e9c2c40dcb72d142ee781f6432a Gitweb: https://git.kernel.org/tip/8a6b240fef388e9c2c40dcb72d142ee781f6432a Author: Juergen Gross <[email protected]> AuthorDate: Mon, 09 Jan 2023 16:09:22 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Thu, 12 Jan 2023 09:48:02 +01:00
x86/mm: fix poking_init() for Xen PV guests
Commit 3f4c8211d982 ("x86/mm: Use mm_alloc() in poking_init()") broke the kernel for running as Xen PV guest.
It seems as if the new address space is never activated before being used, resulting in Xen rejecting to accept the new CR3 value (the PGD isn't pinned).
Fix that by adding the now missing call of paravirt_arch_dup_mmap() to poking_init(). That call was previously done by dup_mm()->dup_mmap() and it is a NOP for all cases but for Xen PV, where it is just doing the pinning of the PGD.
--- arch/x86/mm/init.c | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/mm/init.c +3 -0
@@ -804,6 +804,9 @@ void __init poking_init(void) poking_mm =mm_alloc ();BUG_ON (!poking_mm); +/* Xen PV guests need the PGD to be pinned. */ +paravirt_arch_dup_mmap (NULL , poking_mm); +/* * Randomize the poking address, but make sure that the following page * will be mapped at the same PMD. We need 2 pages, so find space for 3,
The following commit has been merged into the x86/urgent branch of tip:
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 26ce6ec364f18d2915923bc05784084e54a5c4cc Gitweb: https://git.kernel.org/tip/26ce6ec364f18d2915923bc05784084e54a5c4cc Author: Juergen Gross <[email protected]> AuthorDate: Mon, 09 Jan 2023 16:09:22 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Thu, 12 Jan 2023 11:22:20 +01:00
x86/mm: fix poking_init() for Xen PV guests
Commit 3f4c8211d982 ("x86/mm: Use mm_alloc() in poking_init()") broke the kernel for running as Xen PV guest.
It seems as if the new address space is never activated before being used, resulting in Xen rejecting to accept the new CR3 value (the PGD isn't pinned).
Fix that by adding the now missing call of paravirt_arch_dup_mmap() to poking_init(). That call was previously done by dup_mm()->dup_mmap() and it is a NOP for all cases but for Xen PV, where it is just doing the pinning of the PGD.
--- arch/x86/mm/init.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/x86/mm/init.c +4 -0
@@ -26,6 +26,7 @@#include <asm/pti.h> #include <asm/text-patching.h> #include <asm/memtype.h> +#include <asm/paravirt.h> /* * We need to define the tracepoints somewhere, and tlb.c
@@ -804,6 +805,9 @@ void __init poking_init(void) poking_mm =mm_alloc ();BUG_ON (!poking_mm); +/* Xen PV guests need the PGD to be pinned. */ +paravirt_arch_dup_mmap (NULL , poking_mm); +/* * Randomize the poking address, but make sure that the following page * will be mapped at the same PMD. We need 2 pages, so find space for 3,