mm: replace set_pte_at_notify() with just set_pte_at()

With the demise of the .change_pte() MMU notifier callback, there is no
notification happening in set_pte_at_notify().  It is a synonym of
set_pte_at() and can be replaced with it.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240405115815.3226315-5-pbonzini@redhat.com>
Acked-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h
index 8c72bf651606d32bf0876dbd0a56977f542e939a..d39ebb10caeb68453af7595a741bd5fe2c390b40 100644 (file)
--- a/include/linux/mmu_notifier.h
+++ b/include/linux/mmu_notifier.h
@@ -657,6 +657,4 @@ static inline void mmu_notifier_synchronize(void)
 
 #endif /* CONFIG_MMU_NOTIFIER */
 
-#define set_pte_at_notify set_pte_at
-
 #endif /* _LINUX_MMU_NOTIFIER_H */

diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index e4834d23e1d1a209dd6f7ff34c7c9e30a56334fe..1215bc299390bbdcb0bfe56a097fff64ebe00a1d 100644 (file)
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -18,7 +18,7 @@
 #include <linux/sched/coredump.h>
 #include <linux/export.h>
 #include <linux/rmap.h>                /* anon_vma_prepare */
-#include <linux/mmu_notifier.h>        /* set_pte_at_notify */
+#include <linux/mmu_notifier.h>
 #include <linux/swap.h>                /* folio_free_swap */
 #include <linux/ptrace.h>      /* user_enable_single_step */
 #include <linux/kdebug.h>      /* notifier mechanism */
@@ -195,8 +195,8 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr,
        flush_cache_page(vma, addr, pte_pfn(ptep_get(pvmw.pte)));
        ptep_clear_flush(vma, addr, pvmw.pte);
        if (new_page)
-               set_pte_at_notify(mm, addr, pvmw.pte,
-                                 mk_pte(new_page, vma->vm_page_prot));
+               set_pte_at(mm, addr, pvmw.pte,
+                          mk_pte(new_page, vma->vm_page_prot));
 
        folio_remove_rmap_pte(old_folio, old_page, vma);
        if (!folio_mapped(old_folio))

diff --git a/mm/ksm.c b/mm/ksm.c
index 8c001819cf10f5ca18eaaf1f18baae40fe0e7c5e..108a4d167824dbed44dd6ca941a1185728eb8441 100644 (file)
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -1345,7 +1345,7 @@ static int write_protect_page(struct vm_area_struct *vma, struct page *page,
                if (pte_write(entry))
                        entry = pte_wrprotect(entry);
 
-               set_pte_at_notify(mm, pvmw.address, pvmw.pte, entry);
+               set_pte_at(mm, pvmw.address, pvmw.pte, entry);
        }
        *orig_pte = entry;
        err = 0;
@@ -1447,7 +1447,7 @@ static int replace_page(struct vm_area_struct *vma, struct page *page,
         * See Documentation/mm/mmu_notifier.rst
         */
        ptep_clear_flush(vma, addr, ptep);
-       set_pte_at_notify(mm, addr, ptep, newpte);
+       set_pte_at(mm, addr, ptep, newpte);
 
        folio = page_folio(page);
        folio_remove_rmap_pte(folio, page, vma);

diff --git a/mm/memory.c b/mm/memory.c
index f2bc6dd15eb830b9c8a0b6602746e2947a6997e6..9a6f4d8aa379fd0cc4bebadcf8dff8b650abe542 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3327,13 +3327,8 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf)
                ptep_clear_flush(vma, vmf->address, vmf->pte);
                folio_add_new_anon_rmap(new_folio, vma, vmf->address);
                folio_add_lru_vma(new_folio, vma);
-               /*
-                * We call the notify macro here because, when using secondary
-                * mmu page tables (such as kvm shadow page tables), we want the
-                * new page to be mapped directly into the secondary page table.
-                */
                BUG_ON(unshare && pte_write(entry));
-               set_pte_at_notify(mm, vmf->address, vmf->pte, entry);
+               set_pte_at(mm, vmf->address, vmf->pte, entry);
                update_mmu_cache_range(vmf, vma, vmf->address, vmf->pte, 1);
                if (old_folio) {
                        /*

diff --git a/mm/migrate_device.c b/mm/migrate_device.c
index b6c27c76e1a0b2768de8f4196144bd8e43197df6..66206734b1b9c9238a6c86238e591d1efc1f8661 100644 (file)
--- a/mm/migrate_device.c
+++ b/mm/migrate_device.c
@@ -664,13 +664,9 @@ static void migrate_vma_insert_page(struct migrate_vma *migrate,
        if (flush) {
                flush_cache_page(vma, addr, pte_pfn(orig_pte));
                ptep_clear_flush(vma, addr, ptep);
-               set_pte_at_notify(mm, addr, ptep, entry);
-               update_mmu_cache(vma, addr, ptep);
-       } else {
-               /* No need to invalidate - it was non-present before */
-               set_pte_at(mm, addr, ptep, entry);
-               update_mmu_cache(vma, addr, ptep);
        }
+       set_pte_at(mm, addr, ptep, entry);
+       update_mmu_cache(vma, addr, ptep);
 
        pte_unmap_unlock(ptep, ptl);
        *src = MIGRATE_PFN_MIGRATE;