aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/rcu/tree_plugin.h
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.ibm.com>2019-03-26 13:22:22 -0400
committerPaul E. McKenney <paulmck@linux.ibm.com>2019-03-26 17:38:38 -0400
commitadd0d37b4f1e77de7d170ece43c8d765572a1eab (patch)
tree7f0407007feaba2e006c838e8728386e4de41cc3 /kernel/rcu/tree_plugin.h
parentf1a98045abd824df833354b309b5fa64ff95f792 (diff)
rcu: Correct READ_ONCE()/WRITE_ONCE() for ->rcu_read_unlock_special
The task_struct structure's ->rcu_read_unlock_special field is only ever read or written by the owning task, but it is accessed both at process and interrupt levels. It may therefore be accessed using plain reads and writes while interrupts are disabled, but must be accessed using READ_ONCE() and WRITE_ONCE() or better otherwise. This commit makes a few adjustments to align with this discipline. Signed-off-by: Paul E. McKenney <paulmck@linux.ibm.com>
Diffstat (limited to 'kernel/rcu/tree_plugin.h')
-rw-r--r--kernel/rcu/tree_plugin.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
index 81d3cd821891..6ddb3c05e88f 100644
--- a/kernel/rcu/tree_plugin.h
+++ b/kernel/rcu/tree_plugin.h
@@ -285,7 +285,7 @@ static void rcu_qs(void)
285 TPS("cpuqs")); 285 TPS("cpuqs"));
286 __this_cpu_write(rcu_data.cpu_no_qs.b.norm, false); 286 __this_cpu_write(rcu_data.cpu_no_qs.b.norm, false);
287 barrier(); /* Coordinate with rcu_flavor_sched_clock_irq(). */ 287 barrier(); /* Coordinate with rcu_flavor_sched_clock_irq(). */
288 current->rcu_read_unlock_special.b.need_qs = false; 288 WRITE_ONCE(current->rcu_read_unlock_special.b.need_qs, false);
289 } 289 }
290} 290}
291 291
@@ -817,7 +817,7 @@ void exit_rcu(void)
817 if (unlikely(!list_empty(&current->rcu_node_entry))) { 817 if (unlikely(!list_empty(&current->rcu_node_entry))) {
818 t->rcu_read_lock_nesting = 1; 818 t->rcu_read_lock_nesting = 1;
819 barrier(); 819 barrier();
820 t->rcu_read_unlock_special.b.blocked = true; 820 WRITE_ONCE(t->rcu_read_unlock_special.b.blocked, true);
821 } else if (unlikely(t->rcu_read_lock_nesting)) { 821 } else if (unlikely(t->rcu_read_lock_nesting)) {
822 t->rcu_read_lock_nesting = 1; 822 t->rcu_read_lock_nesting = 1;
823 } else { 823 } else {