Skip to content

Commit 606b65e

Browse files
Thomas Pedersengregkh
Thomas Pedersen
authored andcommitted
mac80211: mesh: fix RCU warning
[ Upstream commit 5518424 ] ifmsh->csa is an RCU-protected pointer. The writer context in ieee80211_mesh_finish_csa() is already mutually exclusive with wdev->sdata.mtx, but the RCU checker did not know this. Use rcu_dereference_protected() to avoid a warning. fixes the following warning: [ 12.519089] ============================= [ 12.520042] WARNING: suspicious RCU usage [ 12.520652] 5.1.0-rc7-wt+ #16 Tainted: G W [ 12.521409] ----------------------------- [ 12.521972] net/mac80211/mesh.c:1223 suspicious rcu_dereference_check() usage! [ 12.522928] other info that might help us debug this: [ 12.523984] rcu_scheduler_active = 2, debug_locks = 1 [ 12.524855] 5 locks held by kworker/u8:2/152: [ 12.525438] #0: 00000000057be08c ((wq_completion)phy0){+.+.}, at: process_one_work+0x1a2/0x620 [ 12.526607] #1: 0000000059c6b07a ((work_completion)(&sdata->csa_finalize_work)){+.+.}, at: process_one_work+0x1a2/0x620 [ 12.528001] #2: 00000000f184ba7d (&wdev->mtx){+.+.}, at: ieee80211_csa_finalize_work+0x2f/0x90 [ 12.529116] #3: 00000000831a1f54 (&local->mtx){+.+.}, at: ieee80211_csa_finalize_work+0x47/0x90 [ 12.530233] #4: 00000000fd06f988 (&local->chanctx_mtx){+.+.}, at: ieee80211_csa_finalize_work+0x51/0x90 Signed-off-by: Thomas Pedersen <thomas@eero.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 04c3ad7 commit 606b65e

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

net/mac80211/mesh.c

+4-1
Original file line numberDiff line numberDiff line change
@@ -1135,7 +1135,8 @@ int ieee80211_mesh_finish_csa(struct ieee80211_sub_if_data *sdata)
11351135
ifmsh->chsw_ttl = 0;
11361136

11371137
/* Remove the CSA and MCSP elements from the beacon */
1138-
tmp_csa_settings = rcu_dereference(ifmsh->csa);
1138+
tmp_csa_settings = rcu_dereference_protected(ifmsh->csa,
1139+
lockdep_is_held(&sdata->wdev.mtx));
11391140
RCU_INIT_POINTER(ifmsh->csa, NULL);
11401141
if (tmp_csa_settings)
11411142
kfree_rcu(tmp_csa_settings, rcu_head);
@@ -1157,6 +1158,8 @@ int ieee80211_mesh_csa_beacon(struct ieee80211_sub_if_data *sdata,
11571158
struct mesh_csa_settings *tmp_csa_settings;
11581159
int ret = 0;
11591160

1161+
lockdep_assert_held(&sdata->wdev.mtx);
1162+
11601163
tmp_csa_settings = kmalloc(sizeof(*tmp_csa_settings),
11611164
GFP_ATOMIC);
11621165
if (!tmp_csa_settings)

0 commit comments

Comments
 (0)