From patchwork Tue Mar 4 15:04:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 14000866 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 A4251C282D2 for ; Tue, 4 Mar 2025 15:05:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9AC216B008A; Tue, 4 Mar 2025 10:05:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 90D0B6B008C; Tue, 4 Mar 2025 10:05:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7AF066B0092; Tue, 4 Mar 2025 10:05:02 -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 4DBB96B008C for ; Tue, 4 Mar 2025 10:05:02 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 0DE0914021D for ; Tue, 4 Mar 2025 15:05:02 +0000 (UTC) X-FDA: 83184191244.03.CD33082 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf15.hostedemail.com (Postfix) with ESMTP id 4276CA0034 for ; Tue, 4 Mar 2025 15:05:00 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf15.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=1741100700; 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=nmyuc6lIBFf/YKH0hZWfobduPBbxOIgME37VdPqLXHU=; b=ir1y/FBmTPaH2bRH8gIVSUY2BfvUjMliJV1Eh4gaEtTAJcxkMfiRtePFecxS0LxCvgggc7 ZSxxeRTnTFwMhWdtqrt8ypF7CrJ7ZMUG/dOQTLZbg2MV5epHFMoeSfDO6TUsKyaVL52iY5 arD03x/Da8uSKUxcq872a+kxJ/q3vlY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741100700; a=rsa-sha256; cv=none; b=LOizLcSTR++VFH9gjqEHD60l4v8DXwpvq//QXqAcfBdtHfPDpsfjj3QTTYeNRwAcrEBGXd dvWkjgwI7F+y7O5ksJpPF2h/EnN9QRPYIL1VuM4MERUDFW0gWVhoT2jUe41HCdg9H8BZqz qMmtQAf3O+IsEQGjc6Ceq4RU1iJeYjM= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf15.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com 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 167B41C25; Tue, 4 Mar 2025 07:05:13 -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 84D063F66E; Tue, 4 Mar 2025 07:04:57 -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 02/11] arm64: hugetlb: Refine tlb maintenance scope Date: Tue, 4 Mar 2025 15:04:32 +0000 Message-ID: <20250304150444.3788920-3-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: rspam02 X-Stat-Signature: bmwpwkeqpgry8swie11xa8313b9nbxc3 X-Rspamd-Queue-Id: 4276CA0034 X-Rspam-User: X-HE-Tag: 1741100700-492844 X-HE-Meta: U2FsdGVkX1+PGDlVvI2KKA1TLy5eSvpAcVm7HQtYOKOajRX0NhkgAUsKBfh9773px1mcLQbu6uAeRAuhei4UsEZWEQcllMFTfddbrTB9vmqbtyYtVV5KB9Q4akU7DhW1WqH3nTvjV5sJUVWF0Iwz95Vk7XAHRTUvoqk3a/gA4c1qTV6tWjfNCIv49Of1nET05G4BndnCxSng84tl/qrU+ZuH+r7uoxrBUJ9y0HF0v9u1BD1D6HpXz5Hu0L7mX3h7Fn2aP5GdPHl5uHap2QV1YtgDXVusGapabarhkHU7G8fvLaBUqGzydmCU0Q+Bwxq6LlTlIIO7IYufe/PbW4AyMTFlUFvqaCT5fTwvqvB3a3aFgCPynIRvQtmvTu1AYKGsndsBGdnJqWXokbI0HPugJoFKq+uObziA0tVzZHuRcv89pGWTMdMWWH3OCctLuONYO1HejegU3O8QepT0lTUJG9zestQ9wNdEP7zkwIvcjGtQDv8bAFMQ8UhlqS7QUJGgmSfwL5nYQNwbvByKkMmwsfT9nLKgLAt2pEjvCGIol0YDPxOPhQfkZ/XjHVQgdKVlYYD90meizf9Avh5diePQVdX1aZwqcgyETjzt0cgenyYlWNj9FX8s4VtRK6DjRTDdok2rRQG+Arm70azjQP8gvkFv/vB3tsQF3Z7p3K4lTQHeyoJxhemkz4OhO67Y9JNoIVHUk3+WxLTHFxYUc1ZnNJut6ySw4kD+XbAPBF0ugT1XEo8721ReXab8pHV1HH3KWVgUgLnfiswGfxUdhkFzAZEba24szg86ZiJ8n96MkuexATnVFLNObenCM21uKJDn9cOcSK+Ysj1NPDkkRl5alZtvpGppalQPQw7y0vXGoEhEY4MdU1mE+EVBcbvxO1T3gUufSEHTtjAQBJpC8EZp4k39O27TuSdkFn3B/3lw8YVH8sCbAxvSNk9iyT05lv3htkKoKGsl2xZa4c+nscZ zOb0VQ6M xHXRQTgnrzPB7rCZG4egX5NXWwGQ6PP781hKqTHDLBUhYkq1KGFLl0XFMQNRqJdNVldvYe1NlEXqmWoOYou/SPSPdn8kVReoS9cAv3S/h+12xj8fv56DEdqDUUN+RvpGiCU0uIPqbO1m5MEirMVPBA6FHog== 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 6a2af9fb2566..065be8650aa5 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -183,8 +183,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; } @@ -209,7 +210,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, @@ -238,7 +239,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);