From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752159AbeCTIKI (ORCPT ); Tue, 20 Mar 2018 04:10:08 -0400 Received: from terminus.zytor.com ([198.137.202.136]:37917 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751712AbeCTIKF (ORCPT ); Tue, 20 Mar 2018 04:10:05 -0400 Date: Tue, 20 Mar 2018 01:09:51 -0700 From: tip-bot for Boris Ostrovsky Message-ID: Cc: linux-kernel@vger.kernel.org, jgross@suse.com, mingo@kernel.org, tglx@linutronix.de, boris.ostrovsky@oracle.com, luto@kernel.org, hpa@zytor.com Reply-To: tglx@linutronix.de, boris.ostrovsky@oracle.com, hpa@zytor.com, luto@kernel.org, mingo@kernel.org, jgross@suse.com, linux-kernel@vger.kernel.org In-Reply-To: <20180319143154.3742-1-boris.ostrovsky@oracle.com> References: <20180319143154.3742-1-boris.ostrovsky@oracle.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/pti] x86/vsyscall/64: Use proper accessor to update p4d entry Git-Commit-ID: f9ee6990bd505ecefa014f5e699b3c4d25860d80 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: f9ee6990bd505ecefa014f5e699b3c4d25860d80 Gitweb: https://git.kernel.org/tip/f9ee6990bd505ecefa014f5e699b3c4d25860d80 Author: Boris Ostrovsky AuthorDate: Mon, 19 Mar 2018 10:31:54 -0400 Committer: Thomas Gleixner CommitDate: Tue, 20 Mar 2018 09:04:51 +0100 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 Signed-off-by: Thomas Gleixner Reviewed-by: Juergen Gross Acked-by: Andy Lutomirski Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/20180319143154.3742-1-boris.ostrovsky@oracle.com --- arch/x86/entry/vsyscall/vsyscall_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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));