2022-12-07 03:21:06

by Kefeng Wang

Subject: [PATCH 2/2] mm: swap: Convert mark_page_lazyfree() to mark_folio_lazyfree()

mark_page_lazyfree() and the callers are converted to use folio,
this rename and make it to take in a folio argument instead of
calling page_folio().

Signed-off-by: Kefeng Wang <[email protected]>
---
include/linux/swap.h | 2 +-
mm/huge_memory.c | 2 +-
mm/madvise.c | 2 +-
mm/swap.c | 12 +++++-------
4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/include/linux/swap.h b/include/linux/swap.h
index 2787b84eaf12..ae4e8f0d9951 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -402,7 +402,7 @@ extern void lru_add_drain_cpu(int cpu);
extern void lru_add_drain_cpu_zone(struct zone *zone);
extern void lru_add_drain_all(void);
extern void deactivate_page(struct page *page);
-extern void mark_page_lazyfree(struct page *page);
+extern void mark_folio_lazyfree(struct folio *folio);
extern void swap_setup(void);

extern void lru_cache_add_inactive_or_unevictable(struct page *page,
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 6e76c770529b..91e149a11f2d 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1660,7 +1660,7 @@ bool madvise_free_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,
tlb_remove_pmd_tlb_entry(tlb, pmd, addr);
}

- mark_page_lazyfree(&folio->page);
+ mark_folio_lazyfree(folio);
ret = true;
out:
spin_unlock(ptl);
diff --git a/mm/madvise.c b/mm/madvise.c
index 09bb97f118ac..7ae1743b67c1 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -727,7 +727,7 @@ static int madvise_free_pte_range(pmd_t *pmd, unsigned long addr,
set_pte_at(mm, addr, pte, ptent);
tlb_remove_tlb_entry(tlb, pte, addr);
}
- mark_page_lazyfree(&folio->page);
+ mark_folio_lazyfree(folio);
}
out:
if (nr_swap) {
diff --git a/mm/swap.c b/mm/swap.c
index 70e2063ef43a..a6046cd5f3a2 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -757,16 +757,14 @@ void deactivate_page(struct page *page)
}

/**
- * mark_page_lazyfree - make an anon page lazyfree
- * @page: page to deactivate
+ * mark_folio_lazyfree - make an anon folio lazyfree
+ * @folio: folio to deactivate
*
- * mark_page_lazyfree() moves @page to the inactive file list.
- * This is done to accelerate the reclaim of @page.
+ * mark_folio_lazyfree() moves @folio to the inactive file list.
+ * This is done to accelerate the reclaim of @folio.
*/
-void mark_page_lazyfree(struct page *page)
+void mark_folio_lazyfree(struct folio *folio)
{
- struct folio *folio = page_folio(page);
-
if (folio_test_lru(folio) && folio_test_anon(folio) &&
folio_test_swapbacked(folio) && !folio_test_swapcache(folio) &&
!folio_test_unevictable(folio)) {
--
2.35.3

2022-12-08 21:53:43

by Vishal Moola

Subject: Re: [PATCH 2/2] mm: swap: Convert mark_page_lazyfree() to mark_folio_lazyfree()

On Wed, Dec 07, 2022 at 10:34:31AM +0800, Kefeng Wang wrote:
> @@ -402,7 +402,7 @@ extern void lru_add_drain_cpu(int cpu);
> extern void lru_add_drain_cpu_zone(struct zone *zone);
> extern void lru_add_drain_all(void);
> extern void deactivate_page(struct page *page);
> -extern void mark_page_lazyfree(struct page *page);
> +extern void mark_folio_lazyfree(struct folio *folio);
> extern void swap_setup(void);

Can we rename this function to folio_mark_lazyfree() instead so it's more
consistent with other the folio functions. Also I believe we can get rid of
the 'extern' keyword.