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

Revert "mm/hugetlb: convert free_huge_page to folios"

Browse Source 
This reverts commit 10de76f4cd which is
commit 0356c4b96f upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I17aaa4dfc3802a5de10dfbf2e438888d8d5158e4
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-07-20 12:49:05 +00:00
parent dd84aa68cd
commit 563a9907e2
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mm/hugetlb.c
View File

@@ -1917,22 +1917,21 @@ 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 folio *folio = page_folio(page); struct hstate *h = page_hstate(page);
struct hstate *h = folio_hstate(folio); int nid = page_to_nid(page);
int nid = folio_nid(folio); struct hugepage_subpool *spool = hugetlb_page_subpool(page);
struct hugepage_subpool *spool = hugetlb_folio_subpool(folio);
bool restore_reserve; bool restore_reserve;
unsigned long flags; unsigned long flags;
VM_BUG_ON_FOLIO(folio_ref_count(folio), folio); VM_BUG_ON_PAGE(page_count(page), page);
VM_BUG_ON_FOLIO(folio_mapcount(folio), folio); VM_BUG_ON_PAGE(page_mapcount(page), page);
hugetlb_set_folio_subpool(folio, NULL); hugetlb_set_page_subpool(page, NULL);
if (folio_test_anon(folio)) if (PageAnon(page))
__ClearPageAnonExclusive(&folio->page); __ClearPageAnonExclusive(page);
folio->mapping = NULL; page->mapping = NULL;
restore_reserve = folio_test_hugetlb_restore_reserve(folio); restore_reserve = HPageRestoreReserve(page);
folio_clear_hugetlb_restore_reserve(folio); ClearHPageRestoreReserve(page);
/* /*
* If HPageRestoreReserve was set on page, page allocation consumed a * If HPageRestoreReserve was set on page, page allocation consumed a
@@ -1954,7 +1953,7 @@ void free_huge_page(struct page *page)
} }
spin_lock_irqsave(&hugetlb_lock, flags); spin_lock_irqsave(&hugetlb_lock, flags);
folio_clear_hugetlb_migratable(folio); ClearHPageMigratable(page);
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 +1961,7 @@ void free_huge_page(struct page *page)
if (restore_reserve) if (restore_reserve)
h->resv_huge_pages++; h->resv_huge_pages++;
if (folio_test_hugetlb_temporary(folio)) { if (HPageTemporary(page)) {
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);