Change cpa_flush() to call flush_kernel_range() directly

-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEV76QKkVc4xCGURexaDWVMHDJkrAFAmjdYZkACgkQaDWVMHDJ
 krDp6w/+M06XTqlgELA7GtyRGJpLVM9TBmFCFJKAdaOvuOQeMMzqWTlEYSc83BrY
 MOfwWQfwEoQ0MQqI4mk1nxzgGxsJz3akC8BRgnVXECF9ltXnKDHl/xrABk9FMs4g
 rDWBlLPVSK2Gvi4mBSzdoIVoQ+Y/k33dyW//iiGbQls2zgPWfQmUJUc3uJVtOh5J
 6oFZpnCNoskXMvK+QD55pkM/yp3xhHWFmzjRtkT9QIPsy+xy+0VA74FMXdB6yeIa
 qA5wPqrnzkrWSO+6+W25ufPjsv6BivHV9APZClKILtcBWM/Pk6ZE3gOPDsMJtdug
 iku1lfsmH81GlWd/Qpj1ThL5xZQpjB+lReXCDcUr919ZvnLzwDT/ocE2qISaQMZp
 uomyHBZbhRftcyQuiSwKKAGKtfRbwYLx34ieFW0B0mXzR4EUXv0DPtCgUOYVhEjG
 zPDs6sG3CShPXcBFaQhj4QYf95k3LeW/GwfY4yjjzzmnL9pDJXyowG8Oncvq4+46
 C/crRUpDf3f9Rl1SOMEM5ODS/6mUL41e5KaIX7HpvidJlDWnBobRIodbn2SxrdYg
 4ytbDY7pkUDfjdAyrfaTuvQbpN72G+R0XEOG9id+Yv6JGRnwZXVbF2Th9+CHsnkD
 qLH1yxRb2EzCCHfU8iY9w+2FW5q/xd8ISGNMX26+Xjy0gQjKNDk=
 =IC52
 -----END PGP SIGNATURE-----

Merge tag 'x86_mm_for_6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 mm update from Dave Hansen:
 "A single change to remove an open-coded TLB flush operation by using
  an existing helper. This came out of Rik van Riel's work to get the
  INVLPGB instruction working.

   - Change cpa_flush() to call flush_kernel_range() directly"

* tag 'x86_mm_for_6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Change cpa_flush() to call flush_kernel_range() directly
This commit is contained in:
Linus Torvalds 2025-10-04 10:20:26 -07:00
commit be786eba12

View File

@ -399,15 +399,6 @@ static void cpa_flush_all(unsigned long cache)
on_each_cpu(__cpa_flush_all, (void *) cache, 1);
}
static void __cpa_flush_tlb(void *data)
{
struct cpa_data *cpa = data;
unsigned int i;
for (i = 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 *pgtables);
static void cpa_collapse_large_pages(struct cpa_data *cpa)
@ -444,6 +435,7 @@ static void cpa_collapse_large_pages(struct cpa_data *cpa)
static void cpa_flush(struct cpa_data *cpa, int cache)
{
unsigned long start, end;
unsigned int i;
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;
}
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 = fix_addr(__cpa_addr(cpa, 0));
end = fix_addr(__cpa_addr(cpa, cpa->numpages));
if (cpa->force_flush_all)
end = TLB_FLUSH_ALL;
flush_tlb_kernel_range(start, end);
if (!cache)
goto collapse_large_pages;