Commit 9c7d6a6e authored by Roman Gushchin's avatar Roman Gushchin Committed by Stephen Rothwell
Browse files

mm: memcg/slab: pre-allocate obj_cgroups for slab caches with SLAB_ACCOUNT

In general it's unknown in advance if a slab page will contain accounted
objects or not.  In order to avoid memory waste, an obj_cgroup vector is
allocated dynamically when a need to account of a new object arises.  Such
approach is memory efficient, but requires an expensive cmpxchg() to set
up the memcg/objcgs pointer, because an allocation can race with a
different allocation on another cpu.

But in some common cases it's known for sure that a slab page will contain
accounted objects: if the page belongs to a slab cache with a SLAB_ACCOUNT
flag set.  It includes such popular objects like vm_area_struct, anon_vma,
task_struct, etc.

In such cases we can pre-allocate the objcgs vector and simple assign it
to the page without any atomic operations, because at this early stage the
page is not visible to anyone else.

A very simplistic benchmark (allocating 10000000 64-bytes objects in a
row) shows ~15% win.  In the real life it seems that most workloads are
not very sensitive to the speed of (accounted) slab allocations.

Link: https://lkml.kernel.org/r/20201110195753.530157-2-guro@fb.com


Signed-off-by: default avatarRoman Gushchin <guro@fb.com>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Cc: Shakeel Butt <shakeelb@google.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Christoph Lameter <cl@linux.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent 68eb11db
......@@ -479,14 +479,20 @@ static inline struct obj_cgroup **page_objcgs_check(struct page *page)
* set_page_objcgs - associate a page with a object cgroups vector
* @page: a pointer to the page struct
* @objcgs: a pointer to the object cgroups vector
* @atomic: save the value atomically
*
* Atomically associates a page with a vector of object cgroups.
*/
static inline bool set_page_objcgs(struct page *page,
struct obj_cgroup **objcgs)
struct obj_cgroup **objcgs, bool atomic)
{
return !cmpxchg(&page->memcg_data, 0, (unsigned long)objcgs |
MEMCG_DATA_OBJCGS);
unsigned long memcg_data = (unsigned long) objcgs | MEMCG_DATA_OBJCGS;
if (atomic)
return !cmpxchg(&page->memcg_data, 0, memcg_data);
page->memcg_data = memcg_data;
return true;
}
#else
static inline struct obj_cgroup **page_objcgs(struct page *page)
......@@ -500,7 +506,7 @@ static inline struct obj_cgroup **page_objcgs_check(struct page *page)
}
static inline bool set_page_objcgs(struct page *page,
struct obj_cgroup **objcgs)
struct obj_cgroup **objcgs, bool atomic)
{
return true;
}
......
......@@ -2952,7 +2952,7 @@ static void commit_charge(struct page *page, struct mem_cgroup *memcg)
#ifdef CONFIG_MEMCG_KMEM
int memcg_alloc_page_obj_cgroups(struct page *page, struct kmem_cache *s,
gfp_t gfp)
gfp_t gfp, bool atomic)
{
unsigned int objects = objs_per_slab_page(s, page);
void *vec;
......@@ -2962,7 +2962,7 @@ int memcg_alloc_page_obj_cgroups(struct page *page, struct kmem_cache *s,
if (!vec)
return -ENOMEM;
if (!set_page_objcgs(page, vec))
if (!set_page_objcgs(page, vec, atomic))
kfree(vec);
else
kmemleak_not_leak(vec);
......
......@@ -1380,7 +1380,7 @@ static struct page *kmem_getpages(struct kmem_cache *cachep, gfp_t flags,
return NULL;
}
account_slab_page(page, cachep->gfporder, cachep);
account_slab_page(page, cachep->gfporder, cachep, flags);
__SetPageSlab(page);
/* Record if ALLOC_NO_WATERMARKS was set when allocating the slab */
if (sk_memalloc_socks() && page_is_pfmemalloc(page))
......
......@@ -240,7 +240,7 @@ static inline bool kmem_cache_debug_flags(struct kmem_cache *s, slab_flags_t fla
#ifdef CONFIG_MEMCG_KMEM
int memcg_alloc_page_obj_cgroups(struct page *page, struct kmem_cache *s,
gfp_t gfp);
gfp_t gfp, bool atomic);
static inline void memcg_free_page_obj_cgroups(struct page *page)
{
......@@ -307,7 +307,8 @@ static inline void memcg_slab_post_alloc_hook(struct kmem_cache *s,
page = virt_to_head_page(p[i]);
if (!page_objcgs(page) &&
memcg_alloc_page_obj_cgroups(page, s, flags)) {
memcg_alloc_page_obj_cgroups(page, s, flags,
true)) {
obj_cgroup_uncharge(objcg, obj_full_size(s));
continue;
}
......@@ -371,7 +372,8 @@ static inline struct mem_cgroup *memcg_from_slab_obj(void *ptr)
}
static inline int memcg_alloc_page_obj_cgroups(struct page *page,
struct kmem_cache *s, gfp_t gfp)
struct kmem_cache *s, gfp_t gfp,
bool atomic)
{
return 0;
}
......@@ -412,8 +414,12 @@ static inline struct kmem_cache *virt_to_cache(const void *obj)
}
static __always_inline void account_slab_page(struct page *page, int order,
struct kmem_cache *s)
struct kmem_cache *s,
gfp_t gfp)
{
if (memcg_kmem_enabled() && (s->flags & SLAB_ACCOUNT))
memcg_alloc_page_obj_cgroups(page, s, gfp, false);
mod_node_page_state(page_pgdat(page), cache_vmstat_idx(s),
PAGE_SIZE << order);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment