Commit 46de4087 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'slab-for-7.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab 

Pull slab fix from Vlastimil Babka:

 - Stable fix for a missing cpus_read_lock in one of the cpu sheaves
   flushing paths (Qing Wang)

* tag 'slab-for-7.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab:
  mm/slub: hold cpus_read_lock around flush_rcu_sheaves_on_cache()
parents 1c04dcd8 67ea9d35

mm/slab_common.c

+2 −0
Original line number Diff line number Diff line
@@ -2110,7 +2110,9 @@ EXPORT_SYMBOL_GPL(kvfree_rcu_barrier); 
void kvfree_rcu_barrier_on_cache(struct kmem_cache *s)

{

	if (cache_has_sheaves(s)) {

		cpus_read_lock();

		flush_rcu_sheaves_on_cache(s);

		cpus_read_unlock();

		rcu_barrier();

	}

mm/slub.c

+1 −0
Original line number Diff line number Diff line
@@ -4024,6 +4024,7 @@ void flush_rcu_sheaves_on_cache(struct kmem_cache *s) 
	struct slub_flush_work *sfw;

	unsigned int cpu;



	lockdep_assert_cpus_held();

	mutex_lock(&flush_lock);



	for_each_online_cpu(cpu) {