From patchwork Tue Jul 10 22:26:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu-cheng Yu X-Patchwork-Id: 10518209 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B830A600CA for ; Tue, 10 Jul 2018 22:32:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB25C2623D for ; Tue, 10 Jul 2018 22:32:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9ECE828F39; Tue, 10 Jul 2018 22:32:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4C48F2623D for ; Tue, 10 Jul 2018 22:32:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 49E4C6B028D; Tue, 10 Jul 2018 18:32:56 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 44C816B028E; Tue, 10 Jul 2018 18:32:56 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 362E26B028F; Tue, 10 Jul 2018 18:32:56 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f200.google.com (mail-pf0-f200.google.com [209.85.192.200]) by kanga.kvack.org (Postfix) with ESMTP id E72676B028D for ; Tue, 10 Jul 2018 18:32:55 -0400 (EDT) Received: by mail-pf0-f200.google.com with SMTP id a12-v6so14741887pfn.12 for ; Tue, 10 Jul 2018 15:32:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=P7qLkyvMM20psQjOrTd1tFs8X6D34ICWpOYJuJEy8us=; b=sKZph8F5FrEpOlf0aHxcqCec8ZKxqH5hhuzxr9+WtRhE51suRI4MJnfcqcMOCG3Kww Jx9+HyDoOybiJpwNBwdJjn8hiFKdE0zDfwNf3vmJItepd0xT6mSeCuJpGerw6x3sEtQl jmTruSflLWTRMjAoCqHvfstbh7T80VQk291pqmk3iAKO81tsc1Q8pYrZr/6r4c8XMW5Y lwGMmZew20AtXKu7Qn0vNkp7LN7+h3BJDAbWfyQq9bhBQQKY0X8U3oKAtUBLkOExPNHm XPy+8BED+EsoeznEiieGId7QcTzjlF4/HmyL9CTpprd14Nf12pPB4zdQ+aLMRR2r2Wjc h6cA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.93 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: APt69E1fU9j3wT4PhEf0/0D0ixicFOfzjDHC5lY1cefB7DWmbD4WAjaj a7GJKzU5kE/yMk6JsxRVbtLGS8QFlCRLTN19nn46zZcrO0zQLVJ9ALQ1OdKkcniAjNQ2M7BPCeG H0NE50ES/1xyNvHZxK2UIuiVTlr6vGfJzBBdyERglT2xzs/XgKsWT1ZL1V+J5EpJcOA== X-Received: by 2002:a62:49cf:: with SMTP id r76-v6mr26896009pfi.235.1531261975649; Tue, 10 Jul 2018 15:32:55 -0700 (PDT) X-Google-Smtp-Source: AAOMgpetZWK+RcQlryhHoJBxcwouMthc+KYtc0Uvm0PrmpWOJDEX1SrVtr7Ch7XSMu4q1QLbecQb X-Received: by 2002:a62:49cf:: with SMTP id r76-v6mr26891136pfi.235.1531261873104; Tue, 10 Jul 2018 15:31:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531261873; cv=none; d=google.com; s=arc-20160816; b=RFFWvfRjwNFIbh8HLFAUAi+7++wh6BNqliHs4zUDY/hhxVojqHMcyfhF2Sr8kSJ2iw RFsx7uhLJkAlOjZTlQQ7xZgCVvjeb4KfHuwBv0J45gI4DwJ1HxdcCOfG45MVV+X6gpRk 22U1tbxHG60zu5d1ppvoLGfZb4EBQ3BPyathuSifOgV8+SshcG/jdtUCkRKPYcZ1gcoM uClCruL5wi2ip1kehaGTiZfRP4hO7Ynst5j59ieXdDrafQODfUYvId2LMNi8Ss/OQ9M4 wlT1kPZNxqxh6a6+gFf7lsIzWiIwNOYJzixZtOxTrn0miN5HaXYuT9STxdZ4RhfRvIhU QMlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=P7qLkyvMM20psQjOrTd1tFs8X6D34ICWpOYJuJEy8us=; b=IgxmWF11DNLdKjWbWBsHk9I4WOLz5UDqmr5A7MVQmtO5HK9hqS+Zixp4kz/pfZ7rmV 3bb2oNmNCXmKzcQgyKVQ4WPbxIcUERF47NWMwqKpuqUNM5n25Ia1Yr7OtgS3ZdKLyCe4 A151j829daTIAW3nMwKF605AsCQ9Nfb4K57PBT/FiENvlhV9WWByHzN9lnPeVLzSZ+Jf A0IUFcrQqagbQ/5L3yBnMN+wNbLPKFbxEOsxuH0umoxOC2ae4aGlIFTnubd6j+qdqP6T ILVkZfYqTNk75mRjiCZXAUx4gcfV8E8agA2xcTvxUFaP8DLJCAfq3+/vspzkr5Bu7VOs WAUA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.93 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga11.intel.com (mga11.intel.com. [192.55.52.93]) by mx.google.com with ESMTPS id z10-v6si17009124pgo.412.2018.07.10.15.31.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Jul 2018 15:31:13 -0700 (PDT) Received-SPF: pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.93 as permitted sender) client-ip=192.55.52.93; Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.93 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2018 15:31:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,335,1526367600"; d="scan'208";a="70305403" Received: from 2b52.sc.intel.com ([143.183.136.52]) by fmsmga004.fm.intel.com with ESMTP; 10 Jul 2018 15:31:12 -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 , Cyrill Gorcunov , Dave Hansen , Florian Weimer , "H.J. Lu" , Jann Horn , Jonathan Corbet , Kees Cook , Mike Kravetz , Nadav Amit , Oleg Nesterov , Pavel Machek , Peter Zijlstra , "Ravi V. Shankar" , Vedvyas Shanbhogue Cc: Yu-cheng Yu Subject: [RFC PATCH v2 11/27] x86/mm: Modify ptep_set_wrprotect and pmdp_set_wrprotect for _PAGE_DIRTY_SW Date: Tue, 10 Jul 2018 15:26:23 -0700 Message-Id: <20180710222639.8241-12-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180710222639.8241-1-yu-cheng.yu@intel.com> References: <20180710222639.8241-1-yu-cheng.yu@intel.com> 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: X-Virus-Scanned: ClamAV using ClamSMTP Update ptep_set_wrprotect() and pmdp_set_wrprotect() for _PAGE_DIRTY_SW. Signed-off-by: Yu-cheng Yu --- arch/x86/include/asm/pgtable.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index ecbd3539a864..456a864aa605 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1170,7 +1170,18 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep) { + pte_t pte; + clear_bit(_PAGE_BIT_RW, (unsigned long *)&ptep->pte); + pte = *ptep; + + /* + * On platforms before CET, other threads could race to + * create a RO and _PAGE_DIRTY_HW PTE again. However, + * on CET platforms, this is safe without a TLB flush. + */ + pte = pte_move_flags(pte, _PAGE_DIRTY_HW, _PAGE_DIRTY_SW); + set_pte_at(mm, addr, ptep, pte); } #define flush_tlb_fix_spurious_fault(vma, address) do { } while (0) @@ -1220,7 +1231,18 @@ static inline pud_t pudp_huge_get_and_clear(struct mm_struct *mm, static inline void pmdp_set_wrprotect(struct mm_struct *mm, unsigned long addr, pmd_t *pmdp) { + pmd_t pmd; + clear_bit(_PAGE_BIT_RW, (unsigned long *)pmdp); + pmd = *pmdp; + + /* + * On platforms before CET, other threads could race to + * create a RO and _PAGE_DIRTY_HW PMD again. However, + * on CET platforms, this is safe without a TLB flush. + */ + pmd = pmd_move_flags(pmd, _PAGE_DIRTY_HW, _PAGE_DIRTY_SW); + set_pmd_at(mm, addr, pmdp, pmd); } #define pud_write pud_write