Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp450240imm; Wed, 11 Jul 2018 05:30:18 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcYaxwGKmnLlrnoNeEp61BUlY+TPFiyDrUkfqK88kdJlX7scZ6wakYF04uEbQiC5dZofrdn X-Received: by 2002:a63:3f05:: with SMTP id m5-v6mr20248962pga.51.1531312218630; Wed, 11 Jul 2018 05:30:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531312218; cv=none; d=google.com; s=arc-20160816; b=GygsCDO82eSmXg+boThqgc2qn7Do9sFkil+Hnx5FtzhAVk7EBYydmydecUQ5Ue/hyi x4lmUh1ksjHu0K7eWKg0FS0V2plvHJciMzeOpu5pj5GXlfzR+g/bvqNMWtJoLS9v97jf s7WLyaIwSlcb0yRCjGV6MN5AcG+F2TIHLpDJauwnyH3EEppyirbVU7bLYosA0/kEweqv m7WBIwLcmwiih/8+/1eoAlfrKUZXIm8YSNorJ2jqLXy/v4Fx0SVHWrkuMOpwq3qD7cPi Q/blnz8ZkFTOWQKMrSQO5JKjUFSZFvvYNiRLMrZWz2c+wUfzby5TSFhYPxy2v6SiI6mV mNwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=YQx9cZdEuHeJE+gwrrn8Afu/0pGPh6Q3W4RpoMicy/s=; b=TnhI226tqSrvjfgpZA0YEPVPeTgZfePXXZJSWzmnSK3wp2hM5mlRhzVqdwobnhlVVX SU2czbyCOPQbRNjE9uL6wkcGGw+QSG6j4UMhwHUlFthAJ8pzjqsYGnIPGrjGT5KWDs4j h7D6UvdaYSk09txr87NfXLoY2xHF57FfAsh0FSZsp/BWnh07WFnmuv34OAOlK/WIYqnA AsbNBnkB5fP36avQ461vegB9BpQL+1cFJkoKcouaw+7bpndWaoJe/Fu56GCf8hDBQmr0 QE3ea0nKbPhcNsMZUocm8an9cmesbGK3IcASCyDXXuZUP6LFEEmXc+feVV7R3nTf2RaU ZE7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail (test mode) header.i=@8bytes.org header.s=mail-1 header.b=Wn+CJu39; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=8bytes.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q124-v6si21889551pfc.93.2018.07.11.05.30.03; Wed, 11 Jul 2018 05:30:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail (test mode) header.i=@8bytes.org header.s=mail-1 header.b=Wn+CJu39; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=8bytes.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732976AbeGKLeI (ORCPT + 99 others); Wed, 11 Jul 2018 07:34:08 -0400 Received: from 8bytes.org ([81.169.241.247]:37618 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732962AbeGKLeH (ORCPT ); Wed, 11 Jul 2018 07:34:07 -0400 Received: by theia.8bytes.org (Postfix, from userid 1000) id E48569DB; Wed, 11 Jul 2018 13:30:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=8bytes.org; s=mail-1; t=1531308604; bh=DSRqcm2/h0MeJA2B6bB5atAwDqT3xDCIA/VjkOUJHKM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wn+CJu39w8N4OE2sRBKUdViOJK23vEWNB1sbYkKdKhvGjO7Ljqx3QKGNgw/rzQeA4 6rN55tsJbVuHkTdCzk4atgEdQLBy1VuhrgpXTB21d9PjkcDCN2Mhuzh+He2PfrkuUX 90e3seXfSUCA81Ai+6+wSta5KTc48479mN4Tml3Cq1SfPRc6ellngKWZJWfgK00Nq0 q88hPRGqvnDN3/V32lb/skULJdtDcx8TqoESRLdZwGA1ov9uBBWi9+hZ8/aSQdRyIO CsfMhXIurk3/WStqpm81NPAp6C2C5J1vwuscArE4NUri2j6yb8ngJu1UomVHb9ME8K ty0Qk/gRyRXOQ== From: Joerg Roedel To: Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" Cc: x86@kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Linus Torvalds , Andy Lutomirski , Dave Hansen , Josh Poimboeuf , Juergen Gross , Peter Zijlstra , Borislav Petkov , Jiri Kosina , Boris Ostrovsky , Brian Gerst , David Laight , Denys Vlasenko , Eduardo Valentin , Greg KH , Will Deacon , aliguori@amazon.com, daniel.gruss@iaik.tugraz.at, hughd@google.com, keescook@google.com, Andrea Arcangeli , Waiman Long , Pavel Machek , "David H . Gutteridge" , jroedel@suse.de, joro@8bytes.org Subject: [PATCH 22/39] x86/mm/pae: Populate the user page-table with user pgd's Date: Wed, 11 Jul 2018 13:29:29 +0200 Message-Id: <1531308586-29340-23-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1531308586-29340-1-git-send-email-joro@8bytes.org> References: <1531308586-29340-1-git-send-email-joro@8bytes.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Joerg Roedel When we populate a PGD entry, make sure we populate it in the user page-table too. Signed-off-by: Joerg Roedel --- arch/x86/include/asm/pgtable-3level.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h index f24df59..f2ca313 100644 --- a/arch/x86/include/asm/pgtable-3level.h +++ b/arch/x86/include/asm/pgtable-3level.h @@ -98,6 +98,9 @@ static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) static inline void native_set_pud(pud_t *pudp, pud_t pud) { +#ifdef CONFIG_PAGE_TABLE_ISOLATION + pud.p4d.pgd = pti_set_user_pgtbl(&pudp->p4d.pgd, pud.p4d.pgd); +#endif set_64bit((unsigned long long *)(pudp), native_pud_val(pud)); } @@ -229,6 +232,10 @@ static inline pud_t native_pudp_get_and_clear(pud_t *pudp) { union split_pud res, *orig = (union split_pud *)pudp; +#ifdef CONFIG_PAGE_TABLE_ISOLATION + pti_set_user_pgtbl(&pudp->p4d.pgd, __pgd(0)); +#endif + /* xchg acts as a barrier before setting of the high bits */ res.pud_low = xchg(&orig->pud_low, 0); res.pud_high = orig->pud_high; -- 2.7.4