diff options
author | Masami Hiramatsu <mhiramat@kernel.org> | 2017-06-27 20:41:25 -0400 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2017-08-17 10:26:23 -0400 |
commit | 35fe723bda12c25f4ac20a4fb91e345cacf568f7 (patch) | |
tree | 71737fb6c7436744fb45a32ae0cf29058c902686 /kernel/rcu/tree.c | |
parent | d8db2e86d8ba20ef7eb8ba8627129ade40192838 (diff) |
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>
Diffstat (limited to 'kernel/rcu/tree.c')
-rw-r--r-- | kernel/rcu/tree.c | 2 |
1 files changed, 2 insertions, 0 deletions
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) | |||
955 | if (oldval & DYNTICK_TASK_NEST_MASK) { | 955 | if (oldval & DYNTICK_TASK_NEST_MASK) { |
956 | rdtp->dynticks_nesting += DYNTICK_TASK_NEST_VALUE; | 956 | rdtp->dynticks_nesting += DYNTICK_TASK_NEST_VALUE; |
957 | } else { | 957 | } else { |
958 | __this_cpu_inc(disable_rcu_irq_enter); | ||
958 | rdtp->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE; | 959 | rdtp->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE; |
959 | rcu_eqs_exit_common(oldval, user); | 960 | rcu_eqs_exit_common(oldval, user); |
961 | __this_cpu_dec(disable_rcu_irq_enter); | ||
960 | } | 962 | } |
961 | } | 963 | } |
962 | 964 | ||