rcu: Make rcu_tasks_kthread()'s GP-wait loop allow preemption
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Tue, 5 Aug 2014 12:10:24 +0000 (05:10 -0700)
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Sun, 7 Sep 2014 23:27:31 +0000 (16:27 -0700)
The grace-period-wait loop in rcu_tasks_kthread() is under (unnecessary)
RCU protection, and therefore has no preemption points in a PREEMPT=n
kernel.  This commit therefore removes the RCU protection and inserts
cond_resched().

Reported-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
kernel/rcu/update.c

index 2658de4a5975967667d716eff1525d9e92b9a4c3..f86d1ae50005e2223a3a70936cc96b541c1a5091 100644 (file)
@@ -467,7 +467,7 @@ static void check_holdout_task(struct task_struct *t,
            (IS_ENABLED(CONFIG_NO_HZ_FULL) &&
             !is_idle_task(t) && t->rcu_tasks_idle_cpu >= 0)) {
                ACCESS_ONCE(t->rcu_tasks_holdout) = false;
-               list_del_rcu(&t->rcu_tasks_holdout_list);
+               list_del_init(&t->rcu_tasks_holdout_list);
                put_task_struct(t);
                return;
        }
@@ -573,6 +573,7 @@ static int __noreturn rcu_tasks_kthread(void *arg)
                        bool firstreport;
                        bool needreport;
                        int rtst;
+                       struct task_struct *t1;
 
                        schedule_timeout_interruptible(HZ);
                        rtst = ACCESS_ONCE(rcu_task_stall_timeout);
@@ -582,11 +583,11 @@ static int __noreturn rcu_tasks_kthread(void *arg)
                                lastreport = jiffies;
                        firstreport = true;
                        WARN_ON(signal_pending(current));
-                       rcu_read_lock();
-                       list_for_each_entry_rcu(t, &rcu_tasks_holdouts,
-                                               rcu_tasks_holdout_list)
+                       list_for_each_entry_safe(t, t1, &rcu_tasks_holdouts,
+                                               rcu_tasks_holdout_list) {
                                check_holdout_task(t, needreport, &firstreport);
-                       rcu_read_unlock();
+                               cond_resched();
+                       }
                }
 
                /*