From nobody Thu Dec 18 16:49:02 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 035641DDC0F; Wed, 19 Mar 2025 14:38:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742395129; cv=none; b=eGnkLY8P8j+/FSTfc5BJtrC3MEInU7O/16r0gWrBgCmwWskeJpwKdVjx6TZT8xipHgUICcbP0SaYVxz/W096hCHOe9SlRqV+wQfw//G6A8ufK5JbBQlC9b8QPvCiQujvXR7EzDUOuDDrA4EpFdrRbZKwwnGC2FUAnPBxEJqhwKk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742395129; c=relaxed/simple; bh=HSWc5fCxV7lvtTayJJEkLzGhrj+YsdPXh/awgWGIBfA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pQ7BgAnuAYR6iWlUS8+M/x1P6Xpm7vq0COYai5wmGZvG7HcIJVPBriGCAbFba0CxGMdLfb4g2seiNEJ3otyUkYZxegVSXfn3IFQOi/t+ST7KbKkvq/y1sct4zZUKGX2nPUqay6i46QKNwI1nOCKlCX4Rt4emf1GIUmoGfxJpBro= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=CYv+gBfT; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="CYv+gBfT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A3E8C4CEE4; Wed, 19 Mar 2025 14:38:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1742395128; bh=HSWc5fCxV7lvtTayJJEkLzGhrj+YsdPXh/awgWGIBfA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CYv+gBfTwi8EAhXxb+4WyEiVps2/1qJYhaC1m8pbHiCREaVSXfLdCDu/Xy97IB7WD P6h7aRQDphmJJ+bYn2I+CEmDmy3dcr7TsRQ2KfwqkTKm7aTXoxBfUvnBMuVv2amxow w3kkTwZG+/yXsZn9DaL5SI1PBVPTfOxiiE5T2pfg= 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.12 192/231] Fix mmu notifiers for range-based invalidates Date: Wed, 19 Mar 2025 07:31:25 -0700 Message-ID: <20250319143031.585102708@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250319143026.865956961@linuxfoundation.org> References: <20250319143026.865956961@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 6.12-stable review patch. If anyone has any objections, please let me know. Reviewed-by: Alistair Popple Reviewed-by: Catalin Marinas ------------------ 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=3Dend. 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 invalidat= ing 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@nvidi= a.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 =3D start; \ + typeof(pages) __flush_pages =3D pages; \ int num =3D 0; \ int scale =3D 3; \ int shift =3D lpa2 ? 16 : PAGE_SHIFT; \ unsigned long addr; \ \ - while (pages > 0) { \ + while (__flush_pages > 0) { \ if (!system_supports_tlb_range() || \ - pages =3D=3D 1 || \ - (lpa2 && start !=3D ALIGN(start, SZ_64K))) { \ - addr =3D __TLBI_VADDR(start, asid); \ + __flush_pages =3D=3D 1 || \ + (lpa2 && __flush_start !=3D ALIGN(__flush_start, SZ_64K))) { \ + addr =3D __TLBI_VADDR(__flush_start, asid); \ __tlbi_level(op, addr, tlb_level); \ if (tlbi_user) \ __tlbi_user_level(op, addr, tlb_level); \ - start +=3D stride; \ - pages -=3D stride >> PAGE_SHIFT; \ + __flush_start +=3D stride; \ + __flush_pages -=3D stride >> PAGE_SHIFT; \ continue; \ } \ \ - num =3D __TLBI_RANGE_NUM(pages, scale); \ + num =3D __TLBI_RANGE_NUM(__flush_pages, scale); \ if (num >=3D 0) { \ - addr =3D __TLBI_VADDR_RANGE(start >> shift, asid, \ + addr =3D __TLBI_VADDR_RANGE(__flush_start >> shift, asid, \ scale, num, tlb_level); \ __tlbi(r##op, addr); \ if (tlbi_user) \ __tlbi_user(r##op, addr); \ - start +=3D __TLBI_RANGE_PAGES(num, scale) << PAGE_SHIFT; \ - pages -=3D __TLBI_RANGE_PAGES(num, scale); \ + __flush_start +=3D __TLBI_RANGE_PAGES(num, scale) << PAGE_SHIFT; \ + __flush_pages -=3D __TLBI_RANGE_PAGES(num, scale);\ } \ scale--; \ } \