Skip to contentSkip to conversation

mac80211: handle lack of sband->bitrates in rates

PATCH In review Thomas Pedersen 2 participants 4 messages Oct 5, 2020 – Oct 8, 2020 mac80211

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 mac80211: handle lack of sband->bitrates in rates

Even though a driver or mac80211 shouldn't produce a legacy bitrate if sband->bitrates doesn't exist, don't crash if that is the case either.

This fixes a kernel panic if station dump is run before last_rate can be updated with a data frame when sband->bitrates is missing (eg. in S1G bands).

---

v2:
WARN_ON -> WARN_ON_ONCE (Ben)

---
 net/mac80211/cfg.c      | 3 ++-
 net/mac80211/sta_info.c | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)
net/mac80211/cfg.c +2 -1
index da70f174d629..eb52aafd9381 100644
@@ -709,7 +709,8 @@ void sta_set_rate_info_tx(struct sta_info *sta,
 		u16 brate;
 
 		sband = ieee80211_get_sband(sta->sdata);
-		if (sband) {
+		WARN_ON_ONCE(sband && !sband->bitrates);
+		if (sband && sband->bitrates) {
 			brate = sband->bitrates[rate->idx].bitrate;
 			rinfo->legacy = DIV_ROUND_UP(brate, 1 << shift);
 		}
net/mac80211/sta_info.c +4 -0
index f2840d1d95cf..fb4f2b9b294f 100644
@@ -2122,6 +2122,10 @@ static void sta_stats_decode_rate(struct ieee80211_local *local, u32 rate,
 		int rate_idx = STA_STATS_GET(LEGACY_IDX, rate);
 
 		sband = local->hw.wiphy->bands[band];
+
+		if (WARN_ON_ONCE(!sband->bitrates))
+			break;
+
 		brate = sband->bitrates[rate_idx].bitrate;
 		if (rinfo->bw == RATE_INFO_BW_5)
 			shift = 2;
Signature · 1 line
2.20.1
#1 lore raw

PATCH v2 2/2 mac80211: initialize last_rate for S1G STAs

last_rate is initialized to zero by sta_info_alloc(), but this indicates legacy bitrate for the last TX rate (and invalid for the last RX rate). To avoid a warning when decoding the last rate as legacy (before a data frame has been sent), initialize them as S1G MCS.

---
 net/mac80211/Makefile      |  1 +
 net/mac80211/ieee80211_i.h |  3 +++
 net/mac80211/mlme.c        |  4 +++-
 net/mac80211/rate.c        |  1 +
 net/mac80211/s1g.c         | 17 +++++++++++++++++
 net/mac80211/sta_info.h    |  1 +
 6 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 net/mac80211/s1g.c
net/mac80211/Makefile +1 -0
index 6cbb1286d6c0..ad04c361cba5 100644
@@ -13,6 +13,7 @@ mac80211-y := \
 	ht.o agg-tx.o agg-rx.o \
 	vht.o \
 	he.o \
+	s1g.o \
 	ibss.o \
 	iface.o \
 	rate.o \
net/mac80211/ieee80211_i.h +3 -0
index c3e3578574a6..d9d7a34480b0 100644
@@ -1928,6 +1928,9 @@ void
 ieee80211_he_op_ie_to_bss_conf(struct ieee80211_vif *vif,
 			const struct ieee80211_he_operation *he_op_ie_elem);
 
+/* S1G */
+void ieee80211_s1g_sta_init(struct sta_info *sta);
+
 /* Spectrum management */
 void ieee80211_process_measurement_req(struct ieee80211_sub_if_data *sdata,
 				       struct ieee80211_mgmt *mgmt,
net/mac80211/mlme.c +3 -1
index e9a8e8e94ee6..fe6cfb8d477f 100644
@@ -5190,8 +5190,10 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
 		int shift = ieee80211_vif_get_shift(&sdata->vif);
 
 		/* TODO: S1G Basic Rate Set is expressed elsewhere */
-		if (cbss->channel->band == NL80211_BAND_S1GHZ)
+		if (cbss->channel->band == NL80211_BAND_S1GHZ) {
+			ieee80211_s1g_sta_init(new_sta);
 			goto skip_rates;
+		}
 
 		ieee80211_get_rates(sband, bss->supp_rates,
 				    bss->supp_rates_len,
net/mac80211/rate.c +1 -0
index 0cba7fed28cf..723762a4052b 100644
@@ -53,6 +53,7 @@ void rate_control_rate_init(struct sta_info *sta)
 
 	/* TODO: check for minstrel_s1g ? */
 	if (sband->band == NL80211_BAND_S1GHZ) {
+		ieee80211_s1g_sta_init(sta);
 		rcu_read_unlock();
 		return;
 	}
net/mac80211/s1g.c new file +17 -0
new file mode 100644
index 000000000000..dbc216ad0a6e
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0
+/* S1G handling
+ * Copyright(c) 2020 Adapt-IP
+ */
+
+#include <linux/ieee80211.h>
+#include <net/mac80211.h>
+
+#include "ieee80211_i.h"
+
+void ieee80211_s1g_sta_init(struct sta_info *sta)
+{
+	/* avoid indicating legacy bitrates for S1G STAs */
+	sta->tx_stats.last_rate.flags |= IEEE80211_TX_RC_S1G_MCS;
+	sta->rx_stats.last_rate =
+			STA_STATS_FIELD(TYPE, STA_STATS_RATE_TYPE_S1G);
+}
net/mac80211/sta_info.h +1 -0
index 91a61b44b4e0..00ae81e9e1a1 100644
@@ -823,6 +823,7 @@ enum sta_stats_type {
 	STA_STATS_RATE_TYPE_HT,
 	STA_STATS_RATE_TYPE_VHT,
 	STA_STATS_RATE_TYPE_HE,
+	STA_STATS_RATE_TYPE_S1G,
 };
 
 #define STA_STATS_FIELD_HT_MCS		GENMASK( 7,  0)
Signature · 1 line
2.20.1
maintainer
#2 lore raw

Re: [PATCH v2 2/2] mac80211: initialize last_rate for S1G STAs

Quoted 5 lines · Thomas Pedersen

last_rate is initialized to zero by sta_info_alloc(), but this indicates legacy bitrate for the last TX rate (and invalid for the last RX rate). To avoid a warning when decoding the last rate as legacy (before a data frame has been sent), initialize them as S1G MCS.

Oh, I see, this fixes the warning ...

OK, never mind, I'll just apply both.

johannes

maintainer
#3 lore raw
In reply to Thomas Pedersen
Quoted 38 lines · Thomas Pedersen

Even though a driver or mac80211 shouldn't produce a legacy bitrate if sband->bitrates doesn't exist, don't crash if that is the case either.

This fixes a kernel panic if station dump is run before last_rate can be updated with a data frame when sband->bitrates is missing (eg. in S1G bands).

---

v2:
WARN_ON -> WARN_ON_ONCE (Ben)

---
 net/mac80211/cfg.c      | 3 ++-
 net/mac80211/sta_info.c | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)
net/mac80211/cfg.c +2 -1
index da70f174d629..eb52aafd9381 100644
@@ -709,7 +709,8 @@ void sta_set_rate_info_tx(struct sta_info *sta,
 		u16 brate;
 
 		sband = ieee80211_get_sband(sta->sdata);
-		if (sband) {
+		WARN_ON_ONCE(sband && !sband->bitrates);
+		if (sband && sband->bitrates) {
 			brate = sband->bitrates[rate->idx].bitrate;
 			rinfo->legacy = DIV_ROUND_UP(brate, 1 << shift);
 		}
net/mac80211/sta_info.c +0 -0
index f2840d1d95cf..fb4f2b9b294f 100644

net/mac80211/sta_info.c static void sta_stats_decode_rate(struct ieee80211_local *local, u32 rate, · line 2128

Quoted 7 lines
net/mac80211/sta_info.c +4 -0
@@ -2122,6 +2122,10 @@ static void sta_stats_decode_rate(struct ieee80211_local *local, u32 rate,
 		int rate_idx = STA_STATS_GET(LEGACY_IDX, rate);
 
 		sband = local->hw.wiphy->bands[band];
+
+		if (WARN_ON_ONCE(!sband->bitrates))
+			break;
+

Given the premise described in the commit message, neither of these really seem right - why would we want to trigger a WARN_ON(_ONCE) if userspace requests the information that early? Should be silent IMHO?

johannes