From patchwork Mon Feb 17 14:07:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13977907 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 C8BE0C021AB for ; Mon, 17 Feb 2025 14:08:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6543628005A; Mon, 17 Feb 2025 09:08:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5DB2E280059; Mon, 17 Feb 2025 09:08:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4084628005A; Mon, 17 Feb 2025 09:08:28 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 17C57280059 for ; Mon, 17 Feb 2025 09:08:28 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id CF6001C71C1 for ; Mon, 17 Feb 2025 14:08:27 +0000 (UTC) X-FDA: 83129616654.04.5290510 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf24.hostedemail.com (Postfix) with ESMTP id 23161180017 for ; Mon, 17 Feb 2025 14:08:25 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf24.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=1739801306; a=rsa-sha256; cv=none; b=3nBIFN5zKuXnZ/klp0QtGA8DoMX19IntoMdd6Wp+zEzJ+gGokIQr5rTyzWC2AuchnhU8K7 weupbY1ouIkMbjR1w5jr/1PR4Yf+jFK9oy52+h2azeaAFRN1bkwU/Cm8bVWr/pZah2NKgQ V6Szo66Z/WBjnBv2n241buc7UT8+nOk= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf24.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=1739801306; 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=F8P6CnZIKWih8v53EKSQOz8corlrU6mPWHF0BWlrBYA=; b=yJ3nUwpSCY7X/7538NdmICi2J5Y+qEmgfU4mjOf72sZmoYmHdyO3wnoq/i0PN+CP9Pv11m xPOaTONMTR4spx1SZIgHlvF99qQNbjB+iVmv4SxYnT4H2wkO5kJWzeFPQbmpu3gLqDtwhB 9cBtlJp3qdn0FZZYVZHJ3BVwvdp769M= 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 A18691A2D; Mon, 17 Feb 2025 06:08:44 -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 33ED53F6A8; Mon, 17 Feb 2025 06:08:23 -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 02/14] arm64: hugetlb: Refine tlb maintenance scope Date: Mon, 17 Feb 2025 14:07:54 +0000 Message-ID: <20250217140809.1702789-3-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-Queue-Id: 23161180017 X-Rspamd-Server: rspam12 X-Stat-Signature: 5f3q391fs4qhrx1c7dfatkm6zikn1fqr X-HE-Tag: 1739801305-598712 X-HE-Meta: U2FsdGVkX1+ysrpKN+kFE/R6dSGnEoh15ZgRHN8Z/WrTy1ueDWPNZpAv+9nLPm1k8L8pPDBJltmKXZ7DZpydIUXhqDToCcG35gBcBRzju2t5gfYkUdY3rCaSgBochKwlmBCO/GbrsFhox/JrjMHocMQsY+8HHI83i76rnlm4kauYLOczcRH1w5EhkZhGNwj3pkbnQaGl3Z1zbm0/yoKp+wGH9ez8MiaWDLOjWO8bu25qJy0sgUZ0pBinKFZci8J++wfXQRTl5fvTZ6dWIil6n8s/g5JMbSOe94nOg6NkEZ7WuT11WMfRp6zjO+pnJWLNsmyz4R10B5nIMwuJznZUiPoKFYdPzIVOT58BxcNUqJMiTO4JBKDa8NSYweulwBM/ZFVgHyRLFlEobrE0OyQOafUdAEOINtjdmbDR+Ii/IiSO52/R69pXeqqk7CHkDtkolSv+c32utkBHpTYLxCvc6mlTpGm4Xmd2bSNOYERlxjsIyxnquHOA3e5nrenPVsPT74HXhAnGmgZ51Nrcz+GjYbO4+GMLcijt4yaCQbcnqvjpo9Sa5ShUSx4YJOrgw8bfNyJB+4sNyISbCAoPVWrOqh4bnG7one31f/wbog4axfJaC60WOtm9OhZKcnjwqmQeG4xo4P9HsSnbb88LxRgLZ41kiwhRIoPGtiIz/+SJXYECvD6j4BUnPQB0CsxkX7r/od2cQcfWk6RZZUxv0Iu/k8YC8k4eOOuNNvW/tihJEkFEr5WtEkfW3zwXM2w/VuC8wZzUG8Z1InQT/89ppLJCB4JMwteMAFKeh/xuZtqhi4JgwKoYAq9nuZixERUqdgamCH/SfTdT/2oHQC735XAEvmEhoffUB8gvJCJEcaU2ClroUO2vgTWqsJ00LVJlnrTvnLUq98ekxiGtqRrbvoja63LGkd9lBk/7u/ADVLnycLCqKz4qMT/0YrZagTxZyaiqjR6c1klLLWZvhPp44yv IuXt8ahE g75Vg/bg5VrfzcP0YehyKWZ8eP55tNY7MwNmSFZLYa3I54G/tUVeKesToshy3jehN5SoH5H8bji6KbXzS9MIX9Q7kaKQUG7CiVKTW/kbdlyTuuAyNQJRcs16XKuEb6/pFIytlK8ozJ0VYlV3eAYnwbe6XlQ== 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: When operating on contiguous blocks of ptes (or pmds) for some hugetlb sizes, we must honour break-before-make requirements and clear down the block to invalid state in the pgtable then invalidate the relevant tlb entries before making the pgtable entries valid again. However, the tlb maintenance is currently always done assuming the worst case stride (PAGE_SIZE), last_level (false) and tlb_level (TLBI_TTL_UNKNOWN). We can do much better with the hinting; In reality, we know the stride from the huge_pte pgsize, we are always operating only on the last level, and we always know the tlb_level, again based on pgsize. So let's start providing these hints. Additionally, avoid tlb maintenace in set_huge_pte_at(). Break-before-make is only required if we are transitioning the contiguous pte block from valid -> valid. So let's elide the clear-and-flush ("break") if the pte range was previously invalid. Signed-off-by: Ryan Roberts --- arch/arm64/include/asm/hugetlb.h | 29 +++++++++++++++++++---------- arch/arm64/mm/hugetlbpage.c | 9 ++++++--- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/arch/arm64/include/asm/hugetlb.h b/arch/arm64/include/asm/hugetlb.h index 07fbf5bf85a7..2a8155c4a882 100644 --- a/arch/arm64/include/asm/hugetlb.h +++ b/arch/arm64/include/asm/hugetlb.h @@ -69,29 +69,38 @@ extern void huge_ptep_modify_prot_commit(struct vm_area_struct *vma, #include -#define __HAVE_ARCH_FLUSH_HUGETLB_TLB_RANGE -static inline void flush_hugetlb_tlb_range(struct vm_area_struct *vma, - unsigned long start, - unsigned long end) +static inline void __flush_hugetlb_tlb_range(struct vm_area_struct *vma, + unsigned long start, + unsigned long end, + unsigned long stride, + bool last_level) { - unsigned long stride = huge_page_size(hstate_vma(vma)); - switch (stride) { #ifndef __PAGETABLE_PMD_FOLDED case PUD_SIZE: - __flush_tlb_range(vma, start, end, PUD_SIZE, false, 1); + __flush_tlb_range(vma, start, end, PUD_SIZE, last_level, 1); break; #endif case CONT_PMD_SIZE: case PMD_SIZE: - __flush_tlb_range(vma, start, end, PMD_SIZE, false, 2); + __flush_tlb_range(vma, start, end, PMD_SIZE, last_level, 2); break; case CONT_PTE_SIZE: - __flush_tlb_range(vma, start, end, PAGE_SIZE, false, 3); + __flush_tlb_range(vma, start, end, PAGE_SIZE, last_level, 3); break; default: - __flush_tlb_range(vma, start, end, PAGE_SIZE, false, TLBI_TTL_UNKNOWN); + __flush_tlb_range(vma, start, end, PAGE_SIZE, last_level, TLBI_TTL_UNKNOWN); } } +#define __HAVE_ARCH_FLUSH_HUGETLB_TLB_RANGE +static inline void flush_hugetlb_tlb_range(struct vm_area_struct *vma, + unsigned long start, + unsigned long end) +{ + unsigned long stride = huge_page_size(hstate_vma(vma)); + + __flush_hugetlb_tlb_range(vma, start, end, stride, false); +} + #endif /* __ASM_HUGETLB_H */ diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index 31ea826a8a09..b7434ed1b93b 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -190,8 +190,9 @@ static pte_t get_clear_contig_flush(struct mm_struct *mm, { pte_t orig_pte = get_clear_contig(mm, addr, ptep, pgsize, ncontig); struct vm_area_struct vma = TLB_FLUSH_VMA(mm, 0); + unsigned long end = addr + (pgsize * ncontig); - flush_tlb_range(&vma, addr, addr + (pgsize * ncontig)); + __flush_hugetlb_tlb_range(&vma, addr, end, pgsize, true); return orig_pte; } @@ -216,7 +217,7 @@ static void clear_flush(struct mm_struct *mm, for (i = 0; i < ncontig; i++, addr += pgsize, ptep++) __ptep_get_and_clear(mm, addr, ptep); - flush_tlb_range(&vma, saddr, addr); + __flush_hugetlb_tlb_range(&vma, saddr, addr, pgsize, true); } void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, @@ -245,7 +246,9 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, dpfn = pgsize >> PAGE_SHIFT; hugeprot = pte_pgprot(pte); - clear_flush(mm, addr, ptep, pgsize, ncontig); + /* Only need to "break" if transitioning valid -> valid. */ + if (pte_valid(__ptep_get(ptep))) + clear_flush(mm, addr, ptep, pgsize, ncontig); for (i = 0; i < ncontig; i++, ptep++, addr += pgsize, pfn += dpfn) __set_ptes(mm, addr, ptep, pfn_pte(pfn, hugeprot), 1);