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 5EC52C36001 for ; Wed, 19 Mar 2025 14:36:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2A9AA280002; Wed, 19 Mar 2025 10:36:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 259A7280001; Wed, 19 Mar 2025 10:36:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 147F8280002; Wed, 19 Mar 2025 10:36:37 -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 EBF53280001 for ; Wed, 19 Mar 2025 10:36:36 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 2B7591A0230 for ; Wed, 19 Mar 2025 14:36:37 +0000 (UTC) X-FDA: 83238551634.03.3B1215E Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf15.hostedemail.com (Postfix) with ESMTP id 72D37A002D for ; Wed, 19 Mar 2025 14:36:35 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=Pejy3geX; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf15.hostedemail.com: domain of gregkh@linuxfoundation.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742394995; a=rsa-sha256; cv=none; b=yUAlf9iqz/oxvW44+GFVtiWJ54bO0J2szWLcxHmt88FeClAqlyOKp0QcaTT1vdhZp4607I 8mlqul+Lf3rUrVMOSROZ4olBQWuDAQqwqyl9nyU2/ALNWRgUlydijtNi+AmKYqqAhbF7Kf BJxz69tUsXTARqsoJunxUCFfrzmNRbw= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=Pejy3geX; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf15.hostedemail.com: domain of gregkh@linuxfoundation.org designates 147.75.193.91 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=1742394995; 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=6seGR6KU6HJp1kcJjZcy5SS+HN6XY02O1lWkWzy98/0=; b=PPTXlYMPoroGh8CBfFZsaRAcwZEZWPImIr3CKAUsIcZd8YEhOBxxLcZhY6S1zOFPrvHN0/ bo4sgcYZbUSTazPzlpCYNW12LNV3SIP0d8XhzIgGQUxHumCPPdy/3lqYvPsr8f8JpaE8Eb UCVXuEtLKHJaVCXcluYGpN+vqg48xmo= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id CEBC6A49169; Wed, 19 Mar 2025 14:31:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DCC93C4CEE4; Wed, 19 Mar 2025 14:36:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1742394994; bh=/SqmxPhiN7ldbpBkht0grZFZ+2BUSs0J1qDm57iP3MU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pejy3geX6HMsej2duFXbby43pJnEHkvTB8kODukJVPqU23+Aq8Mxpr7EHFgvCA2Ef eyKOLzHU6K2wbRAMK1Cx/JxluU4DkN1c/4twMStWEzABMHZynFkI6OAQVnNRQ5IAVu ozIycKvcG3YX6Ct+tAz08s5Mue5zHql6jyix57o4= 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.13 199/241] Fix mmu notifiers for range-based invalidates Date: Wed, 19 Mar 2025 07:31:09 -0700 Message-ID: <20250319143032.645686776@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250319143027.685727358@linuxfoundation.org> References: <20250319143027.685727358@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: 72D37A002D X-Rspamd-Server: rspam05 X-Stat-Signature: 644644kmo1twa581uwj45rd7ig3867kd X-HE-Tag: 1742394995-149244 X-HE-Meta: U2FsdGVkX18IcS0rZ13d0gBSdXfGoQ9E/oOtJBkVFfKxjvIR9neppsVkPlWI68Q9vtlliGt1KERAv0nxwNY/qrx05GFKkJXMV3Kttw70ax0nEgkzBHtquaQQZhWCbPIGdyLTJgdVdsb04yGw1W7Ax1jg9d5ceCCajPuUup7LDhsqSbhVKm54DNvjsOrL6FwJL50kLb+HrpwocNhXhmMt6XRs47PeSVTxTLKYge9WIAqsxdAuO1kvghI+TtXZ4yoBIGwqDWToTbnHHMu3CnfDMrCTgMpCG6sGl4XXRqMBglUe+R7/IlHNbN7BiX9jKPhKec2V5hADMCy/1ZHGFtN8wKDahSDZ3PJPZ9f8qQAuOck0B2DNycXQSgUKyGBkitxfcO5DhFn1+tDgtfFAlwf7iPUCOvAB2dAX0LmyFP8hGM2b5ny2HcwfDQnd/dul3mA8vvBvrRsOulrd/8+d2c7hDXH6eXnOGw5PYptMjPe1mzeCw/P4fk/6b7wCGh7yy82hs4kmU82iRFkzPs9VS9x+iG0fcSANM9cwxKJxvfLqalIuATMtutui20xFJUpZqY/XrGEwiSEGHga+bFduM1F/0uHdZzBONXrDqvrxup5A0ZZcxrjTn0A9kcjsBPchU5Epa6SxwA8sp9Oy7C+WkR3pKIVKY4cyQs7zPSFiuw3MYJThPM6GEBB9EZUZoAkcWLUKyaHzmYrxUgJlO4tmfYTe+K884D0wmSuTF07sPqlfG6t7Xh48ikTboso6opLtDxn1+j2sfN/wcEV3MLBooBWSovc1g43zeUwaXB74pQ0D8LztQLaUZjRl+4U5SQBfrKr1IZUpXhYTPQVS7bTrdUWHqVf3aEJ582ztw+1olVTqYRy831+UU5Nmf4G02H/XDAsqS2/pSA1bO0y89c6k3zFHeOAfIuxsxkRmLl93NrqTIft8mzDXRh4tYSFgSD01aKTk+z1gOvQof8c= 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.13-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--; \ } \