From patchwork Tue Feb 11 21:07:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rik van Riel X-Patchwork-Id: 13970696 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 95D09C021A1 for ; Tue, 11 Feb 2025 21:09:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E7558280003; Tue, 11 Feb 2025 16:09:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D6255280001; Tue, 11 Feb 2025 16:09:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B3D2E6B0093; Tue, 11 Feb 2025 16:09:06 -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 955056B008C for ; Tue, 11 Feb 2025 16:09:06 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 4D83E80B64 for ; Tue, 11 Feb 2025 21:09:06 +0000 (UTC) X-FDA: 83108903892.07.D197D1E Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf25.hostedemail.com (Postfix) with ESMTP id B7430A0010 for ; Tue, 11 Feb 2025 21:09:04 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=none; spf=pass (imf25.hostedemail.com: domain of riel@shelob.surriel.com designates 96.67.55.147 as permitted sender) smtp.mailfrom=riel@shelob.surriel.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739308144; a=rsa-sha256; cv=none; b=CRrDbXgaa5gTwLThI9mXDLK2s6ggVPig8n5biTsQZw4o24YroY8EOPltJ/H8PplM6xMYPH Dqa6zkvZePFlSQvMUKPbADQ/zZp65/0RmAOvAwXH/CxVLpoHO+zKEyt5Bl2nNhG+XVInvl E2aMe1wl4C3XB8+O/JDURtp3mcDs4SI= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=none; spf=pass (imf25.hostedemail.com: domain of riel@shelob.surriel.com designates 96.67.55.147 as permitted sender) smtp.mailfrom=riel@shelob.surriel.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739308144; h=from:from:sender: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; bh=UlPy0p14IsQWBCIsvN3dzDIKE7Ry1N2cej3bhiK/m74=; b=voRo9thwtkOoX3eaoVyok7IxYMsKvNwjCtmeMA9DhdLqHrVSoD5CNUCe/4175pyibf4UK8 n4Fi47OR8taKzBZAyCv5Zmm90cg0vPoRHnk1Y+zfWwLjOow3jEuar4sh4mdSL8qz8SMnuJ inzwWQwh81KYGxHGi02CN6/l0zg4VNo= Received: from fangorn.home.surriel.com ([10.0.13.7]) by shelob.surriel.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.97.1) (envelope-from ) id 1thxUX-000000008HU-2jR8; Tue, 11 Feb 2025 16:08:25 -0500 From: Rik van Riel To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, bp@alien8.de, peterz@infradead.org, dave.hansen@linux.intel.com, zhengqi.arch@bytedance.com, nadav.amit@gmail.com, thomas.lendacky@amd.com, kernel-team@meta.com, linux-mm@kvack.org, akpm@linux-foundation.org, jackmanb@google.com, jannh@google.com, mhklinux@outlook.com, andrew.cooper3@citrix.com, Rik van Riel , Dave Hansen Subject: [PATCH v10 03/12] x86/mm: consolidate full flush threshold decision Date: Tue, 11 Feb 2025 16:07:58 -0500 Message-ID: <20250211210823.242681-4-riel@surriel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250211210823.242681-1-riel@surriel.com> References: <20250211210823.242681-1-riel@surriel.com> MIME-Version: 1.0 X-Stat-Signature: 6t31yrfijib6desum3aph4t3mkef9ngx X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: B7430A0010 X-Rspam-User: X-HE-Tag: 1739308144-652362 X-HE-Meta: U2FsdGVkX19u3vh13FntgkMfnFMyWzIRassxm4hqtvn8Cm9fY49JWkFhMNjRKtrCJyVJQpYBzU7/goV72Fp16wPG6t11wvET0ZjFawiRBYRdnrHN4HEK7CL+/yFGAL263G2pgsbJHGFPLQNYXZbF/M/Mmx5L6EOf+UjK/oDgWT7Z9Zk0ZdSlhabAgwk/s0Smo+4PYO8a9Jhvtpjp+Le+Pup8xSVgA4iwZMpcrGh8/Dp2hHbYjkmsjvHFwuAAvm11RXLwvTbFBOa0BvitU7SO+3BtC9xlfIiiXJVMnfQpVCp4sDIX98uK3K4sK7vh0P+nVbRyN2PMMEz/qznF1Ybil51sUxJd1yaf28iCmtqqxBSvritmfALrzF87Gt8o7RgEqh2Iew5Hsc1pQ85IOEKca9E2HDNeMryq2VTW9o3iktdfX+jiPvEAvKw/a7mHrsqAYVfHrVgORPBBSwUTNG1kvnCQYR6x3VRvGIdWJAhf+2dRkEjngtS5doY8pk0a5gPOiQaH9BcAX//QF4AQ446vBelJcUpNBZDgFXii+0pQ9oK0f5FYk6v4XGjMR63zpytCXrcgQjnmyZp5DhCU2qKuUd5o8HllNvuY74GOXGo8dT28igzukVAxLAXHByKX04yAKMEgohXEz+KFWWZz3+v/jMI5lNDosXkuUhExkkYvihBvTeA8HfRvPQ7HMyPPF0MMhR6g//70q6di8yvLE3cT0L+W3PiPANIBSwBYVe26rdPtU+PTOHmWVFsZatj1eFmxcpMjxRwBiDYAQyi9xcYX8SDEfqSi0PLamNBgFhknAv9c8XprqiSvQX83tEegp4z9exjjNp1ixBvjaViyPFPV7b1rwrBuaZZXjNT+bt9DSC0TudUaRdGg50IuRRbfltNWL5ITBLsMWRv/QOdX3xA9C+BuI+VtAdBa4CkSh4OjsNNVh5R5fvx2Y1OvGmrumL6jvAhJoTNcX9m13vf+UwW hp7h6+px nxaHkgWP0d2w9pAjYLPaYrD81cUFRtcsT783vV7+lm6Soeh3Vmpo4iSh5t1T23g3RCpKojnqfXchmOlvMepIyPi1+HEt3Gz+3Vkcj6GBqs8nPye5Vsh8VZnIgNDjkcAgcsvP1vwmrzVyp5/zHpGAALfMgi3ajlLbtdgqOLXoNrzTvM1CgcFhPERxWZy4wYeH8uHG77PtFIZbcqrTORH0VtDz3IZ7K/o9ELOZq7DkOo8ZMlALf7x6Xp1tNKdWd3lgp1cJNa3jo4dDnqHQsbd6GiQOkwzomXxMZqu7Mwmz/DCMXsKmxj4YMqORHRuQPWNnvQ893OKhy/flGyXH+VVtIJOCEPwWJCYHly6n7RNlgeIwOj/z6HaXGUHv/UiekhpR0Unmvpjk4pdx84HXhw2jBE+BveTnYPZvibumB5aaYP6g/YvwixwRASOo0fK1y1MlvuvYTYmW2l4ihnjI3NX8lM0XR4EIDJZ+CROzYnu0Nbt3c/t3c/y2teIAKZA== 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: Reduce code duplication by consolidating the decision point for whether to do individual invalidations or a full flush inside get_flush_tlb_info. Signed-off-by: Rik van Riel Suggested-by: Dave Hansen --- 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 6cf881a942bb..58c8a6a94e65 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c @@ -1009,6 +1009,15 @@ static struct flush_tlb_info *get_flush_tlb_info(struct mm_struct *mm, info->initiating_cpu = smp_processor_id(); info->trim_cpumask = 0; + /* + * 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) { + info->start = 0; + info->end = TLB_FLUSH_ALL; + } + return info; } @@ -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; - preempt_disable(); - info = get_flush_tlb_info(NULL, start, end, 0, false, - TLB_GENERATION_INVALID); + guard(preempt)(); + 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(); } /*