mm-hugetlb-convert-demote_free_huge_page-to-folios.patch removed from -mm tree
The quilt patch titled
Subject: mm/hugetlb: convert demote_free_huge_page to folios
has been removed from the -mm tree. Its filename was
mm-hugetlb-convert-demote_free_huge_page-to-folios.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Sidhartha Kumar <[email protected]>
Subject: mm/hugetlb: convert demote_free_huge_page to folios
Date: Fri, 13 Jan 2023 16:30:57 -0600
Change demote_free_huge_page to demote_free_hugetlb_folio() and change demote_pool_huge_page() pass in a folio.
Signed-off-by Sidhartha Kumar <[email protected]>
Cc John Hubbard <[email protected]>
Cc Matthew Wilcox <[email protected]>
Cc Mike Kravetz <[email protected]>
Cc Muchun Song <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/hugetlb.c renamed from mm/hugetlb.c~mm-hugetlb-convert-demote_free_huge_page-to-folios +17 -18
@@ -3579,12 +3579,12 @@ out:return 0 ; } -static int demote_free_huge_page (struct hstate *h,struct page *page) +static int demote_free_hugetlb_folio (struct hstate *h,struct folio *folio) { -int i, nid =page_to_nid (page); +int i, nid =folio_nid (folio);struct hstate *target_hstate; -struct folio *folio =page_folio (page);struct page *subpage; +struct folio *inner_folio;int rc =0 ; target_hstate =size_to_hstate (PAGE_SIZE << h->demote_order);
@@ -3592,18 +3592,18 @@ static int demote_free_huge_page(structremove_hugetlb_folio_for_demote (h, folio, false);spin_unlock_irq (&hugetlb_lock); - rc =hugetlb_vmemmap_restore (h, page); + rc =hugetlb_vmemmap_restore (h, &folio->page);if (rc) { -/* Allocation of vmemmmap failed, we can not demote page */ +/* Allocation of vmemmmap failed, we can not demote folio */ spin_lock_irq (&hugetlb_lock); -set_page_refcounted (page); -add_hugetlb_folio (h,page_folio (page), false); +folio_ref_unfreeze (folio,1 ); +add_hugetlb_folio (h, folio, false);return rc; }/* * Use destroy_compound_hugetlb_folio_for_demote for all huge page -* sizes as it will not ref count pages. +* sizes as it will not ref count folios. */ destroy_compound_hugetlb_folio_for_demote (folio,huge_page_order (h));
@@ -3618,15 +3618,15 @@ static int demote_free_huge_page(structmutex_lock (&target_hstate->resize_lock);for (i =0 ; i <pages_per_huge_page (h); i +=pages_per_huge_page (target_hstate)) { - subpage =nth_page (page, i); - folio =page_folio (subpage); + subpage =folio_page (folio, i); + inner_folio =page_folio (subpage);if (hstate_is_gigantic (target_hstate)) -prep_compound_gigantic_folio_for_demote (folio, +prep_compound_gigantic_folio_for_demote (inner_folio, target_hstate->order);else prep_compound_page (subpage, target_hstate->order); -set_page_private (subpage,0 ); -prep_new_hugetlb_folio (target_hstate, folio, nid); +folio_change_private (inner_folio,NULL ); +prep_new_hugetlb_folio (target_hstate, inner_folio, nid);free_huge_page (subpage); }mutex_unlock (&target_hstate->resize_lock);
@@ -3648,7 +3648,7 @@ static int demote_pool_huge_page(struct __must_hold(&hugetlb_lock) {int nr_nodes, node; -struct page *page; +struct folio *folio;lockdep_assert_held (&hugetlb_lock);
@@ -3659,11 +3659,10 @@ static int demote_pool_huge_page(struct }for_each_node_mask_to_free (h, nr_nodes, node, nodes_allowed) { -list_for_each_entry (page, &h->hugepage_freelists[node], lru) { -if (PageHWPoison (page)) +list_for_each_entry (folio, &h->hugepage_freelists[node], lru) { +if (folio_test_hwpoison (folio))continue ; - -return demote_free_huge_page (h, page); +return demote_free_hugetlb_folio (h, folio); } }
_
Patches currently in -mm which might be from [email protected] are