Skip to content

Commit

Permalink
mm: memcg/slab: save obj_cgroup for non-root slab objects
Browse files Browse the repository at this point in the history 
Store the obj_cgroup pointer in the corresponding place of
page->obj_cgroups for each allocated non-root slab object.  Make sure that
each allocated object holds a reference to obj_cgroup.

Objcg pointer is obtained from the memcg->objcg dereferencing in
memcg_kmem_get_cache() and passed from pre_alloc_hook to post_alloc_hook.
Then in case of successful allocation(s) it's getting stored in the
page->obj_cgroups vector.

The objcg obtaining part look a bit bulky now, but it will be simplified
by next commits in the series.

Signed-off-by: Roman Gushchin <guro@fb.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Vlastimil Babka <vbabka@suse.cz>
Reviewed-by: Shakeel Butt <shakeelb@google.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Tejun Heo <tj@kernel.org>
Link: http://lkml.kernel.org/r/20200623174037.3951353-9-guro@fb.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Roman Gushchin authored and Linus Torvalds committed Aug 7, 2020
1 parent 286e04b commit 964d4bd
Show file tree
Hide file tree
Showing 5 changed files with 88 additions and 21 deletions.
3 changes: 2 additions & 1 deletion include/linux/memcontrol.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1404,7 +1404,8 @@ static inline void memcg_set_shrinker_bit(struct mem_cgroup *memcg,
}
#endif

struct kmem_cache *memcg_kmem_get_cache(struct kmem_cache *cachep);
struct kmem_cache *memcg_kmem_get_cache(struct kmem_cache *cachep,
struct obj_cgroup **objcgp);
void memcg_kmem_put_cache(struct kmem_cache *cachep);

#ifdef CONFIG_MEMCG_KMEM
Expand Down
14 changes: 12 additions & 2 deletions mm/memcontrol.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2973,7 +2973,8 @@ static inline bool memcg_kmem_bypass(void)
* done with it, memcg_kmem_put_cache() must be called to release the
* reference.
*/
struct kmem_cache *memcg_kmem_get_cache(struct kmem_cache *cachep)
struct kmem_cache *memcg_kmem_get_cache(struct kmem_cache *cachep,
struct obj_cgroup **objcgp)
{
struct mem_cgroup *memcg;
struct kmem_cache *memcg_cachep;
Expand Down Expand Up @@ -3029,8 +3030,17 @@ struct kmem_cache *memcg_kmem_get_cache(struct kmem_cache *cachep)
*/
if (unlikely(!memcg_cachep))
memcg_schedule_kmem_cache_create(memcg, cachep);
else if (percpu_ref_tryget(&memcg_cachep->memcg_params.refcnt))
else if (percpu_ref_tryget(&memcg_cachep->memcg_params.refcnt)) {
struct obj_cgroup *objcg = rcu_dereference(memcg->objcg);

if (!objcg || !obj_cgroup_tryget(objcg)) {
percpu_ref_put(&memcg_cachep->memcg_params.refcnt);
goto out_unlock;
}

*objcgp = objcg;
cachep = memcg_cachep;
}
out_unlock:
rcu_read_unlock();
return cachep;
Expand Down
18 changes: 11 additions & 7 deletions mm/slab.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3228,9 +3228,10 @@ slab_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid,
unsigned long save_flags;
void *ptr;
int slab_node = numa_mem_id();
struct obj_cgroup *objcg = NULL;

flags &= gfp_allowed_mask;
cachep = slab_pre_alloc_hook(cachep, flags);
cachep = slab_pre_alloc_hook(cachep, &objcg, 1, flags);
if (unlikely(!cachep))
return NULL;

Expand Down Expand Up @@ -3266,7 +3267,7 @@ slab_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid,
if (unlikely(slab_want_init_on_alloc(flags, cachep)) && ptr)
memset(ptr, 0, cachep->object_size);

slab_post_alloc_hook(cachep, flags, 1, &ptr);
slab_post_alloc_hook(cachep, objcg, flags, 1, &ptr);
return ptr;
}

