Skip to contentSkip to conversation

rcu: Mark rcu_cpu_kthread() accesses to ->rcu_cpu_has_work

PATCH New Sasha Levin 1 participant 1 message Jul 2, 2023

Subsystems (2)
lore
Share & tools
lore

Sasha Levin

author maintainer
#0 lore raw

PATCH 1/1 rcu: Mark rcu_cpu_kthread() accesses to ->rcu_cpu_has_work

From: "Paul E. McKenney" <[email protected]>

[ Upstream commit a24c1aab652ebacf9ea62470a166514174c96fe1 ]

The rcu_data structure's ->rcu_cpu_has_work field can be modified by any CPU attempting to wake up the rcuc kthread. Therefore, this commit marks accesses to this field from the rcu_cpu_kthread() function.

This data race was reported by KCSAN. Not appropriate for backporting due to failure being unlikely.

---
 kernel/rcu/tree.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/rcu/tree.c +2 -2
index df016f6d0662c..48f3e90c5de53 100644
@@ -2826,12 +2826,12 @@ static void rcu_cpu_kthread(unsigned int cpu)
 		*statusp = RCU_KTHREAD_RUNNING;
 		local_irq_disable();
 		work = *workp;
-		*workp = 0;
+		WRITE_ONCE(*workp, 0);
 		local_irq_enable();
 		if (work)
 			rcu_core();
 		local_bh_enable();
-		if (*workp == 0) {
+		if (!READ_ONCE(*workp)) {
 			trace_rcu_utilization(TPS("End CPU kthread@rcu_wait"));
 			*statusp = RCU_KTHREAD_WAITING;
 			return;
Signature · 1 line
2.39.2