From patchwork Thu Feb 13 16:13:54 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: 13973652 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 6C3F3C021A4 for ; Thu, 13 Feb 2025 16:22:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0783D6B009B; Thu, 13 Feb 2025 11:22:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 04F596B009C; Thu, 13 Feb 2025 11:22:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E597E280001; Thu, 13 Feb 2025 11:22:04 -0500 (EST) 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 C62986B009B for ; Thu, 13 Feb 2025 11:22:04 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 5BB174B555 for ; Thu, 13 Feb 2025 16:22:04 +0000 (UTC) X-FDA: 83115438168.21.5C3C406 Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf02.hostedemail.com (Postfix) with ESMTP id 9DBCC80015 for ; Thu, 13 Feb 2025 16:22:02 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=none; spf=pass (imf02.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=1739463722; 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=feHMxbUJk0/EzMWTQfrt/LATGrgLKwPkbP9LPcpQaKU=; b=HiF9WLFRXeSuFLjDhEZnlWaxTm8T6g/T/xQjZon6uWzovQX/gNLELaDflYzKckussnxFx6 HP3rmFR0BEd7zJRvguvG6ureJuXZfwOmxgfuY+El17ikkVaoKTDdY0JcwtZ2FNxJtngojK NQRnEk27q4ANZFGzg7cdaabrlc+U0Js= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=none; spf=pass (imf02.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=1739463722; a=rsa-sha256; cv=none; b=bB9LhgabsCPmlIsv9TnZ3bJgOkfDyJDmO4AApF909cPLqDWCxgZAncEzdVvzW4qm/s21nY ElRmjsFWSxLb9NYh9qtv4wLX9DbOr5Xxfme/L9kO5F/yGF5tCIp7lHmxCd1o2Mm8i5iOn5 7fcNY7k2hHznEwdZSCxUYpxl3wzG0FQ= 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 1tibr7-000000003xx-0bsl; Thu, 13 Feb 2025 11:14: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 v11 03/12] x86/mm: consolidate full flush threshold decision Date: Thu, 13 Feb 2025 11:13:54 -0500 Message-ID: <20250213161423.449435-4-riel@surriel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250213161423.449435-1-riel@surriel.com> References: <20250213161423.449435-1-riel@surriel.com> MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 9DBCC80015 X-Stat-Signature: ngs7u49bt8biio8sgzx9k9nepx33ap99 X-Rspam-User: X-HE-Tag: 1739463722-582902 X-HE-Meta: U2FsdGVkX1+d/Ph/VZ23MnOrojHyVb+uojWC6/tzYNcaTWQvc+NkUYc1Y1rPLtxmhb2l1kh0pjEXo57IH51i+z/VNfur4HE+ODypuo9TSROcyq8sndkhUT6Wrt/OnWt1bYPAbkN7Cv14vuUdsi2q1Xo03QxuD/CEixukUVMJuhsZs5Xr6FLvSiLpncQlj5XvU3MNhcHG5NvZuvNZ6aH/JezmIdgfxRd2iBvmn5ZS1xEnnefimkp1Hiyb8R6ySjcEfUKLCbgwUVBtFvcdOV5ZYinlsS5FjDXG5sgdBo33WRDYG+qUtR/jM/HxVsfvJwCsVnZ2UsLhcLuTWWc/SN6tqCUpG4x3IGtPUXU6rTUsgu1yI607ixAXg2pmHNYJxh2w7yrw3La/fBZzOkpbCB4D64QmodNiP8Ly4/Zw1sSA6EfkEb/zcbuTehzl/sL4tGSBnFO29od7QcEufsl7p1VTuK8H0Rz+8FG9LPeRRJHvXchqPucKyrjQrJlCGIGH317B5AQXuTZHpGAxrHySer06vb/tg0HMwAYmr7yUD3iK2Mz+V6ZuoE7nZxZxt9rawV81Nih3RqooUuCWquaMSOCiCihjRTNKqrzxJMUGbpsN1S/jbaX7/0YYgNEfMMEqAUueQxPNtBqLogEmS5S6JR8Osf7k8zYC3Xh1jnfNVUfNkjqQ/koFPNlXDfq2K5r7Ef9bbpxuCnvqpALdOePhJo4UIr8qCRCaIRmThKeyKHIwBW6RyDU5ehfBBKRI+GbabRg/uh+DZuaknk5sQfwRanWuLDr/BhPZMba6STfE0to8MGzVAnFYN5aciAGIJfI+JdfkOGVAZmradLQYzYeTyHBZqeuExS+E1fttNCQYYdh2dfn+/yjqTqqjMglWrkUz76CPwWYxFBtwM/uMJMyqkVmRGO0wh4rYdRxnNrRDEc9hNWrrdtoqs5iAs4hEHvKSiHHKqijtwwISbVhUajd07A7 IAEh3vdZ zkoQK+pREAiNSK78efVJEYa+jn7eEUyr3Zqq5BZGDXiJI0Vu9TuWSzLydcyqZXlhID5XS9LUCpND4w12ZiAIKFNi5ciuRyjhqzseqdkH2NjzybSxpwVsC/XCpZ5dEaM28/a0aoBDKvLSyHbmF2JJobjr7PiS8buFE0odvAF/mtcspSODueBWFEI+f9loG41zMdNOSUj/mqUdw+En+h54DxUCR+pT0u8es/dIB6cCeWCEk822aEnAnR/0Ov2S8H71+Vmy/X1RJ8HVc7sFRMDq9BbtmJzUeRcnqOWECSpSwvt55VF3QMGUY9kYl1lUKznx+w+qBmWqTRqdRjRtfkjRiVio6h+uN5gYK0dFJ6zZhtBc1AMO7FgO+9qlSGxZRAjk3Q+b46uVVLT5xbeZhVXvUtiQd1/qXteb+BDU3Vy7aj9DmASgXKJn07bYY0IhcTL/LF2nwfN302E27tJh+ol/w4FK7rmn7zXAGo6Sj9+R2yNBsGc/zE2V69NVmXKBj0G8gN8nOTbGqOLxRjEc= 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 Tested-by: Michael Kelley Acked-by: Dave Hansen Reviewed-by: Borislav Petkov (AMD) --- 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..924ac2263725 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(); } /*