mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

hugetlb: remove a few calls to page_folio() 

Anything found on a linked list threaded through ->lru is guaranteed to be
a folio as the compound_head found in a tail page overlaps the ->lru
member of struct page.  So we can pull folios directly off these lists no
matter whether pages or folios were added to the list.

Link: https://lkml.kernel.org/r/20230824141325.2704553-3-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
Reviewed-by: Muchun Song <songmuchun@bytedance.com>
Cc: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2023-08-24 15:13:24 +01:00 committed by Andrew Morton
parent 3ec145f9d0
commit 04bbfd844b
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mm/hugetlb.c
View File

@ -1836,11 +1836,9 @@ static void update_and_free_hugetlb_folio(struct hstate *h, struct folio *folio,
static void update_and_free_pages_bulk(struct hstate *h, struct list_head *list) static void update_and_free_pages_bulk(struct hstate *h, struct list_head *list)
{ {
struct page *page, *t_page; struct folio *folio, *t_folio;
struct folio *folio;
list_for_each_entry_safe(page, t_page, list, lru) { list_for_each_entry_safe(folio, t_folio, list, lru) {
folio = page_folio(page);
update_and_free_hugetlb_folio(h, folio, false); update_and_free_hugetlb_folio(h, folio, false);
cond_resched(); cond_resched();
} }
@ -2229,8 +2227,7 @@ static struct page *remove_pool_huge_page(struct hstate *h,
bool acct_surplus) bool acct_surplus)
{ {
int nr_nodes, node; int nr_nodes, node;
struct page *page = NULL; struct folio *folio = NULL;
struct folio *folio;
lockdep_assert_held(&hugetlb_lock); lockdep_assert_held(&hugetlb_lock);
for_each_node_mask_to_free(h, nr_nodes, node, nodes_allowed) { for_each_node_mask_to_free(h, nr_nodes, node, nodes_allowed) {
@ -2240,15 +2237,14 @@ static struct page *remove_pool_huge_page(struct hstate *h,
*/ */
if ((!acct_surplus || h->surplus_huge_pages_node[node]) && if ((!acct_surplus || h->surplus_huge_pages_node[node]) &&
!list_empty(&h->hugepage_freelists[node])) { !list_empty(&h->hugepage_freelists[node])) {
page = list_entry(h->hugepage_freelists[node].next, folio = list_entry(h->hugepage_freelists[node].next,
struct page, lru); struct folio, lru);
folio = page_folio(page);
remove_hugetlb_folio(h, folio, acct_surplus); remove_hugetlb_folio(h, folio, acct_surplus);
break; break;
} }
} }
return page; return &folio->page;
} }
/* /*
@ -3414,15 +3410,15 @@ static void try_to_free_low(struct hstate *h, unsigned long count,
* Collect pages to be freed on a list, and free after dropping lock * Collect pages to be freed on a list, and free after dropping lock
*/ */
for_each_node_mask(i, *nodes_allowed) { for_each_node_mask(i, *nodes_allowed) {
struct page *page, *next; struct folio *folio, *next;
struct list_head *freel = &h->hugepage_freelists[i]; struct list_head *freel = &h->hugepage_freelists[i];
list_for_each_entry_safe(page, next, freel, lru) { list_for_each_entry_safe(folio, next, freel, lru) {
if (count >= h->nr_huge_pages) if (count >= h->nr_huge_pages)
goto out; goto out;
if (PageHighMem(page)) if (folio_test_highmem(folio))
continue; continue;
remove_hugetlb_folio(h, page_folio(page), false); remove_hugetlb_folio(h, folio, false);
list_add(&page->lru, &page_list); list_add(&folio->lru, &page_list);
} }
} }