cfg80211: dynamically allocate per-tid stats for station info

With the addition of TXQ stats in the per-tid statistics the struct
station_info grew significantly. This resulted in stack size warnings
due to the structure itself being above the limit for the warnings.

Add an allocation function that those who want to provide per-tid
stats should use to allocate the tid array, i.e.
struct station_info::pertid.

Cc: Toke Høiland-Jørgensen <toke@toke.dk>
Fixes: 52539ca89f36 ("cfg80211: Expose TXQ stats and parameters to userspace")
Signed-off-by: Arend van Spriel <aspriel@gmail.com>
[johannes: fix missing BIT() and logic by removing]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 8db6071b60636dbae01fe194954cd0357444fe79..8984d24d68b7ed555bf44af97e274ba366301d1a 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1184,6 +1184,7 @@ struct cfg80211_tid_stats {
  * @rx_duration: aggregate PPDU duration(usecs) for all the frames from a peer
  * @pertid: per-TID statistics, see &struct cfg80211_tid_stats, using the last
  *     (IEEE80211_NUM_TIDS) index for MSDUs not encapsulated in QoS-MPDUs.
+ *     Note that this doesn't use the @filled bit, but is used if non-NULL.
  * @ack_signal: signal strength (in dBm) of the last ACK frame.
  * @avg_ack_signal: average rssi value of ack packet for the no of msdu's has
  *     been sent.
@@ -1230,7 +1231,7 @@ struct station_info {
        u64 rx_beacon;
        u64 rx_duration;
        u8 rx_beacon_signal_avg;
-       struct cfg80211_tid_stats pertid[IEEE80211_NUM_TIDS + 1];
+       struct cfg80211_tid_stats *pertid;
        s8 ack_signal;
        s8 avg_ack_signal;
 };
@@ -5701,6 +5702,13 @@ void cfg80211_remain_on_channel_expired(struct wireless_dev *wdev, u64 cookie,
                                        struct ieee80211_channel *chan,
                                        gfp_t gfp);
 
+/**
+ * cfg80211_sinfo_alloc_tid_stats - allocate per-tid statistics.
+ *
+ * @sinfo: the station information
+ * @gfp: allocation flags
+ */
+int cfg80211_sinfo_alloc_tid_stats(struct station_info *sinfo, gfp_t gfp);
 
 /**
  * cfg80211_new_sta - notify userspace about station

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 43f34aa873bcd88d92da1721e57356551c52ddcc..04d47689b5573310435783682f9a8f1ef316d79c 100644 (file)
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -2233,11 +2233,12 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
                        sinfo->filled |= BIT(NL80211_STA_INFO_RX_BITRATE);
        }
 
-       sinfo->filled |= BIT(NL80211_STA_INFO_TID_STATS);
-       for (i = 0; i < IEEE80211_NUM_TIDS + 1; i++) {
-               struct cfg80211_tid_stats *tidstats = &sinfo->pertid[i];
+       if (!cfg80211_sinfo_alloc_tid_stats(sinfo, GFP_KERNEL)) {
+               for (i = 0; i < IEEE80211_NUM_TIDS + 1; i++) {
+                       struct cfg80211_tid_stats *tidstats = &sinfo->pertid[i];
 
-               sta_set_tidstats(sta, tidstats, i);
+                       sta_set_tidstats(sta, tidstats, i);
+               }
        }
 
        if (ieee80211_vif_is_mesh(&sdata->vif)) {

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index f7715b85fd2bb738a320b696410bf15545dd3062..3d638f11edb50173efbd6355977225573d4cc0ca 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -4658,7 +4658,7 @@ static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid,
 #undef PUT_SINFO
 #undef PUT_SINFO_U64
 
-       if (sinfo->filled & BIT(NL80211_STA_INFO_TID_STATS)) {
+       if (sinfo->pertid) {
                struct nlattr *tidsattr;
                int tid;
 
@@ -4702,6 +4702,7 @@ static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid,
                }
 
                nla_nest_end(msg, tidsattr);
+               kfree(sinfo->pertid);
        }
 
        nla_nest_end(msg, sinfoattr);

diff --git a/net/wireless/util.c b/net/wireless/util.c
index d112e9a89364518fbd9ac748f9391022601669b7..b5bb1c30991461d980cd57e3e582e3ca69ac4516 100644 (file)
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -1787,6 +1787,17 @@ bool cfg80211_does_bw_fit_range(const struct ieee80211_freq_range *freq_range,
        return false;
 }
 
+int cfg80211_sinfo_alloc_tid_stats(struct station_info *sinfo, gfp_t gfp)
+{
+       sinfo->pertid = kcalloc(sizeof(*(sinfo->pertid)),
+                               IEEE80211_NUM_TIDS + 1, gfp);
+       if (!sinfo->pertid)
+               return -ENOMEM;
+
+       return 0;
+}
+EXPORT_SYMBOL(cfg80211_sinfo_alloc_tid_stats);
+
 /* See IEEE 802.1H for LLC/SNAP encapsulation/decapsulation */
 /* Ethernet-II snap header (RFC1042 for most EtherTypes) */
 const unsigned char rfc1042_header[] __aligned(2) =