From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EBF30C35257 for ; Mon, 12 Oct 2020 15:40:13 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 948E920575 for ; Mon, 12 Oct 2020 15:40:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 948E920575 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 3F5D594000A; Mon, 12 Oct 2020 11:39:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3286894000B; Mon, 12 Oct 2020 11:39:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1819094000C; Mon, 12 Oct 2020 11:39:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0178.hostedemail.com [216.40.44.178]) by kanga.kvack.org (Postfix) with ESMTP id CE58894000B for ; Mon, 12 Oct 2020 11:39:54 -0400 (EDT) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 521973624 for ; Mon, 12 Oct 2020 15:39:54 +0000 (UTC) X-FDA: 77363683908.04.knee15_05012ed271fb Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin04.hostedemail.com (Postfix) with ESMTP id 36E6780061E0 for ; Mon, 12 Oct 2020 15:39:54 +0000 (UTC) X-HE-Tag: knee15_05012ed271fb X-Filterd-Recvd-Size: 4895 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by imf08.hostedemail.com (Postfix) with ESMTP for ; Mon, 12 Oct 2020 15:39:53 +0000 (UTC) IronPort-SDR: zIX9ZeKEWVUWzfO5FXpgKqFhOtal/dyBKb5Sq2sL4DZKPl8rb8aFcTaQOXS4gaBAvXn3aUGKDs BqPv/jikNRiQ== X-IronPort-AV: E=McAfee;i="6000,8403,9772"; a="152686136" X-IronPort-AV: E=Sophos;i="5.77,367,1596524400"; d="scan'208";a="152686136" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Oct 2020 08:39:50 -0700 IronPort-SDR: SNezZIX3iQfvqLeFwIsoodTD1ldkQ3bTV+V4ctyUJzDe2+SxxsUwRTsrlWWo324VkU9HRXZ+do jqodP9HXgTbg== X-IronPort-AV: E=Sophos;i="5.77,367,1596524400"; d="scan'208";a="530010833" Received: from yyu32-desk.sc.intel.com ([143.183.136.146]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Oct 2020 08:39:50 -0700 From: Yu-cheng Yu To: x86@kernel.org, "H. Peter Anvin" , Thomas Gleixner , Ingo Molnar , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-api@vger.kernel.org, Arnd Bergmann , Andy Lutomirski , Balbir Singh , Borislav Petkov , Cyrill Gorcunov , Dave Hansen , Eugene Syromiatnikov , Florian Weimer , "H.J. Lu" , Jann Horn , Jonathan Corbet , Kees Cook , Mike Kravetz , Nadav Amit , Oleg Nesterov , Pavel Machek , Peter Zijlstra , Randy Dunlap , "Ravi V. Shankar" , Vedvyas Shanbhogue , Dave Martin , Weijiang Yang , Pengfei Xu Cc: Yu-cheng Yu Subject: [PATCH v14 10/26] x86/mm: Update pte_modify for _PAGE_COW Date: Mon, 12 Oct 2020 08:38:34 -0700 Message-Id: <20201012153850.26996-11-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20201012153850.26996-1-yu-cheng.yu@intel.com> References: <20201012153850.26996-1-yu-cheng.yu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Pte_modify() changes a PTE to 'newprot'. It doesn't use the pte_*() helpers that a previous patch fixed up, so we need a new site. Introduce fixup_dirty_pte() to set the dirty bits based on _PAGE_RW, and apply the same changes to pmd_modify(). Signed-off-by: Yu-cheng Yu --- arch/x86/include/asm/pgtable.h | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtabl= e.h index ac4ed814be96..8d4c09831e67 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -727,6 +727,21 @@ static inline pmd_t pmd_mkinvalid(pmd_t pmd) =20 static inline u64 flip_protnone_guard(u64 oldval, u64 val, u64 mask); =20 +static inline pteval_t fixup_dirty_pte(pteval_t pteval) +{ + pte_t pte =3D __pte(pteval); + + if (cpu_feature_enabled(X86_FEATURE_SHSTK) && pte_dirty(pte)) { + pte =3D pte_mkclean(pte); + + if (pte_flags(pte) & _PAGE_RW) + pte =3D pte_set_flags(pte, _PAGE_DIRTY_HW); + else + pte =3D pte_set_flags(pte, _PAGE_COW); + } + return pte_val(pte); +} + static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) { pteval_t val =3D pte_val(pte), oldval =3D val; @@ -737,16 +752,34 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t = newprot) */ val &=3D _PAGE_CHG_MASK; val |=3D check_pgprot(newprot) & ~_PAGE_CHG_MASK; + val =3D fixup_dirty_pte(val); val =3D flip_protnone_guard(oldval, val, PTE_PFN_MASK); return __pte(val); } =20 +static inline int pmd_write(pmd_t pmd); +static inline pmdval_t fixup_dirty_pmd(pmdval_t pmdval) +{ + pmd_t pmd =3D __pmd(pmdval); + + if (cpu_feature_enabled(X86_FEATURE_SHSTK) && pmd_dirty(pmd)) { + pmd =3D pmd_mkclean(pmd); + + if (pmd_flags(pmd) & _PAGE_RW) + pmd =3D pmd_set_flags(pmd, _PAGE_DIRTY_HW); + else + pmd =3D pmd_set_flags(pmd, _PAGE_COW); + } + return pmd_val(pmd); +} + static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot) { pmdval_t val =3D pmd_val(pmd), oldval =3D val; =20 val &=3D _HPAGE_CHG_MASK; val |=3D check_pgprot(newprot) & ~_HPAGE_CHG_MASK; + val =3D fixup_dirty_pmd(val); val =3D flip_protnone_guard(oldval, val, PHYSICAL_PMD_PAGE_MASK); return __pmd(val); } --=20 2.21.0