Expand Down Expand Up @@ -3307,9 +3308,10 @@ slab_alloc(struct kmem_cache *cachep, gfp_t flags, unsigned long caller)
{
unsigned long save_flags;
void *objp;
struct obj_cgroup *objcg = NULL;

flags &= gfp_allowed_mask;
cachep = slab_pre_alloc_hook(cachep, flags);
cachep = slab_pre_alloc_hook(cachep, &objcg, 1, flags);
if (unlikely(!cachep))
return NULL;

Expand All @@ -3323,7 +3325,7 @@ slab_alloc(struct kmem_cache *cachep, gfp_t flags, unsigned long caller)
if (unlikely(slab_want_init_on_alloc(flags, cachep)) && objp)
memset(objp, 0, cachep->object_size);

slab_post_alloc_hook(cachep, flags, 1, &objp);
slab_post_alloc_hook(cachep, objcg, flags, 1, &objp);
return objp;
}

Expand Down Expand Up @@ -3450,6 +3452,7 @@ void ___cache_free(struct kmem_cache *cachep, void *objp,
memset(objp, 0, cachep->object_size);
kmemleak_free_recursive(objp, cachep->flags);
objp = cache_free_debugcheck(cachep, objp, caller);
memcg_slab_free_hook(cachep, virt_to_head_page(objp), objp);

/*
* Skip calling cache_free_alien() when the platform is not numa.
Expand Down Expand Up @@ -3515,8 +3518,9 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
void **p)
{
size_t i;
struct obj_cgroup *objcg = NULL;

s = slab_pre_alloc_hook(s, flags);
s = slab_pre_alloc_hook(s, &objcg, size, flags);
if (!s)
return 0;

Expand All @@ -3539,13 +3543,13 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
for (i = 0; i < size; i++)
memset(p[i], 0, s->object_size);

slab_post_alloc_hook(s, flags, size, p);
slab_post_alloc_hook(s, objcg, flags, size, p);
/* FIXME: Trace call missing. Christoph would like a bulk variant */
return size;
error:
local_irq_enable();
cache_alloc_debugcheck_after_bulk(s, flags, i, p, _RET_IP_);
slab_post_alloc_hook(s, flags, i, p);
slab_post_alloc_hook(s, objcg, flags, i, p);
__kmem_cache_free_bulk(s, i, p);
return 0;
}
Expand Down
60 changes: 54 additions & 6 deletions mm/slab.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,41 @@ static inline void memcg_free_page_obj_cgroups(struct page *page)
page->obj_cgroups = NULL;
}

static inline void memcg_slab_post_alloc_hook(struct kmem_cache *s,
struct obj_cgroup *objcg,
size_t size, void **p)
{
struct page *page;
unsigned long off;
size_t i;

for (i = 0; i < size; i++) {
if (likely(p[i])) {
page = virt_to_head_page(p[i]);
off = obj_to_index(s, page, p[i]);
obj_cgroup_get(objcg);
page_obj_cgroups(page)[off] = objcg;
}
}
obj_cgroup_put(objcg);
memcg_kmem_put_cache(s);
}

static inline void memcg_slab_free_hook(struct kmem_cache *s, struct page *page,
void *p)
{
struct obj_cgroup *objcg;
unsigned int off;

if (!memcg_kmem_enabled() || is_root_cache(s))
return;

off = obj_to_index(s, page, p);
objcg = page_obj_cgroups(page)[off];
page_obj_cgroups(page)[off] = NULL;
obj_cgroup_put(objcg);
}

extern void slab_init_memcg_params(struct kmem_cache *);
extern void memcg_link_cache(struct kmem_cache *s, struct mem_cgroup *memcg);

Expand Down Expand Up @@ -529,6 +564,17 @@ static inline void memcg_free_page_obj_cgroups(struct page *page)
{
}

