From: Masami Hiramatsu <mhiramat@kernel.org>
Date: Wed, 28 Jun 2017 00:41:25 +0000 (-0700)
Subject: rcu/tracing: Set disable_rcu_irq_enter on rcu_eqs_exit()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=35fe723bda12c25f4ac20a4fb91e345cacf568f7;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

rcu/tracing: Set disable_rcu_irq_enter on rcu_eqs_exit()

Set disable_rcu_irq_enter on not only rcu_eqs_enter_common() but also
rcu_eqs_exit(), since rcu_eqs_exit() suffers from the same issue as was
fixed for rcu_eqs_enter_common() by commit 03ecd3f48e57 ("rcu/tracing:
Add rcu_disabled to denote when rcu_irq_enter() will not work").

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
---

diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index c1442bea1b5c..2b37f1a8e235 100644
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -955,8 +955,10 @@ static void rcu_eqs_exit(bool user)
 	if (oldval & DYNTICK_TASK_NEST_MASK) {
 		rdtp->dynticks_nesting += DYNTICK_TASK_NEST_VALUE;
 	} else {
+		__this_cpu_inc(disable_rcu_irq_enter);
 		rdtp->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
 		rcu_eqs_exit_common(oldval, user);
+		__this_cpu_dec(disable_rcu_irq_enter);
 	}
 }