From nobody Wed Feb 11 09:37:53 2026 Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0EE364C92 for ; Mon, 2 Jun 2025 13:34:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=96.67.55.147 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748871266; cv=none; b=f8INPrExzoNxZsTmzuQol6a4rCzslStm2XfYvNvK2uszAM1Pgg6NpNNY+lHfOGHqUOP1Y2OzFw+UnuOvmMsBGticrInmCGT5Of/OoivZdi5hx3tkzOq+8MSSga/3CKfYOge2j7CF7gVUypipECGU6mDzAsxJy3NN6ZAny4CKB4U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748871266; c=relaxed/simple; bh=N/bc8cctnDxYPo2VjOUGNDpV2wFXojvm5ZPAAPyh1jM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hKTrN0zd2SyDrd/HsMg2ewReNpiWTbP3OPv93sBlCrd00bEWZ6m1IhW8OczSks6clBzGL+tBsxqFkvR3KhTFzhVYw8UMbr3+C63R3rV+dhS+KLrNW2YT+PLsCOrqtaR9d882NWM+NKLkdOJAYWzq7DK71CLr5nosd9hEFEJ2LB4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=surriel.com; spf=pass smtp.mailfrom=surriel.com; dkim=pass (2048-bit key) header.d=surriel.com header.i=@surriel.com header.b=dNUn9e8O; arc=none smtp.client-ip=96.67.55.147 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=surriel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=surriel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=surriel.com header.i=@surriel.com header.b="dNUn9e8O" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=surriel.com ; s=mail; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=P6nle2NZJqiVUJ7iKkvpJRIQ4Mwb3x6RviBJIuO/ifo=; b=dNUn9e8OZeFXWNaOH8FTxZj3H/ nhpiOb04gD3njt7n9snxOivXRGam8QQNZsgcdzgHrOMlWANtUDbcOpgzMfibFWIGfICTt6jVFmzhz nLUTi1ifmh5Gd1p4HjSGUI1q6CbUrZsvUr+hccTlpF5dY4QVEQs0tpzcTYRkR0j5Ri8fefybTK405 xJ8j1w0QzwLRuzaL+efCxa7sUXSyzFd8eqbY57UbuLRHvXOaH73We+TaW/Gm+8txpYMo09MIQWoZF FffVU1eJNhVZPPGM2bdGLd1YUOc614d567ro2RGjspNuPn3eLhM/ibb6HHoImPS24ytiQTsfS1KkN V2zOjs+w==; 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 1uM5Im-000000008IJ-176s; Mon, 02 Jun 2025 09:34:08 -0400 From: Rik van Riel To: linux-kernel@vger.kernel.org Cc: kernel-team@meta.com, dave.hansen@linux.intel.com, luto@kernel.org, peterz@infradead.org, bp@alien8.de, x86@kernel.org, yu-cheng.yu@intel.com, Rik van Riel Subject: [PATCH 3/3] x86/mm: Change cpa_flush() to call flush_kernel_range() directly Date: Mon, 2 Jun 2025 09:30:57 -0400 Message-ID: <20250602133402.3385163-4-riel@surriel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602133402.3385163-1-riel@surriel.com> References: <20250602133402.3385163-1-riel@surriel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Yu-cheng Yu The function cpa_flush() calls __flush_tlb_one_kernel() and flush_tlb_all(). Replacing that with a call to flush_tlb_kernel_range() allows cpa_flush() to make use of INVLPGB or RAR without any additional changes. Initialize invlpgb_count_max to 1, since flush_tlb_kernel_range() can now be called before invlpgb_count_max has been initialized to the value read from CPUID. [riel: remove now unused __cpa_flush_tlb] Signed-off-by: Yu-cheng Yu Signed-off-by: Rik van Riel Acked-by: Dave Hansen --- arch/x86/mm/pat/set_memory.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c index 30ab4aced761..2454f5249329 100644 --- a/arch/x86/mm/pat/set_memory.c +++ b/arch/x86/mm/pat/set_memory.c @@ -399,15 +399,6 @@ static void cpa_flush_all(unsigned long cache) on_each_cpu(__cpa_flush_all, (void *) cache, 1); } =20 -static void __cpa_flush_tlb(void *data) -{ - struct cpa_data *cpa =3D data; - unsigned int i; - - for (i =3D 0; i < cpa->numpages; i++) - flush_tlb_one_kernel(fix_addr(__cpa_addr(cpa, i))); -} - static int collapse_large_pages(unsigned long addr, struct list_head *pgta= bles); =20 static void cpa_collapse_large_pages(struct cpa_data *cpa) @@ -444,6 +435,7 @@ static void cpa_collapse_large_pages(struct cpa_data *c= pa) =20 static void cpa_flush(struct cpa_data *cpa, int cache) { + unsigned long start, end; unsigned int i; =20 BUG_ON(irqs_disabled() && !early_boot_irqs_disabled); @@ -453,10 +445,12 @@ static void cpa_flush(struct cpa_data *cpa, int cache) goto collapse_large_pages; } =20 - if (cpa->force_flush_all || cpa->numpages > tlb_single_page_flush_ceiling) - flush_tlb_all(); - else - on_each_cpu(__cpa_flush_tlb, cpa, 1); + start =3D fix_addr(__cpa_addr(cpa, 0)); + end =3D fix_addr(__cpa_addr(cpa, cpa->numpages)); + if (cpa->force_flush_all) + end =3D TLB_FLUSH_ALL; + + flush_tlb_kernel_range(start, end); =20 if (!cache) goto collapse_large_pages; --=20 2.49.0