2023-01-19 21:32:35

by Sidhartha Kumar

Subject: [PATCH 3/9] mm/hugetlb: convert putback_active_hugepage to take in a folio

Convert putback_active_hugepage() to putback_active_hugetlb_folio(), this
removes one user of the Huge Page macros which take in a page. The callers
in migrate.c are also cleaned up by being able to directly use the src and
dst folio variables.

Signed-off-by: Sidhartha Kumar <[email protected]>
---
include/linux/hugetlb.h | 4 ++--
mm/hugetlb.c | 8 ++++----
mm/migrate.c | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 06eb59711e4a..f88c832bdfa4 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -174,7 +174,7 @@ int isolate_hugetlb(struct folio *folio, struct list_head *list);
int get_hwpoison_hugetlb_folio(struct folio *folio, bool *hugetlb, bool unpoison);
int get_huge_page_for_hwpoison(unsigned long pfn, int flags,
bool *migratable_cleared);
-void putback_active_hugepage(struct page *page);
+void putback_active_hugetlb_folio(struct folio *folio);
void move_hugetlb_state(struct folio *old_folio, struct folio *new_folio, int reason);
void free_huge_page(struct page *page);
void hugetlb_fix_reserve_counts(struct inode *inode);
@@ -428,7 +428,7 @@ static inline int get_huge_page_for_hwpoison(unsigned long pfn, int flags,
return 0;
}

-static inline void putback_active_hugepage(struct page *page)
+static inline void putback_active_hugetlb_folio(struct folio *folio)
{
}

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 04cbdf5025a5..c37a26c8392c 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -7302,13 +7302,13 @@ int get_huge_page_for_hwpoison(unsigned long pfn, int flags,
return ret;
}

-void putback_active_hugepage(struct page *page)
+void putback_active_hugetlb_folio(struct folio *folio)
{
spin_lock_irq(&hugetlb_lock);
- SetHPageMigratable(page);
- list_move_tail(&page->lru, &(page_hstate(page))->hugepage_activelist);
+ folio_set_hugetlb_migratable(folio);
+ list_move_tail(&folio->lru, &(folio_hstate(folio))->hugepage_activelist);
spin_unlock_irq(&hugetlb_lock);
- put_page(page);
+ folio_put(folio);
}

void move_hugetlb_state(struct folio *old_folio, struct folio *new_folio, int reason)
diff --git a/mm/migrate.c b/mm/migrate.c
index 92d53e0b609a..a35f2b36df01 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -151,7 +151,7 @@ void putback_movable_pages(struct list_head *l)

list_for_each_entry_safe(page, page2, l, lru) {
if (unlikely(PageHuge(page))) {
- putback_active_hugepage(page);
+ putback_active_hugetlb_folio(page_folio(page));
continue;
}
list_del(&page->lru);
@@ -1374,7 +1374,7 @@ static int unmap_and_move_huge_page(new_page_t get_new_page,

if (folio_ref_count(src) == 1) {
/* page was freed from under us. So we are done. */
- putback_active_hugepage(hpage);
+ putback_active_hugetlb_folio(src);
return MIGRATEPAGE_SUCCESS;
}

@@ -1459,7 +1459,7 @@ static int unmap_and_move_huge_page(new_page_t get_new_page,
folio_unlock(src);
out:
if (rc == MIGRATEPAGE_SUCCESS)
- putback_active_hugepage(hpage);
+ putback_active_hugetlb_folio(src);
else if (rc != -EAGAIN)
list_move_tail(&src->lru, ret);

@@ -1471,7 +1471,7 @@ static int unmap_and_move_huge_page(new_page_t get_new_page,
if (put_new_page)
put_new_page(new_hpage, private);
else
- putback_active_hugepage(new_hpage);
+ putback_active_hugetlb_folio(dst);

return rc;
}
--
2.39.0

2023-01-20 05:56:06

by Matthew Wilcox

Subject: Re: [PATCH 3/9] mm/hugetlb: convert putback_active_hugepage to take in a folio

On Thu, Jan 19, 2023 at 01:14:40PM -0800, Sidhartha Kumar wrote:
> -void putback_active_hugepage(struct page *page)
> +void putback_active_hugetlb_folio(struct folio *folio)

Maybe call this folio_putback_active_hugetlb()? It fits better
with folio_putback_lru().

> +++ b/mm/migrate.c
> @@ -151,7 +151,7 @@ void putback_movable_pages(struct list_head *l)
>
> list_for_each_entry_safe(page, page2, l, lru) {
> if (unlikely(PageHuge(page))) {
> - putback_active_hugepage(page);
> + putback_active_hugetlb_folio(page_folio(page));
> continue;
> }
> list_del(&page->lru);

Maybe we need a patch first to convert this loop from an iteration of
page->lru to folio->lru to avoid that call to page_folio()?

2023-01-21 00:16:51

by Mike Kravetz

Subject: Re: [PATCH 3/9] mm/hugetlb: convert putback_active_hugepage to take in a folio

On 01/19/23 13:14, Sidhartha Kumar wrote:
> Convert putback_active_hugepage() to putback_active_hugetlb_folio(), this
> removes one user of the Huge Page macros which take in a page. The callers
> in migrate.c are also cleaned up by being able to directly use the src and
> dst folio variables.
>
> Signed-off-by: Sidhartha Kumar <[email protected]>
> ---
> include/linux/hugetlb.h | 4 ++--
> mm/hugetlb.c | 8 ++++----
> mm/migrate.c | 8 ++++----
> 3 files changed, 10 insertions(+), 10 deletions(-)

Thanks,

Reviewed-by: Mike Kravetz <[email protected]>
--
Mike Kravetz