mm-rmap-remove-do_page_add_anon_rmap.patch removed from -mm tree
The quilt patch titled
Subject: mm/rmap: remove do_page_add_anon_rmap()
has been removed from the -mm tree. Its filename was
mm-rmap-remove-do_page_add_anon_rmap.patch
This patch was dropped because it was merged into mm-stable
------------------------------------------------------
From: David Hildenbrand <[email protected]>
Subject: mm/rmap: remove do_page_add_anon_rmap()
... and instead convert page_add_anon_rmap() to accept flags.
Passing flags instead of bools is usually nicer either way, and we want to more often also pass RMAP_EXCLUSIVE in follow up patches when detecting that an anonymous page is exclusive: for example, when restoring an anonymous page from a writable migration entry.
This is a preparation for marking an anonymous page inside page_add_anon_rmap() as exclusive when RMAP_EXCLUSIVE is passed.
---
include/linux/rmap.h | 2 -- mm/huge_memory.c | 2 +- mm/ksm.c | 2 +- mm/memory.c | 4 ++-- mm/migrate.c | 3 ++- mm/rmap.c | 14 +------------- mm/swapfile.c | 2 +- 7 files changed, 8 insertions(+), 21 deletions(-)
include/linux/rmap.h renamed from include/linux/rmap.h~mm-rmap-remove-do_page_add_anon_rmap +0 -2
@@ -183,8 +183,6 @@ typedef int __bitwise rmap_t;*/ void page_move_anon_rmap (struct page *,struct vm_area_struct *);void page_add_anon_rmap (struct page *,struct vm_area_struct *, -unsigned long address,bool compound); -void do_page_add_anon_rmap (struct page *,struct vm_area_struct *,unsigned long address,rmap_t flags);void page_add_new_anon_rmap (struct page *,struct vm_area_struct *,unsigned long address,bool compound);
mm/huge_memory.c renamed from mm/huge_memory.c~mm-rmap-remove-do_page_add_anon_rmap +1 -1
@@ -3077,7 +3077,7 @@ void remove_migration_pmd(struct page_vm pmde =pmd_wrprotect (pmd_mkuffd_wp (pmde));if (PageAnon (new)) -page_add_anon_rmap (new, vma, mmun_start, true); +page_add_anon_rmap (new, vma, mmun_start,RMAP_COMPOUND );else page_add_file_rmap (new, vma, true);set_pmd_at (mm, mmun_start, pvmw->pmd, pmde);
mm/ksm.c renamed from mm/ksm.c~mm-rmap-remove-do_page_add_anon_rmap +1 -1
@@ -1156,7 +1156,7 @@ static int replace_page(struct vm_area_s*/ if (!is_zero_pfn (page_to_pfn (kpage))) {get_page (kpage); -page_add_anon_rmap (kpage, vma, addr, false); +page_add_anon_rmap (kpage, vma, addr,RMAP_NONE ); newpte =mk_pte (kpage, vma->vm_page_prot); }else { newpte = pte_mkspecial(pfn_pte(page_to_pfn(kpage),
mm/memory.c renamed from mm/memory.c~mm-rmap-remove-do_page_add_anon_rmap +2 -2
@@ -725,7 +725,7 @@ static void restore_exclusive_pte(struct* created when the swap entry was made. */ if (PageAnon (page)) -page_add_anon_rmap (page, vma, address, false); +page_add_anon_rmap (page, vma, address,RMAP_NONE );else /* * Currently device exclusive access only supports anonymous
@@ -3705,7 +3705,7 @@ vm_fault_t do_swap_page(struct vm_faultpage_add_new_anon_rmap (page, vma, vmf->address, false);lru_cache_add_inactive_or_unevictable (page, vma); }else { -do_page_add_anon_rmap (page, vma, vmf->address, rmap_flags); +page_add_anon_rmap (page, vma, vmf->address, rmap_flags); }set_pte_at (vma->vm_mm, vmf->address, vmf->pte, pte);
mm/migrate.c renamed from mm/migrate.c~mm-rmap-remove-do_page_add_anon_rmap +2 -1
@@ -240,7 +240,8 @@ static bool remove_migration_pte(struct#endif {if (folio_test_anon (folio)) -page_add_anon_rmap (new, vma, pvmw.address, false); +page_add_anon_rmap (new, vma, pvmw.address, +RMAP_NONE );else page_add_file_rmap (new, vma, false);set_pte_at (vma->vm_mm, pvmw.address, pvmw.pte, pte);
mm/rmap.c renamed from mm/rmap.c~mm-rmap-remove-do_page_add_anon_rmap +1 -13
@@ -1171,7 +1171,7 @@ static void __page_check_anon_rmap(struc* @page: the page to add the mapping to * @vma: the vm area in which the mapping is added * @address: the user virtual address mapped -* @compound: charge the page as compound or small page +* @flags: the rmap flags * * The caller needs to hold the pte lock, and the page must be locked in * the anon_vma case: to serialize mapping,index checking after setting,
@@ -1179,18 +1179,6 @@ static void __page_check_anon_rmap(struc* (but PageKsm is never downgraded to PageAnon). */ void page_add_anon_rmap (struct page *page, -struct vm_area_struct *vma,unsigned long address,bool compound) -{ -do_page_add_anon_rmap (page, vma, address, - compound ?RMAP_COMPOUND :RMAP_NONE ); -} - -/* -* Special version of the above for do_swap_page, which often runs -* into pages that are exclusively owned by the current process. -* Everybody else should continue to use page_add_anon_rmap above. -*/ -void do_page_add_anon_rmap (struct page *page,struct vm_area_struct *vma,unsigned long address,rmap_t flags) {bool compound = flags &RMAP_COMPOUND ;
mm/swapfile.c renamed from mm/swapfile.c~mm-rmap-remove-do_page_add_anon_rmap +1 -1
@@ -1800,7 +1800,7 @@ static int unuse_pte(struct vm_area_struinc_mm_counter (vma->vm_mm,MM_ANONPAGES );get_page (page);if (page == swapcache) { -page_add_anon_rmap (page, vma, addr, false); +page_add_anon_rmap (page, vma, addr,RMAP_NONE ); }else {/* ksm created a completely new copy */ page_add_new_anon_rmap (page, vma, addr, false);lru_cache_add_inactive_or_unevictable (page, vma);
_
Patches currently in -mm which might be from [email protected] are