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 C9319C19F32 for ; Wed, 5 Mar 2025 18:48:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 444D928000A; Wed, 5 Mar 2025 13:48:27 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3F70A280006; Wed, 5 Mar 2025 13:48:27 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2947728000A; Wed, 5 Mar 2025 13:48:27 -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 0CE8F280006 for ; Wed, 5 Mar 2025 13:48:27 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id C32FF1C8C94 for ; Wed, 5 Mar 2025 18:48:28 +0000 (UTC) X-FDA: 83188383096.04.6EF1943 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf30.hostedemail.com (Postfix) with ESMTP id 1AFB980004 for ; Wed, 5 Mar 2025 18:48:26 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none); spf=pass (imf30.hostedemail.com: domain of cmarinas@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=cmarinas@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741200507; 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: in-reply-to:in-reply-to:references:references; bh=XlTkLQMLL5cKhsNogbp1AV75B11bSfw8IM7FxEYfnHE=; b=4k3UzzEI5Tw6YdhTyvAl/Ny6QQl5l9ZYnC3biuXO5Xwed1xzTcLBqjkr/ueHcwdzc80B0z BWg+pghM9zNuPy1GzZ6wtjc1bdFf3JE10N7tNqcXHNkaC+lFldwLRyHWjnBh5sHn45RXQq oqFO/2OeEjsas2bktB7RPeECnCxPh5o= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741200507; a=rsa-sha256; cv=none; b=5/AraNCiOb6OMxIe862lAC2fRn8UpGQMIVlynO8yhJcjD32Ubhzh8aLaJR3LczPYgZy7ys xY9x1pFR1d8wfVw+Va5Lylszq50ieZNlzrFL90brFfD+9GcZ+rQ0cATxglho/1OeXb7vaX a7RLVp7kuiV0syxo6j+vW2LmNoGG8oU= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none); spf=pass (imf30.hostedemail.com: domain of cmarinas@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=cmarinas@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 8C988A425D2; Wed, 5 Mar 2025 18:42:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A70DCC4CED1; Wed, 5 Mar 2025 18:48:22 +0000 (UTC) Date: Wed, 5 Mar 2025 18:48:19 +0000 From: Catalin Marinas To: Piotr Jaroszynski Cc: Will Deacon , linux-arm-kernel@lists.infradead.org, Robin Murphy , Alistair Popple , Raghavendra Rao Ananta , SeongJae Park , Jason Gunthorpe , John Hubbard , Nicolin Chen , iommu@lists.linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH] [arm64/tlb] Fix mmu notifiers for range-based invalidates Message-ID: References: <20250304085127.2238030-1-pjaroszynski@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250304085127.2238030-1-pjaroszynski@nvidia.com> X-Rspamd-Server: rspam02 X-Stat-Signature: 1qqe5559mn1hk66pkphstqmrbkr5jexe X-Rspamd-Queue-Id: 1AFB980004 X-Rspam-User: X-HE-Tag: 1741200506-779628 X-HE-Meta: U2FsdGVkX19cYwqP3714tCfpBVqLApDnJ9Ph2J/ykKxKLileWu4fP7KvZ8tkJHVL+DAYuvxOG7CSgSgR5W4lTvYI3/QmO3drZ3CeGhwxlq27fQpnW5k/BzBhI1UXAXXGaSku2KlJZXMdYKTpziaLQi3L1iHaOtOq7TH7JLsPNTLMtYs+pfaadv0bj1IK23IDXY0IgCYwXF4yVltqSURDA4qRa84MRMjG8swh/ppKQmVUMexz2m2DaUw+RIvTD0wjgabfgIua3C/DF2H4Soa8FuuO2N0/vEB3TwAHZUiIhfQiCUICs1g3X9TAADpkVQAWnZf0igUmuZsLU0Wq8XiyWGMB/321BaqCHQHSVp4ceanvKW+LFxGuxs1Xsc0CRtIHCAAOo4vuDp8MkZLoUTMUGW8i+gD7XTVkoQNCAcaCkjWtwY1xJFGT3cYEec6jRoX4tpBrVHGB0H7eVlGc6boS14K07lKIytAS33uyduD2hUAe1jQzJsWK1K3NWJYIcXnLl32im3YEyF61Zi8Ko34tTyII95WZXshMOSK5yJFWi3J886J4snZDw8+6V8NMiFyk4wWoySkJ3VOQvqyrjINljvrPBzccrM4YD+jMsRVc7HG6gpZMB7gW0Qrmg+6He+kwLwuI6Lp4nF3NJ8RtvhinZKCrluAleKcTSjQh3fvn2N1qI90iDnyazUSEWxq9dnCYD7Vb2NZw8RvVFVGSnu4jd8B6CfwS9Pg1tkfzda7PW/IrZwV5lvpu7ZFTefwxrY98V1HOhofQExkJeSx4/zQGlh66AP4N4UPxE5YebiTvMJ60d3ZzzgK2lWcVBq8amKo+LXerdJWK2OlJ12AqcSuaS7GudjzVQFCyX9NUDflPrcj6ICrc8NWqHnMoQL+jF3OEvlwL4WUcvGtr7GyFF+P0WZw/aekrXYH1BXftttgBIjBGxqGRX1iWeIeo04Em+8m2jRpzYXnCS2DvTYM0rgh 7+wPHFnA IEyQ5Y2tmUNWC576HrV0JsIuqk3InHrHoIq9TwuXYUMgq2x7d7wndvg6JwyCgAKwkWlnQHv4Wsxhe3YV6FQex5lPwy/FJJbsTOqYQGkQanJKInCjx2PfTjSFthgkxOSFkjiJayDbDNzVnukkAt1PryEZ7PLBrRANgFg2lhBnaU29lC9367cQctQEEnRXeiM6M5x7g9RaQRZOpjJ8LG7MxejsFnQsh9vOAIKk+alDn3JdH6is51/dOAwpofCbFkjBf2UBWMytlty2pKwv3NlMuP9cRkOcQI7OXch3H/XJ2jyJUltCwhifZjQTl3BtTuiMm7HPCqldS4nqEeVoTN/kdEOtyl2LfGkew3Fcvqcu8uPuSAuq6CIIbEA7RHuarCaySNFSvirj1H79CKta+fXbkkObGP3zOzwOAEsyw++9/+8jpocRCKJvbBYug2dDq/GITKnSiqgIKawCNK2rTpkh+i3B/HCUm60qvPAWvv6U0A/zjIexUDHOD+XwCsGUzdxIk69UMPstpsMY6RsZ8HKCFlM7+q8QPAm3sCbzcFSfnqhd7+qNtkdwu5pkxK1EfEXc6MzMy2a/xZkQ/k3c3dHgjvSOBjg== 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 Tue, Mar 04, 2025 at 12:51:27AM -0800, Piotr Jaroszynski wrote: > Update the __flush_tlb_range_op macro not to modify its parameters as > these are unexepcted semantics. In practice, this fixes the call to > mmu_notifier_arch_invalidate_secondary_tlbs() in > __flush_tlb_range_nosync() to use the correct range instead of an empty > range with start=end. The empty range was (un)lucky as it results in > taking the invalidate-all path that doesn't cause correctness issues, > but can certainly result in suboptimal perf. > > This has been broken since commit 6bbd42e2df8f ("mmu_notifiers: call > invalidate_range() when invalidating TLBs") when the call to the > notifiers was added to __flush_tlb_range(). It predates the addition of > the __flush_tlb_range_op() macro from commit 360839027a6e ("arm64: tlb: > Refactor the core flush algorithm of __flush_tlb_range") that made the > bug hard to spot. That's the problem with macros. Reviewed-by: Catalin Marinas Will, do you want to take this as a fix? It's only a performance regression, though you never know how it breaks the callers of the macro at some point. > Fixes: 6bbd42e2df8f ("mmu_notifiers: call invalidate_range() when invalidating TLBs") > > Signed-off-by: Piotr Jaroszynski > Cc: Catalin Marinas > Cc: Will Deacon > Cc: Robin Murphy > Cc: Alistair Popple > Cc: Raghavendra Rao Ananta > Cc: SeongJae Park > Cc: Jason Gunthorpe > Cc: John Hubbard > Cc: Nicolin Chen > Cc: linux-arm-kernel@lists.infradead.org > Cc: iommu@lists.linux.dev > Cc: linux-mm@kvack.org > Cc: linux-kernel@vger.kernel.org > Cc: stable@vger.kernel.org > --- > arch/arm64/include/asm/tlbflush.h | 22 ++++++++++++---------- > 1 file changed, 12 insertions(+), 10 deletions(-) > > diff --git a/arch/arm64/include/asm/tlbflush.h b/arch/arm64/include/asm/tlbflush.h > index bc94e036a26b..8104aee4f9a0 100644 > --- a/arch/arm64/include/asm/tlbflush.h > +++ b/arch/arm64/include/asm/tlbflush.h > @@ -396,33 +396,35 @@ static inline void arch_tlbbatch_flush(struct arch_tlbflush_unmap_batch *batch) > #define __flush_tlb_range_op(op, start, pages, stride, \ > asid, tlb_level, tlbi_user, lpa2) \ > do { \ > + typeof(start) __flush_start = start; \ > + typeof(pages) __flush_pages = pages; \ > int num = 0; \ > int scale = 3; \ > int shift = lpa2 ? 16 : PAGE_SHIFT; \ > unsigned long addr; \ > \ > - while (pages > 0) { \ > + while (__flush_pages > 0) { \ > if (!system_supports_tlb_range() || \ > - pages == 1 || \ > - (lpa2 && start != ALIGN(start, SZ_64K))) { \ > - addr = __TLBI_VADDR(start, asid); \ > + __flush_pages == 1 || \ > + (lpa2 && __flush_start != ALIGN(__flush_start, SZ_64K))) { \ > + addr = __TLBI_VADDR(__flush_start, asid); \ > __tlbi_level(op, addr, tlb_level); \ > if (tlbi_user) \ > __tlbi_user_level(op, addr, tlb_level); \ > - start += stride; \ > - pages -= stride >> PAGE_SHIFT; \ > + __flush_start += stride; \ > + __flush_pages -= stride >> PAGE_SHIFT; \ > continue; \ > } \ > \ > - num = __TLBI_RANGE_NUM(pages, scale); \ > + num = __TLBI_RANGE_NUM(__flush_pages, scale); \ > if (num >= 0) { \ > - addr = __TLBI_VADDR_RANGE(start >> shift, asid, \ > + addr = __TLBI_VADDR_RANGE(__flush_start >> shift, asid, \ > scale, num, tlb_level); \ > __tlbi(r##op, addr); \ > if (tlbi_user) \ > __tlbi_user(r##op, addr); \ > - start += __TLBI_RANGE_PAGES(num, scale) << PAGE_SHIFT; \ > - pages -= __TLBI_RANGE_PAGES(num, scale); \ > + __flush_start += __TLBI_RANGE_PAGES(num, scale) << PAGE_SHIFT; \ > + __flush_pages -= __TLBI_RANGE_PAGES(num, scale);\ > } \ > scale--; \ > } \ > > base-commit: 99fa936e8e4f117d62f229003c9799686f74cebc > -- > 2.22.1.7.gac84d6e93c.dirty -- Catalin