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 B6A8CC282DE for ; Sun, 16 Mar 2025 08:06:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F3420680003; Sun, 16 Mar 2025 04:06:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EE331680001; Sun, 16 Mar 2025 04:06:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DD364680003; Sun, 16 Mar 2025 04:06:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id C1BC6680001 for ; Sun, 16 Mar 2025 04:06:47 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 6F0D21607EF for ; Sun, 16 Mar 2025 08:06:48 +0000 (UTC) X-FDA: 83226682896.01.246E29A Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf09.hostedemail.com (Postfix) with ESMTP id B6051140007 for ; Sun, 16 Mar 2025 08:06:46 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=yTsydWov; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf09.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742112406; a=rsa-sha256; cv=none; b=rBsexEQSMiU40xVjE6NdoTEDQTLlionWpsXz+ONHe380mfUbLynhkk/AXt/WhanoCOfpwT fxqa+0TCdlKiweoHaS4NkLTVTV1wUhCr8ddoNrgrrcmSOskK9zLrvcgDnxV72k3dHj5d0o asPEs66wWOo1XjONCjy/AebVlcfZYu8= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=yTsydWov; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf09.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742112406; 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: references:dkim-signature; bh=Wn/xEAiDPHyUAW46bI9e3lgKHPnSpfIX/FyHwGUbOOE=; b=CTZ4+j+xU8wMIgHWdqtBuRVsuJeMajRfKWCT/AJ1fHkOzIAk4hFTMWn7h58qsqh7Ku+jaX mdCL5nKFvrACIBdNBt/+r+AOXsFIYRk1QTB26ZPfULveJE3cZUivcn8MP6iqrSzyecDFJC hvXw+j9c5jdb+OeKzvPECpquGqu+iRw= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 0A8405C46C0; Sun, 16 Mar 2025 08:04:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 442FAC4CEDD; Sun, 16 Mar 2025 08:06:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1742112405; bh=27+d26U2EgjkRb+/BT+lpoDb+IcFbQOkCFlWNoVpp8k=; h=Subject:To:Cc:From:Date:From; b=yTsydWovv4as9xpofeKGiUxd2SQNB6E/ZpLTfcH+rM70JM1xdsxNPh+EAEp95zfPj nABNoxMV+bl5ND7gx6lFQa1bbqxYlTckmGdmKZw/ZW6LNKaFsLy8FQcsqiBJD+u568 hqjjqD1s3b5E3BoyEzne1JWKCfz3c2sP4V2XrGiE= Subject: Patch "Fix mmu notifiers for range-based invalidates" has been added to the 6.13-stable tree To: apopple@nvidia.com,catalin.marinas@arm.com,gregkh@linuxfoundation.org,iommu@lists.linux.dev,jgg@nvidia.com,jhubbard@nvidia.com,linux-arm-kernel@lists.infradead.org,linux-mm@kvack.org,nicolinc@nvidia.com,pjaroszynski@nvidia.com,rananta@google.com,robin.murphy@arm.com,sj@kernel.org,will@kernel.org Cc: From: Date: Sun, 16 Mar 2025 09:02:17 +0100 Message-ID: <2025031617-swept-encounter-c305@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit X-stable: commit X-Patchwork-Hint: ignore X-Rspamd-Server: rspam07 X-Rspam-User: X-Stat-Signature: 81wupwutk9qe3h8rxprojst8yzzke4fg X-Rspamd-Queue-Id: B6051140007 X-HE-Tag: 1742112406-75137 X-HE-Meta: U2FsdGVkX18mbA0NFOC5kG6OvwNueEEbLxnakuRAyFJQaaCFECyO0+gp3hKalYya9DfL0Lx9VlLqv0eLWtNyQoRHVzuS9Y4KMxwuN2x5ntBvRFsS3tF0JTORPGfj+QbMxeyF3kTzlxGL5fKER0y67vBCCckkwejZJfVDCJQsM3G6k/Ub09glEbFXuDdZUpgT/Fsmb0BGt5pWDvy8HXtz3XTpC/4vHPa09mzN1soPO4grgMgdr9PV/0C4K+BDTO43Ci0pRpaNfN5coMZGzpkN0wooPd7p9bl6RikFjrngu9ix7xv2f67rSORgoqi61jaa5g+qDjWWpviEWy90OsfDa1uRVD+mzbHIYP00Bbw1uHcKpzSel+ZiQWG0cD8G+YsZ8Df/t4kk+OQ9eF98iXBRaeen5X9x6lg9Ue7cMYLGtb5FP16EhocLc+GSBrhkgGEDU5L9o7utw/CAF/b1FdHcx/FSZbBQjkqs3TCSR9FNJU47Me6DEbRFECDBl4jYVnGpoHdsnUFY2hP9PWKGDg4NTRp3y2dcGqrNzPnOrP7CvvDZHQe5wFpxs5MUD+5ifFJx+TsJ9yRhA/SZhVG2zqWeURGbVcE3LR+y+7u3bAS/DFgDgt5TBQHHp5ce9R/3hWxKPwtMM1GWj2Ug/HxAkgiJA4Uy2IE4C8Ur+iQhI17yl05jC0qyUsSwtklEEothQnTOGK8ubRbVtfAkQJ8PdER75p8ZNNzAtS4NStE/qpy1acmgSeoY9WSUi8Ci8tV7NHP5KV/oLh7gSXGIOELuLqspca+jnMIBh1VKrZ16kmXHPvgLN0qoM+hX9tdRDRmyJMAD2F2qNmd6IybsvNG69l+HLs/egyb16krN5hE1+0b/5gPsZHqcahi4Is3LqOG1GZTYongb8+lQAydTQ0TVejk77J+9UG1D/Sj+mcXsuauDD+hirFA7+voWd6dT3kH96z8K/qF7qFVRONLtcLxGKD8 YHIlX4si nTZMXOoHUTWUI0iSf+wWPR+xEKM+pL/A1D8KO2raxnihDjQXcqP5TPNpmrl5zICQ2Cq4KGLvkk0yZL/NepSqMO3Wax+6ZpnRayxgcHur4YFRsnG4nXToh+aWIue3d09WZYGz/l+9WgTDlZlyN4l6BN45GVdBIYazCCZiFho6ciyTbK6kGaIuJXyz5NNDFvtRLQZCf4Wj4i2Z88WycfwpvpcuPEuvJazPfQ5lHpMNRmKcpol4EHyPrifqmnTjvIRmkKGJwzJA18GIKjGSQnqZPVC4PynCNf90OQxdWlmNChRz7QNbItGP1aCEVE6TgMunuJxpVLER2chOkMfuHLMPTr8TjDaYYK2xwKob5l1nRyVVcKjPxdcNhdf8y8hKVkatVzZygySFiYM/E++orZttmC25kH3LrbS+ejyzyV3KHZ+h1DtyCjijIiMWq30DeF3JEoaLJd74RWNGbi3JgFgABfZKOxsKWLwdClBy/pAkLdCsb7HoF0tWlbu9HVhWNx/xNOT8jPhHVhUy64M837CCQP/FKqI4V69UMcFeYtEznucK7dRXiOUbUFyZlHxdjKBsKk4Y12ggyPV+RVYNAFE4+EOZAhE4f0wfD2kiWnM6+aY56CQU+2UNC6kc4aA== 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: This is a note to let you know that I've just added the patch titled Fix mmu notifiers for range-based invalidates to the 6.13-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: fix-mmu-notifiers-for-range-based-invalidates.patch and it can be found in the queue-6.13 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From f7edb07ad7c66eab3dce57384f33b9799d579133 Mon Sep 17 00:00:00 2001 From: Piotr Jaroszynski Date: Tue, 4 Mar 2025 00:51:27 -0800 Subject: Fix mmu notifiers for range-based invalidates From: Piotr Jaroszynski commit f7edb07ad7c66eab3dce57384f33b9799d579133 upstream. 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. 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 Reviewed-by: Catalin Marinas Reviewed-by: Alistair Popple Link: https://lore.kernel.org/r/20250304085127.2238030-1-pjaroszynski@nvidia.com Signed-off-by: Will Deacon Signed-off-by: Greg Kroah-Hartman --- arch/arm64/include/asm/tlbflush.h | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) --- a/arch/arm64/include/asm/tlbflush.h +++ b/arch/arm64/include/asm/tlbflush.h @@ -396,33 +396,35 @@ static inline void arch_tlbbatch_flush(s #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--; \ } \ Patches currently in stable-queue which might be from pjaroszynski@nvidia.com are queue-6.13/fix-mmu-notifiers-for-range-based-invalidates.patch