static inline void memcg_slab_post_alloc_hook(struct kmem_cache *s,
struct obj_cgroup *objcg,
size_t size, void **p)
{
}

static inline void memcg_slab_free_hook(struct kmem_cache *s, struct page *page,
void *p)
{
}

static inline void slab_init_memcg_params(struct kmem_cache *s)
{
}
Expand Down Expand Up @@ -631,7 +677,8 @@ static inline size_t slab_ksize(const struct kmem_cache *s)
}

static inline struct kmem_cache *slab_pre_alloc_hook(struct kmem_cache *s,
gfp_t flags)
struct obj_cgroup **objcgp,
size_t size, gfp_t flags)
{
flags &= gfp_allowed_mask;

Expand All @@ -645,13 +692,14 @@ static inline struct kmem_cache *slab_pre_alloc_hook(struct kmem_cache *s,

if (memcg_kmem_enabled() &&
((flags & __GFP_ACCOUNT) || (s->flags & SLAB_ACCOUNT)))
return memcg_kmem_get_cache(s);
return memcg_kmem_get_cache(s, objcgp);

return s;
}

static inline void slab_post_alloc_hook(struct kmem_cache *s, gfp_t flags,
size_t size, void **p)
static inline void slab_post_alloc_hook(struct kmem_cache *s,
struct obj_cgroup *objcg,
gfp_t flags, size_t size, void **p)
{
size_t i;

Expand All @@ -663,8 +711,8 @@ static inline void slab_post_alloc_hook(struct kmem_cache *s, gfp_t flags,
s->flags, flags);
}

if (memcg_kmem_enabled())
memcg_kmem_put_cache(s);
if (memcg_kmem_enabled() && !is_root_cache(s))
memcg_slab_post_alloc_hook(s, objcg, size, p);
}

#ifndef CONFIG_SLOB
Expand Down
14 changes: 9 additions & 5 deletions mm/slub.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2817,8 +2817,9 @@ static __always_inline void *slab_alloc_node(struct kmem_cache *s,
struct kmem_cache_cpu *c;
struct page *page;
unsigned long tid;
struct obj_cgroup *objcg = NULL;

s = slab_pre_alloc_hook(s, gfpflags);
s = slab_pre_alloc_hook(s, &objcg, 1, gfpflags);
if (!s)
return NULL;
redo:
Expand Down Expand Up @@ -2894,7 +2895,7 @@ static __always_inline void *slab_alloc_node(struct kmem_cache *s,
if (unlikely(slab_want_init_on_alloc(gfpflags, s)) && object)
memset(object, 0, s->object_size);

slab_post_alloc_hook(s, gfpflags, 1, &object);
slab_post_alloc_hook(s, objcg, gfpflags, 1, &object);

return object;
}
Expand Down Expand Up @@ -3099,6 +3100,8 @@ static __always_inline void do_slab_free(struct kmem_cache *s,
void *tail_obj = tail ? : head;
struct kmem_cache_cpu *c;
unsigned long tid;

memcg_slab_free_hook(s, page, head);
redo:
/*
* Determine the currently cpus per cpu slab.
Expand Down Expand Up @@ -3278,9 +3281,10 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
{
struct kmem_cache_cpu *c;
int i;
struct obj_cgroup *objcg = NULL;

/* memcg and kmem_cache debug support */
s = slab_pre_alloc_hook(s, flags);
s = slab_pre_alloc_hook(s, &objcg, size, flags);
if (unlikely(!s))
return false;
/*
Expand Down Expand Up @@ -3334,11 +3338,11 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
}

/* memcg and kmem_cache debug support */
slab_post_alloc_hook(s, flags, size, p);
slab_post_alloc_hook(s, objcg, flags, size, p);
return i;
error:
local_irq_enable();
slab_post_alloc_hook(s, flags, i, p);
slab_post_alloc_hook(s, objcg, flags, i, p);
__kmem_cache_free_bulk(s, i, p);
return 0;
}
Expand Down

0 comments on commit 964d4bd

Please sign in to comment.