shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

mm/hugetlb: convert free_huge_page to folios

Browse Source 
[ Upstream commit 0356c4b96f ]

Use folios inside free_huge_page(), this is in preparation for converting
hugetlb_cgroup_uncharge_page() to take in a folio.

Link: https://lkml.kernel.org/r/20221101223059.460937-7-sidhartha.kumar@oracle.com
Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
Reviewed-by: Muchun 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: Andrew Morton <akpm@linux-foundation.org>
Stable-dep-of: b76b46902c2d ("mm/hugetlb: fix missing hugetlb_lock for resv uncharge")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Sidhartha Kumar
2022-11-01 15:30:56 -07:00
committed by Greg Kroah-Hartman
parent fc50e09b8b
commit 10de76f4cd
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mm/hugetlb.c
View File

@@ -1918,21 +1918,22 @@ void free_huge_page(struct page *page)
* Can't pass hstate in here because it is called from the * Can't pass hstate in here because it is called from the
* compound page destructor. * compound page destructor.
*/ */
struct hstate *h = page_hstate(page); struct folio *folio = page_folio(page);
int nid = page_to_nid(page); struct hstate *h = folio_hstate(folio);
struct hugepage_subpool *spool = hugetlb_page_subpool(page); int nid = folio_nid(folio);
struct hugepage_subpool *spool = hugetlb_folio_subpool(folio);
bool restore_reserve; bool restore_reserve;
unsigned long flags; unsigned long flags;
VM_BUG_ON_PAGE(page_count(page), page); VM_BUG_ON_FOLIO(folio_ref_count(folio), folio);
VM_BUG_ON_PAGE(page_mapcount(page), page); VM_BUG_ON_FOLIO(folio_mapcount(folio), folio);
hugetlb_set_page_subpool(page, NULL); hugetlb_set_folio_subpool(folio, NULL);
if (PageAnon(page)) if (folio_test_anon(folio))
__ClearPageAnonExclusive(page); __ClearPageAnonExclusive(&folio->page);
page->mapping = NULL; folio->mapping = NULL;
restore_reserve = HPageRestoreReserve(page); restore_reserve = folio_test_hugetlb_restore_reserve(folio);
ClearHPageRestoreReserve(page); folio_clear_hugetlb_restore_reserve(folio);
/* /*
* If HPageRestoreReserve was set on page, page allocation consumed a * If HPageRestoreReserve was set on page, page allocation consumed a
@@ -1954,7 +1955,7 @@ void free_huge_page(struct page *page)
} }
spin_lock_irqsave(&hugetlb_lock, flags); spin_lock_irqsave(&hugetlb_lock, flags);
ClearHPageMigratable(page); folio_clear_hugetlb_migratable(folio);
hugetlb_cgroup_uncharge_page(hstate_index(h), hugetlb_cgroup_uncharge_page(hstate_index(h),
pages_per_huge_page(h), page); pages_per_huge_page(h), page);
hugetlb_cgroup_uncharge_page_rsvd(hstate_index(h), hugetlb_cgroup_uncharge_page_rsvd(hstate_index(h),
@@ -1962,7 +1963,7 @@ void free_huge_page(struct page *page)
if (restore_reserve) if (restore_reserve)
h->resv_huge_pages++; h->resv_huge_pages++;
if (HPageTemporary(page)) { if (folio_test_hugetlb_temporary(folio)) {
remove_hugetlb_page(h, page, false); remove_hugetlb_page(h, page, false);
spin_unlock_irqrestore(&hugetlb_lock, flags); spin_unlock_irqrestore(&hugetlb_lock, flags);
update_and_free_page(h, page, true); update_and_free_page(h, page, true);