From patchwork Tue Mar 4 15:04:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 14000867 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 C5385C021B8 for ; Tue, 4 Mar 2025 15:05:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 739E26B008C; Tue, 4 Mar 2025 10:05:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6EA3E6B0092; Tue, 4 Mar 2025 10:05:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5B17A6B0093; Tue, 4 Mar 2025 10:05:04 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 3C5386B008C for ; Tue, 4 Mar 2025 10:05:04 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id EEB47B0027 for ; Tue, 4 Mar 2025 15:05:03 +0000 (UTC) X-FDA: 83184191286.08.4B9412F Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf11.hostedemail.com (Postfix) with ESMTP id 44D1B40032 for ; Tue, 4 Mar 2025 15:05:02 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf11.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741100702; a=rsa-sha256; cv=none; b=iQ4EAFc7cukq/kQwBpMn1z3ZcGLCf6exiZqrQbFvEOK961Cve8b/7BDto8Db/ZDDu2FbFF WMPdNJCT8PrNXWrSyCZQOCMij1+jxy6OTCVbKh0kG/xEEITR8fVUE4kPk7AVjFKylzSbCy xUvelC2Lk75ziFf9EcC0XM9ew+d82e0= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf11.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=1741100702; 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=i1h0X13EBKBwrKu1G9dgmEtg+bxoPDg6xcG/Lwz+vSw=; b=GfXUhfopQeW4OGkULLDrp3t3+TFW5RRMaNfna/fWDkjVIRM8yOPy7NDvbLPrVhBDmUbE9F tgSw19iINDIBKgqaQS7qIPFVSMQuVciKMQJ6BhOE4Yo5//DFdX9+88JV78ener6YUgUQzU dDE2zpBswGx4jkOSRY3WC2hKEqvJMbA= 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 379ECFEC; Tue, 4 Mar 2025 07:05:15 -0800 (PST) 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 A4AB43F66E; Tue, 4 Mar 2025 07:04:59 -0800 (PST) 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 v3 03/11] mm/page_table_check: Batch-check pmds/puds just like ptes Date: Tue, 4 Mar 2025 15:04:33 +0000 Message-ID: <20250304150444.3788920-4-ryan.roberts@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250304150444.3788920-1-ryan.roberts@arm.com> References: <20250304150444.3788920-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 44D1B40032 X-Stat-Signature: nbipcyoemrrdex9hbsraq1pin6zwwtyr X-Rspam-User: X-HE-Tag: 1741100702-603376 X-HE-Meta: U2FsdGVkX18WFJDKuKFxHd4bEBST7/rKQoSCHrlc+PsOcieRmO3Q3mWVO8EyJAe3AYDjljERR7Z2V5PD4HClC/cVXTvgjC/+XYG5PQnPwf57vgg19oX9eOf57SNUD1Gk1XdFM1Ykl0rV0zZ5hLA024FgdAc9VvS4PPwFV/plNJzBs19B6jUawHdjTqLFjZALRjFzRD0FrCnBAVny0MUMwS9qxW3K+GRAIjoFRx0LfTvml72+IliRwnyvrcsmGVDB4gLEURwvVPY2c/1fygM8KpPb+40y+xJd9iSRScEj7v31AvLc36ZHp5R6lKZHdW8gp8EuOh736u/y4lM3tA6QRxonDyTnTjmYNTTeJmDeD7kpHZv/sC/iDmT/nkkM20xH5Tv5Rln0q7XtT0kxbVuny7Cezih21ca69FUk+6o+peWci42Zhryz7nCNfn7gheZurAa7hLJK5/cQGtAqiDzdpyt85KJxvEbvo6ZL01ERHdp4QwCOYtEHzH5hSb/LMzpWg/F1JjmG3xwGW5SFABmNBD+alOdG2O1HPwt4OuFywkVi1f8IJ/4piSqS/wBR8J11opkRnUCnUKxd5gMKmqeSMSJ1vMWveNJKKnbnHEyknn3+LA01X91B4gIEfn7l2b/7CJCkBRyKtXYK+v1ZAPFAuts7xInc8T1YB7TFUUTZs1PUUTyMx5xh8bKhcT0n5thDre/ClAyZsSmBrE4y4cFRfIProgdSAoukkg97RPGEVZe7lV+0gx8ba8kiyWRjMiWoPbT66sRXzANNjlHnNanOk3ReZwsfpcqiuUgFZindmQHQmT+ulTnTcMgaD1ssLOkoAprdSSfQQ7R/u9kZLM7JT2i4O1nknwtdhvtNxpCeY40XGYdnoRGopG5m1rkoHe5aGQDmhx9NIK9a7cG9CDf6oxiU1P7bDluSY3mfnb7jNnkr66qgm3OjiJAQIqediYGzgKbZjGs71xVAnkeoEUl 2rP4LI/C 9VGtOv93/rTtnVAx4katBlDx+sMMpLK9EzTKyq0JX0+aPs8iUudl9P294zWhRS58LV5yDk6n+rn4QsR6d2COGnUTIGmjgD260zg8Leojyf6jKk9mD8/ue8AnrFOsPvSOefrz3w9kz2ytTIn9BfFedJ5ggq0WExMpS3xyBWAijkN+FHOpEYRtnYgfSqFritosIx8X13a6QQBWNtZA= 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 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 509c6ef8de40..dae4a7d776b3 100644 --- a/mm/page_table_check.c +++ b/mm/page_table_check.c @@ -234,33 +234,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 int i; + unsigned long stride = PMD_SIZE >> PAGE_SHIFT; + 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 int i; + unsigned long stride = PUD_SIZE >> PAGE_SHIFT; + 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,