Skip to content

Commit 0937d04

Browse files
committed
rcu: Add READ_ONCE() to rcu_node ->gp_seq
The rcu_node structure's ->gp_seq field is read locklessly, so this commit adds the READ_ONCE() to several loads in order to avoid destructive compiler optimizations. This data race was reported by KCSAN. Not appropriate for backporting because this affects only tracing and warnings. Signed-off-by: Paul E. McKenney <[email protected]>
1 parent b0c18c8 commit 0937d04

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

kernel/rcu/tree.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,8 +1126,9 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp)
11261126
static void trace_rcu_this_gp(struct rcu_node *rnp, struct rcu_data *rdp,
11271127
unsigned long gp_seq_req, const char *s)
11281128
{
1129-
trace_rcu_future_grace_period(rcu_state.name, rnp->gp_seq, gp_seq_req,
1130-
rnp->level, rnp->grplo, rnp->grphi, s);
1129+
trace_rcu_future_grace_period(rcu_state.name, READ_ONCE(rnp->gp_seq),
1130+
gp_seq_req, rnp->level,
1131+
rnp->grplo, rnp->grphi, s);
11311132
}
11321133

11331134
/*
@@ -1904,7 +1905,7 @@ static void rcu_report_qs_rnp(unsigned long mask, struct rcu_node *rnp,
19041905
rnp_c = rnp;
19051906
rnp = rnp->parent;
19061907
raw_spin_lock_irqsave_rcu_node(rnp, flags);
1907-
oldmask = rnp_c->qsmask;
1908+
oldmask = READ_ONCE(rnp_c->qsmask);
19081909
}
19091910

19101911
/*
@@ -2052,7 +2053,7 @@ int rcutree_dying_cpu(unsigned int cpu)
20522053
return 0;
20532054

20542055
blkd = !!(rnp->qsmask & rdp->grpmask);
2055-
trace_rcu_grace_period(rcu_state.name, rnp->gp_seq,
2056+
trace_rcu_grace_period(rcu_state.name, READ_ONCE(rnp->gp_seq),
20562057
blkd ? TPS("cpuofl") : TPS("cpuofl-bgp"));
20572058
return 0;
20582059
}

0 commit comments

Comments
 (0)