[v2,1/2] hugetlb: memcg: account hugetlb-backed memory in memory controller (fix)

Message ID 20230929181712.3723495-1-nphamcs@gmail.com
State New
Headers
Series [v2,1/2] hugetlb: memcg: account hugetlb-backed memory in memory controller (fix) |

Commit Message

Nhat Pham Sept. 29, 2023, 6:17 p.m. UTC
  This fixlet disables the hugetlb memcg accounting behavior in cgroup v1.

Signed-off-by: Nhat Pham <nphamcs@gmail.com>
---
 mm/memcontrol.c | 1 +
 1 file changed, 1 insertion(+)
  

Patch

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index d5dfc9b36acb..de6bd8ca87f5 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -7081,6 +7081,7 @@  int mem_cgroup_hugetlb_charge_folio(struct folio *folio, gfp_t gfp)
 	int ret;
 
 	if (mem_cgroup_disabled() ||
+		!cgroup_subsys_on_dfl(memory_cgrp_subsys) ||
 		!(cgrp_dfl_root.flags & CGRP_ROOT_MEMORY_HUGETLB_ACCOUNTING))
 		return 0;