mac80211: Re-structure aqm debugfs output and keep CoDel stats per txq

Currently the 'aqm' stats in mac80211 only keeps overlimit drop stats,
not CoDel stats. This moves the CoDel stats into the txqi structure to
keep them per txq in order to show them in debugfs.

In addition, the aqm debugfs output is restructured by splitting it up
into three files: One global per phy, one per netdev and one per
station, in the appropriate directories. The files are all called aqm,
and are only created if the driver supports the wake_tx_queue op (rather
than emitting an error on open as previously).

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 36 insertions, 1 deletions

diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c
index a5ba739cd2a7..5d35c0f37bb7 100644
--- a/net/mac80211/debugfs_netdev.c
+++ b/net/mac80211/debugfs_netdev.c
@@ -30,7 +30,7 @@ static ssize_t ieee80211_if_read(
         size_t count, loff_t *ppos,
         ssize_t (*format)(const struct ieee80211_sub_if_data *, char *, int))
 {
-        char buf[70];
+        char buf[200];
         ssize_t ret = -EINVAL;
 
         read_lock(&dev_base_lock);
@@ -486,6 +486,38 @@ static ssize_t ieee80211_if_fmt_num_buffered_multicast(
 }
 IEEE80211_IF_FILE_R(num_buffered_multicast);
 
+static ssize_t ieee80211_if_fmt_aqm(
+        const struct ieee80211_sub_if_data *sdata, char *buf, int buflen)
+{
+        struct ieee80211_local *local = sdata->local;
+        struct txq_info *txqi = to_txq_info(sdata->vif.txq);
+        int len;
+
+        spin_lock_bh(&local->fq.lock);
+        rcu_read_lock();
+
+        len = scnprintf(buf,
+                        buflen,
+                        "ac backlog-bytes backlog-packets new-flows drops marks overlimit collisions tx-bytes tx-packets\n"
+                        "%u %u %u %u %u %u %u %u %u %u\n",
+                        txqi->txq.ac,
+                        txqi->tin.backlog_bytes,
+                        txqi->tin.backlog_packets,
+                        txqi->tin.flows,
+                        txqi->cstats.drop_count,
+                        txqi->cstats.ecn_mark,
+                        txqi->tin.overlimit,
+                        txqi->tin.collisions,
+                        txqi->tin.tx_bytes,
+                        txqi->tin.tx_packets);
+
+        rcu_read_unlock();
+        spin_unlock_bh(&local->fq.lock);
+
+        return len;
+}
+IEEE80211_IF_FILE_R(aqm);
+
 /* IBSS attributes */
 static ssize_t ieee80211_if_fmt_tsf(
         const struct ieee80211_sub_if_data *sdata, char *buf, int buflen)
@@ -618,6 +650,9 @@ static void add_common_files(struct ieee80211_sub_if_data *sdata)
         DEBUGFS_ADD(rc_rateidx_vht_mcs_mask_2ghz);
         DEBUGFS_ADD(rc_rateidx_vht_mcs_mask_5ghz);
         DEBUGFS_ADD(hw_queues);
+
+        if (sdata->local->ops->wake_tx_queue)
+                DEBUGFS_ADD(aqm);
 }
 
 static void add_sta_files(struct ieee80211_sub_if_data *sdata)