superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mm: memcontrol: split out __obj_cgroup_charge() 

Move the page charge and remainder calculation into its own function.  It
will make the slab stat refactor easier to follow.

Link: https://lkml.kernel.org/r/20260302195305.620713-4-hannes@cmpxchg.org
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Shakeel Butt <shakeel.butt@linux.dev>
Acked-by: Roman Gushchin <roman.gushchin@linux.dev>
Reviewed-by: Vlastimil Babka (SUSE) <vbabka@kernel.org>
Reviewed-by: Hao Li <hao.li@linux.dev>
Cc: Johannes Weiner <jweiner@meta.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Muchun Song <muchun.song@linux.dev>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
master
Johannes Weiner 2026-03-02 14:50:16 -05:00 committed by Andrew Morton
parent 9d181e4709
commit edb6abd31b
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mm/memcontrol.c
View File

@ -3156,10 +3156,24 @@ out:
obj_cgroup_uncharge_pages(objcg, nr_pages);
}
static int __obj_cgroup_charge(struct obj_cgroup *objcg, gfp_t gfp,
size_t size, size_t *remainder)
{
size_t charge_size;
int ret;
charge_size = PAGE_ALIGN(size);
ret = obj_cgroup_charge_pages(objcg, gfp, charge_size >> PAGE_SHIFT);
if (!ret)
*remainder = charge_size - size;
return ret;
}
static int obj_cgroup_charge_account(struct obj_cgroup *objcg, gfp_t gfp, size_t size,
struct pglist_data *pgdat, enum node_stat_item idx)
{
size_t charge_size, remainder;
size_t remainder;
int ret;
if (likely(consume_obj_stock(objcg, size, pgdat, idx)))
@ -3188,10 +3202,7 @@ static int obj_cgroup_charge_account(struct obj_cgroup *objcg, gfp_t gfp, size_t
* bytes is (sizeof(object) + PAGE_SIZE - 2) if there is no data
* race.
*/
charge_size = PAGE_ALIGN(size);
remainder = charge_size - size;
ret = obj_cgroup_charge_pages(objcg, gfp, charge_size >> PAGE_SHIFT);
ret = __obj_cgroup_charge(objcg, gfp, size, &remainder);
if (!ret && (remainder || pgdat))
refill_obj_stock(objcg, remainder, false, size, pgdat, idx);