Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 997e3d93 authored by Vladimir Davydov's avatar Vladimir Davydov Committed by android-build-merger
Browse files

slub: move synchronize_sched out of slab_mutex on shrink 

am: bc01eb93

Change-Id: Ie8b2378edb57e2a7401bd766a5b782d8a5bb9eab
parents dc68ed0a bc01eb93

mm/slab.c

+2 −2
Original line number Diff line number Diff line
@@ -2332,7 +2332,7 @@ static int drain_freelist(struct kmem_cache *cache, 
	return nr_freed;

}



int __kmem_cache_shrink(struct kmem_cache *cachep, bool deactivate)

int __kmem_cache_shrink(struct kmem_cache *cachep)

{

	int ret = 0;

	int node;
@@ -2352,7 +2352,7 @@ int __kmem_cache_shrink(struct kmem_cache *cachep, bool deactivate) 


int __kmem_cache_shutdown(struct kmem_cache *cachep)

{

	return __kmem_cache_shrink(cachep, false);

	return __kmem_cache_shrink(cachep);

}



void __kmem_cache_release(struct kmem_cache *cachep)

mm/slab.h

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size, 


int __kmem_cache_shutdown(struct kmem_cache *);

void __kmem_cache_release(struct kmem_cache *);

int __kmem_cache_shrink(struct kmem_cache *, bool);

int __kmem_cache_shrink(struct kmem_cache *);

void slab_kmem_cache_release(struct kmem_cache *);



struct seq_file;

mm/slab_common.c

+25 −2
Original line number Diff line number Diff line
@@ -573,6 +573,29 @@ void memcg_deactivate_kmem_caches(struct mem_cgroup *memcg) 
	get_online_cpus();

	get_online_mems();



#ifdef CONFIG_SLUB

	/*

	 * In case of SLUB, we need to disable empty slab caching to

	 * avoid pinning the offline memory cgroup by freeable kmem

	 * pages charged to it. SLAB doesn't need this, as it

	 * periodically purges unused slabs.

	 */

	mutex_lock(&slab_mutex);

	list_for_each_entry(s, &slab_caches, list) {

		c = is_root_cache(s) ? cache_from_memcg_idx(s, idx) : NULL;

		if (c) {

			c->cpu_partial = 0;

			c->min_partial = 0;

		}

	}

	mutex_unlock(&slab_mutex);

	/*

	 * kmem_cache->cpu_partial is checked locklessly (see

	 * put_cpu_partial()). Make sure the change is visible.

	 */

	synchronize_sched();

#endif



	mutex_lock(&slab_mutex);

	list_for_each_entry(s, &slab_caches, list) {

		if (!is_root_cache(s))
@@ -584,7 +607,7 @@ void memcg_deactivate_kmem_caches(struct mem_cgroup *memcg) 
		if (!c)

			continue;



		__kmem_cache_shrink(c, true);

		__kmem_cache_shrink(c);

		arr->entries[idx] = NULL;

	}

	mutex_unlock(&slab_mutex);
@@ -755,7 +778,7 @@ int kmem_cache_shrink(struct kmem_cache *cachep) 
	get_online_cpus();

	get_online_mems();

	kasan_cache_shrink(cachep);

	ret = __kmem_cache_shrink(cachep, false);

	ret = __kmem_cache_shrink(cachep);

	put_online_mems();

	put_online_cpus();

	return ret;

mm/slob.c

+1 −1
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ void __kmem_cache_release(struct kmem_cache *c) 
{

}



int __kmem_cache_shrink(struct kmem_cache *d, bool deactivate)

int __kmem_cache_shrink(struct kmem_cache *d)

{

	return 0;

}

mm/slub.c

+2 −17
Original line number Diff line number Diff line
@@ -3887,7 +3887,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;
@@ -3899,21 +3899,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);
@@ -3970,7 +3955,7 @@ static int slab_mem_going_offline_callback(void *arg) 


	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;