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 7371CC021AA for ; Wed, 19 Feb 2025 08:56:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DD68944014C; Wed, 19 Feb 2025 03:56:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D5EF344014A; Wed, 19 Feb 2025 03:56:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C004944014C; Wed, 19 Feb 2025 03:56:37 -0500 (EST) 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 A152444014A for ; Wed, 19 Feb 2025 03:56:37 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 32F9E1612F2 for ; Wed, 19 Feb 2025 08:56:37 +0000 (UTC) X-FDA: 83136088434.09.BC89100 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf08.hostedemail.com (Postfix) with ESMTP id 3A846160004 for ; Wed, 19 Feb 2025 08:56:35 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf08.hostedemail.com: domain of anshuman.khandual@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=anshuman.khandual@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739955395; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GgWjzKl8pOIbbfF7ognkhTAU1FOv85XsHUlTnOyLHVQ=; b=Y1EJNJRT9a6LmEKVZTst5zDVUpCJSJykKUaeAKiU6TEz+li5AM4qYRQeEboG1xlBTFxUjP A1Anoy0HvIZbjtPWan+3OcyfZYE1cFm7p3wp0QUwYUxLgPp0B26luxtAAPOm10+3v6dwOj x649M0FmMGsBULk1retOwRNHxCaUL/k= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739955395; a=rsa-sha256; cv=none; b=dC4g5/FpJxt4v2M3cnjKjTX+8JvGJbQOz2mV+QxVfWAHbtZtqsjzLv+FgptF00w5BG1nA/ tKXSDnZ5moI6ExiPaIWEIjNopGFkyrZN7iYODKF2gT0Wo1+G6j+RG/9+3Uxd8G4f7N+J3K NfSNRaV/3ZIMIbktUcSXN/9wPl3adr0= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf08.hostedemail.com: domain of anshuman.khandual@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=anshuman.khandual@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 003F11682; Wed, 19 Feb 2025 00:56:53 -0800 (PST) Received: from [10.162.42.6] (unknown [10.162.42.6]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4EF9A3F5A1; Wed, 19 Feb 2025 00:56:21 -0800 (PST) Message-ID: <5fbfd74e-7f87-4f4f-86a7-7d4c38e0b4ba@arm.com> Date: Wed, 19 Feb 2025 14:26:19 +0530 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 3/4] arm64: hugetlb: Fix flush_hugetlb_tlb_range() invalidation level To: Ryan Roberts , Catalin Marinas , Will Deacon , Huacai Chen , WANG Xuerui , Thomas Bogendoerfer , "James E.J. Bottomley" , Helge Deller , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Naveen N Rao , Paul Walmsley , Palmer Dabbelt , Albert Ou , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Gerald Schaefer , "David S. Miller" , Andreas Larsson , Arnd Bergmann , Muchun Song , Andrew Morton , Uladzislau Rezki , Christoph Hellwig , David Hildenbrand , "Matthew Wilcox (Oracle)" , Mark Rutland , Dev Jain , Kevin Brodsky , Alexandre Ghiti Cc: linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org References: <20250217140419.1702389-1-ryan.roberts@arm.com> <20250217140419.1702389-4-ryan.roberts@arm.com> Content-Language: en-US From: Anshuman Khandual In-Reply-To: <20250217140419.1702389-4-ryan.roberts@arm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Queue-Id: 3A846160004 X-Rspamd-Server: rspam07 X-Stat-Signature: biwnxosrcrsnoisg4tasmpf1ef45s4ra X-HE-Tag: 1739955395-356530 X-HE-Meta: U2FsdGVkX1+dur0yCLX51fq/MMNd/QcjdqxWy0crevwSDc9+1iVGPopuYOzaSaWbDVOPaNfc0/15JLROJKu+GbBPTwQsgGRVfV/un4dtW9SJYKNmigffSFrEiwnqfQP3vXFgQJQpljfYFNHfjjndK5XSwBKQlinkFGX3EwrbURUgh1HCDe5eAiXmJgVqQfx0tbe7dc9DACvNgRM1amHmT6MOM9vu6p4LYqjq2tKaGjw2ieECqCmqE4aL1x4fNw2yc/8XSb74T6cfW18hiTfPRbJr6kULz+cU6w1KP2DM+I9sZ0WiNNmhmUk0uKXHTacvBgpx/Jv4qIwmaF8eUwAC0/shdgz9UaRF1aItzAGySUhFLVGQ5sEb2FRy2IZXrwtyUXakDXCS6TKnJ7Cf0OGk8YEL0VClz0DxyiMYa3t8pEdbfG6X1F4SbNMezXJZrNePuIiaq9d4SDmnAS9yV6Q3+eiQXD8fO0FT4AZtttQXOLLCXXDA6Zc4y9yGTHiQ9ogCo9aQnKK9FVnZFL7KYAL0AuWqOqsV6GbgupLghdiF3Wv3aKOlf4Jjh9lLCfNCoHK50yEwV8l9V2gyoT4/GLn4haSlEYT+r1SFWiRoR02BNtuZzmArFjbWX6obHypHKlGYzcSUb1Sk/q1mnm7VQvHka0bSKQuDMqisjWCs0skD6Zwoxbm7/gXTvEOqq9y2xuoXbRXibqqHC5obWm1JoCuR7T5JhFADM6QWSPICTiviKj7/ob087IPHdK3KeVfk/ECD5+VnCbxv4B99EubitD68C8bOlj2O0Hy4/yPsJry20EsClmDLZ6UMQF/Z2WCGekTslz5l/bNr/005k4i/Jfht2ROTFjZulD7yYbJBHVRXj3lHdQ5pk/Hme3I3jtOLK2RmwEfycvAnQKsQODgMgg2hFh8nYXUf3X93zC+S43uwIfmX9l1G+Chla5J1EVfX3/ZJ+06Xb1IfDf+aQJhX41k cPWZujEp 8iMKqQ3L1r8GetbgG3fF75MsOvU7M9WlB7+5b0izIkjhTBRsr2aPQq6oqex65O6wMP46FlyEQ7z/pTfm9zX2adl9kaCqBVDwAiKTw9xQm/gkld+LeVgxUEW5cYQiv4Y/gVD+u7MQTE07HYq6t7xhJ/Kj4KnPLuqMdPNUrEublv+TSsAO7bMx5nQNyyY16rkteNoixDOdqZfZcTUEZbW43CuxFskH4E6hpQJ8c94VJAfrg7hZIKjKOOK6unCSLmLqeOWxlGihz7Fq/hI6oOupYkVlZ4g== 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: On 2/17/25 19:34, Ryan Roberts wrote: > commit c910f2b65518 ("arm64/mm: Update tlb invalidation routines for > FEAT_LPA2") changed the "invalidation level unknown" hint from 0 to > TLBI_TTL_UNKNOWN (INT_MAX). But the fallback "unknown level" path in > flush_hugetlb_tlb_range() was not updated. So as it stands, when trying > to invalidate CONT_PMD_SIZE or CONT_PTE_SIZE hugetlb mappings, we will > spuriously try to invalidate at level 0 on LPA2-enabled systems. > > Fix this so that the fallback passes TLBI_TTL_UNKNOWN, and while we are > at it, explicitly use the correct stride and level for CONT_PMD_SIZE and > CONT_PTE_SIZE, which should provide a minor optimization. > > Cc: stable@vger.kernel.org > Fixes: c910f2b65518 ("arm64/mm: Update tlb invalidation routines for FEAT_LPA2") > Signed-off-by: Ryan Roberts LGTM Reviewed-by: Anshuman Khandual > --- > arch/arm64/include/asm/hugetlb.h | 22 ++++++++++++++++------ > 1 file changed, 16 insertions(+), 6 deletions(-) > > diff --git a/arch/arm64/include/asm/hugetlb.h b/arch/arm64/include/asm/hugetlb.h > index 03db9cb21ace..07fbf5bf85a7 100644 > --- a/arch/arm64/include/asm/hugetlb.h > +++ b/arch/arm64/include/asm/hugetlb.h > @@ -76,12 +76,22 @@ static inline void flush_hugetlb_tlb_range(struct vm_area_struct *vma, > { > unsigned long stride = huge_page_size(hstate_vma(vma)); > > - if (stride == PMD_SIZE) > - __flush_tlb_range(vma, start, end, stride, false, 2); > - else if (stride == PUD_SIZE) > - __flush_tlb_range(vma, start, end, stride, false, 1); > - else > - __flush_tlb_range(vma, start, end, PAGE_SIZE, false, 0); > + switch (stride) { > +#ifndef __PAGETABLE_PMD_FOLDED > + case PUD_SIZE: > + __flush_tlb_range(vma, start, end, PUD_SIZE, false, 1); > + break; > +#endif > + case CONT_PMD_SIZE: > + case PMD_SIZE: > + __flush_tlb_range(vma, start, end, PMD_SIZE, false, 2); > + break; > + case CONT_PTE_SIZE: > + __flush_tlb_range(vma, start, end, PAGE_SIZE, false, 3); > + break; > + default: > + __flush_tlb_range(vma, start, end, PAGE_SIZE, false, TLBI_TTL_UNKNOWN); > + } > } > > #endif /* __ASM_HUGETLB_H */