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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC816C369CB for ; Tue, 22 Apr 2025 08:18:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BA8BE6B0031; Tue, 22 Apr 2025 04:18:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B59F46B0032; Tue, 22 Apr 2025 04:18:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A499A6B007B; Tue, 22 Apr 2025 04:18:48 -0400 (EDT) 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 876586B0031 for ; Tue, 22 Apr 2025 04:18:48 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id B96E91413C4 for ; Tue, 22 Apr 2025 08:18:49 +0000 (UTC) X-FDA: 83360978778.30.D06FFAE Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf30.hostedemail.com (Postfix) with ESMTP id 219E280008 for ; Tue, 22 Apr 2025 08:18:47 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf30.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745309928; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=krp44dJNkBDHUtvYOeduh45byx5d8HD4EHt5vDmtMkc=; b=EXuhHoP6OzDjisLP7Y92wMm03es/SM80Jz7UwQRFJZ3Can/S63ComJDukpGJCLSWEG6d7I eY6/4RIvWm/D+lhSLAXs/oDcCfFWAsAsLIlkBAMBaD2UgRltELxlBlQokXY7i7YOLw/iXD iZPusWkHPN05Y6RjA9SYEI47p7gI+kg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745309928; a=rsa-sha256; cv=none; b=OXK9ehDF0fA+acQN7JFapKT6GvPwHsk9wQv3OXy23sflKeMEwJ8EZkxNFz1keKbSLV8gSH cOfdLVpGZLEzOWp3nxunbshY+NolVN+CXICBchP3b7grex9v9psyCw3OUtZSCsIag7I7s1 2G6/OYuKLlNwFsm4HUfneGgBZSjiTcY= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf30.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3EC931EDB; Tue, 22 Apr 2025 01:18:43 -0700 (PDT) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.27]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8BB513F66E; Tue, 22 Apr 2025 01:18:45 -0700 (PDT) From: Ryan Roberts To: Catalin Marinas , Will Deacon , Pasha Tatashin , Andrew Morton , Uladzislau Rezki , Christoph Hellwig , David Hildenbrand , "Matthew Wilcox (Oracle)" , Mark Rutland , Anshuman Khandual , Alexandre Ghiti , Kevin Brodsky Cc: Ryan Roberts , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 03/11] mm/page_table_check: Batch-check pmds/puds just like ptes Date: Tue, 22 Apr 2025 09:18:11 +0100 Message-ID: <20250422081822.1836315-4-ryan.roberts@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250422081822.1836315-1-ryan.roberts@arm.com> References: <20250422081822.1836315-1-ryan.roberts@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 219E280008 X-Rspam-User: X-Stat-Signature: a656zwwummcq8cjbohz1h74w655yay1w X-HE-Tag: 1745309927-428322 X-HE-Meta: U2FsdGVkX19SX+bofOG7+WDvTLmYMX/oEfC0rFsF26VmdQyGL2cjSbDo4YT1lkhSdKLPV46/JIXMGELmhjt1qhkPB9/btp0Yo0iDEHve1JnH70sa8FQeOWRVuU5Mm5HwM/cYSMZtOCQNU85NeE2NePtey7PQD/EyJ8cA5muCWbe6xy8DmYwqOAL6IOYNrRhoQMC4BDAqeeEvzzyZk+TgOBbrbBMKUYpiR13LqWfr61to1lC1soVsoaHRHSbqJ1/IUJjQe+qvYgr4dOM7xbYXD9Uxr0f3b1Zg2YrbTp9GB/WMjn2/NdyzKPBv1OyeLl/yV/qQnpBcZ2yXiAXXunl8Oqljoiv4hP587bcfoCaCqiP/s31MmIahUIKtAqztA+1C+qBAljsP/Uz0NIe9hkMUTgzh7yVbW0S5S36gjIf7k7Rk1xC+5IG/Bmgj8qBLedDt37jqzZ+UM6ygThgwjXKTpPWkwEAQFB2Nc8AEdkMPwMeyaHgHefo/QJll8ehA9hnzx7/7Yu0LsnEpXBAdq78VCYEJQR4UnQMJj5Z2FPbOr4niMlOMMPwxOb6gCMtyr0Vhe/vdpPg99GTcBxYx1fY8R6cHIWmj7CoHFiIeIg5gpl5PPZTRzZeB83fT7riNPSjv4NKznyoBi43B+YZUkgS2YTbQJLH596E5tx5gjo5E10nWP0MMzM0EbGfLkoLj863jZOZrwrJ7SlObN1U1aUUan1j7pRtaaQX4AuTFW5VSXOutOIrGP3Fn01In9uEOGoBmBkSqMUmGBxAzoadBpF9g0UI1fX799rxhXUIhFW0a+HpbQJo7mWNiBcsGcHBcgXZHQpLW3+MEzbpeHAv6+hFEuwnyEX9sPvy9yWYd8o72LV+N/x6+kqYAGYz5f27peiLk1MYmL6UB1sVJF2VEdeNE6+IWv546/NRcLHF6qRunosE2a2QsQqMwncDTGM24/3FhBUEeYJ4WW4Iv6m11ONu g/5U5z7B y/1rlWOl5VAab2i1y0ciO2fxQ2o0WWjSbFC/iPsbyuGatUBajUkbLX/klJXHMFxpcklACG+57KOSuHP3R3/Sonof67CfYfjYR/5QkSJuWhDtj8lS/9VRHb/04jvOgqXRrcouit1rkSZd96iWPb7bgL04Fi3CZkeX3b8zH29LgXrea7yEdWSm/V3SWUzPgT8BbUJQJp92szNyrJv5zFMck6Ms+x1gQhUjs52bv0ICYO2MX0oc0QtHUkm8lWfiF0pjFm0k4NIWQLGHqEqU= 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: List-Subscribe: List-Unsubscribe: Convert page_table_check_p[mu]d_set(...) to page_table_check_p[mu]ds_set(..., nr) to allow checking a contiguous set of pmds/puds in single batch. We retain page_table_check_p[mu]d_set(...) as macros that call new batch functions with nr=1 for compatibility. arm64 is about to reorganise its pte/pmd/pud helpers to reuse more code and to allow the implementation for huge_pte to more efficiently set ptes/pmds/puds in batches. We need these batch-helpers to make the refactoring possible. Reviewed-by: Anshuman Khandual Reviewed-by: Pasha Tatashin Reviewed-by: Catalin Marinas Signed-off-by: Ryan Roberts --- include/linux/page_table_check.h | 30 +++++++++++++++++----------- mm/page_table_check.c | 34 +++++++++++++++++++------------- 2 files changed, 38 insertions(+), 26 deletions(-) diff --git a/include/linux/page_table_check.h b/include/linux/page_table_check.h index 6722941c7cb8..289620d4aad3 100644 --- a/include/linux/page_table_check.h +++ b/include/linux/page_table_check.h @@ -19,8 +19,10 @@ void __page_table_check_pmd_clear(struct mm_struct *mm, pmd_t pmd); void __page_table_check_pud_clear(struct mm_struct *mm, pud_t pud); void __page_table_check_ptes_set(struct mm_struct *mm, pte_t *ptep, pte_t pte, unsigned int nr); -void __page_table_check_pmd_set(struct mm_struct *mm, pmd_t *pmdp, pmd_t pmd); -void __page_table_check_pud_set(struct mm_struct *mm, pud_t *pudp, pud_t pud); +void __page_table_check_pmds_set(struct mm_struct *mm, pmd_t *pmdp, pmd_t pmd, + unsigned int nr); +void __page_table_check_puds_set(struct mm_struct *mm, pud_t *pudp, pud_t pud, + unsigned int nr); void __page_table_check_pte_clear_range(struct mm_struct *mm, unsigned long addr, pmd_t pmd); @@ -74,22 +76,22 @@ static inline void page_table_check_ptes_set(struct mm_struct *mm, __page_table_check_ptes_set(mm, ptep, pte, nr); } -static inline void page_table_check_pmd_set(struct mm_struct *mm, pmd_t *pmdp, - pmd_t pmd) +static inline void page_table_check_pmds_set(struct mm_struct *mm, + pmd_t *pmdp, pmd_t pmd, unsigned int nr) { if (static_branch_likely(&page_table_check_disabled)) return; - __page_table_check_pmd_set(mm, pmdp, pmd); + __page_table_check_pmds_set(mm, pmdp, pmd, nr); } -static inline void page_table_check_pud_set(struct mm_struct *mm, pud_t *pudp, - pud_t pud) +static inline void page_table_check_puds_set(struct mm_struct *mm, + pud_t *pudp, pud_t pud, unsigned int nr) { if (static_branch_likely(&page_table_check_disabled)) return; - __page_table_check_pud_set(mm, pudp, pud); + __page_table_check_puds_set(mm, pudp, pud, nr); } static inline void page_table_check_pte_clear_range(struct mm_struct *mm, @@ -129,13 +131,13 @@ static inline void page_table_check_ptes_set(struct mm_struct *mm, { } -static inline void page_table_check_pmd_set(struct mm_struct *mm, pmd_t *pmdp, - pmd_t pmd) +static inline void page_table_check_pmds_set(struct mm_struct *mm, + pmd_t *pmdp, pmd_t pmd, unsigned int nr) { } -static inline void page_table_check_pud_set(struct mm_struct *mm, pud_t *pudp, - pud_t pud) +static inline void page_table_check_puds_set(struct mm_struct *mm, + pud_t *pudp, pud_t pud, unsigned int nr) { } @@ -146,4 +148,8 @@ static inline void page_table_check_pte_clear_range(struct mm_struct *mm, } #endif /* CONFIG_PAGE_TABLE_CHECK */ + +#define page_table_check_pmd_set(mm, pmdp, pmd) page_table_check_pmds_set(mm, pmdp, pmd, 1) +#define page_table_check_pud_set(mm, pudp, pud) page_table_check_puds_set(mm, pudp, pud, 1) + #endif /* __LINUX_PAGE_TABLE_CHECK_H */ diff --git a/mm/page_table_check.c b/mm/page_table_check.c index 68109ee93841..4eeca782b888 100644 --- a/mm/page_table_check.c +++ b/mm/page_table_check.c @@ -218,33 +218,39 @@ static inline void page_table_check_pmd_flags(pmd_t pmd) WARN_ON_ONCE(swap_cached_writable(pmd_to_swp_entry(pmd))); } -void __page_table_check_pmd_set(struct mm_struct *mm, pmd_t *pmdp, pmd_t pmd) +void __page_table_check_pmds_set(struct mm_struct *mm, pmd_t *pmdp, pmd_t pmd, + unsigned int nr) { + unsigned long stride = PMD_SIZE >> PAGE_SHIFT; + unsigned int i; + if (&init_mm == mm) return; page_table_check_pmd_flags(pmd); - __page_table_check_pmd_clear(mm, *pmdp); - if (pmd_user_accessible_page(pmd)) { - page_table_check_set(pmd_pfn(pmd), PMD_SIZE >> PAGE_SHIFT, - pmd_write(pmd)); - } + for (i = 0; i < nr; i++) + __page_table_check_pmd_clear(mm, *(pmdp + i)); + if (pmd_user_accessible_page(pmd)) + page_table_check_set(pmd_pfn(pmd), stride * nr, pmd_write(pmd)); } -EXPORT_SYMBOL(__page_table_check_pmd_set); +EXPORT_SYMBOL(__page_table_check_pmds_set); -void __page_table_check_pud_set(struct mm_struct *mm, pud_t *pudp, pud_t pud) +void __page_table_check_puds_set(struct mm_struct *mm, pud_t *pudp, pud_t pud, + unsigned int nr) { + unsigned long stride = PUD_SIZE >> PAGE_SHIFT; + unsigned int i; + if (&init_mm == mm) return; - __page_table_check_pud_clear(mm, *pudp); - if (pud_user_accessible_page(pud)) { - page_table_check_set(pud_pfn(pud), PUD_SIZE >> PAGE_SHIFT, - pud_write(pud)); - } + for (i = 0; i < nr; i++) + __page_table_check_pud_clear(mm, *(pudp + i)); + if (pud_user_accessible_page(pud)) + page_table_check_set(pud_pfn(pud), stride * nr, pud_write(pud)); } -EXPORT_SYMBOL(__page_table_check_pud_set); +EXPORT_SYMBOL(__page_table_check_puds_set); void __page_table_check_pte_clear_range(struct mm_struct *mm, unsigned long addr, -- 2.43.0