github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

wifi: mac80211: mesh: fix path table generation counters

Browse Source 
The mesh and MPP path generation counters (for netlink)
are updated wrongly and sometimes unlocked. Fix those
issues.

Assisted-by: LLM
Link: https://patch.msgid.link/20261005224950.373dd5c1e46a.I29b95bc3f62b846084700599a261a203a6e459b4@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2026-10-05 22:47:58 +02:00
parent 22d8e38161
commit ede3a3e0da
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
net/mac80211/mesh_pathtbl.c
View File

@ -711,8 +711,10 @@ struct mesh_path *mesh_path_add(struct ieee80211_sub_if_data *sdata,
mpath = rhashtable_lookup_get_insert_fast(&tbl->rhead,
&new_mpath->rhash,
mesh_rht_params);
if (!mpath)
if (!mpath) {
hlist_add_head_rcu(&new_mpath->walk_list, &tbl->walk_head);
sdata->u.mesh.mesh_paths_generation++;
}
spin_unlock_bh(&tbl->walk_lock);
if (mpath) {
@ -725,7 +727,6 @@ struct mesh_path *mesh_path_add(struct ieee80211_sub_if_data *sdata,
new_mpath = mpath;
}
sdata->u.mesh.mesh_paths_generation++;
return new_mpath;
}
@ -760,8 +761,10 @@ int mpp_path_add(struct ieee80211_sub_if_data *sdata,
ret = rhashtable_lookup_insert_fast(&tbl->rhead,
&new_mpath->rhash,
mesh_rht_params);
if (!ret)
if (!ret) {
hlist_add_head_rcu(&new_mpath->walk_list, &tbl->walk_head);
sdata->u.mesh.mpp_paths_generation++;
}
spin_unlock_bh(&tbl->walk_lock);
if (ret) {
@ -771,7 +774,6 @@ int mpp_path_add(struct ieee80211_sub_if_data *sdata,
mesh_fast_tx_flush_addr(sdata, dst);
}
sdata->u.mesh.mpp_paths_generation++;
return ret;
}
@ -833,10 +835,13 @@ static void __mesh_path_del(struct mesh_table *tbl, struct mesh_path *mpath)
spin_lock_bh(&mpath->state_lock);
WRITE_ONCE(mpath->flags, mpath->flags | MESH_PATH_DELETED);
spin_unlock_bh(&mpath->state_lock);
if (tbl == &mpath->sdata->u.mesh.mpp_paths)
if (tbl == &mpath->sdata->u.mesh.mpp_paths) {
mpath->sdata->u.mesh.mpp_paths_generation++;
mesh_fast_tx_flush_addr(mpath->sdata, mpath->dst);
else
} else {
mpath->sdata->u.mesh.mesh_paths_generation++;
mesh_fast_tx_flush_mpath(mpath);
}
mesh_path_free_rcu(tbl, mpath);
}
@ -944,14 +949,10 @@ static int table_path_del(struct mesh_table *tbl,
*/
int mesh_path_del(struct ieee80211_sub_if_data *sdata, const u8 *addr)
{
int err;
/* flush relevant mpp entries first */
mpp_flush_by_proxy(sdata, addr);
err = table_path_del(&sdata->u.mesh.mesh_paths, sdata, addr);
sdata->u.mesh.mesh_paths_generation++;
return err;
return table_path_del(&sdata->u.mesh.mesh_paths, sdata, addr);
}
/**