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 25E84C369AB for ; Fri, 11 Apr 2025 17:28:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 32163680016; Fri, 11 Apr 2025 13:28:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2CFAD2801B8; Fri, 11 Apr 2025 13:28:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1999C680016; Fri, 11 Apr 2025 13:28:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id F0B2E2801B8 for ; Fri, 11 Apr 2025 13:28:13 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id E65D91C922A for ; Fri, 11 Apr 2025 17:28:13 +0000 (UTC) X-FDA: 83322446466.11.C754925 Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf10.hostedemail.com (Postfix) with ESMTP id 5FFFFC0003 for ; Fri, 11 Apr 2025 17:28:12 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=MymUixhS; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf10.hostedemail.com: domain of will@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=will@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744392492; a=rsa-sha256; cv=none; b=ZF6Qx9CRWcTRQL5cUVRsPRNEf33rGKmAJCm+AYBAi8/ejoFFUy9/ctMo+QiKOQClM6orca 2j18IUSXrzPum+NhE5f/2xqRcALsrauJQ19cgxecBCcEoshKnlWJq/dSpZYJQFvRuGQjhl Dw1uA8f3D2qrEUHrxdhwxCad7y3JRS4= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=MymUixhS; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf10.hostedemail.com: domain of will@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=will@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744392492; 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:references:dkim-signature; bh=7PisXZx8Xm0HiPcHJWMpCOtSYpEXoHPpQf705JcExTk=; b=yPmbqr/1S2jbPb3c7p01mQaMu/462WKM8clsBE05x8ljwpDowqew17dtkWZEoafZ7Rv2sL mqWHrPlAhAUmucF1/UQYByMVOO3/3TAjjOLGkfNvy9Nu4MitCgiKN+z28T0OTcddp7BvzC DZQnlaHKkPVYvL+uX8WqCMj1FlropP4= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 4699A68471; Fri, 11 Apr 2025 17:28:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6AB82C4CEE2; Fri, 11 Apr 2025 17:28:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744392491; bh=WC3u1ImMrIwQcuUwS71L4kjKo8LAJfFX0pYiJWHDjs0=; h=From:To:Cc:Subject:Date:From; b=MymUixhS6j31bXwFvi6mFMde2JMsbqVN+cM5XbJ2n0Fw/uSA4PPjbKbuOl03Ljm65 c1+UhbEjQan/xoAt0c9NIRR65zLecEmEUJF3NyMD8/ejDRa/Iz2ZsBE1iTpENqhIEh 00Q1T95PWm9ASE3S+nTEm0EsKYpVUZ+dzRrCeswWM17+kYaykbNZ6y4Jk9j4RyONDx PRqI4GNN8WIB62+cER8is5rrKbYsvr+yCpfBLHLU935pl+Q+ogeLrdmontI6Z8IjM4 WUh4/SyHAdwJKiNNgXyLGRr9hKTCDLc/M0r4VONW5ZFiceGjNAin/RD/b2MBZ2AJPq wRe0JosummXAg== From: Will Deacon To: stable@vger.kernel.org Cc: gregkh@linuxfoundation.org, 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: [BACKPORT PATCH 6.6.y] Fix mmu notifiers for range-based invalidates Date: Fri, 11 Apr 2025 18:28:04 +0100 Message-Id: <20250411172804.6014-1-will@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 5FFFFC0003 X-Stat-Signature: drodu8ydtemgod9t7kscc9qbuq86bjss X-HE-Tag: 1744392492-168669 X-HE-Meta: U2FsdGVkX1/0rWu/khL85qCyPH2v2Ry7L0qUzxYuQts6pGWu9ZNJYv/UsJVPX5OTdo6EXQbt+hTojBqJYzRC7i2LJ0BAVet+oTT01usAmNWhfLe7rJ0kGkbTVAuI5go0gauyUJrAQmUy53AOXQfxATzueNknTqdG8cXv0yln/iK5ROb6zSICjyoL0oca282N1IebRY0jmAb7kOo/ZDNmbd/hdtKjOTynGs71V1eTmStuvXt0RNnda9g0RWNknr3EN5EXfHphV2DMVUYwtANxbQzpNt/zIWHnh94vDfInO4UhRPG1WpaYUYeRh/UyE69yM2SAM2sQRHGIcetS8loAWLug8aP7ql9fcbWARhNZkxFhmBpYDQY9PSFGzRiSucBtfN+scpR0CqATaAhDKyMv0eKQnkANsA/fgglM3NOOUjP4o2cr3UplgP8EjHUp5tY6/FSJml1x8lJDT0Qhl+CaNA/FllhBmCqEN3rRySRy8hPvp9FXRgyfwzcczVem/2y281CeaBSDROD7tDoqB/bUOQoVr2wKvUqB9qzH+K5FPo5g38z5/fuBCJGZQJGo7br2tzjGZ1hMuHXGd4VklCRj8g05OxaPGTv1EoUVneukjIENuVjeMvZk8uzXOf1KFWrkM79IwVYoLiXfsaMQGphZnahZmqxTzK/YDdFoo/p8xi6Tla3DfTtHNLsmiftiOYMwIs6r8VdRkFSfidbAElgTzvrDSUDneSLT/nr8E4CR++YRToUqdxET935CJLy5r2qIr8rV9A08MalOFnRzdKF69Xgo+usQ9HugE0QXAzBax3jBpCcmKNDo+G75o+lMWyKGM66bodkeeqa8Zgz6yUcb+0mHaWAH5J4gMzB8g+ITfyiEDDSM/g+w28SaXFQw5NatFk2Lczv2pVPgTzks34oZ8+8QVthwNCn6bl8xztj6IZwIth8oWlmKqlT1ES0oJmPsxyNhDfVIiMRUZ7qJBsF wUYkHIRn glTRzHfyyqXUQO9BQ7bAkJ5quchBuYaZaYRJguq4lQt7Wz2CXdhIHIVSZV058vXMDuvPxQTSEsTZ1uXeFY3TIk8Mu/03uXvJuTLXHLF6mNJtRRjtYKLO0CT5RCzkATnc0PDF1G4WYqPpEv169d/O/4nYCsBObRrBut1Dsw0dAI9LanLV62ALd+uC3QhPn2XJOg8ivWQy8WpGM6dxU8ibbaSGiWQV2XJjZBI6Afp+GDYQbzfaj2Kmv6MEHWfXLpOBSnWeovYIq5nAU3NFVkWjw3SUmDHSnjkSnG0xAsU5NHxzc6/91XAHCiQNzDJowoVVnx4wofdL1DGkGTvdpaXFqbookOvbveDWT0XlvIRYmXagRg9dkGDvXQUt/xAhu+jNOy4DA9UDystLYPWq9AvnH6vDelsz5kL0AF+8fm5oDfyyZMZ9GIzt2jMRNmp6VjL5NwFhoL22hDYOzbLw= 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: From: Piotr Jaroszynski [ Upstream commit f7edb07ad7c66eab3dce57384f33b9799d579133 ] 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 # Backport for 6.6.y only Reviewed-by: Catalin Marinas Reviewed-by: Alistair Popple Link: https://lore.kernel.org/r/20250304085127.2238030-1-pjaroszynski@nvidia.com [will: Resolve conflicts due to lack of LPA2 support] Signed-off-by: Will Deacon --- 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 b73baaf8ae47..d37db2f7a54c 100644 --- a/arch/arm64/include/asm/tlbflush.h +++ b/arch/arm64/include/asm/tlbflush.h @@ -369,31 +369,33 @@ 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) \ 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--; \ } \ -- 2.49.0.604.gff1f9ca942-goog