mm-mmu_notifier-remove-unused-mmu_notifier_range_update_to_read_only-export.patch removed from -mm tree
The quilt patch titled
Subject: mm/mmu_notifier: remove unused mmu_notifier_range_update_to_read_only export
has been removed from the -mm tree. Its filename was
mm-mmu_notifier-remove-unused-mmu_notifier_range_update_to_read_only-export.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Alistair Popple <[email protected]>
Subject: mm/mmu_notifier: remove unused mmu_notifier_range_update_to_read_only export
Date: Tue, 10 Jan 2023 13:57:22 +1100
mmu_notifier_range_update_to_read_only() was originally introduced in commit c6d23413f81b ("mm/mmu_notifier:mmu_notifier_range_update_to_read_only() helper") as an optimisation for device drivers that know a range has only been mapped read-only. However there are no users of this feature so remove it. As it is the only user of the struct mmu_notifier_range.vma field remove that also.
---
fs/proc/task_mmu.c renamed from fs/proc/task_mmu.c~mm-mmu_notifier-remove-unused-mmu_notifier_range_update_to_read_only-export +1 -1
@@ -1306,7 +1306,7 @@ static ssize_t clear_refs_write(struct finc_tlb_flush_pending (mm);mmu_notifier_range_init (&range,MMU_NOTIFY_SOFT_DIRTY , -0 ,NULL , mm,0 ,-1UL ); +0 , mm,0 ,-1UL );mmu_notifier_invalidate_range_start (&range); }walk_page_range (mm,0 ,-1 , &clear_refs_walk_ops, &cp);
include/linux/mmu_notifier.h renamed from include/linux/mmu_notifier.h~mm-mmu_notifier-remove-unused-mmu_notifier_range_update_to_read_only-export +5 -8
@@ -269,7 +269,6 @@ extern struct lockdep_map __mmu_notifier#endif struct mmu_notifier_range { -struct vm_area_struct *vma;struct mm_struct *mm;unsigned long start;unsigned long end;
@@ -514,12 +513,10 @@ static inline void mmu_notifier_subscripstatic inline void mmu_notifier_range_init (struct mmu_notifier_range *range,enum mmu_notifier_event event,unsigned flags, -struct vm_area_struct *vma,struct mm_struct *mm,unsigned long start,unsigned long end) { - range->vma = vma; range->event = event; range->mm = mm; range->start = start;
@@ -530,10 +527,10 @@ static inline void mmu_notifier_range_instatic inline void mmu_notifier_range_init_owner (struct mmu_notifier_range *range,enum mmu_notifier_event event,unsigned int flags, -struct vm_area_struct *vma,struct mm_struct *mm, -unsigned long start,unsigned long end,void *owner) +struct mm_struct *mm,unsigned long start, +unsigned long end,void *owner) { -mmu_notifier_range_init (range, event, flags, vma, mm, start, end); +mmu_notifier_range_init (range, event, flags, mm, start, end); range->owner = owner; }
@@ -659,9 +656,9 @@ static inline void _mmu_notifier_range_i range->end = end; } -#define mmu_notifier_range_init (range,event,flags,vma,mm,start,end) \ +#define mmu_notifier_range_init (range,event,flags,mm,start,end) \ _mmu_notifier_range_init(range, start, end) -#define mmu_notifier_range_init_owner (range, event, flags, vma, mm, start, \ +#define mmu_notifier_range_init_owner (range, event, flags, mm, start, \ end, owner) \ _mmu_notifier_range_init(range, start, end)
kernel/events/uprobes.c renamed from kernel/events/uprobes.c~mm-mmu_notifier-remove-unused-mmu_notifier_range_update_to_read_only-export +1 -1
@@ -161,7 +161,7 @@ static int __replace_page(struct vm_areaint err;struct mmu_notifier_range range; -mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , vma, mm, addr, +mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , mm, addr, addr +PAGE_SIZE );if (new_page) {
mm/huge_memory.c renamed from mm/huge_memory.c~mm-mmu_notifier-remove-unused-mmu_notifier_range_update_to_read_only-export +2 -2
@@ -2020,7 +2020,7 @@ void __split_huge_pud(struct vm_area_strspinlock_t *ptl;struct mmu_notifier_range range; -mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , vma, vma->vm_mm, +mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , vma->vm_mm, address &HPAGE_PUD_MASK , (address &HPAGE_PUD_MASK ) +HPAGE_PUD_SIZE );mmu_notifier_invalidate_range_start (&range);
@@ -2282,7 +2282,7 @@ void __split_huge_pmd(struct vm_area_strspinlock_t *ptl;struct mmu_notifier_range range; -mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , vma, vma->vm_mm, +mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , vma->vm_mm, address &HPAGE_PMD_MASK , (address &HPAGE_PMD_MASK ) +HPAGE_PMD_SIZE );mmu_notifier_invalidate_range_start (&range);
mm/hugetlb.c renamed from mm/hugetlb.c~mm-mmu_notifier-remove-unused-mmu_notifier_range_update_to_read_only-export +6 -6
@@ -4966,7 +4966,7 @@ int copy_hugetlb_page_range(struct mm_stint ret =0 ;if (cow) { -mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , src_vma, src, +mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , src, src_vma->vm_start, src_vma->vm_end);mmu_notifier_invalidate_range_start (&range);
@@ -5177,7 +5177,7 @@ int move_hugetlb_page_tables(struct vm_astruct mmu_notifier_range range;bool shared_pmd = false; -mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , vma, mm, old_addr, +mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , mm, old_addr, old_end);adjust_range_if_pmd_sharing_possible (vma, &range.start, &range.end);/*
@@ -5391,7 +5391,7 @@ void unmap_hugepage_range(struct vm_areastruct mmu_notifier_range range;struct mmu_gather tlb; -mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , vma, vma->vm_mm, +mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , vma->vm_mm, start, end);adjust_range_if_pmd_sharing_possible (vma, &range.start, &range.end);mmu_notifier_invalidate_range_start (&range);
@@ -5597,7 +5597,7 @@ retry_avoidcopy: pages_per_huge_page(h));__SetPageUptodate (new_page); -mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , vma, mm, haddr, +mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , mm, haddr, haddr +huge_page_size (h));mmu_notifier_invalidate_range_start (&range);
@@ -6637,7 +6637,7 @@ long hugetlb_change_protection(struct vm* range if PMD sharing is possible. */ mmu_notifier_range_init (&range,MMU_NOTIFY_PROTECTION_VMA , -0 , vma, mm, start, end); +0 , mm, start, end);adjust_range_if_pmd_sharing_possible (vma, &range.start, &range.end);BUG_ON (address >= end);
@@ -7368,7 +7368,7 @@ static void hugetlb_unshare_pmds(struct* No need to call adjust_range_if_pmd_sharing_possible(), because * we have already done the PUD_SIZE alignment. */ -mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , vma, mm, +mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , mm, start, end);mmu_notifier_invalidate_range_start (&range);hugetlb_vma_lock_write (vma);
mm/khugepaged.c renamed from mm/khugepaged.c~mm-mmu_notifier-remove-unused-mmu_notifier_range_update_to_read_only-export +3 -3
@@ -1040,8 +1040,8 @@ static int collapse_huge_page(struct mm_anon_vma_lock_write (vma->anon_vma); -mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 ,NULL , mm, - address, address +HPAGE_PMD_SIZE ); +mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , mm, address, + address +HPAGE_PMD_SIZE );mmu_notifier_invalidate_range_start (&range); pte =pte_offset_map (pmd, address);
@@ -1412,7 +1412,7 @@ static void collapse_and_free_pmd(structif (vma->anon_vma)lockdep_assert_held_write (&vma->anon_vma->root->rwsem); -mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 ,NULL , mm, addr, +mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , mm, addr, addr +HPAGE_PMD_SIZE );mmu_notifier_invalidate_range_start (&range); pmd =pmdp_collapse_flush (vma, addr, pmdp);
mm/ksm.c renamed from mm/ksm.c~mm-mmu_notifier-remove-unused-mmu_notifier_range_update_to_read_only-export +2 -3
@@ -1057,8 +1057,7 @@ static int write_protect_page(struct vm_BUG_ON (PageTransCompound (page)); -mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , vma, mm, - pvmw.address, +mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , mm, pvmw.address, pvmw.address +PAGE_SIZE );mmu_notifier_invalidate_range_start (&range);
@@ -1164,7 +1163,7 @@ static int replace_page(struct vm_area_sif (!pmd_present (pmde) ||pmd_trans_huge (pmde)) goto out; -mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , vma, mm, addr, +mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , mm, addr, addr +PAGE_SIZE );mmu_notifier_invalidate_range_start (&range);
mm/madvise.c renamed from mm/madvise.c~mm-mmu_notifier-remove-unused-mmu_notifier_range_update_to_read_only-export +1 -1
@@ -765,7 +765,7 @@ static int madvise_free_single_vma(struc range.end =min (vma->vm_end, end_addr);if (range.end <= vma->vm_start)return -EINVAL ; -mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , vma, mm, +mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , mm, range.start, range.end);lru_add_drain ();
mm/mapping_dirty_helpers.c renamed from mm/mapping_dirty_helpers.c~mm-mmu_notifier-remove-unused-mmu_notifier_range_update_to_read_only-export +1 -1
@@ -191,7 +191,7 @@ static int wp_clean_pre_vma(unsigned lon wpwalk->tlbflush_end = start;mmu_notifier_range_init (&wpwalk->range,MMU_NOTIFY_PROTECTION_PAGE ,0 , - walk->vma, walk->mm, start, end); + walk->mm, start, end);mmu_notifier_invalidate_range_start (&wpwalk->range);flush_cache_range (walk->vma, start, end);
mm/memory.c renamed from mm/memory.c~mm-mmu_notifier-remove-unused-mmu_notifier_range_update_to_read_only-export +5 -5
@@ -1266,7 +1266,7 @@ copy_page_range(struct vm_area_struct *dif (is_cow) {mmu_notifier_range_init (&range,MMU_NOTIFY_PROTECTION_PAGE , -0 , src_vma, src_mm, addr, end); +0 , src_mm, addr, end);mmu_notifier_invalidate_range_start (&range);/* * Disabling preemption is not needed for the write side, as
@@ -1683,7 +1683,7 @@ void unmap_vmas(struct mmu_gather *tlb, };MA_STATE (mas, mt, vma->vm_end, vma->vm_end); -mmu_notifier_range_init (&range,MMU_NOTIFY_UNMAP ,0 , vma, vma->vm_mm, +mmu_notifier_range_init (&range,MMU_NOTIFY_UNMAP ,0 , vma->vm_mm, start_addr, end_addr);mmu_notifier_invalidate_range_start (&range); do {
@@ -1709,7 +1709,7 @@ void zap_page_range_single(struct vm_arestruct mmu_gather tlb;lru_add_drain (); -mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , vma, vma->vm_mm, +mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , vma->vm_mm, address, end);if (is_vm_hugetlb_page (vma)) adjust_range_if_pmd_sharing_possible(vma, &range.start,
@@ -3091,7 +3091,7 @@ static vm_fault_t wp_page_copy(struct vm__SetPageUptodate (new_page); -mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , vma, mm, +mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , mm, vmf->address &PAGE_MASK , (vmf->address &PAGE_MASK ) +PAGE_SIZE );mmu_notifier_invalidate_range_start (&range);
@@ -3561,7 +3561,7 @@ static vm_fault_t remove_device_exclusivif (!folio_lock_or_retry (folio, vma->vm_mm, vmf->flags))return VM_FAULT_RETRY ; -mmu_notifier_range_init_owner (&range,MMU_NOTIFY_EXCLUSIVE ,0 , vma, +mmu_notifier_range_init_owner (&range,MMU_NOTIFY_EXCLUSIVE ,0 , vma->vm_mm, vmf->address &PAGE_MASK , (vmf->address &PAGE_MASK ) +PAGE_SIZE ,NULL );mmu_notifier_invalidate_range_start (&range);
mm/migrate_device.c renamed from mm/migrate_device.c~mm-mmu_notifier-remove-unused-mmu_notifier_range_update_to_read_only-export +2 -2
@@ -306,7 +306,7 @@ static void migrate_vma_collect(struct m* private page mappings that won't be migrated. */ mmu_notifier_range_init_owner (&range,MMU_NOTIFY_MIGRATE ,0 , - migrate->vma, migrate->vma->vm_mm, migrate->start, migrate->end, + migrate->vma->vm_mm, migrate->start, migrate->end, migrate->pgmap_owner);mmu_notifier_invalidate_range_start (&range);
@@ -733,7 +733,7 @@ static void __migrate_device_pages(unsig notified = true;mmu_notifier_range_init_owner (&range, -MMU_NOTIFY_MIGRATE ,0 , migrate->vma, +MMU_NOTIFY_MIGRATE ,0 , migrate->vma->vm_mm, addr, migrate->end, migrate->pgmap_owner);mmu_notifier_invalidate_range_start (&range);
mm/mmu_notifier.c renamed from mm/mmu_notifier.c~mm-mmu_notifier-remove-unused-mmu_notifier_range_update_to_read_only-export +0 -10
@@ -1120,13 +1120,3 @@ void mmu_notifier_synchronize(void)synchronize_srcu (&srcu); }EXPORT_SYMBOL_GPL (mmu_notifier_synchronize); - -bool -mmu_notifier_range_update_to_read_only (const struct mmu_notifier_range *range) -{ -if (!range->vma || range->event !=MMU_NOTIFY_PROTECTION_VMA ) -return false; -/* Return true if the vma still have the read flag set. */ -return range->vma->vm_flags &VM_READ ; -} -EXPORT_SYMBOL_GPL (mmu_notifier_range_update_to_read_only);
mm/mprotect.c renamed from mm/mprotect.c~mm-mmu_notifier-remove-unused-mmu_notifier_range_update_to_read_only-export +1 -1
@@ -398,7 +398,7 @@ static inline long change_pmd_range(struif (!range.start) {mmu_notifier_range_init (&range,MMU_NOTIFY_PROTECTION_VMA ,0 , - vma, vma->vm_mm, addr, end); + vma->vm_mm, addr, end);mmu_notifier_invalidate_range_start (&range); }
mm/mremap.c renamed from mm/mremap.c~mm-mmu_notifier-remove-unused-mmu_notifier_range_update_to_read_only-export +1 -1
@@ -498,7 +498,7 @@ unsigned long move_page_tables(struct vm new_addr, len);flush_cache_range (vma, old_addr, old_end); -mmu_notifier_range_init (&range,MMU_NOTIFY_UNMAP ,0 , vma, vma->vm_mm, +mmu_notifier_range_init (&range,MMU_NOTIFY_UNMAP ,0 , vma->vm_mm, old_addr, old_end);mmu_notifier_invalidate_range_start (&range);
mm/oom_kill.c renamed from mm/oom_kill.c~mm-mmu_notifier-remove-unused-mmu_notifier_range_update_to_read_only-export +1 -1
@@ -542,7 +542,7 @@ static bool __oom_reap_task_mm(struct mmstruct mmu_gather tlb;mmu_notifier_range_init (&range,MMU_NOTIFY_UNMAP ,0 , - vma, mm, vma->vm_start, + mm, vma->vm_start, vma->vm_end);tlb_gather_mmu (&tlb, mm);if (mmu_notifier_invalidate_range_start_nonblock (&range)) {
mm/rmap.c renamed from mm/rmap.c~mm-mmu_notifier-remove-unused-mmu_notifier_range_update_to_read_only-export +5 -6
@@ -944,9 +944,8 @@ static int page_vma_mkclean_one(struct p* We have to assume the worse case ie pmd for invalidation. Note that * the folio can not be freed from this function. */ -mmu_notifier_range_init (&range,MMU_NOTIFY_PROTECTION_PAGE , -0 , vma, vma->vm_mm, address, -vma_address_end (pvmw)); +mmu_notifier_range_init (&range,MMU_NOTIFY_PROTECTION_PAGE ,0 , + vma->vm_mm, address,vma_address_end (pvmw));mmu_notifier_invalidate_range_start (&range);while (page_vma_mapped_walk (pvmw)) {
@@ -1475,7 +1474,7 @@ static bool try_to_unmap_one(struct foli* try_to_unmap() must hold a reference on the folio. */ range.end =vma_address_end (&pvmw); -mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , vma, vma->vm_mm, +mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , vma->vm_mm, address, range.end);if (folio_test_hugetlb (folio)) {/*
@@ -1850,7 +1849,7 @@ static bool try_to_migrate_one(struct fo* try_to_unmap() must hold a reference on the page. */ range.end =vma_address_end (&pvmw); -mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , vma, vma->vm_mm, +mmu_notifier_range_init (&range,MMU_NOTIFY_CLEAR ,0 , vma->vm_mm, address, range.end);if (folio_test_hugetlb (folio)) {/*
@@ -2180,7 +2179,7 @@ static bool page_make_device_exclusive_oswp_entry_t entry;pte_t swp_pte; -mmu_notifier_range_init_owner (&range,MMU_NOTIFY_EXCLUSIVE ,0 , vma, +mmu_notifier_range_init_owner (&range,MMU_NOTIFY_EXCLUSIVE ,0 , vma->vm_mm, address,min (vma->vm_end, address +folio_size (folio)), args->owner);
_
Patches currently in -mm which might be from [email protected] are