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 652C5C36000 for ; Wed, 19 Mar 2025 14:38:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 06780280003; Wed, 19 Mar 2025 10:38:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 01739280001; Wed, 19 Mar 2025 10:38:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E47C4280003; Wed, 19 Mar 2025 10:38:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id C8AC8280001 for ; Wed, 19 Mar 2025 10:38:51 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 2B624120244 for ; Wed, 19 Mar 2025 14:38:52 +0000 (UTC) X-FDA: 83238557304.14.E298263 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf02.hostedemail.com (Postfix) with ESMTP id E0B878001F for ; Wed, 19 Mar 2025 14:38:49 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=CYv+gBfT; spf=pass (imf02.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742395130; 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=F21EwZxMr4PfVMwFjKbEFSM0r7jh48hV6Y5hY9VrwS0=; b=N228phHPvaeiAH+kH/LMgQ7uLvxkb5H4BTZsTOWzkOqphQ8fE+drVdRNkAZzx265ZcQyby tCnwYwiDQcWPeNZLGTWeRCmvX50ieLEQoK6eyWJQ+/Eqqcih3CJR8ESOHtTdHCFbb7jByV lkeD72qtAioSQ8PnCbblZsUXnklq4h0= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=CYv+gBfT; spf=pass (imf02.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742395130; a=rsa-sha256; cv=none; b=xT0bVrxOXUXbUTJ5MqSle62ISQZYr6IZISiyFaAb3ZFXDrboweuBE6p1DuYq3NZjhLxnX7 +wV8zIqPbliU2EsKFB/PXAQOksTUXaNwr2CeMJD/CaZ+0p43rvURw7ZJ0TIhWfBDKf3rPl +D2ujir1rDI6HyGj6MaG5437oZomWus= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id DADCD5C5A1F; Wed, 19 Mar 2025 14:36:31 +0000 (UTC) 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 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: b7f7hxu9gt6yf7mswebcu17fermb5x89 X-Rspamd-Queue-Id: E0B878001F X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1742395129-550608 X-HE-Meta: U2FsdGVkX1+Z+DqalnvfjYj6Ug42YJIctU0xQpwR3Kg50Mj1KkdPK3uQyuEMjbfhJGR4URjM0ISc4RVS+HQaxCl+t2q1ba6zN/+vEHo93JJJLSNlh/v1t/Z8IZvitrjFxrCLqlDMLaIdjsUFxOezQqkOixZM44+zKEXHXE6gIYKjhnqybv95lrm1PceTXBZSPPIt8C6HeTBTAhXO4qaD6l8YQz823XteGoRPuT1dfOo4T0KuxNvo406MqxhNQtPiP/G/YMiZmV8Z+2oqNqHScesknR2+xhj5mbj3Ag402ZPA1IB/loo3bmQoPJe05xwfDVRJiA5mrDdxeXs4kbfb7nfiOVIgDdkwd/GOgOapdQqJzqFW+kCtG5Ffyp0r0SMIEqyZ6K/rfYTuDBkYYjpQoF2NWXYx42oInccTXyNc2Y0TBrNIydvUUJiycRfcOYRM5xO2MfkVl1iKZPsLYCbyUjQuR+/cPZ22QQn2bw4Dssux7izovzzGRWB/OjJMbJOV7wr0IBsx4alNOzB2XZ0srFwRK6oa1dwVAU5wQ36Xk8vj4N/2u47e5zOt+kLngdufPxM7Yd8viT7X9FdvkFyZ6AO6LjVN7YG63M3nn47O8OFvb3Phn1CZWfo1fUPneMzi23sXKRh3NUp2i40mFVTALXgbRl1+AZ+qZOro8C5H4473KWw0XL2RUA2hFiiLoiB0cl4SnSXu8qVVaQ41GW53DGBOvkz8RtOKKKf40u8o61MOZZ0M8q3EyryA/45QYCQ6GRpKJs0/Yru6KjHj4AwGUGdA4wQIHSrEC5E6UDcCURZ61LR7MKxEANpQhRn34HWoTTV02fWC1b1iiRe8Tx9BxeYOsakvuz/VU5B8zWLbA5/GObmnspPHoV6pBquRhUrPHSnL/20G968PcCV9XrRlPo/GmmdJcmlwp89uMLvpeYNplGlpmVQuWEnTlAXnaIlHfmqNL2wPcDTzl7DdKVF v7Ll4xsN B35yfiS2VaBf1+YhsDHPrianFpSXogOzElwvGgfKOZsC6tfq7IZXktJV0ORezHwlbNryqMXVbjGeD774pMDjrwoLKv746zzU6J9OabQijudQwmcx2t0mtLNekuxegIjgAljDpAdUlrDG+f8alYW1RrZQTIyOURfGC+3nku6igegANtrR/LOCyVHq8/ZSZeKlGGlQneCImz/ri0iL/0YW8OAbdZwNbuBEhqDRu4WyRJjCLTgz9pZ3VURqbjSxDyFCMKMoIEewmsZ1h9GTAEgo6P3PF/WG7ALEaHBrJwJY8cm/8P5ts9MYfu3N8LQHWaadst1Q9iidvHl1bFCES0XzX5YOOJG8nZ/hUOhdeqXgPiCYOy+ToufKcg01Jrq8SNOKHmYMDhHWL0Y67wChHrsxo26iuVBg7YwEfOD/137N2GFP7p9i3UC3Y1FHwMiaNX8HBs6qVD1n7qXNrktlQIH7duqUzZaQ/USvLGMiC4fIrYyqhqzDX4ytlPtnNa6uWvq94JIFZ+HtUT0l2JUnpUFB0gI+dfPhCP/q1lI9e 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.12-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 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--; \ } \