From patchwork Wed Feb 26 03:00:36 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: 13991448 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 568BDC021BE for ; Wed, 26 Feb 2025 03:02:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E1CD16B009A; Tue, 25 Feb 2025 22:02:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DAC076B009B; Tue, 25 Feb 2025 22:02:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C1A72280007; Tue, 25 Feb 2025 22:02:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id A26C56B0099 for ; Tue, 25 Feb 2025 22:02:25 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 5CCEF1C8107 for ; Wed, 26 Feb 2025 03:02:25 +0000 (UTC) X-FDA: 83160597450.15.40C472E Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf19.hostedemail.com (Postfix) with ESMTP id 4D9D41A000F for ; Wed, 26 Feb 2025 03:02:22 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=none; spf=pass (imf19.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=1740538943; 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=FfnRwq33yyi/Wd2CTbfl4M5RVRk0hOOuF/UtgJG2WM8=; b=zxBlbrCZckfudY2FRGb2kFezxl93uzkGVVG76pIU5L6B7ONmvqplVfHC/F+nqUUJmFGNHN +h3kd+sQGhymmySlqzbmK/JCVpRTDhHqtCO1Ng0zLOEJrxxlFY46xAjXYTrPuW2yXsl7m6 XAzM9fBxNOd8HsNS+6hbPjEollJjbMM= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; spf=pass (imf19.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=1740538943; a=rsa-sha256; cv=none; b=1De1h7w9ytc2S244Ck75qHj+onQD25PDQufvjsZcGrzw260cvzNCdq6DwuFgmvisK3Nu7D ZkPxizx6TtBdKe5cmL5mRCsOL2tQwd3CxRtcOsm3MdfP7D2T6nsyaWp4wKd0+jpRNhBZul sLidumAdShNcfJDanqSEEAS+DFt0AQ4= 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 1tn7fw-000000001Y5-0MJ4; Tue, 25 Feb 2025 22:01:32 -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, Manali.Shukla@amd.com, mingo@kernel.org, Rik van Riel , Dave Hansen Subject: [PATCH v14 01/13] x86/mm: consolidate full flush threshold decision Date: Tue, 25 Feb 2025 22:00:36 -0500 Message-ID: <20250226030129.530345-2-riel@surriel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250226030129.530345-1-riel@surriel.com> References: <20250226030129.530345-1-riel@surriel.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 4D9D41A000F X-Stat-Signature: sqw4p77c5677xx9hkc7zn1y8jac3gxff X-Rspamd-Server: rspam03 X-HE-Tag: 1740538942-20049 X-HE-Meta: U2FsdGVkX1+kFvJOI8kj3puqh/p3kFe+0nnI+MRCON2vwHOpy8ct2xdvRUHqaPjIqlGBF5w3eVMBEKEewYfut7ZkGsXDB2ilrfpEc2pKTp7G9wSxONIymF8lTB5Eb/5Ljuk54U+rR3vfgX6dZ7oqNSEmtIyaNDk7EQnttczqTEeVtqXoEaC+OqI15gp8vVVMmIiAeOjk3hY6PwE379xjQGz1h4GAyMJC0ckTbczkk8i3/die4l/8sXzoV5wR8z6AxYQcXKlU5oO+Uup4OsWYWoOf38JoqXyu7MJNJ0imlgTtSsq1M0lEMd+OXNSlaee4kiSh66pa1yhfdwWFkdHJfpcWbPcqMNVnWWKzkV5AYl1nrn9MjSzQsHz+UKiCjdRhNRrmfSPz/9Aca9BIRnnVzvvUFVlbfJ2lFRSlszMpKW6wUFW4mu/IyEPwxuwN/Sij7gMu1BhHnS68HQxWRkJeFpbg7ptBzRGxIBfh9Ab+RgP+OeNq3WlCjluURhs+NhN2tAdphyHnXWKyztpnbhtpOyj2C+IFdN7RwSyCx7HHCT/FdCSUHTnScuEfa4pL0Sd5FRUpscrWxwoaQnlgXzCgexoWusT8JIpL4Ja9YzXKtuXC1kmSPDD0UfdBN4ZsLWBrd8FEo2AhojDjkfjNjBvRaJIhX+7mk7VHZM5EsiSfpB7wP8WznAQatDBbHYBOI1vgl5jGStvB1SM76AL0TujmNGlrdl4nzW+hT+i/xlj0fyd5OFYf56tkjie5Ot7B5M3+DqO8KTRzRaP6JjEXxbCr3j1EtLUZanfZ1JBs1ZNNEpjHL5+eAzF/Ue/L05/vflyB5nZJOogxfRfDTUCQJNm7ovxXw+CXLPxByMR4rAaFM22hRrHO3PExNGoqe+Sto2pF1acqZNJviSvSEtXjToQ3DbYmHT6D8gAb+qgjM2x5ozdp8WidtTwKE4j84l4wi5/FOb8j/4J43YYjX+vI79H PlduAItJ fatBOsuUuR+pFMBVEVLZUDotBdlpqpoCq09HzQ4Sjo9yXpQ8QYrORhtCRXlKf9lkNhILEf0NlwvY9hM8KGo7sIgIY916gFJOYn0Ss/KyuJsWCQdU1mhl8RhGGyNTk/vaKATZJNzSIHlSoytOh+re0i1MlXYt5DJvu4/qfpXcvz4bEKkDeG1nIzQOsASfnNnMQ1qcrfb6pHVsEI730kK1fD0S08wcy4P47jfxWKY3nLWaepyFknlI8WMbyexe9Zw5x0mjYL6WvVAuHUbUZ8n6GNVUyCDiKsyD1+5ddybJ6blJBH00yHDf9HNj4f50tiRTaEMS619jQh8Fx+JtFxKGmmhN9fsvblr5mrhOmiuVSDuG5N+W/C7u7soAPO5I9g7ThM85Lr7y+4rqa0xYZE2VCr3mXLpASHConE3kliEvBE1Yr1zB4uAK25OyuUQ== 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..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(); } /*