mm-rmap-drop-compound-parameter-from-page_add_new_anon_rmap.patch removed from -mm tree
The quilt patch titled
Subject: mm/rmap: drop "compound" parameter from page_add_new_anon_rmap()
has been removed from the -mm tree. Its filename was
mm-rmap-drop-compound-parameter-from-page_add_new_anon_rmap.patch
This patch was dropped because it was merged into mm-stable
------------------------------------------------------
From: David Hildenbrand <[email protected]>
Subject: mm/rmap: drop "compound" parameter from page_add_new_anon_rmap()
New anonymous pages are always mapped natively: only THP/khugepaged code maps a new compound anonymous page and passes "true". Otherwise, we're just dealing with simple, non-compound pages.
Let's give the interface clearer semantics and document these. Remove the PageTransCompound() sanity check from page_add_new_anon_rmap().
---
include/linux/rmap.h | 3 ++- kernel/events/uprobes.c | 2 +- mm/huge_memory.c | 2 +- mm/khugepaged.c | 2 +- mm/memory.c | 10 +++++----- mm/migrate_device.c | 2 +- mm/rmap.c | 11 ++++++----- mm/swapfile.c | 2 +- mm/userfaultfd.c | 2 +- 9 files changed, 19 insertions(+), 17 deletions(-)
include/linux/rmap.h renamed from include/linux/rmap.h~mm-rmap-drop-compound-parameter-from-page_add_new_anon_rmap +2 -1
@@ -185,11 +185,12 @@ void page_move_anon_rmap(struct page *,void 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); +unsigned long address);void page_add_file_rmap (struct page *,struct vm_area_struct *,bool compound);void page_remove_rmap (struct page *,struct vm_area_struct *,bool compound); +void hugepage_add_anon_rmap (struct page *,struct vm_area_struct *,unsigned long address,rmap_t flags); void hugepage_add_new_anon_rmap(struct page *, struct vm_area_struct *,
kernel/events/uprobes.c renamed from kernel/events/uprobes.c~mm-rmap-drop-compound-parameter-from-page_add_new_anon_rmap +1 -1
@@ -180,7 +180,7 @@ static int __replace_page(struct vm_areaif (new_page) {get_page (new_page); -page_add_new_anon_rmap (new_page, vma, addr, false); +page_add_new_anon_rmap (new_page, vma, addr);lru_cache_add_inactive_or_unevictable (new_page, vma); }else /* no new page, just dec_mm_counter for old_page */
mm/huge_memory.c renamed from mm/huge_memory.c~mm-rmap-drop-compound-parameter-from-page_add_new_anon_rmap +1 -1
@@ -647,7 +647,7 @@ static vm_fault_t __do_huge_pmd_anonymou entry =mk_huge_pmd (page, vma->vm_page_prot); entry =maybe_pmd_mkwrite (pmd_mkdirty (entry), vma); -page_add_new_anon_rmap (page, vma, haddr, true); +page_add_new_anon_rmap (page, vma, haddr);lru_cache_add_inactive_or_unevictable (page, vma);pgtable_trans_huge_deposit (vma->vm_mm, vmf->pmd, pgtable);set_pmd_at (vma->vm_mm, haddr, vmf->pmd, entry);
mm/khugepaged.c renamed from mm/khugepaged.c~mm-rmap-drop-compound-parameter-from-page_add_new_anon_rmap +1 -1
@@ -1183,7 +1183,7 @@ static void collapse_huge_page(struct mmspin_lock (pmd_ptl);BUG_ON (!pmd_none (*pmd)); -page_add_new_anon_rmap (new_page, vma, address, true); +page_add_new_anon_rmap (new_page, vma, address);lru_cache_add_inactive_or_unevictable (new_page, vma);pgtable_trans_huge_deposit (mm, pmd, pgtable);set_pmd_at (mm, address, pmd, _pmd);
mm/memory.c renamed from mm/memory.c~mm-rmap-drop-compound-parameter-from-page_add_new_anon_rmap +5 -5
@@ -893,7 +893,7 @@ copy_present_page(struct vm_area_struct *prealloc =NULL ;copy_user_highpage (new_page, page, addr, src_vma);__SetPageUptodate (new_page); -page_add_new_anon_rmap (new_page, dst_vma, addr, false); +page_add_new_anon_rmap (new_page, dst_vma, addr);lru_cache_add_inactive_or_unevictable (new_page, dst_vma); rss[mm_counter (new_page)]++;
@@ -3058,7 +3058,7 @@ static vm_fault_t wp_page_copy(struct vm* some TLBs while the old PTE remains in others. */ ptep_clear_flush_notify (vma, vmf->address, vmf->pte); -page_add_new_anon_rmap (new_page, vma, vmf->address, false); +page_add_new_anon_rmap (new_page, vma, vmf->address);lru_cache_add_inactive_or_unevictable (new_page, vma);/* * We call the notify macro here because, when using secondary
@@ -3702,7 +3702,7 @@ vm_fault_t do_swap_page(struct vm_fault/* ksm created a completely new copy */ if (unlikely (page != swapcache && swapcache)) { -page_add_new_anon_rmap (page, vma, vmf->address, false); +page_add_new_anon_rmap (page, vma, vmf->address);lru_cache_add_inactive_or_unevictable (page, vma); }else {page_add_anon_rmap (page, vma, vmf->address, rmap_flags);
@@ -3852,7 +3852,7 @@ static vm_fault_t do_anonymous_page(stru }inc_mm_counter_fast (vma->vm_mm,MM_ANONPAGES ); -page_add_new_anon_rmap (page, vma, vmf->address, false); +page_add_new_anon_rmap (page, vma, vmf->address);lru_cache_add_inactive_or_unevictable (page, vma); setpte:set_pte_at (vma->vm_mm, vmf->address, vmf->pte, entry);
@@ -4039,7 +4039,7 @@ void do_set_pte(struct vm_fault *vmf, st/* copy-on-write page */ if (write && !(vma->vm_flags &VM_SHARED )) {inc_mm_counter_fast (vma->vm_mm,MM_ANONPAGES ); -page_add_new_anon_rmap (page, vma, addr, false); +page_add_new_anon_rmap (page, vma, addr);lru_cache_add_inactive_or_unevictable (page, vma); }else {inc_mm_counter_fast (vma->vm_mm,mm_counter_file (page));
mm/migrate_device.c renamed from mm/migrate_device.c~mm-rmap-drop-compound-parameter-from-page_add_new_anon_rmap +1 -1
@@ -610,7 +610,7 @@ static void migrate_vma_insert_page(stru goto unlock_abort;inc_mm_counter (mm,MM_ANONPAGES ); -page_add_new_anon_rmap (page, vma, addr, false); +page_add_new_anon_rmap (page, vma, addr);if (!is_zone_device_page (page))lru_cache_add_inactive_or_unevictable (page, vma);get_page (page);
mm/rmap.c renamed from mm/rmap.c~mm-rmap-drop-compound-parameter-from-page_add_new_anon_rmap +6 -5
@@ -1226,19 +1226,22 @@ void page_add_anon_rmap(struct page *pag }/** -* page_add_new_anon_rmap - add pte mapping to a new anonymous page +* page_add_new_anon_rmap - add mapping to a new anonymous page * @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 +* +* If it's a compound page, it is accounted as a compound page. As the page +* is new, it's assume to get mapped exclusively by a single process. * * Same as page_add_anon_rmap but must only be called on *new* pages. * This means the inc-and-test can be bypassed. * Page does not have to be locked. */ void page_add_new_anon_rmap (struct page *page, -struct vm_area_struct *vma,unsigned long address,bool compound) +struct vm_area_struct *vma,unsigned long address) { +const bool compound =PageCompound (page);int nr = compound ?thp_nr_pages (page) :1 ;VM_BUG_ON_VMA (address < vma->vm_start || address >= vma->vm_end, vma);
@@ -1251,8 +1254,6 @@ void page_add_new_anon_rmap(struct page__mod_lruvec_page_state (page,NR_ANON_THPS , nr); }else { -/* Anon THP always mapped first with PMD */ -VM_BUG_ON_PAGE (PageTransCompound (page), page);/* increment count (starts at -1) */ atomic_set (&page->_mapcount,0 ); }
mm/swapfile.c renamed from mm/swapfile.c~mm-rmap-drop-compound-parameter-from-page_add_new_anon_rmap +1 -1
@@ -1802,7 +1802,7 @@ static int unuse_pte(struct vm_area_struif (page == swapcache) {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); +page_add_new_anon_rmap (page, vma, addr);lru_cache_add_inactive_or_unevictable (page, vma); } set_pte_at(vma->vm_mm, addr, pte,
mm/userfaultfd.c renamed from mm/userfaultfd.c~mm-rmap-drop-compound-parameter-from-page_add_new_anon_rmap +1 -1
@@ -104,7 +104,7 @@ int mfill_atomic_install_pte(struct mm_slru_cache_add (page);page_add_file_rmap (page, dst_vma, false); }else { -page_add_new_anon_rmap (page, dst_vma, dst_addr, false); +page_add_new_anon_rmap (page, dst_vma, dst_addr);lru_cache_add_inactive_or_unevictable (page, dst_vma); }
_
Patches currently in -mm which might be from [email protected] are