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 5DFE4C369C2 for ; Tue, 22 Apr 2025 07:56:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 350B76B000E; Tue, 22 Apr 2025 03:56:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2FE716B0010; Tue, 22 Apr 2025 03:56:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1F15B6B0011; Tue, 22 Apr 2025 03:56:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 02EAF6B000E for ; Tue, 22 Apr 2025 03:56:22 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 45B8FC60BD for ; Tue, 22 Apr 2025 07:56:23 +0000 (UTC) X-FDA: 83360922246.23.733DA58 Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf20.hostedemail.com (Postfix) with ESMTP id 7F58F1C0007 for ; Tue, 22 Apr 2025 07:56:21 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=2B2X1Rzp; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf20.hostedemail.com: domain of gregkh@linuxfoundation.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745308581; a=rsa-sha256; cv=none; b=2d5iS2VNjCcnY1baVQ0r9JpEZyGvyZ5TB705b8HJtqlQ3S5xI7XN/LTVNAWA4P9TIMTHPF SN4Smc+VbnLyuKEMy81G06iqUfcql1dt49QsTmiT/TfwAdl6C1krwSzhpZE5p/r8JLnqPc qVNIkiwPgw4yzo2W9Lk/KnV1/cYlAy0= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=2B2X1Rzp; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf20.hostedemail.com: domain of gregkh@linuxfoundation.org designates 172.105.4.254 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=1745308581; 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=H/Q1DHhVnhvCoOfNuVzKIRgZ4aepLzWcl3YpfBpC4d8=; b=gV++X9FjPV/08P88LTld8uvR4v38ChWXXJMBnDblmVS2GH9aU4cARWUhI3/HyhIVgrpfI9 vkMa7NXNpCaigZ3tmvt/vcdx+tu0ebt0QHEWct9k3BS1/5gWQb5uYRWi0nVPZjpEegSFA7 WDwTPy4fJMOdQKlnTXA3rVM80KNgUXg= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 01CD7614AB; Tue, 22 Apr 2025 07:56:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 15CB5C4CEE9; Tue, 22 Apr 2025 07:56:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745308580; bh=5IHVZ518v1tW+/IGWWsuU/FGE1j6f0ia94o/kYtjpEQ=; h=Subject:To:Cc:From:Date:From; b=2B2X1RzpmP324+zVeqUaFu/Wi3vwsC1P8OsWEMrCV7nP4pF0Nq/c7y8zDKiZUrtYA MtaKTH1iHckAfuyt5YlztJdUCYrRxHWmLdOgbC8S4guOd921pFRaTcqgR1ftE2uX4J Z3tVGnh3Q8ru1zUbGTD35dPFHWWmxeLWeywOCJEU= Subject: Patch "Fix mmu notifiers for range-based invalidates" has been added to the 6.6-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: Tue, 22 Apr 2025 09:55:44 +0200 Message-ID: <2025042244-divorcee-haunt-f231@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-Rspam-User: X-Rspamd-Queue-Id: 7F58F1C0007 X-Rspamd-Server: rspam04 X-Stat-Signature: 1qnrsmihmkjxj5gp3ookzkgfq5duthph X-HE-Tag: 1745308581-774609 X-HE-Meta: U2FsdGVkX1/gVM6KylW6l4nKIMVOVxi0XTe9PbRppDC3xZNsdipN+ELtcENAmHAQdw3Rd9aXYm+zVK5DZqQQ1j/WGBSc4AKONAvReAWzMfmuF+FUgu0kS62QZcEmwEi4QIKaDkN7tPVjQN191S0ui6KbikfuZV/+Ur7uG1ENLqeX6Ky4ZuOryIcyYrg4qDkQJDYQlILIE+xk7WDfghwl0qllGGbzEXWFHO/TnCIRVeKu01UPLrSHJJVmoKIml+B+d1/mCRoG+HKWwN7hc/CsKhS1R9yvLfTUCwwMViGcBHgctfzSXOSFYsvb87HWnFkiC1GT5iLcHCSN/Evw7IzGm2LHdhOQ4oJ5s9NcPmH89Lg7OFzuHf1ezydIJKtkwNsWmZZwiAztlPMTdc48Ew+9Sw/wIPJdYdcc4RCS4wxVwBlE9W9HjvCkE+lt2WEbhsqDG5CNLpySPSvZxieBD0R+8X41PXBstVIfsx2UyXQZ/42PfKsQcuR8qMcEziADNl2Uxdnm4IkXMi7uDqSKbxh+65X+K27U91oKpA3x0Rqzd1HPRyeRRyTYmsGM7Mb/70ZHeIiJ32IJA8Nw2kvPFUw7n7OPjyHX/8YJYmchkGBw8RPLHJeB19RXucedNG++gbKK91N/E5FHX+DzISZBGPvMayqXV24oFo+XTma+zIWzKW4ffeSuw6reFD+YhfyhWSS4g1/KxWWd+kHFrOKJnDsYUxuVnawXUa8DKAojTDNfMXc8EGxn6tPmE7jR+/Q3BMXyOAH7r2Y6SAp/lSSL1erE+anXSfO7/ZVuYY+3QjqO+jHiSn9GgV0rlQV9xj2bT19OIYvOXLkGlLHr4LeNbOJeZZgXlZfvaCaXlA7uY2SHEd2e4De+T+Q9hOUNOxbOM1YhOsmb5T6BTX9Yk2R6KFf0Mp2wOgm5K3GHDC2fEr4wtcaqbOsVVg10OKec+VtJvK/7JsN+vycd1hbuayHY/zF yVR283GR NRk64OlOU36az9RSrEHc0I0SiJlUkoAe6oiM7VvQR6amPm9aGKABnmz/ZHKy0Ln9aMuW0WIyLwnh9Pxnpjj9FHLGP8HAQr4PdT5roluXQzVrv2Za8q2VIjxM29Fj6OoBOqcVP32eH5MZxi8AyIGbjP6dAv2CpC9mP8tXD9JulLTHL3kjLLEygYycSJHSLOyD1K1Vj3gh3BKAPV4IqTtiantRO0705wlbXtwSRVCalnWg++s6473/NgWjLJY6lwWncAuQi3yPFoJEvvOT020lArEa9cYlDi3KN7XVFSx1EYFUyBC+tTElY8dhpOH5KgknuRlKt17P2F+7q17yQIQVbmzWF2YZvAEySZh8BxwYOXH+01HQmjhulV7G2eBP+vy6eo25aPSuioxkVjkVT1mR60sBpZcMIHqZJY76vaRRybtjtEnT4LhH35s1jEkglTc8XvVTwyyDjsRtiUFPGZAG2IEEJx+dajx4fAaJIzNdQn08WV6h5xXrlqgIN4G8FQkNL6KVOGWs8+4EMFuBPiBI8jWCR9vWDfMS9nVhLshQDt/0r8iMPuvloY9AefySrJwR2bUz7pi0x1QISz4PuIzLZHkTQs8BX+dJXvzrc+lwhWXiN/pQNZK/iwsO7/g== 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.6-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.6 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 [will: Resolve conflicts due to lack of LPA2 support] 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 @@ -369,31 +369,33 @@ static inline void arch_tlbbatch_flush(s #define __flush_tlb_range_op(op, start, pages, stride, \ asid, tlb_level, tlbi_user) \ do { \ + typeof(start) __flush_start = start; \ + typeof(pages) __flush_pages = pages; \ int num = 0; \ int scale = 3; \ unsigned long addr; \ \ - while (pages > 0) { \ + while (__flush_pages > 0) { \ if (!system_supports_tlb_range() || \ - pages == 1) { \ - addr = __TLBI_VADDR(start, asid); \ + __flush_pages == 1) { \ + 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, asid, scale, \ - num, tlb_level); \ + addr = __TLBI_VADDR_RANGE(__flush_start, 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.6/fix-mmu-notifiers-for-range-based-invalidates.patch