Commit d5e33bd8 authored by Sidhartha Kumar's avatar Sidhartha Kumar Committed by Andrew Morton

mm/hugetlb: convert isolate_or_dissolve_huge_page to folios

Removes a call to compound_head() by using a folio when operating on the
head page of a hugetlb compound page.

Link: https://lkml.kernel.org/r/20221101223059.460937-6-sidhartha.kumar@oracle.comSigned-off-by: default avatarSidhartha Kumar <sidhartha.kumar@oracle.com>
Reviewed-by: default avatarMike Kravetz <mike.kravetz@oracle.com>
Reviewed-by: default avatarMuchun Song <songmuchun@bytedance.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Cc: Bui Quang Minh <minhquangbui99@gmail.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Miaohe Lin <linmiaohe@huawei.com>
Cc: Mina Almasry <almasrymina@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 29f39430
...@@ -2832,7 +2832,7 @@ static int alloc_and_dissolve_huge_page(struct hstate *h, struct page *old_page, ...@@ -2832,7 +2832,7 @@ static int alloc_and_dissolve_huge_page(struct hstate *h, struct page *old_page,
int isolate_or_dissolve_huge_page(struct page *page, struct list_head *list) int isolate_or_dissolve_huge_page(struct page *page, struct list_head *list)
{ {
struct hstate *h; struct hstate *h;
struct page *head; struct folio *folio = page_folio(page);
int ret = -EBUSY; int ret = -EBUSY;
/* /*
...@@ -2841,9 +2841,8 @@ int isolate_or_dissolve_huge_page(struct page *page, struct list_head *list) ...@@ -2841,9 +2841,8 @@ int isolate_or_dissolve_huge_page(struct page *page, struct list_head *list)
* Return success when racing as if we dissolved the page ourselves. * Return success when racing as if we dissolved the page ourselves.
*/ */
spin_lock_irq(&hugetlb_lock); spin_lock_irq(&hugetlb_lock);
if (PageHuge(page)) { if (folio_test_hugetlb(folio)) {
head = compound_head(page); h = folio_hstate(folio);
h = page_hstate(head);
} else { } else {
spin_unlock_irq(&hugetlb_lock); spin_unlock_irq(&hugetlb_lock);
return 0; return 0;
...@@ -2858,10 +2857,10 @@ int isolate_or_dissolve_huge_page(struct page *page, struct list_head *list) ...@@ -2858,10 +2857,10 @@ int isolate_or_dissolve_huge_page(struct page *page, struct list_head *list)
if (hstate_is_gigantic(h)) if (hstate_is_gigantic(h))
return -ENOMEM; return -ENOMEM;
if (page_count(head) && !isolate_hugetlb(head, list)) if (folio_ref_count(folio) && !isolate_hugetlb(&folio->page, list))
ret = 0; ret = 0;
else if (!page_count(head)) else if (!folio_ref_count(folio))
ret = alloc_and_dissolve_huge_page(h, head, list); ret = alloc_and_dissolve_huge_page(h, &folio->page, list);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment