37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
From e69b5d308da72cbf4e7911c3979f9a46d28532af Mon Sep 17 00:00:00 2001
|
|
From: Juergen Gross <jgross@suse.com>
|
|
Date: Mon, 2 Jul 2018 12:00:18 +0200
|
|
Subject: [PATCH] xen: remove global bit from __default_kernel_pte_mask for pv
|
|
guests
|
|
|
|
When removing the global bit from __supported_pte_mask do the same for
|
|
__default_kernel_pte_mask in order to avoid the WARN_ONCE() in
|
|
check_pgprot() when setting a kernel pte before having called
|
|
init_mem_mapping().
|
|
|
|
Cc: <stable@vger.kernel.org> # 4.17
|
|
Reported-by: Michael Young <m.a.young@durham.ac.uk>
|
|
Signed-off-by: Juergen Gross <jgross@suse.com>
|
|
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
|
|
Signed-off-by: Juergen Gross <jgross@suse.com>
|
|
Signed-off-by: Jeremy Cline <jcline@redhat.com>
|
|
---
|
|
arch/x86/xen/enlighten_pv.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c
|
|
index 8d4e2e1ae60b..4816b6f82a9a 100644
|
|
--- a/arch/x86/xen/enlighten_pv.c
|
|
+++ b/arch/x86/xen/enlighten_pv.c
|
|
@@ -1229,6 +1229,7 @@ asmlinkage __visible void __init xen_start_kernel(void)
|
|
|
|
/* Prevent unwanted bits from being set in PTEs. */
|
|
__supported_pte_mask &= ~_PAGE_GLOBAL;
|
|
+ __default_kernel_pte_mask &= ~_PAGE_GLOBAL;
|
|
|
|
/*
|
|
* Prevent page tables from being allocated in highmem, even
|
|
--
|
|
2.17.1
|
|
|