From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail2.tohojo.dk (mail2.tohojo.dk [77.235.48.147]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.bufferbloat.net (Postfix) with ESMTPS id 8B9353B2A3 for ; Wed, 20 Jul 2016 10:55:04 -0400 (EDT) X-Virus-Scanned: amavisd-new at mail2.tohojo.dk DKIM-Filter: OpenDKIM Filter v2.10.3 mail2.tohojo.dk 328E240472 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=toke.dk; s=201310; t=1469026502; bh=1JIBP5gCgJDYEbcmZAZRbP5JXXbsCBAT+EI0kg5JLQk=; h=From:To:Cc:Subject:Date:From; b=V+LSU7TQ168n8qI6tIm/dglYFGVdlhmw8S6AtOZ+79FvY0/Ycm6n/P50FTdeU4z/m O0vVGoLbdlDPHedcf8w0iEgl8t6mnaYeioQ3FTvJF8gv7U7VXGsAh6OhJ2iyxGyv43 WmOma7v6NGaGWETlGDN4s6OIByh5g7FMu1XFCJ8c= Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 6D0613350; Wed, 20 Jul 2016 16:55:01 +0200 (CEST) From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= To: make-wifi-fast@lists.bufferbloat.net, linux-wireless@vger.kernel.org Date: Wed, 20 Jul 2016 16:54:42 +0200 Message-Id: <20160720145442.1098-1-toke@toke.dk> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Make-wifi-fast] [PATCH] mac80211: Keep CoDel stats per txq, export them in debugfs. X-BeenThere: make-wifi-fast@lists.bufferbloat.net X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Jul 2016 14:55:04 -0000 Currently the 'aqm' stats in mac80211 only keeps overlimit drop stats, not CoDel stats. This moves the CoDel stats into the txqi structure and adds the drop and mark counts to the debug output. Cc: Michal Kazior Signed-off-by: Toke H=C3=B8iland-J=C3=B8rgensen --- net/mac80211/debugfs.c | 12 ++++++++---- net/mac80211/ieee80211_i.h | 2 +- net/mac80211/tx.c | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c index 27e6fb9..69bf2e5 100644 --- a/net/mac80211/debugfs.c +++ b/net/mac80211/debugfs.c @@ -137,18 +137,20 @@ static int aqm_open(struct inode *inode, struct fil= e *file) len +=3D scnprintf(info->buf + len, info->size - len, "* vif\n" - "ifname addr ac backlog-bytes backlog-packets flows overlimit collis= ions tx-bytes tx-packets\n"); + "ifname addr ac backlog-bytes backlog-packets flows drops marks over= limit collisions tx-bytes tx-packets\n"); =20 list_for_each_entry_rcu(sdata, &local->interfaces, list) { txqi =3D to_txq_info(sdata->vif.txq); len +=3D scnprintf(info->buf + len, info->size - len, - "%s %pM %u %u %u %u %u %u %u %u\n", + "%s %pM %u %u %u %u %u %u %u %u %u %u\n", sdata->name, sdata->vif.addr, 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, @@ -158,14 +160,14 @@ static int aqm_open(struct inode *inode, struct fil= e *file) len +=3D scnprintf(info->buf + len, info->size - len, "* sta\n" - "ifname addr tid ac backlog-bytes backlog-packets flows overlimit co= llisions tx-bytes tx-packets\n"); + "ifname addr tid ac backlog-bytes backlog-packets flows drops marks = overlimit collisions tx-bytes tx-packets\n"); =20 list_for_each_entry_rcu(sta, &local->sta_list, list) { sdata =3D sta->sdata; for (i =3D 0; i < ARRAY_SIZE(sta->sta.txq); i++) { txqi =3D to_txq_info(sta->sta.txq[i]); len +=3D scnprintf(info->buf + len, info->size - len, - "%s %pM %d %d %u %u %u %u %u %u %u\n", + "%s %pM %d %d %u %u %u %u %u %u %u %u %u\n", sdata->name, sta->sta.addr, txqi->txq.tid, @@ -173,6 +175,8 @@ static int aqm_open(struct inode *inode, struct file = *file) 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, diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index c9f8c80..9f11b13 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -812,6 +812,7 @@ struct txq_info { struct fq_tin tin; struct fq_flow def_flow; struct codel_vars def_cvars; + struct codel_stats cstats; unsigned long flags; =20 /* keep last! */ @@ -1106,7 +1107,6 @@ struct ieee80211_local { struct fq fq; struct codel_vars *cvars; struct codel_params cparams; - struct codel_stats cstats; =20 const struct ieee80211_ops *ops; =20 diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 682011e..201167d 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -1339,7 +1339,7 @@ static struct sk_buff *fq_tin_dequeue_func(struct f= q *fq, local =3D container_of(fq, struct ieee80211_local, fq); txqi =3D container_of(tin, struct txq_info, tin); cparams =3D &local->cparams; - cstats =3D &local->cstats; + cstats =3D &txqi->cstats; =20 if (flow =3D=3D &txqi->def_flow) cvars =3D &txqi->def_cvars; @@ -1399,6 +1399,7 @@ void ieee80211_txq_init(struct ieee80211_sub_if_dat= a *sdata, fq_tin_init(&txqi->tin); fq_flow_init(&txqi->def_flow); codel_vars_init(&txqi->def_cvars); + codel_stats_init(&txqi->cstats); =20 txqi->txq.vif =3D &sdata->vif; =20 @@ -1437,7 +1438,6 @@ int ieee80211_txq_setup_flows(struct ieee80211_loca= l *local) return ret; =20 codel_params_init(&local->cparams); - codel_stats_init(&local->cstats); local->cparams.interval =3D MS2TIME(100); local->cparams.target =3D MS2TIME(20); local->cparams.ecn =3D true; --=20 2.9.0