From patchwork Tue Mar 4 13:58:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 14000777 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 179DBC282C6 for ; Tue, 4 Mar 2025 13:58:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 92DF66B0085; Tue, 4 Mar 2025 08:58:29 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8B6F6280001; Tue, 4 Mar 2025 08:58:29 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6E1DB6B0089; Tue, 4 Mar 2025 08:58:29 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 4D50D6B0085 for ; Tue, 4 Mar 2025 08:58:29 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 06324141CB9 for ; Tue, 4 Mar 2025 13:58:29 +0000 (UTC) X-FDA: 83184023538.05.2C24610 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf20.hostedemail.com (Postfix) with ESMTP id 5C13E1C001B for ; Tue, 4 Mar 2025 13:58:27 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=h8kbxrx7; spf=pass (imf20.hostedemail.com: domain of bp@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=bp@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741096707; 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=sarqgyLf7PRHyIouFMRKv/vMk4RKJdq/9QGwcqMirTg=; b=hdMghrPacCnXiL6Gp1/B9oiKcPjIBmOaMX4Z+Oykfhrr43NWCRLdo6BCLPLfBcbsusWFia T/QtQKAzH8oq7PsLVLtFZidyQKywl1qsbmTFRKJekYrPLzslFeu25Sqp0vLbTy+pNkCK67 5r6vIDG0VMJsF79/NLS9GO1sd6dGF6E= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=h8kbxrx7; spf=pass (imf20.hostedemail.com: domain of bp@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=bp@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741096707; a=rsa-sha256; cv=none; b=Mv598ai+a3dBbtDypK0AlFHXMps6NAWgJ9MssvqYFsbSj4whlME5s3Oi3K3fd+DOe9DOft VxQy+88IHw+r5wDHmIeqkb4/fOUgXIhLynoAOniwV8yU8Er2dHWFQE0CxTbd3zWgXAKOek fZwWF41b9VZz/06wFAbFzL/dGDQEFG8= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id C01465C5D48; Tue, 4 Mar 2025 13:56:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4144AC4CEE9; Tue, 4 Mar 2025 13:58:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741096706; bh=vdVKhRglpt9Vosn6QZofV8P5uPpS3iho3gB/iAAuoYE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h8kbxrx7XK4Q+NvxBwsqKAlUsRBlNusvYOQqa0kf5IrWbDf80uhG5BGtg+q9zejMf oAqZYkG9/qjpExATxHbmuTpbZK2dfkB7e6NzRlJsNoDhm2Mlg8TE+bEZz5S/zi/QOR /Zw0xLHN3jXCTS2tzLM1RblDh0T7FFfcDnBF7wlZt7FWicx8bsydT8MZoHrPcWDSYV t/u5zBdrjbIS1pMarOZxjDvEt/zd9iNJo/N/qn4PRfEBtEHfm1mrO9nnV1a+HuIXfv WtAWNU17nNtTk9VdJaXMcKNm9IwQcRzKR5IQ3yE6ntI9ZLYVjMCJhWyICrHRxL689W 4CHBTPC+GBXiw== From: Borislav Petkov To: riel@surriel.com Cc: Manali.Shukla@amd.com, akpm@linux-foundation.org, andrew.cooper3@citrix.com, jackmanb@google.com, jannh@google.com, kernel-team@meta.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, mhklinux@outlook.com, nadav.amit@gmail.com, thomas.lendacky@amd.com, x86@kernel.org, zhengqi.arch@bytedance.com, Dave Hansen , Borislav Petkov Subject: [PATCH v15 01/11] x86/mm: Consolidate full flush threshold decision Date: Tue, 4 Mar 2025 14:58:06 +0100 Message-ID: <20250304135816.12356-2-bp@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250304135816.12356-1-bp@kernel.org> References: <20250304135816.12356-1-bp@kernel.org> MIME-Version: 1.0 X-Stat-Signature: t1q6hapr99khtqw88knxhdpj5p56y1dw X-Rspamd-Queue-Id: 5C13E1C001B X-Rspamd-Server: rspam06 X-Rspam-User: X-HE-Tag: 1741096707-46387 X-HE-Meta: U2FsdGVkX189YrkQmbsMRDDmuLdNm9KVKNF6XNKWqLrQ7ZzdiHvAleBvc1po/bOFiMR9JdM89Sk7taJhQIsaPUck4gHP+nvUolw7o+PLpQxebLObRbMz2JDEwhqG7zg30BCfOZ2POZzXYyTrQ/KuoBqzbQkiqJt1bv4xdmeqMdLTpx9q826PyOwLHMF3xOaRagMD3YJeucAL0WgKA0OawL5L7bra75C5QuRaDRxrNXQ+NACwu9D2iUcQk5BHIxf0AS6qtRxqXSrczEkirO0xOxjLjoFn77OeIWQrrvKubwQfKWe6ummLsmtBq2oBjP61PaRI+PdZmiwsrl4qekYm8pG/4cah/BbqGg+4H3Da2eWlvXQrtc6UraxzN6Pg/OPNIRP+rW5xXuFYyTY8lfgsqX0/b8OMwU6nuxMjNzMr6nPhTgnzqJqdeoVnj3Is156T3MnhGBhZe24AaEWfIGyszvCWVTksB4AbVYwViUJhzYCKAlxbLMxhbbpmyCx1zjU3apM9mBABT1PbR8iOD7losv5Dpp9KxgPa0QB/M4K7kv35uwI2jC7a/dk0z6IwY1BCrq0IJ2C1/IOCuOARU8v+kvKNyechRZYbIc3F4Yk+qkdiHj064PufYA0KqGTTm+qot1uyPiAokfxr3XdvlgXVkycaUZA3ub4Ih7pqjCN542kEHlmWzlsnyYfZfS7qBQaOO0krw9PSM99od5t+xpGqz/lIz0C4NvYQxm5LyZtvylV3GuZZXOaBI9NyyyQv6AgMuuzDbC5HiSmO150qJp7s8KJDfn/x5Uph//q2ooQFiADijbV/jQKlfwskVSXhH422oYIW+9K9nSBsNDZvpUA7slx32sG6qoovZccSPKlQ60ieJT6DFViCIJOfisL9rRnTvw18KZWRitACYvoR6NmVzg0VHDgsoVn4+EJn9HE3D2b1L6puZG3XBkQuTSncCBcWnNlAn9ApgKIL2J4V/NL /4vBYvGp tdcfGfS0otKn8jvqRbvQGRrQffES27yaLR/peMwBeGCnzgIsR3k9DCOf7Q6D5dh2OSGcrrj4O5U3uHpgXSfjF+ysnFZs/rqtH871RaDJJIUI1HawJY4F90bKsT51G6PxEUhoSMtDb58eZ7pWbxJLE0yA30cf/rhcjQWIQ2GQzp66aair1h+XHmB5X5HQN2n3mrZb8tiq/Lx4Qa4ZEea7+l9zQdXUkPOEl+MBofWMlzdPIZxCiK6MJvY7G1fLEvH97xZefRcGnsYWBXgA4w0LxIjhhpeCp2Wxj/bxvM8rA+2Q8RSgkfee40nFaPEB8TkVicjLY7ve8hqVEF09w9SoIJCdco4/rHzCJQBUQeS+7bgrdGOBGOuiXdj4TTo4bVjiJlNZY 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: Rik van Riel Reduce code duplication by consolidating the decision point for whether to do individual invalidations or a full flush inside get_flush_tlb_info(). Suggested-by: Dave Hansen Signed-off-by: Rik van Riel Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Borislav Petkov (AMD) Acked-by: Dave Hansen Link: https://lore.kernel.org/r/20250226030129.530345-2-riel@surriel.com --- arch/x86/mm/tlb.c | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c index ffc25b348041..dbcb5c968ff9 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c @@ -1000,6 +1000,15 @@ static struct flush_tlb_info *get_flush_tlb_info(struct mm_struct *mm, BUG_ON(this_cpu_inc_return(flush_tlb_info_idx) != 1); #endif + /* + * If the number of flushes is so large that a full flush + * would be faster, do a full flush. + */ + if ((end - start) >> stride_shift > tlb_single_page_flush_ceiling) { + start = 0; + end = TLB_FLUSH_ALL; + } + info->start = start; info->end = end; info->mm = mm; @@ -1026,17 +1035,8 @@ void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start, bool freed_tables) { struct flush_tlb_info *info; + int cpu = get_cpu(); u64 new_tlb_gen; - int cpu; - - cpu = get_cpu(); - - /* Should we flush just the requested range? */ - if ((end == TLB_FLUSH_ALL) || - ((end - start) >> stride_shift) > tlb_single_page_flush_ceiling) { - start = 0; - end = TLB_FLUSH_ALL; - } /* This is also a barrier that synchronizes with switch_mm(). */ new_tlb_gen = inc_mm_tlb_gen(mm); @@ -1089,22 +1089,19 @@ static void do_kernel_range_flush(void *info) void flush_tlb_kernel_range(unsigned long start, unsigned long end) { - /* Balance as user space task's flush, a bit conservative */ - if (end == TLB_FLUSH_ALL || - (end - start) > tlb_single_page_flush_ceiling << PAGE_SHIFT) { - on_each_cpu(do_flush_tlb_all, NULL, 1); - } else { - struct flush_tlb_info *info; + struct flush_tlb_info *info; + + guard(preempt)(); - preempt_disable(); - info = get_flush_tlb_info(NULL, start, end, 0, false, - TLB_GENERATION_INVALID); + info = get_flush_tlb_info(NULL, start, end, PAGE_SHIFT, false, + TLB_GENERATION_INVALID); + if (info->end == TLB_FLUSH_ALL) + on_each_cpu(do_flush_tlb_all, NULL, 1); + else on_each_cpu(do_kernel_range_flush, info, 1); - put_flush_tlb_info(); - preempt_enable(); - } + put_flush_tlb_info(); } /*