wifi: ath11k: mac: fix struct ieee80211_sband_iftype_data handling

PATCH Superseded Kalle Valo 3 participants 6 messages Sep 26, 2023 – Sep 27, 2023 Qualcomm Atheros ATH11K wireless driver

lore

Share & tools

lore

Kalle Valo

author

2023-09-26 16:33 UTC #0 lore raw

PATCH v2 1/1 wifi: ath11k: mac: fix struct ieee80211_sband_iftype_data handling

From: Kalle Valo <[email protected]>

Commit e8c1841278a7 ("wifi: cfg80211: annotate iftype_data pointer with sparse") added sparse checks for struct ieee80211_sband_iftype_data handling which immediately found an issue in ath11k:

drivers/net/wireless/ath/ath11k/mac.c:7952:22: warning: incorrect type in argument 1 (different address spaces)
drivers/net/wireless/ath/ath11k/mac.c:7952:22: expected struct ieee80211_sta_he_cap const *he_cap
drivers/net/wireless/ath/ath11k/mac.c:7952:22: got struct ieee80211_sta_he_cap const [noderef] __iftype_data *

The problem here is that we are accessing sband->iftype_data directly even though we should use for_each_sband_iftype_data() or similar. Fortunately there's ieee80211_get_he_iftype_cap_vif() which is just we need here so use it to get HE capabilities.

Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23

Reported-by Johannes Berg <[email protected]>

Signed-off-by Kalle Valo <[email protected]>

---
 drivers/net/wireless/ath/ath11k/mac.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

drivers/net/wireless/ath/ath11k/mac.c +5 -2

