Commit be786eba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 50ac57c3 86e6815b

arch/x86/mm/pat/set_memory.c

+7 −13
Original line number Diff line number Diff line
@@ -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;