Skip to content

Commit 7cc57ec

Browse files
Matthew Wilcox (Oracle)akpm00
authored andcommitted
mm: remove references to folio in split_page_memcg()
We know that the passed in page is not part of a folio (it's a plain page allocated with GFP_ACCOUNT), so we should get rid of the misleading references to folios. Introduce page_objcg() and page_set_objcg() helpers to make things more clear. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Matthew Wilcox (Oracle) <[email protected]> Acked-by: Johannes Weiner <[email protected]> Acked-by: Shakeel Butt <[email protected]> Acked-by: Roman Gushchin <[email protected]> Cc: David Hildenbrand <[email protected]> Cc: Michal Hocko <[email protected]> Cc: Muchun Song <[email protected]> Cc: Zi Yan <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 1506c25 commit 7cc57ec

File tree

1 file changed

+23
-7
lines changed

1 file changed

+23
-7
lines changed

mm/memcontrol.c

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2677,6 +2677,23 @@ static int obj_cgroup_charge_pages(struct obj_cgroup *objcg, gfp_t gfp,
26772677
return ret;
26782678
}
26792679

2680+
static struct obj_cgroup *page_objcg(const struct page *page)
2681+
{
2682+
unsigned long memcg_data = page->memcg_data;
2683+
2684+
if (mem_cgroup_disabled() || !memcg_data)
2685+
return NULL;
2686+
2687+
VM_BUG_ON_PAGE((memcg_data & OBJEXTS_FLAGS_MASK) != MEMCG_DATA_KMEM,
2688+
page);
2689+
return (struct obj_cgroup *)(memcg_data - MEMCG_DATA_KMEM);
2690+
}
2691+
2692+
static void page_set_objcg(struct page *page, const struct obj_cgroup *objcg)
2693+
{
2694+
page->memcg_data = (unsigned long)objcg | MEMCG_DATA_KMEM;
2695+
}
2696+
26802697
/**
26812698
* __memcg_kmem_charge_page: charge a kmem page to the current memory cgroup
26822699
* @page: page to charge
@@ -2695,8 +2712,7 @@ int __memcg_kmem_charge_page(struct page *page, gfp_t gfp, int order)
26952712
ret = obj_cgroup_charge_pages(objcg, gfp, 1 << order);
26962713
if (!ret) {
26972714
obj_cgroup_get(objcg);
2698-
page->memcg_data = (unsigned long)objcg |
2699-
MEMCG_DATA_KMEM;
2715+
page_set_objcg(page, objcg);
27002716
return 0;
27012717
}
27022718
}
@@ -3069,18 +3085,18 @@ void __memcg_slab_free_hook(struct kmem_cache *s, struct slab *slab,
30693085
* The objcg is only set on the first page, so transfer it to all the
30703086
* other pages.
30713087
*/
3072-
void split_page_memcg(struct page *first, unsigned order)
3088+
void split_page_memcg(struct page *page, unsigned order)
30733089
{
3074-
struct folio *folio = page_folio(first);
3090+
struct obj_cgroup *objcg = page_objcg(page);
30753091
unsigned int i, nr = 1 << order;
30763092

3077-
if (mem_cgroup_disabled() || !folio_memcg_charged(folio))
3093+
if (!objcg)
30783094
return;
30793095

30803096
for (i = 1; i < nr; i++)
3081-
folio_page(folio, i)->memcg_data = folio->memcg_data;
3097+
page_set_objcg(&page[i], objcg);
30823098

3083-
obj_cgroup_get_many(__folio_objcg(folio), nr - 1);
3099+
obj_cgroup_get_many(objcg, nr - 1);
30843100
}
30853101

30863102
void folio_split_memcg_refs(struct folio *folio, unsigned old_order,

0 commit comments

Comments
 (0)