| Message ID | 20231002142949.235104-3-david@redhat.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | mm/rmap: convert page_move_anon_rmap() to folio_move_anon_rmap() | expand |
On Mon, Oct 2, 2023 at 7:29 AM David Hildenbrand <david@redhat.com> wrote: > > Let's convert it to consume a folio. > > Signed-off-by: David Hildenbrand <david@redhat.com> Thanks! Reviewed-by: Suren Baghdasaryan <surenb@google.com> > --- > include/linux/rmap.h | 2 +- > mm/huge_memory.c | 2 +- > mm/hugetlb.c | 2 +- > mm/memory.c | 2 +- > mm/rmap.c | 16 +++++++--------- > 5 files changed, 11 insertions(+), 13 deletions(-) > > diff --git a/include/linux/rmap.h b/include/linux/rmap.h > index 064b432a4033..8034eda972e5 100644 > --- a/include/linux/rmap.h > +++ b/include/linux/rmap.h > @@ -194,7 +194,7 @@ typedef int __bitwise rmap_t; > /* > * rmap interfaces called when adding or removing pte of page > */ > -void page_move_anon_rmap(struct page *, struct vm_area_struct *); > +void folio_move_anon_rmap(struct folio *, struct vm_area_struct *); > 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 *, > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index 01d0d65ece13..08245226ccb8 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -1505,7 +1505,7 @@ vm_fault_t do_huge_pmd_wp_page(struct vm_fault *vmf) > if (folio_ref_count(folio) == 1) { > pmd_t entry; > > - page_move_anon_rmap(page, vma); > + folio_move_anon_rmap(folio, vma); > SetPageAnonExclusive(page); > folio_unlock(folio); > reuse: > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 24591fc145ff..e52c6048e74f 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -5461,7 +5461,7 @@ static vm_fault_t hugetlb_wp(struct mm_struct *mm, struct vm_area_struct *vma, > */ > if (folio_mapcount(old_folio) == 1 && folio_test_anon(old_folio)) { > if (!PageAnonExclusive(&old_folio->page)) { > - page_move_anon_rmap(&old_folio->page, vma); > + folio_move_anon_rmap(old_folio, vma); > SetPageAnonExclusive(&old_folio->page); > } > if (likely(!unshare)) > diff --git a/mm/memory.c b/mm/memory.c > index 9de231c92769..1f0e3317cbdd 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -3483,7 +3483,7 @@ static vm_fault_t do_wp_page(struct vm_fault *vmf) > * and the folio is locked, it's dark out, and we're wearing > * sunglasses. Hit it. > */ > - page_move_anon_rmap(vmf->page, vma); > + folio_move_anon_rmap(folio, vma); > SetPageAnonExclusive(vmf->page); > folio_unlock(folio); > reuse: > diff --git a/mm/rmap.c b/mm/rmap.c > index 854ccbd66954..37f05f33559b 100644 > --- a/mm/rmap.c > +++ b/mm/rmap.c > @@ -1141,19 +1141,17 @@ int folio_total_mapcount(struct folio *folio) > } > > /** > - * page_move_anon_rmap - move a page to our anon_vma > - * @page: the page to move to our anon_vma > - * @vma: the vma the page belongs to > + * folio_move_anon_rmap - move a folio to our anon_vma > + * @page: The folio to move to our anon_vma > + * @vma: The vma the folio belongs to > * > - * When a page belongs exclusively to one process after a COW event, > - * that page can be moved into the anon_vma that belongs to just that > - * process, so the rmap code will not search the parent or sibling > - * processes. > + * When a folio belongs exclusively to one process after a COW event, > + * that folio can be moved into the anon_vma that belongs to just that > + * process, so the rmap code will not search the parent or sibling processes. > */ > -void page_move_anon_rmap(struct page *page, struct vm_area_struct *vma) > +void folio_move_anon_rmap(struct folio *folio, struct vm_area_struct *vma) > { > void *anon_vma = vma->anon_vma; > - struct folio *folio = page_folio(page); > > VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); > VM_BUG_ON_VMA(!anon_vma, vma); > -- > 2.41.0 >
On Mon, Oct 02, 2023 at 04:29:48PM +0200, David Hildenbrand wrote: > Let's convert it to consume a folio. > > Signed-off-by: David Hildenbrand <david@redhat.com> Reviewed-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
diff --git a/include/linux/rmap.h b/include/linux/rmap.h index 064b432a4033..8034eda972e5 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -194,7 +194,7 @@ typedef int __bitwise rmap_t; /* * rmap interfaces called when adding or removing pte of page */ -void page_move_anon_rmap(struct page *, struct vm_area_struct *); +void folio_move_anon_rmap(struct folio *, struct vm_area_struct *); 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 *, diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 01d0d65ece13..08245226ccb8 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1505,7 +1505,7 @@ vm_fault_t do_huge_pmd_wp_page(struct vm_fault *vmf) if (folio_ref_count(folio) == 1) { pmd_t entry; - page_move_anon_rmap(page, vma); + folio_move_anon_rmap(folio, vma); SetPageAnonExclusive(page); folio_unlock(folio); reuse: diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 24591fc145ff..e52c6048e74f 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -5461,7 +5461,7 @@ static vm_fault_t hugetlb_wp(struct mm_struct *mm, struct vm_area_struct *vma, */ if (folio_mapcount(old_folio) == 1 && folio_test_anon(old_folio)) { if (!PageAnonExclusive(&old_folio->page)) { - page_move_anon_rmap(&old_folio->page, vma); + folio_move_anon_rmap(old_folio, vma); SetPageAnonExclusive(&old_folio->page); } if (likely(!unshare)) diff --git a/mm/memory.c b/mm/memory.c index 9de231c92769..1f0e3317cbdd 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3483,7 +3483,7 @@ static vm_fault_t do_wp_page(struct vm_fault *vmf) * and the folio is locked, it's dark out, and we're wearing * sunglasses. Hit it. */ - page_move_anon_rmap(vmf->page, vma); + folio_move_anon_rmap(folio, vma); SetPageAnonExclusive(vmf->page); folio_unlock(folio); reuse: diff --git a/mm/rmap.c b/mm/rmap.c index 854ccbd66954..37f05f33559b 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1141,19 +1141,17 @@ int folio_total_mapcount(struct folio *folio) } /** - * page_move_anon_rmap - move a page to our anon_vma - * @page: the page to move to our anon_vma - * @vma: the vma the page belongs to + * folio_move_anon_rmap - move a folio to our anon_vma + * @page: The folio to move to our anon_vma + * @vma: The vma the folio belongs to * - * When a page belongs exclusively to one process after a COW event, - * that page can be moved into the anon_vma that belongs to just that - * process, so the rmap code will not search the parent or sibling - * processes. + * When a folio belongs exclusively to one process after a COW event, + * that folio can be moved into the anon_vma that belongs to just that + * process, so the rmap code will not search the parent or sibling processes. */ -void page_move_anon_rmap(struct page *page, struct vm_area_struct *vma) +void folio_move_anon_rmap(struct folio *folio, struct vm_area_struct *vma) { void *anon_vma = vma->anon_vma; - struct folio *folio = page_folio(page); VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); VM_BUG_ON_VMA(!anon_vma, vma);
Let's convert it to consume a folio. Signed-off-by: David Hildenbrand <david@redhat.com> --- include/linux/rmap.h | 2 +- mm/huge_memory.c | 2 +- mm/hugetlb.c | 2 +- mm/memory.c | 2 +- mm/rmap.c | 16 +++++++--------- 5 files changed, 11 insertions(+), 13 deletions(-)