mm-hugeltb_cgroup-convert-hugetlb_cgroup_commit_charge-to-folios.patch removed from -mm tree
The quilt patch titled
Subject: mm/hugeltb_cgroup: convert hugetlb_cgroup_commit_charge*() to folios
has been removed from the -mm tree. Its filename was
mm-hugeltb_cgroup-convert-hugetlb_cgroup_commit_charge-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/hugeltb_cgroup: convert hugetlb_cgroup_commit_charge*() to folios
Date: Tue, 1 Nov 2022 15:30:58 -0700
Convert hugetlb_cgroup_commit_charge*() to internally use folios to clean up the code after __set_hugetlb_cgroup() was changed to take a folio.
---
mm/hugetlb_cgroup.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
mm/hugetlb_cgroup.c renamed from mm/hugetlb_cgroup.c~mm-hugeltb_cgroup-convert-hugetlb_cgroup_commit_charge-to-folios +10 -6
@@ -310,21 +310,21 @@ int hugetlb_cgroup_charge_cgroup_rsvd(in/* Should be called with hugetlb_lock held */ static void __hugetlb_cgroup_commit_charge (int idx,unsigned long nr_pages,struct hugetlb_cgroup *h_cg, -struct page *page,bool rsvd) +struct folio *folio,bool rsvd) {if (hugetlb_cgroup_disabled () || !h_cg)return ; -__set_hugetlb_cgroup (page_folio (page), h_cg, rsvd); +__set_hugetlb_cgroup (folio, h_cg, rsvd);if (!rsvd) {unsigned long usage = - h_cg->nodeinfo[page_to_nid (page)]->usage[idx]; + h_cg->nodeinfo[folio_nid (folio)]->usage[idx];/* * This write is not atomic due to fetching usage and writing * to it, but that's fine because we call this with * hugetlb_lock held anyway. */ -WRITE_ONCE (h_cg->nodeinfo[page_to_nid (page)]->usage[idx], +WRITE_ONCE (h_cg->nodeinfo[folio_nid (folio)]->usage[idx], usage + nr_pages); } }
@@ -333,14 +333,18 @@ void hugetlb_cgroup_commit_charge(int idstruct hugetlb_cgroup *h_cg, struct page *page) { -__hugetlb_cgroup_commit_charge (idx ,nr_pages ,h_cg ,page ,false ); + struct folio *folio = page_folio(page); + +__hugetlb_cgroup_commit_charge (idx, nr_pages, h_cg, folio, false); }void hugetlb_cgroup_commit_charge_rsvd (int idx,unsigned long nr_pages,struct hugetlb_cgroup *h_cg,struct page *page) { -__hugetlb_cgroup_commit_charge (idx, nr_pages, h_cg, page, true); +struct folio *folio =page_folio (page); + +__hugetlb_cgroup_commit_charge (idx, nr_pages, h_cg, folio, true); }/*
_
Patches currently in -mm which might be from [email protected] are
mm-add-folio-dtor-and-order-setter-functions.patch mm-hugetlb-convert-destroy_compound_gigantic_page-to-folios.patch mm-hugetlb-convert-dissolve_free_huge_page-to-folios.patch mm-hugetlb-convert-remove_hugetlb_page-to-folios.patch mm-hugetlb-convert-update_and_free_page-to-folios.patch mm-hugetlb-convert-add_hugetlb_page-to-folios-and-add-hugetlb_cma_folio.patch mm-hugetlb-convert-enqueue_huge_page-to-folios.patch mm-hugetlb-convert-free_gigantic_page-to-folios.patch mm-hugetlb-convert-hugetlb-prep-functions-to-folios.patch mm-hugetlb-change-hugetlb-allocation-functions-to-return-a-folio.patch