mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
slab: introduce __kmemcg_cache_deactivate()
__kmem_cache_shrink() is called with %true @deactivate only for memcg caches. Remove @deactivate from __kmem_cache_shrink() and introduce __kmemcg_cache_deactivate() instead. Each memcg-supporting allocator should implement it and it should deactivate and drain the cache. This is to allow memcg cache deactivation behavior to further deviate from simple shrinking without messing up __kmem_cache_shrink(). This is pure reorganization and doesn't introduce any observable behavior changes. v2: Dropped unnecessary ifdef in mm/slab.h as suggested by Vladimir. Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Tejun Heo <[email protected]> Acked-by: Vladimir Davydov <[email protected]> Cc: Christoph Lameter <[email protected]> Cc: Pekka Enberg <[email protected]> Cc: David Rientjes <[email protected]> Cc: Joonsoo Kim <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
510ded33e0
commit
c9fc586403
5 changed files with 36 additions and 23 deletions
39
mm/slub.c
39
mm/slub.c
|
|
@ -3894,7 +3894,7 @@ EXPORT_SYMBOL(kfree);
|
|||
* being allocated from last increasing the chance that the last objects
|
||||
* are freed in them.
|
||||
*/
|
||||
int __kmem_cache_shrink(struct kmem_cache *s, bool deactivate)
|
||||
int __kmem_cache_shrink(struct kmem_cache *s)
|
||||
{
|
||||
int node;
|
||||
int i;
|
||||
|
|
@ -3906,21 +3906,6 @@ int __kmem_cache_shrink(struct kmem_cache *s, bool deactivate)
|
|||
unsigned long flags;
|
||||
int ret = 0;
|
||||
|
||||
if (deactivate) {
|
||||
/*
|
||||
* Disable empty slabs caching. Used to avoid pinning offline
|
||||
* memory cgroups by kmem pages that can be freed.
|
||||
*/
|
||||
s->cpu_partial = 0;
|
||||
s->min_partial = 0;
|
||||
|
||||
/*
|
||||
* s->cpu_partial is checked locklessly (see put_cpu_partial),
|
||||
* so we have to make sure the change is visible.
|
||||
*/
|
||||
synchronize_sched();
|
||||
}
|
||||
|
||||
flush_all(s);
|
||||
for_each_kmem_cache_node(s, node, n) {
|
||||
INIT_LIST_HEAD(&discard);
|
||||
|
|
@ -3971,13 +3956,33 @@ int __kmem_cache_shrink(struct kmem_cache *s, bool deactivate)
|
|||
return ret;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_MEMCG
|
||||
void __kmemcg_cache_deactivate(struct kmem_cache *s)
|
||||
{
|
||||
/*
|
||||
* Disable empty slabs caching. Used to avoid pinning offline
|
||||
* memory cgroups by kmem pages that can be freed.
|
||||
*/
|
||||
s->cpu_partial = 0;
|
||||
s->min_partial = 0;
|
||||
|
||||
/*
|
||||
* s->cpu_partial is checked locklessly (see put_cpu_partial), so
|
||||
* we have to make sure the change is visible.
|
||||
*/
|
||||
synchronize_sched();
|
||||
|
||||
__kmem_cache_shrink(s);
|
||||
}
|
||||
#endif
|
||||
|
||||
static int slab_mem_going_offline_callback(void *arg)
|
||||
{
|
||||
struct kmem_cache *s;
|
||||
|
||||
mutex_lock(&slab_mutex);
|
||||
list_for_each_entry(s, &slab_caches, list)
|
||||
__kmem_cache_shrink(s, false);
|
||||
__kmem_cache_shrink(s);
|
||||
mutex_unlock(&slab_mutex);
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
Loading…
Reference in a new issue