Skip to content

[Deepin-Kernel-SIG] [linux 6.6-y] [Upstream] wifi: ath11k: fix sleeping-in-atomic in ath11k_mac_op_set_bitrate_mask() #1327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
opsiff wants to merge 1 commit into
base: linux-6.6.y
Choose a base branch
from
+6 −6
Open

[Deepin-Kernel-SIG] [linux 6.6-y] [Upstream] wifi: ath11k: fix sleeping-in-atomic in ath11k_mac_op_set_bitrate_mask() #1327

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions drivers/net/wireless/ath/ath11k/mac.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8214,9 +8214,9 @@ ath11k_mac_op_set_bitrate_mask(struct ieee80211_hw *hw,
arvif->vdev_id, ret);
return ret;
}
ieee80211_iterate_stations_atomic(ar->hw,
ath11k_mac_disable_peer_fixed_rate,
arvif);
ieee80211_iterate_stations_mtx(ar->hw,
ath11k_mac_disable_peer_fixed_rate,
arvif);
} else if (ath11k_mac_bitrate_mask_get_single_nss(ar, band, mask,
&single_nss)) {
rate = WMI_FIXED_RATE_NONE;
Expand Down Expand Up @@ -8285,9 +8285,9 @@ ath11k_mac_op_set_bitrate_mask(struct ieee80211_hw *hw,
}

mutex_lock(&ar->conf_mutex);
ieee80211_iterate_stations_atomic(ar->hw,
ath11k_mac_disable_peer_fixed_rate,
arvif);
ieee80211_iterate_stations_mtx(ar->hw,
ath11k_mac_disable_peer_fixed_rate,
arvif);
Comment on lines 8287 to +8290
Copy link

Copilot AI Nov 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Inconsistent mutex handling: ieee80211_iterate_stations_mtx() is called with ar->conf_mutex held here (line 8287), but without it at line 8217-8219. The function ieee80211_iterate_stations_mtx() handles its own internal locking and should be called without holding ar->conf_mutex. Consider moving this call before the mutex_lock() at line 8287 to match the pattern at line 8217 and align with the ath12k driver implementation (see drivers/net/wireless/ath/ath12k/mac.c:6725-6729).

Copilot uses AI. Check for mistakes.

arvif->bitrate_mask = *mask;
ieee80211_iterate_stations_atomic(ar->hw,
Expand Down
Loading