rcu: Mark writes to the rcu_segcblist structure's ->flags field
authorPaul E. McKenney <paulmck@kernel.org>
Tue, 4 Jan 2022 18:34:34 +0000 (10:34 -0800)
committerPaul E. McKenney <paulmck@kernel.org>
Mon, 14 Feb 2022 18:36:58 +0000 (10:36 -0800)
KCSAN reports data races between the rcu_segcblist_clear_flags() and
rcu_segcblist_set_flags() functions, though misreporting the latter
as a call to rcu_segcblist_is_enabled() from call_rcu().  This commit
converts the updates of this field to WRITE_ONCE(), relying on the
resulting unmarked reads to continue to detect buggy concurrent writes
to this field.

Reported-by: Zhouyi Zhou <zhouzhouyi@gmail.com>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Cc: Frederic Weisbecker <frederic@kernel.org>
kernel/rcu/rcu_segcblist.h

index e373fbe44da5e8271d7e4db19e2ed8d6d12a82f4..431cee212467debc5d305bebfb1518fb4ee6fd06 100644 (file)
@@ -56,13 +56,13 @@ static inline long rcu_segcblist_n_cbs(struct rcu_segcblist *rsclp)
 static inline void rcu_segcblist_set_flags(struct rcu_segcblist *rsclp,
                                           int flags)
 {
-       rsclp->flags |= flags;
+       WRITE_ONCE(rsclp->flags, rsclp->flags | flags);
 }
 
 static inline void rcu_segcblist_clear_flags(struct rcu_segcblist *rsclp,
                                             int flags)
 {
-       rsclp->flags &= ~flags;
+       WRITE_ONCE(rsclp->flags, rsclp->flags & ~flags);
 }
 
 static inline bool rcu_segcblist_test_flags(struct rcu_segcblist *rsclp,