[GIT PULL] membarrier fix

Ingo Molnar
2019-10-02T22:04:12Z

Linus,

Please pull the latest sched-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched-urgent-for-linus

# HEAD: 73956fc07dd7b25d4a33ab3fdd6247c60d0b237c membarrier: Fix RCU locking bug caused by faulty merge

Fix a merge bug that resulted in broken locking within
membarrier_private_expedited().

Thanks,

Ingo

------------------>
Peter Zijlstra (1):
membarrier: Fix RCU locking bug caused by faulty merge

kernel/sched/membarrier.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/kernel/sched/membarrier.c b/kernel/sched/membarrier.c
index a39bed2c784f..168479a7d61b 100644
--- a/kernel/sched/membarrier.c
+++ b/kernel/sched/membarrier.c
@@ -174,7 +174,6 @@ static int membarrier_private_expedited(int flags)
*/
if (cpu == raw_smp_processor_id())
continue;
- rcu_read_lock();
p = rcu_dereference(cpu_rq(cpu)->curr);
if (p && p->mm == mm)
__cpumask_set_cpu(cpu, tmpmask);