Commit e3abe959 authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Paul E. McKenney
Browse files

rcu/nocb: Only cond_resched() from actual offloaded batch processing 



During a toggle operations, rcu_do_batch() may be invoked concurrently
by softirqs and offloaded processing for a given CPU's callbacks.
This commit therefore makes sure cond_resched() is invoked only from
the offloaded context.

Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Lai Jiangshan <jiangshanlai@gmail.com>
Cc: Joel Fernandes <joel@joelfernandes.org>
Cc: Neeraj Upadhyay <neeraju@codeaurora.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Inspired-by: default avatarPaul E. McKenney <paulmck@kernel.org>
Tested-by: default avatarBoqun Feng <boqun.feng@gmail.com>
Signed-off-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent b9ced9e1

kernel/rcu/tree.c

+1 −2
Original line number Diff line number Diff line
@@ -2516,8 +2516,7 @@ static void rcu_do_batch(struct rcu_data *rdp) 
			/* Exceeded the time limit, so leave. */

			break;

		}

		if (offloaded) {

			WARN_ON_ONCE(in_serving_softirq());

		if (!in_serving_softirq()) {

			local_bh_enable();

			lockdep_assert_irqs_enabled();

			cond_resched_tasks_rcu_qs();