Commit 7b15c27e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'core-mm-2021-02-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull tlb gather updates from Ingo Molnar:
 "Theses fix MM (soft-)dirty bit management in the procfs code & clean
  up the TLB gather API"

* tag 'core-mm-2021-02-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/ldt: Use tlb_gather_mmu_fullmm() when freeing LDT page-tables
  tlb: arch: Remove empty __tlb_remove_tlb_entry() stubs
  tlb: mmu_gather: Remove start/end arguments from tlb_gather_mmu()
  tlb: mmu_gather: Introduce tlb_gather_mmu_fullmm()
  tlb: mmu_gather: Remove unused start/end arguments from tlb_finish_mmu()
  mm: proc: Invalidate TLB after clearing soft-dirty page state
parents 9eef0233 8cf55f24

arch/ia64/include/asm/tlb.h

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
 * unmapping a portion of the virtual address space, these hooks are called according to

 * the following template:

 *

 *	tlb <- tlb_gather_mmu(mm, start, end);		// start unmap for address space MM

 *	tlb <- tlb_gather_mmu(mm);			// start unmap for address space MM

 *	{

 *	  for each vma that needs a shootdown do {

 *	    tlb_start_vma(tlb, vma);
@@ -36,7 +36,7 @@ 
 *	    tlb_end_vma(tlb, vma);

 *	  }

 *	}

 *	tlb_finish_mmu(tlb, start, end);	// finish unmap for address space MM

 *	tlb_finish_mmu(tlb);				// finish unmap for address space MM

 */

#include <linux/mm.h>

#include <linux/pagemap.h>

arch/sparc/include/asm/tlb_64.h

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ void flush_tlb_pending(void); 


#define tlb_start_vma(tlb, vma) do { } while (0)

#define tlb_end_vma(tlb, vma)	do { } while (0)

#define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0)

#define tlb_flush(tlb)	flush_tlb_pending()



/*

arch/x86/include/asm/tlb.h

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 


#define tlb_start_vma(tlb, vma) do { } while (0)

#define tlb_end_vma(tlb, vma) do { } while (0)

#define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0)



#define tlb_flush tlb_flush

static inline void tlb_flush(struct mmu_gather *tlb);

arch/x86/kernel/ldt.c

+8 −2
Original line number Diff line number Diff line
@@ -398,9 +398,15 @@ static void free_ldt_pgtables(struct mm_struct *mm) 
	if (!boot_cpu_has(X86_FEATURE_PTI))

		return;



	tlb_gather_mmu(&tlb, mm, start, end);

	/*

	 * Although free_pgd_range() is intended for freeing user

	 * page-tables, it also works out for kernel mappings on x86.

	 * We use tlb_gather_mmu_fullmm() to avoid confusing the

	 * range-tracking logic in __tlb_adjust_range().

	 */

	tlb_gather_mmu_fullmm(&tlb, mm);

	free_pgd_range(&tlb, start, end, start, end);

	tlb_finish_mmu(&tlb, start, end);

	tlb_finish_mmu(&tlb);

#endif

}

fs/exec.c

+2 −2
Original line number Diff line number Diff line
@@ -708,7 +708,7 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift) 
		return -ENOMEM;



	lru_add_drain();

	tlb_gather_mmu(&tlb, mm, old_start, old_end);

	tlb_gather_mmu(&tlb, mm);

	if (new_end > old_start) {

		/*

		 * when the old and new regions overlap clear from new_end.
@@ -725,7 +725,7 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift) 
		free_pgd_range(&tlb, old_start, old_end, new_end,

			vma->vm_next ? vma->vm_next->vm_start : USER_PGTABLES_CEILING);

	}

	tlb_finish_mmu(&tlb, old_start, old_end);

	tlb_finish_mmu(&tlb);



	/*

	 * Shrink the vma to just the new range.  Always succeeds.