diff options
| author |   Boris Ostrovsky <boris.ostrovsky@oracle.com> | 2018-03-19 10:31:54 -0400 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2018-03-20 12:00:53 +0100 |
| commit | 31ad7f8e7dc94d3b85ccf9b6141ce6dfd35a1781 (patch) | |
| tree | 2cc46d5d2e96e9a4f9da98b1d3499d7b517950e9 /arch/x86/entry/vsyscall/vsyscall_64.c | |
| parent | x86/cpu: Remove the CONFIG_X86_PPRO_FENCE=y quirk (diff) | |
| download | linux-dev-31ad7f8e7dc94d3b85ccf9b6141ce6dfd35a1781.tar.xz linux-dev-31ad7f8e7dc94d3b85ccf9b6141ce6dfd35a1781.zip | |
x86/vsyscall/64: Use proper accessor to update P4D entry
Writing to it directly does not work for Xen PV guests.
Fixes: 49275fef986a ("x86/vsyscall/64: Explicitly set _PAGE_USER in the pagetable hierarchy")
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Juergen Gross <jgross@suse.com>
Acked-by: Andy Lutomirski <luto@kernel.org>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/20180319143154.3742-1-boris.ostrovsky@oracle.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/entry/vsyscall/vsyscall_64.c')
| -rw-r--r-- | arch/x86/entry/vsyscall/vsyscall_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/entry/vsyscall/vsyscall_64.c b/arch/x86/entry/vsyscall/vsyscall_64.c index 8560ef68a9d6..317be365bce3 100644 --- a/arch/x86/entry/vsyscall/vsyscall_64.c +++ b/arch/x86/entry/vsyscall/vsyscall_64.c @@ -347,7 +347,7 @@ void __init set_vsyscall_pgtable_user_bits(pgd_t *root) set_pgd(pgd, __pgd(pgd_val(*pgd) | _PAGE_USER)); p4d = p4d_offset(pgd, VSYSCALL_ADDR); #if CONFIG_PGTABLE_LEVELS >= 5 - p4d->p4d |= _PAGE_USER; + set_p4d(p4d, __p4d(p4d_val(*p4d) | _PAGE_USER)); #endif pud = pud_offset(p4d, VSYSCALL_ADDR); set_pud(pud, __pud(pud_val(*pud) | _PAGE_USER)); |