From patchwork Wed Feb 5 15:09:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13961284 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 BB32FC02194 for ; Wed, 5 Feb 2025 15:10:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 30CB8280019; Wed, 5 Feb 2025 10:10:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 26A53280001; Wed, 5 Feb 2025 10:10:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0E41D280019; Wed, 5 Feb 2025 10:10:47 -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 E2EC1280001 for ; Wed, 5 Feb 2025 10:10:46 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 86F74C01AB for ; Wed, 5 Feb 2025 15:10:46 +0000 (UTC) X-FDA: 83086228092.19.C97202C Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf25.hostedemail.com (Postfix) with ESMTP id CDB24A0012 for ; Wed, 5 Feb 2025 15:10:44 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf25.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=1738768244; a=rsa-sha256; cv=none; b=M11QGCz9tDOWg5yA3jRxByIC2IQwo0xYCHxbeb5k5woYfM6WCcGsHnaCy+yjo+vSt74pQ2 2+cLoRhRsjxVAFQcLp99///+jIgQbePqW8rKTSpGDwvNzeP58BgbrFU1qTwMwxGps8PUEi dGyE7BltcHySo2ZJhQtdYXOOFHlzB3g= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf25.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=1738768244; 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=dVPrvgxnzxsAfTYi9Dah/Z/7cPmJ2a+tEu4/yE+RZHs=; b=vYJe7X8pAKrvPueG8ia72CN4pf8vYFAYjKrKayE0xfymIpz0DYHlQ39isnl74MxpQaTcwn NdVQUuPjZhaTHX87V4D1CBWe8muSVrQK6qRbyTB5afleHMBOCZ39d2RGe3nGbJhzdFQsk2 0aK/d2FsKHCkAGD/fY1Gl/rknaN2ud0= 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 BE7D41063; Wed, 5 Feb 2025 07:11:07 -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 A24303F5A1; Wed, 5 Feb 2025 07:10:41 -0800 (PST) From: Ryan Roberts To: Catalin Marinas , Will Deacon , Muchun Song , Pasha Tatashin , Andrew Morton , Uladzislau Rezki , Christoph Hellwig , Mark Rutland , Ard Biesheuvel , Anshuman Khandual , Dev Jain , Alexandre Ghiti , Steve Capper , Kevin Brodsky Cc: Ryan Roberts , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 06/16] arm64/mm: Refactor __set_ptes() and __ptep_get_and_clear() Date: Wed, 5 Feb 2025 15:09:46 +0000 Message-ID: <20250205151003.88959-7-ryan.roberts@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250205151003.88959-1-ryan.roberts@arm.com> References: <20250205151003.88959-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: CDB24A0012 X-Rspamd-Server: rspam10 X-Stat-Signature: uo1doumoxugfmpg7seippt9trzzer1p5 X-HE-Tag: 1738768244-134557 X-HE-Meta: U2FsdGVkX1++cYjsZicqLXQGsSqKAqdBqcPrHybqkpio3oHP9cYQZPg6p/QbORu2sm24E2W/ATpUBLPsvIFTvDCWqCZFEoRS+ojm94OJ6JwUg4fOislmc6cstul1jWLwgSGnMjnodYlY63runOuxcAgzR3yR46NpBYvZpqPU32JZm5SpoF/DxfyaKnT5XNfnf1TB1jIrUzArRc4zOrK6aJYRD00gzmvIBTFNt/NoTZv4xxklu1ezjALYpGcLtzgcQty1Z2wL2+fO8LouSx+aBI9ixRsL5wLhhrAw87N/G2ggvrFMJWI6SQcc9oJBd5WHE1dGioamdDVmuCJ5yHbstujayxfDut6+wkpYpKtfwkUiZuH/Dq7fcpq7B6zqHYNsIUlTE7wmDfe9qroTJzf4SbjIPEGkSowLIihnceXfK9DgfNxbRij6YjPUgmjF39yriLk886bDq4v4e4MDk62nIM1GcpwFQSbgM3AXDkzATqPuuotFfPkgDrIn8e7ssbsjBhvJIas7mQvmmypJVXEPEjcH2snoT3lGFN+8wqEL7VbhFQIHePev/2SRniZcRJherh6Q82JpViPKQl2Espzx2Paa0hEN1uQ+7dv6UlXpRKau0VNfJett1C/+koxL514UINDSv8MChoLoGt6Vj5d+daCV1YHFpTeUkMz4kwx4gcnqj/rwfefHiXt3fikyTZaOu9cFxOI6s7sDZKt1YjvnTafUbnmt0vwqgIqzY+DKrvrUUjMd45DuzB0vh6J3M07t5c/sWxckZg7Go54Lr3Z4mZtBSwXvCWHi9SFtwnYfxNOJF0BuezfBhD101VBTRRxsMzdj56JMGET3cYLHvfbfaJqQCk1a+Ed2re+/gYEuFtB3Cc3uNivf9Q4fL1aXK95Y0WMmvI8Qg67qUa86Tf164vdeiiTvtcYs4Od30s5Fi0Jgamz+Woslhy9GFJ/psitOs/Dz9jDYz0yWNJSGwSZ SEUtzr2X Z8XUGE2zFdEfCdRuxNE4oyXkYslS7cjNskQpIzxMgJ1Ons5AiDsUs6E/1nj/9rN39ZTjVzH+KOboCLNrhjPubq4zgcidBt/UXFahoHrgzrGRMvtGZvWgccWOEMN141atsg44ARQMS0SAww5x0C0wrA4wPdcrpnUiVYLL3X6tTAHZQSSa7ULK+lFhUuoylP0fj6EWiC3UY5sA2UQU= 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: Refactor __set_ptes(), set_pmd_at() and set_pud_at() so that they are all a thin wrapper around a generic ___set_ptes(), which takes pgsize parameter. This cleans up the code to remove the confusing __set_pte_at() (which was only ever used for pmd/pud) and will allow us to perform future barrier optimizations in a single place. Additionally, it will permit the huge_pte API to efficiently batch-set pgtable entries and take advantage of the future barrier optimizations. ___set_ptes() calls the correct page_table_check_*_set() function based on the pgsize. This means that huge_ptes be able to get proper coverage regardless of their size, once it's plumbed into huge_pte. Currently the huge_pte API always uses the pte API which assumes an entry only covers a single page. While we are at it, refactor __ptep_get_and_clear() and pmdp_huge_get_and_clear() to use a common ___ptep_get_and_clear() which also takes a pgsize parameter. This will provide the huge_pte API the means to clear ptes corresponding with the way they were set. Signed-off-by: Ryan Roberts --- arch/arm64/include/asm/pgtable.h | 108 +++++++++++++++++++------------ 1 file changed, 67 insertions(+), 41 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 0b2a2ad1b9e8..3b55d9a15f05 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -420,23 +420,6 @@ static inline pte_t pte_advance_pfn(pte_t pte, unsigned long nr) return pfn_pte(pte_pfn(pte) + nr, pte_pgprot(pte)); } -static inline void __set_ptes(struct mm_struct *mm, - unsigned long __always_unused addr, - pte_t *ptep, pte_t pte, unsigned int nr) -{ - page_table_check_ptes_set(mm, ptep, pte, nr); - __sync_cache_and_tags(pte, nr); - - for (;;) { - __check_safe_pte_update(mm, ptep, pte); - __set_pte(ptep, pte); - if (--nr == 0) - break; - ptep++; - pte = pte_advance_pfn(pte, 1); - } -} - /* * Hugetlb definitions. */ @@ -641,30 +624,59 @@ static inline pgprot_t pud_pgprot(pud_t pud) return __pgprot(pud_val(pfn_pud(pfn, __pgprot(0))) ^ pud_val(pud)); } -static inline void __set_pte_at(struct mm_struct *mm, - unsigned long __always_unused addr, - pte_t *ptep, pte_t pte, unsigned int nr) +static inline void ___set_ptes(struct mm_struct *mm, pte_t *ptep, pte_t pte, + unsigned int nr, unsigned long pgsize) { - __sync_cache_and_tags(pte, nr); - __check_safe_pte_update(mm, ptep, pte); - __set_pte(ptep, pte); + unsigned long stride = pgsize >> PAGE_SHIFT; + + switch (pgsize) { + case PAGE_SIZE: + page_table_check_ptes_set(mm, ptep, pte, nr); + break; + case PMD_SIZE: + page_table_check_pmds_set(mm, (pmd_t *)ptep, pte_pmd(pte), nr); + break; + case PUD_SIZE: + page_table_check_puds_set(mm, (pud_t *)ptep, pte_pud(pte), nr); + break; + default: + VM_WARN_ON(1); + } + + __sync_cache_and_tags(pte, nr * stride); + + for (;;) { + __check_safe_pte_update(mm, ptep, pte); + __set_pte(ptep, pte); + if (--nr == 0) + break; + ptep++; + pte = pte_advance_pfn(pte, stride); + } } -static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr, - pmd_t *pmdp, pmd_t pmd) +static inline void __set_ptes(struct mm_struct *mm, + unsigned long __always_unused addr, + pte_t *ptep, pte_t pte, unsigned int nr) { - page_table_check_pmd_set(mm, pmdp, pmd); - return __set_pte_at(mm, addr, (pte_t *)pmdp, pmd_pte(pmd), - PMD_SIZE >> PAGE_SHIFT); + ___set_ptes(mm, ptep, pte, nr, PAGE_SIZE); } -static inline void set_pud_at(struct mm_struct *mm, unsigned long addr, - pud_t *pudp, pud_t pud) +static inline void __set_pmds(struct mm_struct *mm, + unsigned long __always_unused addr, + pmd_t *pmdp, pmd_t pmd, unsigned int nr) +{ + ___set_ptes(mm, (pte_t *)pmdp, pmd_pte(pmd), nr, PMD_SIZE); +} +#define set_pmd_at(mm, addr, pmdp, pmd) __set_pmds(mm, addr, pmdp, pmd, 1) + +static inline void __set_puds(struct mm_struct *mm, + unsigned long __always_unused addr, + pud_t *pudp, pud_t pud, unsigned int nr) { - page_table_check_pud_set(mm, pudp, pud); - return __set_pte_at(mm, addr, (pte_t *)pudp, pud_pte(pud), - PUD_SIZE >> PAGE_SHIFT); + ___set_ptes(mm, (pte_t *)pudp, pud_pte(pud), nr, PUD_SIZE); } +#define set_pud_at(mm, addr, pudp, pud) __set_puds(mm, addr, pudp, pud, 1) #define __p4d_to_phys(p4d) __pte_to_phys(p4d_pte(p4d)) #define __phys_to_p4d_val(phys) __phys_to_pte_val(phys) @@ -1276,16 +1288,34 @@ static inline int pmdp_test_and_clear_young(struct vm_area_struct *vma, } #endif /* CONFIG_TRANSPARENT_HUGEPAGE || CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG */ -static inline pte_t __ptep_get_and_clear(struct mm_struct *mm, - unsigned long address, pte_t *ptep) +static inline pte_t ___ptep_get_and_clear(struct mm_struct *mm, pte_t *ptep, + unsigned long pgsize) { pte_t pte = __pte(xchg_relaxed(&pte_val(*ptep), 0)); - page_table_check_pte_clear(mm, pte); + switch (pgsize) { + case PAGE_SIZE: + page_table_check_pte_clear(mm, pte); + break; + case PMD_SIZE: + page_table_check_pmd_clear(mm, pte_pmd(pte)); + break; + case PUD_SIZE: + page_table_check_pud_clear(mm, pte_pud(pte)); + break; + default: + VM_WARN_ON(1); + } return pte; } +static inline pte_t __ptep_get_and_clear(struct mm_struct *mm, + unsigned long address, pte_t *ptep) +{ + return ___ptep_get_and_clear(mm, ptep, PAGE_SIZE); +} + static inline void __clear_full_ptes(struct mm_struct *mm, unsigned long addr, pte_t *ptep, unsigned int nr, int full) { @@ -1322,11 +1352,7 @@ static inline pte_t __get_and_clear_full_ptes(struct mm_struct *mm, static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm, unsigned long address, pmd_t *pmdp) { - pmd_t pmd = __pmd(xchg_relaxed(&pmd_val(*pmdp), 0)); - - page_table_check_pmd_clear(mm, pmd); - - return pmd; + return pte_pmd(___ptep_get_and_clear(mm, (pte_t *)pmdp, PMD_SIZE)); } #endif /* CONFIG_TRANSPARENT_HUGEPAGE */