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 00600C369D1 for ; Wed, 23 Apr 2025 15:34:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0BC136B0085; Wed, 23 Apr 2025 11:34:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 06ABE6B0088; Wed, 23 Apr 2025 11:34:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E732C6B00A3; Wed, 23 Apr 2025 11:34:45 -0400 (EDT) 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 CA6516B0085 for ; Wed, 23 Apr 2025 11:34:45 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id DD3ABC0F1F for ; Wed, 23 Apr 2025 15:34:45 +0000 (UTC) X-FDA: 83365706130.10.64E13A9 Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf17.hostedemail.com (Postfix) with ESMTP id 0193040004 for ; Wed, 23 Apr 2025 15:34:43 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=dIcD5TDH; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf17.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=1745422484; a=rsa-sha256; cv=none; b=XP2sbTWWJMn0jYSU0A3SXmdX7fcuHCor3FvzFa1IR+1hqTgex4wPHi6oczlndW1d5AfdVZ rUg3eLNNktJ7rVHS7R5OVpYImxnEuXmtIkpC0br1s9gswQGdwWFMSZ5/7ScLIQcD42e+aR /ZdBdIblQDHaRN0l/Ih2+vrAiktM79A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745422484; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=UuxlUex4BEiTP7mwcSqsoGtD22vSi+yRn4Ui/NcyRx4=; b=GzqbkZKlT2zLUrmXjyW2PkBzFWcZv2ZoujtRL+k5KoQ9ZzbwdO/oQMIHKR41GlYujOpsXq IWI4gPwvhpPi8nvoS30myebR6odjwwKRx7TXgPGnS04bzuFBWGaBhAmZUdhoch+FVP1K1y yu52DZ907Y5DbKomCauoR7er9nRBYNg= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=dIcD5TDH; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf17.hostedemail.com: domain of gregkh@linuxfoundation.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 2DF8B615EB; Wed, 23 Apr 2025 15:34:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 57E9FC4CEE2; Wed, 23 Apr 2025 15:34:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745422482; bh=nBOB2RB8Gi5Quj2lV/zQhImxicJWnB8a6mxXg5tyIMY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dIcD5TDHhqBmF7mynXS0s154aZje1oXFoYvt+BMgnI5+k4NsBz5saoD1U97fSmagk cF/RJbPuC1CTzA4ZIWwEYs4Y52OW9+x0kSByrrMYqpsMC8T5x9v1JmjCZTAorsOR/D NXli8K9j/5+ePp3iQcFe+lsymhiNY+RO1yljxl6Q= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Piotr Jaroszynski , Catalin Marinas , Will Deacon , Robin Murphy , Alistair Popple , Raghavendra Rao Ananta , SeongJae Park , Jason Gunthorpe , John Hubbard , Nicolin Chen , linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 6.6 368/393] Fix mmu notifiers for range-based invalidates Date: Wed, 23 Apr 2025 16:44:24 +0200 Message-ID: <20250423142658.539422318@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250423142643.246005366@linuxfoundation.org> References: <20250423142643.246005366@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 0193040004 X-Stat-Signature: 7b5q78qgw7zs3ue8qttou14578f83n9u X-Rspam-User: X-HE-Tag: 1745422483-307001 X-HE-Meta: U2FsdGVkX19s3/sbmGkafnNFMXbyVNYji0uko+UGcrleSyj8/t1Zu1IPUycqxYtfInFOm6m1mEqe0GZPhJxnXRxkunyATqxyPwO+J4LX5G+OuDdcGS/sDFDFwr+XzhW2/GJys6BLVOf8Xv2ZK8NMxWVcCU+6IUx6wG6m8IURkwO2iAzCe+HZp5fqnoJnHI2lyiCmuuRb2cdYCCxCeIQCoANnHHbc/yKKENzsZwDuF1PvhB17H2tFq6W8a6GThrvNxtc6hmbj95LMEA0o6N4pvZorexeTY6PfqydSzlmtC3W26zyAMcq7OYCTny11oEt3zF+I8iUPja21Y0TqLigLiAJt0UQ5zUdUwhJmTglYR6XP1xuMKt2myqShdT3zdzV71GtYevOpLe8gbixwZZA800HqrZ4+NU2jbQdlZo/3kZE6Ljwq8anj9CEUCktA8Ej0qIUg8ZjIY9RR64/5myO9hE+JeT+lQWD2e6nw2HHmEDwVf2WimBUdBfJbnaiHoavy3Uq7V0nRynFK68tAtoLV/vpHpHThG17ZY8vuV/qEFppsXctu1vm9MFZum9muC0oYSVbs/mgi2S+5tX0AIqw5OToNneF76aCspts0hPtptZZaX0gm6DCjg85NnHmbfk5kxNTvoWhngYlve5lVY+uGtltzRt3NnWwRii95avMVPFob6+mNttNSB0I5rxT/X9MlTuwvW6UR+nCXtmyhI1c8LkI2fU2HJZYqao4slNyEVz6EZoJS7IUF8gcBhy5QUF4G51jmFC4qv7jEZUKK26FBs8QODLb1brBcnmERjQXvSOXrYfceNVtnOblvJardK4AsqXdboa4rCgtSbKZwewzEifc55a/l/ktEF7jjSg4Lcm+JGj/pjd7Ncusbs0UGlQ1wmYhVnrXk3AmfvcTgkAbz8kmVK64+f9QM+cEg8um5vQvn4mJHMVteQr2VLvCziFIyufLS9chYH/N9FFjhDpX tKVaoqkR 0ItbMmRfkE+A2k3iVJ9172ATCAX2RY4pec/6X42+TZKSx1shW+30WWVZVS//NliwUKtvBeIXCVDQQ5MhV3rLuXJYUOm4mZte/lpCH5QOftIq6rytbaGTJ9chCcE+GZ8OKALgchtLApf9Ked58nCfmPcH5bTDfgiZ5/rQgLNDgwbA2ZVrjgpzKRbMXIOlvKgJpOjLHzvqh8T34sFOAAkxodButHvOvIWRFAE+cMXkjJjZ1AAMoIebfbqps9FftCnNojHgb5OQlLUz1h66qcBWsr92Rp+ayyt2h+c2q9nc2cSSyEVA7mN3DiNJC3BiSMD7xzviFClAvuKZB1f0BsGXHrFHySvLnRDVOio6BFKWPNB8QWDbqkTy4XuSEENw341Y5E7wPBnzeYkD/h7KKEqYYJc1V1ykY4uu3uwZnSjFvrZtfcZrCrwdR4+zgXmJQUQiyTKYvJgn/oFtjiCDZr5XiyiJUeubBfdCXOXfcjdVD9ZtVAs2GX//tYsy2pM9gO/AyO0lJJSeizPijM7SQErIUkIFUXr/9Lj5eq7RO 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: 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ 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--; \ } \