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 B999AC369CB for ; Tue, 22 Apr 2025 08:18:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DD2E16B000D; Tue, 22 Apr 2025 04:18:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D5F5B6B0032; Tue, 22 Apr 2025 04:18:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BD7CA6B007B; Tue, 22 Apr 2025 04:18:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 9D84F6B000D for ; Tue, 22 Apr 2025 04:18:50 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id CAB415FDC9 for ; Tue, 22 Apr 2025 08:18:51 +0000 (UTC) X-FDA: 83360978862.10.BB972DB Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf28.hostedemail.com (Postfix) with ESMTP id 32955C0006 for ; Tue, 22 Apr 2025 08:18:50 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=none; spf=pass (imf28.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=1745309930; a=rsa-sha256; cv=none; b=thQwCTkwULWU2xranbT8p0wlhsFc0HGolDNZvanx7oF/gasdijPeiRBn2YEaCb1kJLZkGP WBu3PgL2wRgDv+7lr9uROTkO84qhDFwWuAmCtbGVEv9jANWfRKcPJIFYIYnERo2+XgdPDJ SEvuAJrpswVi/p56AaV92uI2bNIQVbA= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=none; spf=pass (imf28.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=1745309930; 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=hD2CUq82ftY/OYVnYF6TvjfIYmmKPNtqA8Ta04bd8IQ=; b=0M4/9b5HnUGDEhREChw0cBNhsuBeZpEhkc7Cg5KjKXq90rrVMlXVpBzAqEx0dIKwJ6zZKv wRUFU8mzYFKPC/oldIBPIBHXerpUijCFg5QM05jiHGV/UdNdYTAfl0IiaYEJ6rkVSGpRhq Sh2oFQIh3IWCDNJ5Ye9kAhDX8ZbRb2M= 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 64F7A152B; Tue, 22 Apr 2025 01:18:45 -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 B1F893F66E; Tue, 22 Apr 2025 01:18:47 -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 04/11] arm64/mm: Refactor __set_ptes() and __ptep_get_and_clear() Date: Tue, 22 Apr 2025 09:18:12 +0100 Message-ID: <20250422081822.1836315-5-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-Queue-Id: 32955C0006 X-Stat-Signature: d97tw8f85w5ps4o6fubih6df8retknqj X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1745309930-475789 X-HE-Meta: U2FsdGVkX1+Ulboq/ybL9p6teeLYa7DCtj9lqYfS3T5nbYoiBzuRkr4vIVXblZ+KG1EHu8Jh7MuoMpxLbcqRN73rYBnfAx8aG56pQlLnRwYV2R6lR3zkuYiwLmxqHW7m0OJCWfBCxluK9DkP4UbXSDsNmRH5ts2J4IjDAbgP0lR8TIIKcQK91SQfIKD2/NDMdqqi9DzYKbojwXdFBVWzjrV+I6oo/nfr6P+Tyu3YXjkNaT+Kk15lia0wvkEoK3WM7CUT6L5mLYdKdzN9aB1GsZemsyAR/IvMQ5ai2Fc1GiYRqzMRRS0QmjraEaX+P1XNKQJquc3UAM6iOgCOWBMHQuWCOgzpILPdUwtGeDGZYfz5gErCzADqVfoms5wF/vNYsU2B1WApCcdzXd+9RpbgixsJqNnDfOpYvzG9b9A68dTmp2GvTftFj29gg/aZ9eoJH0gxUqd/MbbU4T30jZ4umDf+Uu+iHdlWVb3XIsCNqci9henmGaJ+OjJkJt8r3gbAnQFyWWlfnv7bkp/0IH7eIdst9ILg5FPYaNYHZl2o5XEz6fojJqPBWM0umSIgN5DgzE8ma1RHt3eOZ6K3PU6a+MWgxxP/kI3GYjKp5lkvrYVIfY/NFweNx0royDjjzLmGgAfc1GE8omrgnYIwJMwiXcygBi0rCB/lftuqUn+CAv55cb8+iEM0l6ZKLiEliRsGklKfeW8EG/lOSoR83UiEl1rf28kN8OjDJfSOBGh4vX9uOsMd6YvoefuNtvychgLHVgAV4twRA9HJrVn9490elvTBNqXb3Q+EMkRw+ULdKYfEqDsnILvJwTJ1fDRsBf73pFuMe0KEfmEFKr8JrqfT+PmVT/zttTS+xwBq47ONrNR2/BkP+lp9NZQnFBacOUuE7BBSafYzs835Fo/ZeU94e9WHsKvd87+GdZN7NVOKotyYm5PsI18OY7Tco62gk4H0ScKRg7ssgNQb2becK+6 dIUuQ6Pm FSXwJhJa+fiE/v4l3aV7+o82MhGyj/QStulxjVg9YE1Hh9SO11z2Mu+yNyK134k4hyt9IfEQnirwevKOtZ+a/f59sF8ZFjD0aHBOx1kmj4DRRkgvCll8ZNPqH77DTns30pNmrYBEEE1RJD1PuiP2cwopk6PJZCXCuAiLwFuhqhRV21nVk4b2VAAGMWJem9lYS/93Zhsbo0KS7bKA= 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 new common __set_ptes_anysz(), which takes pgsize parameter. Additionally, refactor __ptep_get_and_clear() and pmdp_huge_get_and_clear() to use a new common __ptep_get_and_clear_anysz() which also takes a pgsize parameter. These changes will permit the huge_pte API to efficiently batch-set pgtable entries and take advantage of the future barrier optimizations. Additionally since the new *_anysz() helpers call the correct page_table_check_*_set() API based on pgsize, this means that huge_ptes will be able to get proper coverage. Currently the huge_pte API always uses the pte API which assumes an entry only covers a single page. Reviewed-by: Catalin Marinas Signed-off-by: Ryan Roberts --- arch/arm64/include/asm/pgtable.h | 114 ++++++++++++++++++++----------- 1 file changed, 73 insertions(+), 41 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index d3b538be1500..d80aa9ba0a16 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -423,23 +423,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. */ @@ -649,30 +632,62 @@ 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_anysz(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; +#ifndef __PAGETABLE_PMD_FOLDED + case PUD_SIZE: + page_table_check_puds_set(mm, (pud_t *)ptep, pte_pud(pte), nr); + break; +#endif + 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_ptes(struct mm_struct *mm, + unsigned long __always_unused addr, + pte_t *ptep, pte_t pte, unsigned int nr) +{ + __set_ptes_anysz(mm, ptep, pte, nr, PAGE_SIZE); } -static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr, - pmd_t *pmdp, pmd_t pmd) +static inline void __set_pmds(struct mm_struct *mm, + unsigned long __always_unused addr, + pmd_t *pmdp, pmd_t pmd, 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_anysz(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_pud_at(struct mm_struct *mm, unsigned long addr, - pud_t *pudp, pud_t pud) +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_anysz(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) @@ -1301,16 +1316,37 @@ 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_anysz(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; +#ifndef __PAGETABLE_PMD_FOLDED + case PUD_SIZE: + page_table_check_pud_clear(mm, pte_pud(pte)); + break; +#endif + 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_anysz(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) { @@ -1347,11 +1383,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_anysz(mm, (pte_t *)pmdp, PMD_SIZE)); } #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ -- 2.43.0