Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git] / net / mac80211 / rc80211_minstrel_ht_debugfs.c
index 20c676b8e5b68fa366ed670640e9091c39ebfde3..6822ce0f95e580641f782fb2f59dcf9f09e5e639 100644 (file)
@@ -19,7 +19,7 @@ static char *
 minstrel_ht_stats_dump(struct minstrel_ht_sta *mi, int i, char *p)
 {
        const struct mcs_group *mg;
-       unsigned int j, tp, prob, eprob;
+       unsigned int j, tp_max, tp_avg, prob, eprob, tx_time;
        char htmode = '2';
        char gimode = 'L';
        u32 gflags;
@@ -38,19 +38,26 @@ minstrel_ht_stats_dump(struct minstrel_ht_sta *mi, int i, char *p)
                gimode = 'S';
 
        for (j = 0; j < MCS_GROUP_RATES; j++) {
-               struct minstrel_rate_stats *mr = &mi->groups[i].rates[j];
+               struct minstrel_rate_stats *mrs = &mi->groups[i].rates[j];
                static const int bitrates[4] = { 10, 20, 55, 110 };
                int idx = i * MCS_GROUP_RATES + j;
 
                if (!(mi->groups[i].supported & BIT(j)))
                        continue;
 
-               if (gflags & IEEE80211_TX_RC_MCS)
-                       p += sprintf(p, " HT%c0/%cGI ", htmode, gimode);
-               else if (gflags & IEEE80211_TX_RC_VHT_MCS)
-                       p += sprintf(p, "VHT%c0/%cGI ", htmode, gimode);
-               else
-                       p += sprintf(p, " CCK/%cP   ", j < 4 ? 'L' : 'S');
+               if (gflags & IEEE80211_TX_RC_MCS) {
+                       p += sprintf(p, "HT%c0  ", htmode);
+                       p += sprintf(p, "%cGI  ", gimode);
+                       p += sprintf(p, "%d  ", mg->streams);
+               } else if (gflags & IEEE80211_TX_RC_VHT_MCS) {
+                       p += sprintf(p, "VHT%c0 ", htmode);
+                       p += sprintf(p, "%cGI ", gimode);
+                       p += sprintf(p, "%d  ", mg->streams);
+               } else {
+                       p += sprintf(p, "CCK    ");
+                       p += sprintf(p, "%cP  ", j < 4 ? 'L' : 'S');
+                       p += sprintf(p, "1 ");
+               }
 
                *(p++) = (idx == mi->max_tp_rate[0]) ? 'A' : ' ';
                *(p++) = (idx == mi->max_tp_rate[1]) ? 'B' : ' ';
@@ -59,29 +66,39 @@ minstrel_ht_stats_dump(struct minstrel_ht_sta *mi, int i, char *p)
                *(p++) = (idx == mi->max_prob_rate) ? 'P' : ' ';
 
                if (gflags & IEEE80211_TX_RC_MCS) {
-                       p += sprintf(p, " MCS%-2u ", (mg->streams - 1) * 8 + j);
+                       p += sprintf(p, "  MCS%-2u", (mg->streams - 1) * 8 + j);
                } else if (gflags & IEEE80211_TX_RC_VHT_MCS) {
-                       p += sprintf(p, " MCS%-1u/%1u", j, mg->streams);
+                       p += sprintf(p, "  MCS%-1u/%1u", j, mg->streams);
                } else {
                        int r = bitrates[j % 4];
 
-                       p += sprintf(p, " %2u.%1uM ", r / 10, r % 10);
+                       p += sprintf(p, "   %2u.%1uM", r / 10, r % 10);
                }
 
-               tp = mr->cur_tp / 10;
-               prob = MINSTREL_TRUNC(mr->cur_prob * 1000);
-               eprob = MINSTREL_TRUNC(mr->probability * 1000);
+               p += sprintf(p, "  %3u  ", idx);
 
-               p += sprintf(p, " %4u.%1u %3u.%1u %3u.%1u "
-                               "%3u %4u(%4u) %9llu(%9llu)\n",
-                               tp / 10, tp % 10,
+               /* tx_time[rate(i)] in usec */
+               tx_time = DIV_ROUND_CLOSEST(mg->duration[j], 1000);
+               p += sprintf(p, "%6u  ", tx_time);
+
+               tp_max = minstrel_ht_get_tp_avg(mi, i, j, MINSTREL_FRAC(100, 100));
+               tp_avg = minstrel_ht_get_tp_avg(mi, i, j, mrs->prob_ewma);
+               prob = MINSTREL_TRUNC(mrs->cur_prob * 1000);
+               eprob = MINSTREL_TRUNC(mrs->prob_ewma * 1000);
+
+               p += sprintf(p, "%4u.%1u   %4u.%1u   %3u.%1u    %3u.%1u"
+                               "     %3u.%1u %3u   %3u %-3u   "
+                               "%9llu   %-9llu\n",
+                               tp_max / 10, tp_max % 10,
+                               tp_avg / 10, tp_avg % 10,
                                eprob / 10, eprob % 10,
+                               mrs->prob_ewmsd / 10, mrs->prob_ewmsd % 10,
                                prob / 10, prob % 10,
-                               mr->retry_count,
-                               mr->last_success,
-                               mr->last_attempts,
-                               (unsigned long long)mr->succ_hist,
-                               (unsigned long long)mr->att_hist);
+                               mrs->retry_count,
+                               mrs->last_success,
+                               mrs->last_attempts,
+                               (unsigned long long)mrs->succ_hist,
+                               (unsigned long long)mrs->att_hist);
        }
 
        return p;
@@ -94,8 +111,8 @@ minstrel_ht_stats_open(struct inode *inode, struct file *file)
        struct minstrel_ht_sta *mi = &msp->ht;
        struct minstrel_debugfs_info *ms;
        unsigned int i;
-       char *p;
        int ret;
+       char *p;
 
        if (!msp->is_ht) {
                inode->i_private = &msp->legacy;
@@ -110,8 +127,14 @@ minstrel_ht_stats_open(struct inode *inode, struct file *file)
 
        file->private_data = ms;
        p = ms->buf;
-       p += sprintf(p, " type           rate      tpt eprob *prob "
-                       "ret  *ok(*cum)        ok(      cum)\n");
+
+       p += sprintf(p, "\n");
+       p += sprintf(p, "              best   ____________rate__________    "
+                       "______statistics______    ________last_______    "
+                       "______sum-of________\n");
+       p += sprintf(p, "mode guard #  rate  [name   idx airtime  max_tp]  "
+                       "[ ø(tp) ø(prob) sd(prob)]  [prob.|retry|suc|att]  [#success | "
+                       "#attempts]\n");
 
        p = minstrel_ht_stats_dump(mi, MINSTREL_CCK_GROUP, p);
        for (i = 0; i < MINSTREL_CCK_GROUP; i++)
@@ -123,11 +146,10 @@ minstrel_ht_stats_open(struct inode *inode, struct file *file)
                        "lookaround %d\n",
                        max(0, (int) mi->total_packets - (int) mi->sample_packets),
                        mi->sample_packets);
-       p += sprintf(p, "Average A-MPDU length: %d.%d\n",
+       p += sprintf(p, "Average # of aggregated frames per A-MPDU: %d.%d\n",
                MINSTREL_TRUNC(mi->avg_ampdu_len),
                MINSTREL_TRUNC(mi->avg_ampdu_len * 10) % 10);
        ms->len = p - ms->buf;
-
        WARN_ON(ms->len + sizeof(*ms) > 32768);
 
        return nonseekable_open(inode, file);
@@ -141,6 +163,143 @@ static const struct file_operations minstrel_ht_stat_fops = {
        .llseek = no_llseek,
 };
 
+static char *
+minstrel_ht_stats_csv_dump(struct minstrel_ht_sta *mi, int i, char *p)
+{
+       const struct mcs_group *mg;
+       unsigned int j, tp_max, tp_avg, prob, eprob, tx_time;
+       char htmode = '2';
+       char gimode = 'L';
+       u32 gflags;
+
+       if (!mi->groups[i].supported)
+               return p;
+
+       mg = &minstrel_mcs_groups[i];
+       gflags = mg->flags;
+
+       if (gflags & IEEE80211_TX_RC_40_MHZ_WIDTH)
+               htmode = '4';
+       else if (gflags & IEEE80211_TX_RC_80_MHZ_WIDTH)
+               htmode = '8';
+       if (gflags & IEEE80211_TX_RC_SHORT_GI)
+               gimode = 'S';
+
+       for (j = 0; j < MCS_GROUP_RATES; j++) {
+               struct minstrel_rate_stats *mrs = &mi->groups[i].rates[j];
+               static const int bitrates[4] = { 10, 20, 55, 110 };
+               int idx = i * MCS_GROUP_RATES + j;
+
+               if (!(mi->groups[i].supported & BIT(j)))
+                       continue;
+
+               if (gflags & IEEE80211_TX_RC_MCS) {
+                       p += sprintf(p, "HT%c0,", htmode);
+                       p += sprintf(p, "%cGI,", gimode);
+                       p += sprintf(p, "%d,", mg->streams);
+               } else if (gflags & IEEE80211_TX_RC_VHT_MCS) {
+                       p += sprintf(p, "VHT%c0,", htmode);
+                       p += sprintf(p, "%cGI,", gimode);
+                       p += sprintf(p, "%d,", mg->streams);
+               } else {
+                       p += sprintf(p, "CCK,");
+                       p += sprintf(p, "%cP,", j < 4 ? 'L' : 'S');
+                       p += sprintf(p, "1,");
+               }
+
+               p += sprintf(p, "%s" ,((idx == mi->max_tp_rate[0]) ? "A" : ""));
+               p += sprintf(p, "%s" ,((idx == mi->max_tp_rate[1]) ? "B" : ""));
+               p += sprintf(p, "%s" ,((idx == mi->max_tp_rate[2]) ? "C" : ""));
+               p += sprintf(p, "%s" ,((idx == mi->max_tp_rate[3]) ? "D" : ""));
+               p += sprintf(p, "%s" ,((idx == mi->max_prob_rate) ? "P" : ""));
+
+               if (gflags & IEEE80211_TX_RC_MCS) {
+                       p += sprintf(p, ",MCS%-2u,", (mg->streams - 1) * 8 + j);
+               } else if (gflags & IEEE80211_TX_RC_VHT_MCS) {
+                       p += sprintf(p, ",MCS%-1u/%1u,", j, mg->streams);
+               } else {
+                       int r = bitrates[j % 4];
+                       p += sprintf(p, ",%2u.%1uM,", r / 10, r % 10);
+               }
+
+               p += sprintf(p, "%u,", idx);
+               tx_time = DIV_ROUND_CLOSEST(mg->duration[j], 1000);
+               p += sprintf(p, "%u,", tx_time);
+
+               tp_max = minstrel_ht_get_tp_avg(mi, i, j, MINSTREL_FRAC(100, 100));
+               tp_avg = minstrel_ht_get_tp_avg(mi, i, j, mrs->prob_ewma);
+               prob = MINSTREL_TRUNC(mrs->cur_prob * 1000);
+               eprob = MINSTREL_TRUNC(mrs->prob_ewma * 1000);
+
+               p += sprintf(p, "%u.%u,%u.%u,%u.%u,%u.%u,%u.%u,%u,%u,"
+                               "%u,%llu,%llu,",
+                               tp_max / 10, tp_max % 10,
+                               tp_avg / 10, tp_avg % 10,
+                               eprob / 10, eprob % 10,
+                               mrs->prob_ewmsd / 10, mrs->prob_ewmsd % 10,
+                               prob / 10, prob % 10,
+                               mrs->retry_count,
+                               mrs->last_success,
+                               mrs->last_attempts,
+                               (unsigned long long)mrs->succ_hist,
+                               (unsigned long long)mrs->att_hist);
+               p += sprintf(p, "%d,%d,%d.%d\n",
+                               max(0, (int) mi->total_packets -
+                               (int) mi->sample_packets),
+                               mi->sample_packets,
+                               MINSTREL_TRUNC(mi->avg_ampdu_len),
+                               MINSTREL_TRUNC(mi->avg_ampdu_len * 10) % 10);
+       }
+
+       return p;
+}
+
+static int
+minstrel_ht_stats_csv_open(struct inode *inode, struct file *file)
+{
+       struct minstrel_ht_sta_priv *msp = inode->i_private;
+       struct minstrel_ht_sta *mi = &msp->ht;
+       struct minstrel_debugfs_info *ms;
+       unsigned int i;
+       int ret;
+       char *p;
+
+       if (!msp->is_ht) {
+               inode->i_private = &msp->legacy;
+               ret = minstrel_stats_csv_open(inode, file);
+               inode->i_private = msp;
+               return ret;
+       }
+
+       ms = kmalloc(32768, GFP_KERNEL);
+
+       if (!ms)
+               return -ENOMEM;
+
+       file->private_data = ms;
+
+       p = ms->buf;
+
+       p = minstrel_ht_stats_csv_dump(mi, MINSTREL_CCK_GROUP, p);
+       for (i = 0; i < MINSTREL_CCK_GROUP; i++)
+               p = minstrel_ht_stats_csv_dump(mi, i, p);
+       for (i++; i < ARRAY_SIZE(mi->groups); i++)
+               p = minstrel_ht_stats_csv_dump(mi, i, p);
+
+       ms->len = p - ms->buf;
+       WARN_ON(ms->len + sizeof(*ms) > 32768);
+
+       return nonseekable_open(inode, file);
+}
+
+static const struct file_operations minstrel_ht_stat_csv_fops = {
+       .owner = THIS_MODULE,
+       .open = minstrel_ht_stats_csv_open,
+       .read = minstrel_stats_read,
+       .release = minstrel_stats_release,
+       .llseek = no_llseek,
+};
+
 void
 minstrel_ht_add_sta_debugfs(void *priv, void *priv_sta, struct dentry *dir)
 {
@@ -148,6 +307,8 @@ minstrel_ht_add_sta_debugfs(void *priv, void *priv_sta, struct dentry *dir)
 
        msp->dbg_stats = debugfs_create_file("rc_stats", S_IRUGO, dir, msp,
                        &minstrel_ht_stat_fops);
+       msp->dbg_stats_csv = debugfs_create_file("rc_stats_csv", S_IRUGO,
+                            dir, msp, &minstrel_ht_stat_csv_fops);
 }
 
 void
@@ -156,4 +317,5 @@ minstrel_ht_remove_sta_debugfs(void *priv, void *priv_sta)
        struct minstrel_ht_sta_priv *msp = priv_sta;
 
        debugfs_remove(msp->dbg_stats);
+       debugfs_remove(msp->dbg_stats_csv);
 }