mm: memcg/slab: remove memcg_kmem_get_cache()
The memcg_kmem_get_cache() function became really trivial, so let's just inline it into the single call point: memcg_slab_pre_alloc_hook(). It will make the code less bulky and can also help the compiler to generate a better code. 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-15-guro@fb.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
此提交包含在:
@@ -393,7 +393,7 @@ void memcg_put_cache_ids(void)
|
||||
|
||||
/*
|
||||
* A lot of the calls to the cache allocation functions are expected to be
|
||||
* inlined by the compiler. Since the calls to memcg_kmem_get_cache are
|
||||
* inlined by the compiler. Since the calls to memcg_slab_pre_alloc_hook() are
|
||||
* conditional to this static branch, we'll have to allow modules that does
|
||||
* kmem_cache_alloc and the such to see this symbol as well
|
||||
*/
|
||||
@@ -2900,29 +2900,6 @@ static void memcg_free_cache_id(int id)
|
||||
ida_simple_remove(&memcg_cache_ida, id);
|
||||
}
|
||||
|
||||
/**
|
||||
* memcg_kmem_get_cache: select memcg or root cache for allocation
|
||||
* @cachep: the original global kmem cache
|
||||
*
|
||||
* Return the kmem_cache we're supposed to use for a slab allocation.
|
||||
*
|
||||
* If the cache does not exist yet, if we are the first user of it, we
|
||||
* create it asynchronously in a workqueue and let the current allocation
|
||||
* go through with the original cache.
|
||||
*/
|
||||
struct kmem_cache *memcg_kmem_get_cache(struct kmem_cache *cachep)
|
||||
{
|
||||
struct kmem_cache *memcg_cachep;
|
||||
|
||||
memcg_cachep = READ_ONCE(cachep->memcg_params.memcg_cache);
|
||||
if (unlikely(!memcg_cachep)) {
|
||||
queue_work(system_wq, &cachep->memcg_params.work);
|
||||
return cachep;
|
||||
}
|
||||
|
||||
return memcg_cachep;
|
||||
}
|
||||
|
||||
/**
|
||||
* __memcg_kmem_charge: charge a number of kernel pages to a memcg
|
||||
* @memcg: memory cgroup to charge
|
||||
|
新增問題並參考
封鎖使用者