]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
xen: remove global bit from __default_kernel_pte_mask for pv guests
authorJuergen Gross <jgross@suse.com>
Mon, 2 Jul 2018 10:00:18 +0000 (12:00 +0200)
committerJuergen Gross <jgross@suse.com>
Thu, 12 Jul 2018 09:57:57 +0000 (11:57 +0200)
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>
arch/x86/xen/enlighten_pv.c

index 8d4e2e1ae60bc93d3391dfc8c12b10fc0557f242..4816b6f82a9a6f503b79a3f1484a364245184c22 100644 (file)
@@ -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