index c071bf5841af..79059c42e730 100644
@@ -7910,12 +7910,14 @@ ath11k_mac_get_tx_mcs_map(const struct ieee80211_sta_he_cap *he_cap)
 
 static bool
 ath11k_mac_bitrate_mask_get_single_nss(struct ath11k *ar,
+				       struct ath11k_vif *arvif,
 				       enum nl80211_band band,
 				       const struct cfg80211_bitrate_mask *mask,
 				       int *nss)
 {
 	struct ieee80211_supported_band *sband = &ar->mac.sbands[band];
 	u16 vht_mcs_map = le16_to_cpu(sband->vht_cap.vht_mcs.tx_mcs_map);
+	const struct ieee80211_sta_he_cap *he_cap;
 	u16 he_mcs_map = 0;
 	u8 ht_nss_mask = 0;
 	u8 vht_nss_mask = 0;

@@ -7946,7 +7948,8 @@ ath11k_mac_bitrate_mask_get_single_nss(struct ath11k *ar,
 			return false;
 	}
 
-	he_mcs_map = le16_to_cpu(ath11k_mac_get_tx_mcs_map(&sband->iftype_data->he_cap));
+	he_cap = ieee80211_get_he_iftype_cap_vif(sband, arvif->vif);
+	he_mcs_map = le16_to_cpu(ath11k_mac_get_tx_mcs_map(he_cap));
 
 	for (i = 0; i < ARRAY_SIZE(mask->control[band].he_mcs); i++) {
 		if (mask->control[band].he_mcs[i] == 0)

@@ -8362,7 +8365,7 @@ ath11k_mac_op_set_bitrate_mask(struct ieee80211_hw *hw,
 		ieee80211_iterate_stations_atomic(ar->hw,
 						  ath11k_mac_disable_peer_fixed_rate,
 						  arvif);
-	} else if (ath11k_mac_bitrate_mask_get_single_nss(ar, band, mask,
+	} else if (ath11k_mac_bitrate_mask_get_single_nss(ar, arvif, band, mask,
 							  &single_nss)) {
 		rate = WMI_FIXED_RATE_NONE;
 		nss = single_nss;

base-commit: 73e13f6a439b75a9dbc84bbfa0b0d6624b354853

Signature · 1 line

2.39.2

Kalle Valo

author

2023-09-26 16:36 UTC #1 lore raw

Quoted 18 lines · Kalle Valo

From: Kalle Valo <[email protected]>
Commit e8c1841278a7 ("wifi: cfg80211: annotate iftype_data pointer with sparse") added sparse checks for struct ieee80211_sband_iftype_data handling which immediately found an issue in ath11k:
drivers/net/wireless/ath/ath11k/mac.c:7952:22: warning: incorrect type in argument 1 (different address spaces) drivers/net/wireless/ath/ath11k/mac.c:7952:22: expected struct ieee80211_sta_he_cap const *he_cap drivers/net/wireless/ath/ath11k/mac.c:7952:22: got struct ieee80211_sta_he_cap const [noderef] __iftype_data *
The problem here is that we are accessing sband->iftype_data directly even though we should use for_each_sband_iftype_data() or similar. Fortunately there's ieee80211_get_he_iftype_cap_vif() which is just we need here so use it to get HE capabilities.

Quoted 5 lines

Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
Reported-by Johannes Berg <[email protected]>
Signed-off-by Kalle Valo <[email protected]>

Changelog for v2:

* use ieee80211_get_he_iftype_cap_vif() instead of open coding it

Signature · 8 lines

https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

-- 
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k

Johannes Berg

2023-09-26 16:44 UTC #2 lore raw

In reply to Kalle Valo

drivers/net/wireless/ath/ath11k/mac.c ath11k_mac_bitrate_mask_get_single_nss(struct ath11k *ar, · line 7952

Quoted 4 lines · Kalle Valo

drivers/net/wireless/ath/ath11k/mac.c +2 -1

-	he_mcs_map = le16_to_cpu(ath11k_mac_get_tx_mcs_map(&sband->iftype_data->he_cap));
+	he_cap = ieee80211_get_he_iftype_cap_vif(sband, arvif->vif);
+	he_mcs_map = le16_to_cpu(ath11k_mac_get_tx_mcs_map(he_cap));

Technically, ieee80211_get_he_iftype_cap_vif() could return NULL if you didn't actually configure/enable HE for this iftype, the static checkers might complain here.

johannes

Signature · 3 lines

ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k

Kalle Valo

author

2023-09-26 19:05 UTC #3 lore raw

Quoted 10 lines · Johannes Berg

drivers/net/wireless/ath/ath11k/mac.c ath11k_mac_bitrate_mask_get_single_nss(struct ath11k *ar, · line 7952
Quoted 5 lines · Kalle Valo
- he_mcs_map = le16_to_cpu(ath11k_mac_get_tx_mcs_map(&sband->iftype_data->he_cap));
drivers/net/wireless/ath/ath11k/mac.c +2 -0
+	he_cap = ieee80211_get_he_iftype_cap_vif(sband, arvif->vif);
+	he_mcs_map = le16_to_cpu(ath11k_mac_get_tx_mcs_map(he_cap));
Technically, ieee80211_get_he_iftype_cap_vif() could return NULL if you didn't actually configure/enable HE for this iftype, the static checkers might complain here.

And this is even mentioned in the documentation which I failed to see:

* Return: pointer to the struct ieee80211_sta_he_cap, or %NULL is none found

Thanks! I'll fix this in v3.

Signature · 3 lines

https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Jeff Johnson

2023-09-26 20:55 UTC #4 lore raw

In reply to Kalle Valo

Quoted 6 lines · Kalle Valo

From: Kalle Valo <[email protected]>
Commit e8c1841278a7 ("wifi: cfg80211: annotate iftype_data pointer with sparse") added sparse checks for struct ieee80211_sband_iftype_data handling which immediately found an issue in ath11k:

Quoted 7 lines

drivers/net/wireless/ath/ath11k/mac.c:7952:22: warning: incorrect type in argument 1 (different address spaces)
drivers/net/wireless/ath/ath11k/mac.c:7952:22: expected struct ieee80211_sta_he_cap const *he_cap
drivers/net/wireless/ath/ath11k/mac.c:7952:22: got struct ieee80211_sta_he_cap const [noderef] __iftype_data *
The problem here is that we are accessing sband->iftype_data directly even though we should use for_each_sband_iftype_data() or similar. Fortunately there's ieee80211_get_he_iftype_cap_vif() which is just we need here so use it

nit: just *what* we need

Quoted 1 line

to get HE capabilities.

Signature · 3 lines

ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k

Kalle Valo

author

2023-09-27 05:10 UTC #5 lore raw

Quoted 15 lines · Jeff Johnson

Quoted 5 lines · Kalle Valo
From: Kalle Valo <[email protected]>
Commit e8c1841278a7 ("wifi: cfg80211: annotate iftype_data pointer with
sparse") added sparse checks for struct ieee80211_sband_iftype_data handling which immediately found an issue in ath11k:
Quoted 8 lines
drivers/net/wireless/ath/ath11k/mac.c:7952:22: warning: incorrect type in argument 1 (different address spaces)
drivers/net/wireless/ath/ath11k/mac.c:7952:22: expected struct ieee80211_sta_he_cap const *he_cap
drivers/net/wireless/ath/ath11k/mac.c:7952:22: got struct ieee80211_sta_he_cap const [noderef] __iftype_data *
The problem here is that we are accessing sband->iftype_data directly even
though we should use for_each_sband_iftype_data() or similar. Fortunately there's ieee80211_get_he_iftype_cap_vif() which is just we need here so use it

Quoted 1 line

nit: just *what* we need

I'll add that, thanks.

Signature · 8 lines

https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

-- 
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k