From patchwork Mon Feb 27 22:29:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgecombe, Rick P" X-Patchwork-Id: 13154241 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F559C64ED6 for ; Mon, 27 Feb 2023 22:31:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BC81F6B0083; Mon, 27 Feb 2023 17:31:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B9E5B6B0087; Mon, 27 Feb 2023 17:31:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A3F4A6B0085; Mon, 27 Feb 2023 17:31:38 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 703436B0088 for ; Mon, 27 Feb 2023 17:31:38 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 538BC80A5D for ; Mon, 27 Feb 2023 22:31:38 +0000 (UTC) X-FDA: 80514519876.16.7461DE9 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by imf13.hostedemail.com (Postfix) with ESMTP id 6F90E2000A for ; Mon, 27 Feb 2023 22:31:36 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=d34L9Opn; spf=pass (imf13.hostedemail.com: domain of rick.p.edgecombe@intel.com designates 192.55.52.136 as permitted sender) smtp.mailfrom=rick.p.edgecombe@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1677537096; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references:dkim-signature; bh=Ic4aJhbI+buGyHxHvTWd0ForjxPqTZwiqz8ffS9E0kM=; b=3kaYwXuRtL60IhEVz65uKBvwqp6rQRXTBuuuSdthfaqq/783X506Y0e1NE3PLoR6hPLwx4 NqCRpy+tYzbpeuqjAMYchGKre2V0jAH6aDzx9LS9XCtPpwoZFCvr5EVFKIUQ2krr1UwYp0 ySyeJOD6YItSJVpeH1iVc/+60uhti48= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=d34L9Opn; spf=pass (imf13.hostedemail.com: domain of rick.p.edgecombe@intel.com designates 192.55.52.136 as permitted sender) smtp.mailfrom=rick.p.edgecombe@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677537096; a=rsa-sha256; cv=none; b=tbi5zDkHuGqodaKv+M1QAVd/NlEzK+RPcs5oFbl97ZOVv4ns3tJ/uCGTKVIMJcxTkTdVt+ JBORwNW/GgYTa3xibAHTzf9JU45xoj+VJUCD/JRZP6BjD5ZaEM7RlZuaBmCSl5tp66e0Y+ UEIjgNOE1UyxJHAh5/xtBF5i+AL6ysk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1677537096; x=1709073096; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=PJnxzPZePTV1h98WOAU1laXgjeyErhdpAXi/giQ17HE=; b=d34L9OpntE2O1+Q44yEnhTSH4NXzOGdimGmUXHH7fYkloXAjpRcy0zhT fGHRfiCuzXe5wMeNbDCJpZze3JBUgRqCjwuaHfJkRRpHiG3aXxGvNRHXg W0orhz2mPzuJrn/IHqYup7rxKF/739d6J0b7fLHAv7HXmm6xhFm2XkMC9 EI0xljwvoylLmpuSKmhR4wY0zt6X96LjpvyJ4/Q4b6McZMrrO4rQ78bDG FInK3Z7AMoz29EC4DAH0D61RousS1+/Nit1obeO0RaeViGqtDNP8W509C Wlz/hTYrfeabXgk0LqgMMYxpn5n4p3bf1otedxR6kdSnxIrPGhILCcyyU g==; X-IronPort-AV: E=McAfee;i="6500,9779,10634"; a="313657230" X-IronPort-AV: E=Sophos;i="5.98,220,1673942400"; d="scan'208";a="313657230" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2023 14:31:15 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10634"; a="848024440" X-IronPort-AV: E=Sophos;i="5.98,220,1673942400"; d="scan'208";a="848024440" Received: from leonqu-mobl1.amr.corp.intel.com (HELO rpedgeco-desk.amr.corp.intel.com) ([10.209.72.19]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2023 14:31:14 -0800 From: Rick Edgecombe 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 , Weijiang Yang , "Kirill A . Shutemov" , John Allen , kcc@google.com, eranian@google.com, rppt@kernel.org, jamorris@linux.microsoft.com, dethoma@microsoft.com, akpm@linux-foundation.org, Andrew.Cooper3@citrix.com, christina.schimpe@intel.com, david@redhat.com, debug@rivosinc.com Cc: rick.p.edgecombe@intel.com, Yu-cheng Yu Subject: [PATCH v7 10/41] x86/mm: Move pmd_write(), pud_write() up in the file Date: Mon, 27 Feb 2023 14:29:26 -0800 Message-Id: <20230227222957.24501-11-rick.p.edgecombe@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230227222957.24501-1-rick.p.edgecombe@intel.com> References: <20230227222957.24501-1-rick.p.edgecombe@intel.com> X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 6F90E2000A X-Stat-Signature: 5ias751wqqep9nk4453bjgtesw1p3fy3 X-Rspam-User: X-HE-Tag: 1677537096-637179 X-HE-Meta: U2FsdGVkX1+iCcMgrvO1VF6MPlp5wzkjKScz1Lf73JTyT55t/AGcREUHU0HqJfdb7TTPNcIU8TIg/btYi/vI6wylnGd65/ZemPIq8RPuzuwKVhOg1CN+jy2Dg8NQiS4R75OjIpsv0wEP6PWOKQxTc9xawaD/11guGQ5oAeulBjJE5mNeqALcEdvpP/L5J4nmY/XSLzWyvM102eU/W3j8bOuPoeBDMASxa53BGSgMdQ6UaGl6L6oe2jg788IONq6Vyj8MPyX4maoXtpZvG9Ep05agO0BlNoybWRrtdtLb4mDp8dJI0ocCQT6tGGR1oeV0e+HHEQYYk0ovc66Rtt/xc30h80+OuoYx7Tud0obpkV4KGq2vioH3IDDV6pVCmAQnCiMGPULwPrxMXH81mGNdGEFaGaMZsr9Ft4O+bBXrcDM2BpRH9n0RJPc3hTBygpCyd127wHFDgKp9Hg79llajIS9elOZ2q04wZ+THRSZVJxyN2PHx18XjTAs7HFKma2rZDMhYBOW2NACDGUOlOFZUelB2J0etCAeOkii7Ca9K08QAGmYS56dzRkWmgw2NI0HGo9etdJFXwASU5gWfBt0YuvFLW6mQJKTl+8bcgxWOdJgWGO6e+Dnf3L/z7qIdwo0T5b1hFgHr54pu7uiQ7fRFKWWSG36LZYa/E01wkLLkm273E0NVSNSniw9lKfnZXTfZFo0eiv2VztNIxCVSBfJqmVOYI/YlHU+r1ofFXxMarwnZez/R77YRf/EzOFKVicS9vR3mqIp7oyqSehFtI7QniAiFUNNffBnQ1r2d4xuMPeRehNmgvIaD1MP3eKS8vnG8icE9VGQuqCwS1DX8AokQkAHlPNIn/hjjktv3hTP1w0+iVH7SQOZDjfPY9Bh6IgVAkQ2sT5ICuk/DQcFD+5/w88TIxEa00VJt7OlFwD4SRMq6h4SM9OrWrpKt+CtOgyuY/jXF4g+EGAAcGfnOss4 G484DiUf DeFxkoxBkD9i6qvqXGz9JAKZTiJ7ahy3ID8Zesi416yhos2nUhEO7u6HvBJN0zikcT4yqhwTabicHX9va9VyE+dobaIdb4vuulBrRaB3/vXC3r0IHhkXe1ZmD0mR70OC2wvFFcBac1tgTGbMdR9WPSkBV3JCdKgZgA/qiZvADV3BkANhqfppi47gxTYuCO6p5MIk+al8fCYWArvGOfRz9L8AYfiBh2ZS197/ThNiwJZVzp3N6a4gBylLWNfhw5OkL3ipWx0mW73AOBbdvtfdMkW7rqFCElaQrmf+PW/2CSCTuTWCE3ME/Hy95yHGkIai7sMrzR4w65Q1Ook0kq96GzdKlJaC042BMxw9CzjjHrtTybbBRX69XN0McsvaMxww+eEpx64pN05kO4vo= 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: From: Yu-cheng Yu To prepare the introduction of _PAGE_SAVED_DIRTY, move pmd_write() and pud_write() up in the file, so that they can be used by other helpers below. No functional changes. Tested-by: Pengfei Xu Tested-by: John Allen Tested-by: Kees Cook Acked-by: Mike Rapoport (IBM) Reviewed-by: Kees Cook Signed-off-by: Yu-cheng Yu Reviewed-by: Kirill A. Shutemov Signed-off-by: Rick Edgecombe --- arch/x86/include/asm/pgtable.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 7425f32e5293..56eea96502c6 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -160,6 +160,18 @@ static inline int pte_write(pte_t pte) return pte_flags(pte) & _PAGE_RW; } +#define pmd_write pmd_write +static inline int pmd_write(pmd_t pmd) +{ + return pmd_flags(pmd) & _PAGE_RW; +} + +#define pud_write pud_write +static inline int pud_write(pud_t pud) +{ + return pud_flags(pud) & _PAGE_RW; +} + static inline int pte_huge(pte_t pte) { return pte_flags(pte) & _PAGE_PSE; @@ -1120,12 +1132,6 @@ extern int pmdp_clear_flush_young(struct vm_area_struct *vma, unsigned long address, pmd_t *pmdp); -#define pmd_write pmd_write -static inline int pmd_write(pmd_t pmd) -{ - return pmd_flags(pmd) & _PAGE_RW; -} - #define __HAVE_ARCH_PMDP_HUGE_GET_AND_CLEAR static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm, unsigned long addr, pmd_t *pmdp) @@ -1155,12 +1161,6 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm, clear_bit(_PAGE_BIT_RW, (unsigned long *)pmdp); } -#define pud_write pud_write -static inline int pud_write(pud_t pud) -{ - return pud_flags(pud) & _PAGE_RW; -} - #ifndef pmdp_establish #define pmdp_establish pmdp_establish static inline pmd_t pmdp_establish(struct vm_area_struct *vma,