]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
rcu: Don't disable CPU hotplug during OOM notifiers
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Tue, 14 Jul 2015 23:24:14 +0000 (16:24 -0700)
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Wed, 22 Jul 2015 22:27:43 +0000 (15:27 -0700)
RCU's rcu_oom_notify() disables CPU hotplug in order to stabilize the
list of online CPUs, which it traverses.  However, this is completely
pointless because smp_call_function_single() will quietly fail if invoked
on an offline CPU.  Because the count of requests is incremented in the
rcu_oom_notify_cpu() function that is remotely invoked, everything works
nicely even in the face of concurrent CPU-hotplug operations.

Furthermore, in recent kernels, invoking get_online_cpus() from an OOM
notifier can result in deadlock.  This commit therefore removes the
call to get_online_cpus() and put_online_cpus() from rcu_oom_notify().

Reported-by: Marcin Ślusarz <marcin.slusarz@gmail.com>
Reported-by: David Rientjes <rientjes@google.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: David Rientjes <rientjes@google.com>
Tested-by: Marcin Ślusarz <marcin.slusarz@gmail.com>
kernel/rcu/tree_plugin.h

index 9e922f111d63e6bbddbec4d5f116529118dfa7e3..80a7c17907fe7d9e242fd6800463ff3742d1505b 100644 (file)
@@ -1679,12 +1679,10 @@ static int rcu_oom_notify(struct notifier_block *self,
         */
        atomic_set(&oom_callback_count, 1);
 
-       get_online_cpus();
        for_each_online_cpu(cpu) {
                smp_call_function_single(cpu, rcu_oom_notify_cpu, NULL, 1);
                cond_resched_rcu_qs();
        }
-       put_online_cpus();
 
        /* Unconditionally decrement: no need to wake ourselves up. */
        atomic_dec(&oom_callback_count);