From patchwork Mon Feb 17 14:07:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13977908 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 47196C021AA for ; Mon, 17 Feb 2025 14:08:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CBC9D28005B; Mon, 17 Feb 2025 09:08:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BCEBE280059; Mon, 17 Feb 2025 09:08:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9F9F528005B; Mon, 17 Feb 2025 09:08:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 7E8FA280059 for ; Mon, 17 Feb 2025 09:08:30 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 2FCDE1A0483 for ; Mon, 17 Feb 2025 14:08:30 +0000 (UTC) X-FDA: 83129616780.02.5BFDAD0 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf21.hostedemail.com (Postfix) with ESMTP id 8E6381C0013 for ; Mon, 17 Feb 2025 14:08:28 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=none; spf=pass (imf21.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739801308; 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=DVSig2NspOnTN9oAhuw0oomwmgQEGygT9RuRzv6qvgM6qcnqyeaxxO4yxNfLrv7XOuViTe OwM0LkGWv7FPVu9GAxW+HMAurIkZ2jT5anHJQL/WI3p6Rs+Z2LJ0sqIuHm54Mk0BcxZXd/ 4tYEAmWiEt7A/pMwDVg0YDT3AniQ63Q= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=none; spf=pass (imf21.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739801308; a=rsa-sha256; cv=none; b=Az/EVHn/nn7sEBIvc6H7lGuwQWK52AnMmaxsb+ukdCVWWfTgL0BYSXkTTvahvI770lU9vp c+ZzbOlMIFCEev/gXyki//Poaaa+N2D645nrN881XrVR8+Bh/jojQ08fQyY86vb3hrh9jt wiulQ+b5YeyAwoH28ZldWT+z2ZLs4nk= 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 315891A2D; Mon, 17 Feb 2025 06:08:47 -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 B7B753F6A8; Mon, 17 Feb 2025 06:08:25 -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 v2 03/14] mm/page_table_check: Batch-check pmds/puds just like ptes Date: Mon, 17 Feb 2025 14:07:55 +0000 Message-ID: <20250217140809.1702789-4-ryan.roberts@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250217140809.1702789-1-ryan.roberts@arm.com> References: <20250217140809.1702789-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 8E6381C0013 X-Stat-Signature: gr7h8iy1kymyg465b7hewzk9d7zo5d3m X-HE-Tag: 1739801308-626036 X-HE-Meta: U2FsdGVkX1/ZHbwDI/2EWz2FDW65/mZgIec93z6VA6MA76k5Qfvr3jCG77bPXdxPU89+tqUSl/XwjA5M5uAkwiAJR7EEyLS5uCDgqOTJCjC5iBhRRdWnW4vYBVfqAKH+47T3mrWnXpZv753fCX0cD+UJHltYFHYxBHf7mqOtP5Oury59dUw4gC2tyO2262PE5zwyKI9Ilv0TRaYcK77Sp3aWdOZ3/90wjrEz5n/sr+VZlG/g2HXaBLHM2b02SUL29b8GmnQTkgu4+/w6oVxXtxyalG91WllUWhqc0NNVM7WUIiAL5Rnu/GogI27JRf+DQANXeaFU1+9UcuWu3n6D0psNxb/Z9z0Q+z6K26FXf98YVgae8Gi3evAEOMgKC9BDbE007QdOYMZdJ6KAXaG90GSJ6lvUgPpFV2RBMPE8JyK3JD5eF48S+Ue5Rda0H/jrcuM4m7MtMtfls9JxhVhWSCVZmGmQDLptY/gDJ73hYKU/SG77YYsjayqOnwOrpM0Xm5Xifx/Q6ftS4B4r+gXXjsdpjQ+2Rd828iCMkLVYKahghR692EsUOp1v0EjMv3Mc0ban2ERE69l32swhTmkxifNZz/yKobjIJOrP0KigGbUCqr2BXhuKEuZjxpTQAVVcjfcWgnZ7npdSbfNhZztfU8ITsmTQSjT9vqnbETBTqdMZcU+Y5C3ck3Ll9doNlJIjMDCMBIXMlFZ02dlTdCjRUN9XpW5KKjiNKCKavi4YLbUaoEIGlpIZaR/SOKV6O8lJyzUs5Sx7PboY8KxOfLDFER/3yWXaBttRMJ5f+zI0ycFr1KYNcLPJ3r4az5H+/HxEdytv1wj+T34Po6RjELGzlmj1eZ2CSk6cjhIQZuOBuX0w5/X8SkUZrbeFbAhTpzbu3mvktzg/CNTt6QwQUydlgakpJOQS412ZeHxokrf/3Yio3rUetzFIWPfDUbM8IJPmP0vFkBfsUXnViHWd1Ev 6KQnDmVH pzkDEM5i71L3hTpJ2orVaXXF4ZvVXfqC5/jES3HJrwZd2MhmUnmCE2djHKI0wFTE4ePZ54sRsLjoo8WKS9N1kCukBhF/3hFJSy9AJu+HiIRqWw0hgJO8mYuGa9AUsmmSUx9r3mAPrOrM6Qq1lMpPGFmUEfAkwgLC1Zk+kq+rP9ePd+Sp02ezOA9ZUU8v9/fSRr2dJ1rM/bPojjqg= 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,