From patchwork Sun Feb 23 19:48:51 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: 13987234 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 34401C021B2 for ; Sun, 23 Feb 2025 20:10:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BD5866B007B; Sun, 23 Feb 2025 15:10:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B852A6B0082; Sun, 23 Feb 2025 15:10:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A4C8E6B0083; Sun, 23 Feb 2025 15:10:21 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 879986B007B for ; Sun, 23 Feb 2025 15:10:21 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 376CCC02B1 for ; Sun, 23 Feb 2025 20:10:21 +0000 (UTC) X-FDA: 83152301442.01.16EB2A4 Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf14.hostedemail.com (Postfix) with ESMTP id A656A100002 for ; Sun, 23 Feb 2025 20:10:19 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf14.hostedemail.com: domain of riel@shelob.surriel.com designates 96.67.55.147 as permitted sender) smtp.mailfrom=riel@shelob.surriel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740341419; 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=/LW6VSvXPGSjnBKvbbdw0SlEWW24iiSz41LQZQ3zF1s=; b=SnUrNcfwPM8u7d722mSdFqDdqslkjhrnuVp6DFcS1SDK4WNFQwSgqK+8VbIvEVdYimjZDd lcLXGM1S9we/WI9VszanoKzBvmFvRziO7mYmeBRRoz2jBU8ttZDKALuXLWJlJ1Hl+/oXs2 g6PmpafEOD/cO9Z+SHodOxGPs+Apn4U= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740341419; a=rsa-sha256; cv=none; b=dIlj6gE/QPtF7ODH5tRFlZOoS1NP45jUI1EBUj9bSgLiDFErs3r1WDOcDBnwVYbpwR3ppa T2Iiuw8tNULttZnyk4ePLozPuEJoFs/DibrVXT8AROlUfaPDsJU6rwa9xk5X2Hnoy4Q0mx sSYs6TuhNhzPUcaDszkhkvp3+XQUDvY= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf14.hostedemail.com: domain of riel@shelob.surriel.com designates 96.67.55.147 as permitted sender) smtp.mailfrom=riel@shelob.surriel.com 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 1tmHyy-000000001hX-3X7k; Sun, 23 Feb 2025 14:49:44 -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 v13 01/14] x86/mm: consolidate full flush threshold decision Date: Sun, 23 Feb 2025 14:48:51 -0500 Message-ID: <20250223194943.3518952-2-riel@surriel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250223194943.3518952-1-riel@surriel.com> References: <20250223194943.3518952-1-riel@surriel.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: A656A100002 X-Rspamd-Server: rspam07 X-Stat-Signature: czq1t8t9f41uuta33w7wsysoga3ayd8k X-HE-Tag: 1740341419-235554 X-HE-Meta: U2FsdGVkX19774f3wa1uz2e+yjyVHwOSOyCLhF0mNR1F2X8Volyz4aK2O3qIi7E7iNDiVpSaoeCUHAAOzUyMiL0uf1q+XPPlU1XdGwmJD27dBuLgnRQ7CdtUfawK3hFngdZOQkcgPP+IdGNREG6Kcc52OXQDn1E+MWsTVbOEiqiQ7T+P8PNdRWPeZsXDzWGAb491QbFU41RPnUvfxaDp9nWHUi4Q+gbdymQPRbdQyqlqqbv6kJK2Rsi69Kpgsf7SUOv61NMbPpoSszUp35USLSt1+gQrxP45GTLTkcvs7iYWLZNC1IxRJQQJCbqVedLvdKWl4UREr0UFepcmZSypzbanP/uiBIAL4XsFYs2/N4kWhVibqv8NHvAaLy4rzAHUsOgFotLgBkIpzCkUXD0mceGjOvXXODWFG1poe0fmgRzwip2dJ/L5ukYpX8WnHZ0viOAoUcTsm6/pgChX53qnIVR6DcbZsZSO2V/YtKT4Kdj7YnorkBEbUBKJ9X74KoS/64kDGks6Et6DTVfh6cDb9kMVbWXzdMpDY+czKsMs6qWLHiJ/3o+bSZ3LfFAMFj+98gl5mtJbUtzVuwq69h1y+kmhVPXI4fnM6jS31BQE049Opui3ZuHVM2S91zyGe6cFcWDfXICnYYlg1yJEaVeujnlK1UL1c5O3s6Gv9xfNjOWS17NnpGzwuigAVxT0Q2oyL+fmpv611UawQR+2InZNbiKE0cObvjj6q5xB7+jS6Y+P3EwhDWBPsZ/b6D//+tc2M85q5WcWuVb+z9Pl+EOZOBXG1i9oBxlP0mY2eITZ4mCdb0Oqe35YciGtECvnirrnArdRKxPrxA6HKVSoxH4a1hMl54FvaeRQoZzz+C/wW1dZ5r9M+mYEsS9xUa1hN8Y9HTrC9rapqFgEEtV8EVehIZiW4YnfWFbfHtdoIAUev1t+uNg1Ru8QhPGCsCUlMMSdi05MvYnSANsL496/pTK yklKsurl BWhBlm0OGdJkk14ZyRSqX85SWUhwXYnFbmfiTYeb9RfLxPVgvkefhbix5RUYmJUzqOmzWaPGf3jVkwAx8fneLRjzQXVHNuMES6Biip2MzKVZvueWN2fFkBQeHB7X4hZ7UHVBMCPL8wmu+OtFpoccG/i0qPLTjYRhqVtzfk57yr4o0IX3yQeaUI/RFkLG72QAb8PRYUyKlv8gSOBaZQAQdIMdXEjTcOFY6gswEERK8h5Efw+U/B7EjdaljyU+kxP4T3AOYE6do1x6hS/PbHyycxfYxRg6ehq/QcKPqCNMzvIJecpPSI+D7ccfxOh2rqKIYIh0Z/UhIW21y7Z6BBvM0xCSD99ERRCJL8LYR52AjsrOUzbmgUNg9mNSjYh3dW5W4HlJEmxADjsPlnjTSQVdCDyNSoS8nFdWIcM4EUO7G79dWz5s/cT40uyAdtg== 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 --- 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(); } /*