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 7E34DC02198 for ; Thu, 6 Feb 2025 06:46:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EFC766B0082; Thu, 6 Feb 2025 01:46:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EAB756B0083; Thu, 6 Feb 2025 01:46:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DCA5A6B0085; Thu, 6 Feb 2025 01:46:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id BE07B6B0082 for ; Thu, 6 Feb 2025 01:46:13 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 711A3120F77 for ; Thu, 6 Feb 2025 06:46:13 +0000 (UTC) X-FDA: 83088585426.11.2E1897E Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf15.hostedemail.com (Postfix) with ESMTP id C1272A0003 for ; Thu, 6 Feb 2025 06:46:11 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=none; spf=pass (imf15.hostedemail.com: domain of anshuman.khandual@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=anshuman.khandual@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=1738824371; 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=UCEeO9RghYhC5y3jTkTRtSfSEMB/2uvrdbe5hgfPWJM=; b=ehA1HqeX3F7NgCObIxVtx604DTg38EhWYXs/WFWAYctJUrqrAHfQVhqseyt1LbBfQlfJx9 b3pH/Rf6hkPQmdjvli/S7xdAYxl0xNlTC3tSrygMuKf9Rw7DD3LPz9w9c2s9cPR0sSo4lp CiyOQBaHYRaEbPt/HvElcMIspmYCk2M= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=none; spf=pass (imf15.hostedemail.com: domain of anshuman.khandual@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=anshuman.khandual@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738824371; a=rsa-sha256; cv=none; b=Il1NU4xHPrP88kYyABUExwNrYn+0WDjMNDM4EB2rcBbY+JVuYVADgdnhtaqEsz2xpBJTB+ z+YoJY5mN4sef0D+VYZJOBQkGyaii44pMkuZaIYgg8ghlmJGnulLnxy+SYB1GupSLpH7bt qFGSdV9p/MRwly8IzU8ZaIIqyia9Ap8= 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 406B112FC; Wed, 5 Feb 2025 22:46:34 -0800 (PST) Received: from [10.163.34.115] (unknown [10.163.34.115]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 3BC903F63F; Wed, 5 Feb 2025 22:46:04 -0800 (PST) Message-ID: Date: Thu, 6 Feb 2025 12:16:02 +0530 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1 03/16] arm64: hugetlb: Fix flush_hugetlb_tlb_range() invalidation level To: Ryan Roberts , Catalin Marinas , Will Deacon , Muchun Song , Pasha Tatashin , Andrew Morton , Uladzislau Rezki , Christoph Hellwig , Mark Rutland , Ard Biesheuvel , Dev Jain , Alexandre Ghiti , Steve Capper , Kevin Brodsky Cc: linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org References: <20250205151003.88959-1-ryan.roberts@arm.com> <20250205151003.88959-4-ryan.roberts@arm.com> Content-Language: en-US From: Anshuman Khandual In-Reply-To: <20250205151003.88959-4-ryan.roberts@arm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: C1272A0003 X-Stat-Signature: a4wuorpiohom74j6i89y5o7npqfj7jme X-Rspam-User: X-HE-Tag: 1738824371-234973 X-HE-Meta: U2FsdGVkX18ajTsV6Sa6jFviyKbJDwZnuZHXHxbhWrG8mu8yFN0ib81WDynIOls7Q5eszWq8gfYFGSOwbk27uq3mYz/zWoDfFqmnoJaIkkXZiPMpGNkMOuqHAgw6ElPbeqhBVItwMmjSaPHrVKI3MJrID1BYD8DaYVmsjFBrBRbjnfrma/tzTIDaWnNV754VdFkIopmgHFTkc6/9MMWr4znYtsPgZ/nRUvkZxxBdqcF+BOPzru8+lKALw6C/ZXo2CnNYv7U1+CPLWx906i4/cS5YrU2FEupaR3+yB6uNGmwab3qUa90TjdEKAmC8JvS7rl54999MIYXwsXU2SbV/AYRiGlKmBxIoAIqSIwAaCfx7uzF0rKx//aoqyXrbAA6ZZrduSuc+KQ7a9IMU/kTX+JGjmm6Kli4hiOX28kuT1D6bSL3mN0v6E+Ll9tAvCtmLfoLi4yhDfEnKbopHJ0Yg1CkunskJZzVwipKIB1MvkheGfu4xZoPwjc3F5uWP65Hl+mftxPcjWoaz8q0kciJok00Lb/B3r9HwhhJqLrveZjVvXFrQmnAaDdXrRIOX9bqohC0YrFVU4qDuylCOAUj0ZB2LP8CiAsupndD6/nlvbGSAkfxuQ8LqymQrFgCDO7OiyPrQ5WyMivt2EaOYz7s68folj7r8rDYLcrOU9FbO4NL0NzF8CYdct+odOJP7Xm8AaCwmhQb7PLz1O1QHqaCaIyvfwW/LLp/95a4v8Tfw/lcdy03BPDK4CpE6CT2qoy3trp90blWnylRRm8yzUpRXCWRZZijqpr4PLW5iab1HQXuGZupq8+BG0FowMsMv0RPrnsVLhXmsWjzf4LxuCWCOVPQ5mzVbkgPmAkG38OPbub7RNPRmTfm0AAjqq9xkvs9WDPOSBIxRS+SVfE0reJAvOBrvXj2t+j4yVjfs7BZfHuzCa7iUgAWy7eiY4QS5AsS/s4JyMKe12Vpr52hZlw5 8TKKv9Im uvd9pAojgMCsGLXc1LLCx9FR4eijiPcEbZ+5Y/26coLM13jkqyyWaQacjSvI6LAsqFCLYMKze0stHjfKIEete7i5HFcjWGhI51c94+Wkg2JaVU38N7hcC5loLS5PQo9NrtbALUIbruJsg0wg77hCMR5YJWZ7EKk8+LeyrIB5PjNpdMW/0bKvhPAZyf+qQ5UwWpnHbgwlPQKj701iz3Ivt85Pev83lnynbnBe0CpIeuswBFYWtkKZ1He/ILSCyD7h+qyn+dAd0ioK5gSWsWGiFGSVAFw== 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/5/25 20:39, 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: > Fixes: c910f2b65518 ("arm64/mm: Update tlb invalidation routines for FEAT_LPA2") > Signed-off-by: Ryan Roberts > --- > arch/arm64/include/asm/hugetlb.h | 20 ++++++++++++++------ > 1 file changed, 14 insertions(+), 6 deletions(-) > > diff --git a/arch/arm64/include/asm/hugetlb.h b/arch/arm64/include/asm/hugetlb.h > index 03db9cb21ace..8ab9542d2d22 100644 > --- a/arch/arm64/include/asm/hugetlb.h > +++ b/arch/arm64/include/asm/hugetlb.h > @@ -76,12 +76,20 @@ 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) { > + case PUD_SIZE: > + __flush_tlb_range(vma, start, end, PUD_SIZE, false, 1); > + break; Just wondering - should not !__PAGETABLE_PMD_FOLDED and pud_sect_supported() checks also be added here for this PUD_SIZE case ? > + 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 */