mm-rmap-convert-rmap-flags-to-a-proper-distinct-rmap_t-type.patch removed from -mm tree
The quilt patch titled
Subject: mm/rmap: convert RMAP flags to a proper distinct rmap_t type
has been removed from the -mm tree. Its filename was
mm-rmap-convert-rmap-flags-to-a-proper-distinct-rmap_t-type.patch
This patch was dropped because it was merged into mm-stable
------------------------------------------------------
From: David Hildenbrand <[email protected]>
Subject: mm/rmap: convert RMAP flags to a proper distinct rmap_t type
We want to pass the flags to more than one anon rmap function, getting rid of special "do_page_add_anon_rmap()". So let's pass around a distinct __bitwise type and refine documentation.
Signed-off-by David Hildenbrand <[email protected]>
Acked-by Vlastimil Babka <[email protected]>
Cc Andrea Arcangeli <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc David Rientjes <[email protected]>
Cc Don Dutile <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc Jan Kara <[email protected]>
Cc Jann Horn <[email protected]>
Cc Jason Gunthorpe <[email protected]>
Cc John Hubbard <[email protected]>
Cc Khalid Aziz <[email protected]>
Cc "Kirill A. Shutemov" <[email protected]>
Cc Liang Zhang <[email protected]>
Cc "Matthew Wilcox (Oracle)" <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Mike Kravetz <[email protected]>
Cc Mike Rapoport <[email protected]>
Cc Nadav Amit <[email protected]>
Cc Oded Gabbay <[email protected]>
Cc Oleg Nesterov <[email protected]>
Cc Pedro Demarchi Gomes <[email protected]>
Cc Peter Xu <[email protected]>
Cc Rik van Riel <[email protected]>
Cc Roman Gushchin <[email protected]>
Cc Shakeel Butt <[email protected]>
Cc Yang Shi <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
include/linux/rmap.h | 22 ++++++++++++++++++---- mm/memory.c | 6 +++--- mm/rmap.c | 7 ++++--- 3 files changed, 25 insertions(+), 10 deletions(-)
include/linux/rmap.h renamed from include/linux/rmap.h~mm-rmap-convert-rmap-flags-to-a-proper-distinct-rmap_t-type +18 -4
@@ -160,9 +160,23 @@ static inline void anon_vma_merge(structstruct anon_vma *page_get_anon_vma (struct page *page); -/* bitflags for do_page_add_anon_rmap() */ -#define RMAP_EXCLUSIVE 0x01 -#define RMAP_COMPOUND 0x02 +/* RMAP flags, currently only relevant for some anon rmap operations. */ +typedef int __bitwise rmap_t ; + +/* +* No special request: if the page is a subpage of a compound page, it is +* mapped via a PTE. The mapped (sub)page is possibly shared between processes. +*/ +#define RMAP_NONE ((__force rmap_t)0) + +/* The (sub)page is exclusive to a single process. */ +#define RMAP_EXCLUSIVE ((__force rmap_t)BIT(0)) + +/* +* The compound page is not mapped via PTEs, but instead via a single PMD and +* should be accounted accordingly. +*/ +#define RMAP_COMPOUND ((__force rmap_t)BIT(1))/* * rmap interfaces called when adding or removing pte of page
@@ -171,7 +185,7 @@ void page_move_anon_rmap(struct page *,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,int flags); +unsigned long address,rmap_t flags);void page_add_new_anon_rmap (struct page *,struct vm_area_struct *,unsigned long address,bool compound); void page_add_file_rmap(struct page *, struct vm_area_struct *,
mm/memory.c renamed from mm/memory.c~mm-rmap-convert-rmap-flags-to-a-proper-distinct-rmap_t-type +3 -3
@@ -3511,10 +3511,10 @@ vm_fault_t do_swap_page(struct vm_faultstruct vm_area_struct *vma = vmf->vma;struct page *page =NULL , *swapcache;struct swap_info_struct *si =NULL ; +rmap_t rmap_flags =RMAP_NONE ;swp_entry_t entry;pte_t pte;int locked; -int exclusive =0 ;vm_fault_t ret =0 ;void *shadow =NULL ;
@@ -3689,7 +3689,7 @@ vm_fault_t do_swap_page(struct vm_fault pte =maybe_mkwrite (pte_mkdirty (pte), vma); vmf->flags &= ~FAULT_FLAG_WRITE ; ret |=VM_FAULT_WRITE ; - exclusive =RMAP_EXCLUSIVE ; + rmap_flags |=RMAP_EXCLUSIVE ; }flush_icache_page (vma, page);if (pte_swp_soft_dirty (vmf->orig_pte))
@@ -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, exclusive); +do_page_add_anon_rmap (page, vma, vmf->address, rmap_flags); }set_pte_at (vma->vm_mm, vmf->address, vmf->pte, pte);
mm/rmap.c renamed from mm/rmap.c~mm-rmap-convert-rmap-flags-to-a-proper-distinct-rmap_t-type +4 -3
@@ -1181,7 +1181,8 @@ static void __page_check_anon_rmap(strucvoid 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 :0 ); +do_page_add_anon_rmap (page, vma, address, + compound ?RMAP_COMPOUND :RMAP_NONE ); }/*
@@ -1190,7 +1191,7 @@ void page_add_anon_rmap(struct page *pag* 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,int flags) +struct vm_area_struct *vma,unsigned long address,rmap_t flags) {bool compound = flags &RMAP_COMPOUND ;bool first;
@@ -1229,7 +1230,7 @@ void do_page_add_anon_rmap(struct page */* address might be in next vma when migration races vma_adjust */ else if (first) __page_set_anon_rmap(page, vma, address, - flags & RMAP_EXCLUSIVE); + !!(flags & RMAP_EXCLUSIVE)); else__page_check_anon_rmap (page ,vma ,address );
_
Patches currently in -mm which might be from [email protected] are