From patchwork Fri Feb 21 00:53:02 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: 13984677 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 947F8C021B3 for ; Fri, 21 Feb 2025 00:55:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EAE0828000D; Thu, 20 Feb 2025 19:55:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C19D76B00AC; Thu, 20 Feb 2025 19:55:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A1DC7280009; Thu, 20 Feb 2025 19:55:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 5B8C6280009 for ; Thu, 20 Feb 2025 19:55:09 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id E5846160264 for ; Fri, 21 Feb 2025 00:55:08 +0000 (UTC) X-FDA: 83142132696.21.4FD16A0 Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf15.hostedemail.com (Postfix) with ESMTP id 5F51CA000E for ; Fri, 21 Feb 2025 00:55:07 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf15.hostedemail.com: domain of riel@shelob.surriel.com designates 96.67.55.147 as permitted sender) smtp.mailfrom=riel@shelob.surriel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740099307; a=rsa-sha256; cv=none; b=2o8pglTaWYUX8f8z+yahkOHqEWkSgdf4PoQl2Bj0WaRfj/rPfAtGd9pxcR2muXmBu0GXSo aCefGdrfFRN8/FlRQfrRWsjg6bBTQ3n80QKf1m4PxCUjNi/QNg5mBtGxUQRvFfMLaaRwB3 vYB8t3qK4ezZeiDRF0tDixHQYYM5RmA= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf15.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=1740099307; 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=HHGLhoe6imy/RtZGQO+Khrnu5GeDDyU5ZWtkQjJEvFQAbwi3dV2X6k1aDyieCm8PcB+kTO DOmr2YJFFDM1KU5YGgaT7DentBaN39lmFeS3ON9IBizCBBQLTCwq2P+TZN1i4Zohpqo+Iy l4llAW/YdtzbMl/6jT04KwIB5QRiMyY= 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 1tlHIZ-000000003Qf-0nqE; Thu, 20 Feb 2025 19:53:47 -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, Rik van Riel , Dave Hansen Subject: [PATCH v12 03/16] x86/mm: consolidate full flush threshold decision Date: Thu, 20 Feb 2025 19:53:02 -0500 Message-ID: <20250221005345.2156760-4-riel@surriel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250221005345.2156760-1-riel@surriel.com> References: <20250221005345.2156760-1-riel@surriel.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 5F51CA000E X-Rspamd-Server: rspam12 X-Stat-Signature: ayxo49sm9ddpenmpaxbp31ba3johyiea X-HE-Tag: 1740099307-362404 X-HE-Meta: U2FsdGVkX1+O7CdDCGGGQBdCqNGC1o/clVJbhpIZq9gofzKNEbwfQp3LS5+tDOJlUeFI3eeMsMzw3RVH8+62lDp3a+hOsjh+VVWMo2sml3gDYKmD8BaMDnc9Oym8REoP1JwPoWIYKY65kuTtRfrqcmWLnptib46rLWLizRmDsoKfpki7qz4ZdVZdKeD+zDGnvLbHoi5zbcGsylRTd9GJ8lP0YYbRp6q3t7OlX7xilyI8yyodBiuRu4bU8YBYTlEIOhJ/g7hG/443LhSIwmXsitRyAmitscaOHJrP3nUoj06iX7vnTeoJEWy3azLwT+6b3kQEN7AFpGyPPF6egTFx4LsstDwEDwy0vO1FnANFS5UhXa/v6ndVaKVncwW4DAormWl2Gu9pXj5ICPxM4uejJSqYPwpFB2QGguB1Bly7bZAfNGjtQnOTPdJyITkFbIaG7MRYXECV66w04+JBZv7l95L2c+4KFXX96midXSU31ve1hpmZ8fAPPAOkeiTd/Z2LCCM/eyXD/wKQOdGMNd3896w/P3wUkEBEz7JFR+mippsjfi8NrKieRfgqsaFej+RVV6j9HPmkqI2XwvL7DmrtaLP0uvobWqFC/nCOW7jRiiHoe+NWN/QwW2z46XG1CfxcSpB7s/p8gmsK5ogXkhJ6DJ7LMR346ibqtRyfxPgimiYobe4uhW31J5jQQztrnmThyITQbXO2jqo4BPIecYKq7VNybJwbaulyo/1OG2K27fOVSUJ0UIWtV9+F7JKhBkhOZ69HZEtzoDAolOieVxB7aH80drmyo+7JD5U/EKo2MejtAVVLDYqVSVuAeClRrksNV4085F5TrcUSTph6AK1duOyY5f9R7PDSOyCZZ0qYYZnYXnFLXXY4O/0KMr/ChxZcChajHdg3evTtVDcJtv9D7mcNXbar+tMw0iz4SkIv3VjYbvE0RBYd2L37CW4O3+M1X0YjGVT2vXXrEsVqmzP BoYIVhnk abRo/Bt9rJqNvMDmMUDC1kVtym3Rpt94ye8sXj/wZoxW6E8fl30qUoMLwO5JgaDM0h7ebWc+/W7x5pG+dm9E1xRCzsc45nQ1RpzxamCTdKXfohZL8REy+F/b299+I4cLsCsTsUHxogbB7MoWPTUn0nGI0H16T1cEkgxFOFLvbwhHNI22qCEJAKvf90qjgdd/N9ZyJledP2mcnA7B5GvPL/H6PneDjOKtuNbw2EVbXaXDjjrFnaeeBsqBaOUKlhEd4vxzjU1pjxpAiY20MXyIt3qiw5Zujgyc+u+IpdPvlKO90i2cIeQOoHDEpNlKw76Sqy0r3zDw9TgIqPYhGwfPZop41AAjh7ZlfYu8ng1pjKZ8v3lq5quOV+vOcMpjo1OyHSDa0Sn4pj9wRK1nod0nbPJWaSxBvP4zrTEjeQrLP2UE3YRBKML40bsRsKg== 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(); } /*