Commit 7269f999 authored by Jérôme Glisse's avatar Jérôme Glisse Committed by Linus Torvalds
Browse files

mm/mmu_notifier: use correct mmu_notifier events for each invalidation 

This updates each existing invalidation to use the correct mmu notifier
event that represent what is happening to the CPU page table.  See the
patch which introduced the events to see the rational behind this.

Link: http://lkml.kernel.org/r/20190326164747.24405-7-jglisse@redhat.com


Signed-off-by: default avatarJérôme Glisse <jglisse@redhat.com>
Reviewed-by: default avatarRalph Campbell <rcampbell@nvidia.com>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Felix Kuehling <Felix.Kuehling@amd.com>
Cc: Jason Gunthorpe <jgg@mellanox.com>
Cc: Ross Zwisler <zwisler@kernel.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krcmar <rkrcmar@redhat.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Christian Koenig <christian.koenig@amd.com>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6f4f13e8

fs/proc/task_mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -1169,8 +1169,8 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf, 
				break;

			}



			mmu_notifier_range_init(&range, MMU_NOTIFY_UNMAP, 0,

						NULL, mm, 0, -1UL);

			mmu_notifier_range_init(&range, MMU_NOTIFY_SOFT_DIRTY,

						0, NULL, mm, 0, -1UL);

			mmu_notifier_invalidate_range_start(&range);

		}

		walk_page_range(0, mm->highest_vm_end, &clear_refs_walk);

kernel/events/uprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, 
	struct mmu_notifier_range range;

	struct mem_cgroup *memcg;



	mmu_notifier_range_init(&range, MMU_NOTIFY_UNMAP, 0, vma, mm, addr,

	mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma, mm, addr,

				addr + PAGE_SIZE);



	VM_BUG_ON_PAGE(PageTransHuge(old_page), old_page);

mm/huge_memory.c

+6 −8
Original line number Diff line number Diff line
@@ -1224,9 +1224,8 @@ static vm_fault_t do_huge_pmd_wp_page_fallback(struct vm_fault *vmf, 
		cond_resched();

	}



	mmu_notifier_range_init(&range, MMU_NOTIFY_UNMAP, 0, vma, vma->vm_mm,

				haddr,

				haddr + HPAGE_PMD_SIZE);

	mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma, vma->vm_mm,

				haddr, haddr + HPAGE_PMD_SIZE);

	mmu_notifier_invalidate_range_start(&range);



	vmf->ptl = pmd_lock(vma->vm_mm, vmf->pmd);
@@ -1389,9 +1388,8 @@ alloc: 
				    vma, HPAGE_PMD_NR);

	__SetPageUptodate(new_page);



	mmu_notifier_range_init(&range, MMU_NOTIFY_UNMAP, 0, vma, vma->vm_mm,

				haddr,

				haddr + HPAGE_PMD_SIZE);

	mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma, vma->vm_mm,

				haddr, haddr + HPAGE_PMD_SIZE);

	mmu_notifier_invalidate_range_start(&range);



	spin_lock(vmf->ptl);
@@ -2066,7 +2064,7 @@ void __split_huge_pud(struct vm_area_struct *vma, pud_t *pud, 
	spinlock_t *ptl;

	struct mmu_notifier_range range;



	mmu_notifier_range_init(&range, MMU_NOTIFY_UNMAP, 0, vma, vma->vm_mm,

	mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma, vma->vm_mm,

				address & HPAGE_PUD_MASK,

				(address & HPAGE_PUD_MASK) + HPAGE_PUD_SIZE);

	mmu_notifier_invalidate_range_start(&range);
@@ -2285,7 +2283,7 @@ void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, 
	spinlock_t *ptl;

	struct mmu_notifier_range range;



	mmu_notifier_range_init(&range, MMU_NOTIFY_UNMAP, 0, vma, vma->vm_mm,

	mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma, vma->vm_mm,

				address & HPAGE_PMD_MASK,

				(address & HPAGE_PMD_MASK) + HPAGE_PMD_SIZE);

	mmu_notifier_invalidate_range_start(&range);

mm/hugetlb.c

+4 −4
Original line number Diff line number Diff line
@@ -3294,7 +3294,7 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src, 
	cow = (vma->vm_flags & (VM_SHARED | VM_MAYWRITE)) == VM_MAYWRITE;



	if (cow) {

		mmu_notifier_range_init(&range, MMU_NOTIFY_UNMAP, 0, vma, src,

		mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma, src,

					vma->vm_start,

					vma->vm_end);

		mmu_notifier_invalidate_range_start(&range);
@@ -3675,7 +3675,7 @@ retry_avoidcopy: 
			    pages_per_huge_page(h));

	__SetPageUptodate(new_page);



	mmu_notifier_range_init(&range, MMU_NOTIFY_UNMAP, 0, vma, mm, haddr,

	mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma, mm, haddr,

				haddr + huge_page_size(h));

	mmu_notifier_invalidate_range_start(&range);
@@ -4411,8 +4411,8 @@ unsigned long hugetlb_change_protection(struct vm_area_struct *vma, 
	 * start/end.  Set range.start/range.end to cover the maximum possible

	 * range if PMD sharing is possible.

	 */

	mmu_notifier_range_init(&range, MMU_NOTIFY_UNMAP, 0, vma, mm, start,

				end);

	mmu_notifier_range_init(&range, MMU_NOTIFY_PROTECTION_VMA,

				0, vma, mm, start, end);

	adjust_range_if_pmd_sharing_possible(vma, &range.start, &range.end);



	BUG_ON(address >= end);

mm/khugepaged.c

+1 −1
Original line number Diff line number Diff line
@@ -1016,7 +1016,7 @@ static void collapse_huge_page(struct mm_struct *mm, 
	pte = pte_offset_map(pmd, address);

	pte_ptl = pte_lockptr(mm, pmd);



	mmu_notifier_range_init(&range, MMU_NOTIFY_UNMAP, 0, NULL, mm,

	mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, NULL, mm,

				address, address + HPAGE_PMD_SIZE);

	mmu_notifier_invalidate_range_start(&range);

	pmd_ptl = pmd_lock(mm, pmd); /* probably unnecessary */

CRA Git | Maintained and supported by SUSTech CRA and CCSE