From: Ackerley Tng Now that the alloc_hugetlb_folio path has been successfully migrated to the new try-commit-cancel memcg charging protocol, the old mem_cgroup_charge_hugetlb function and its associated header and static inline declarations are completely unused. Remove them to clean up the memory controller's codebase. Signed-off-by: Ackerley Tng --- include/linux/memcontrol.h | 6 ------ mm/memcontrol.c | 34 ---------------------------------- 2 files changed, 40 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index c4e63d0e03526..23fbbbc8e11f2 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -641,7 +641,6 @@ static inline int mem_cgroup_charge(struct folio *folio, struct mm_struct *mm, return __mem_cgroup_charge(folio, mm, gfp); } -int mem_cgroup_charge_hugetlb(struct folio *folio, gfp_t gfp); int mem_cgroup_hugetlb_try_charge(unsigned int nr_pages, gfp_t gfp, struct mem_cgroup **memcg_p, struct obj_cgroup **objcg_p); @@ -1137,11 +1136,6 @@ static inline int mem_cgroup_charge(struct folio *folio, return 0; } -static inline int mem_cgroup_charge_hugetlb(struct folio *folio, gfp_t gfp) -{ - return 0; -} - static inline int mem_cgroup_hugetlb_try_charge(unsigned int nr_pages, gfp_t gfp, struct mem_cgroup **memcg_p, struct obj_cgroup **objcg_p) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 0beee5c0ce93b..6764ff041c196 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5146,40 +5146,6 @@ int __mem_cgroup_charge(struct folio *folio, struct mm_struct *mm, gfp_t gfp) return ret; } -/** - * mem_cgroup_charge_hugetlb - charge the memcg for a hugetlb folio - * @folio: folio being charged - * @gfp: reclaim mode - * - * This function is called when allocating a huge page folio, after the page has - * already been obtained and charged to the appropriate hugetlb cgroup - * controller (if it is enabled). - * - * Returns ENOMEM if the memcg is already full. - * Returns 0 if either the charge was successful, or if we skip the charging. - */ -int mem_cgroup_charge_hugetlb(struct folio *folio, gfp_t gfp) -{ - struct mem_cgroup *memcg = get_mem_cgroup_from_current(); - int ret = 0; - - /* - * Even memcg does not account for hugetlb, we still want to update - * system-level stats via lruvec_stat_mod_folio. Return 0, and skip - * charging the memcg. - */ - if (mem_cgroup_disabled() || !memcg_accounts_hugetlb() || - !memcg || !cgroup_subsys_on_dfl(memory_cgrp_subsys)) - goto out; - - if (charge_memcg(folio, memcg, gfp)) - ret = -ENOMEM; - -out: - mem_cgroup_put(memcg); - return ret; -} - /** * mem_cgroup_hugetlb_try_charge - Try to charge the memcg for a hugetlb folio * @nr_pages: number of base pages to charge -- 2.55.0.229.g6434b31f56-goog