From: Jiri Pirko <jiri@resnulli•us>
To: netdev@vger•kernel.org
Cc: davem@davemloft•net, nogahf@mellanox•com, jhs@mojatatu•com,
xiyou.wangcong@gmail•com, mlxsw@mellanox•com, andrew@lunn•ch,
vivien.didelot@savoirfairelinux•com, f.fainelli@gmail•com,
michael.chan@broadcom•com, ganeshgr@chelsio•com,
saeedm@mellanox•com, matanb@mellanox•com, leonro@mellanox•com,
idosch@mellanox•com, jakub.kicinski@netronome•com,
simon.horman@netronome•com, pieter.jansenvanvuuren@netronome•com,
john.hurley@netronome•com, alexander.h.duyck@intel•com,
ogerlitz@mellanox•com, john.fastabend@gmail•com
Subject: [patch net-next RFC 7/9] mlxsw: spectrum: Collect tclass related stats periodically
Date: Mon, 30 Oct 2017 09:56:11 +0100 [thread overview]
Message-ID: <20171030085613.8697-8-jiri@resnulli.us> (raw)
In-Reply-To: <20171030085613.8697-1-jiri@resnulli.us>
From: Nogah Frankel <nogahf@mellanox•com>
Add more statistics to be collected from the HW periodically. These stats
are tclass based (beside ECN marked packet, that exist only port based).
They are needed to expose RED qdisc stats and xstats correctly.
Signed-off-by: Nogah Frankel <nogahf@mellanox•com>
Signed-off-by: Jiri Pirko <jiri@mellanox•com>
---
drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 34 ++++++++++++++++++++++++++
drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 9 +++++++
2 files changed, 43 insertions(+)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index fab0bb2..584216a 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -1324,6 +1324,38 @@ static int mlxsw_sp_port_get_hw_stats(struct net_device *dev,
return err;
}
+static void
+mlxsw_sp_port_get_hw_xstats(struct net_device *dev,
+ struct mlxsw_sp_port_xstats *xstats)
+{
+ char ppcnt_pl[MLXSW_REG_PPCNT_LEN];
+ int err, i;
+
+ err = mlxsw_sp_port_get_stats_raw(dev, MLXSW_REG_PPCNT_EXT_CNT, 0,
+ ppcnt_pl);
+ if (!err)
+ xstats->ecn = mlxsw_reg_ppcnt_ecn_marked_get(ppcnt_pl);
+
+ for (i = 0; i < TC_MAX_QUEUE; i++) {
+ err = mlxsw_sp_port_get_stats_raw(dev,
+ MLXSW_REG_PPCNT_TC_CONG_TC,
+ i, ppcnt_pl);
+ if (!err)
+ xstats->wred_drop[i] =
+ mlxsw_reg_ppcnt_wred_discard_get(ppcnt_pl);
+
+ err = mlxsw_sp_port_get_stats_raw(dev, MLXSW_REG_PPCNT_TC_CNT,
+ i, ppcnt_pl);
+ if (err)
+ continue;
+
+ xstats->backlog[i] =
+ mlxsw_reg_ppcnt_tc_transmit_queue_get(ppcnt_pl);
+ xstats->tail_drop[i] =
+ mlxsw_reg_ppcnt_tc_no_buffer_discard_uc_get(ppcnt_pl);
+ }
+}
+
static void update_stats_cache(struct work_struct *work)
{
struct mlxsw_sp_port *mlxsw_sp_port =
@@ -1335,6 +1367,8 @@ static void update_stats_cache(struct work_struct *work)
mlxsw_sp_port_get_hw_stats(mlxsw_sp_port->dev,
&mlxsw_sp_port->periodic_hw_stats.stats);
+ mlxsw_sp_port_get_hw_xstats(mlxsw_sp_port->dev,
+ &mlxsw_sp_port->periodic_hw_stats.xstats);
out:
mlxsw_core_schedule_dw(&mlxsw_sp_port->periodic_hw_stats.update_dw,
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
index 8810c1a..de81e9c 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
@@ -213,6 +213,14 @@ struct mlxsw_sp_qdisc {
enum mlxsw_sp_qdisc_type type;
};
+/* No need an internal lock; At worse - miss a single periodic iteration */
+struct mlxsw_sp_port_xstats {
+ u64 ecn;
+ u64 wred_drop[TC_MAX_QUEUE];
+ u64 tail_drop[TC_MAX_QUEUE];
+ u64 backlog[TC_MAX_QUEUE];
+};
+
struct mlxsw_sp_port {
struct net_device *dev;
struct mlxsw_sp_port_pcpu_stats __percpu *pcpu_stats;
@@ -242,6 +250,7 @@ struct mlxsw_sp_port {
struct {
#define MLXSW_HW_STATS_UPDATE_TIME HZ
struct rtnl_link_stats64 stats;
+ struct mlxsw_sp_port_xstats xstats;
struct delayed_work update_dw;
} periodic_hw_stats;
struct mlxsw_sp_port_sample *sample;
--
2.9.5
next prev parent reply other threads:[~2017-10-30 8:56 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-30 8:56 [patch net-next RFC 0/9] qdisc RED offload Jiri Pirko
2017-10-30 8:56 ` [patch net-next RFC 1/9] net_sch: red: Add offload ability to RED qdisc Jiri Pirko
2017-10-30 12:20 ` David Miller
2017-10-30 13:54 ` Nogah Frankel
2017-10-30 19:24 ` David Ahern
2017-10-31 7:41 ` Jiri Pirko
2017-10-31 14:59 ` David Ahern
2017-10-31 15:03 ` Jiri Pirko
2017-10-30 12:47 ` Roman Mashak
2017-10-30 14:10 ` Nogah Frankel
2017-10-30 8:56 ` [patch net-next RFC 2/9] net_sch: mqprio: Change TC_SETUP_MQPRIO to TC_SETUP_QDISC_MQPRIO Jiri Pirko
2017-11-01 15:31 ` Simon Horman
2017-11-02 6:48 ` Jiri Pirko
2017-10-30 8:56 ` [patch net-next RFC 3/9] net_sch: cbs: Change TC_SETUP_CBS to TC_SETUP_QDISC_CBS Jiri Pirko
2017-10-30 8:56 ` [patch net-next RFC 4/9] mlxsw: reg: Add cwtp & cwtpm registers Jiri Pirko
2017-10-30 8:56 ` [patch net-next RFC 5/9] mlxsw: spectrum: Support RED qdisc offload Jiri Pirko
2017-10-30 8:56 ` [patch net-next RFC 6/9] mlxsw: reg: Add ext and tc-cong counter groups Jiri Pirko
2017-10-30 8:56 ` Jiri Pirko [this message]
2017-10-30 8:56 ` [patch net-next RFC 8/9] mlxsw: spectrum: Support RED xstats Jiri Pirko
2017-10-30 8:56 ` [patch net-next RFC 9/9] mlxsw: spectrum: Support general qdisc stats Jiri Pirko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171030085613.8697-8-jiri@resnulli.us \
--to=jiri@resnulli$(echo .)us \
--cc=alexander.h.duyck@intel$(echo .)com \
--cc=andrew@lunn$(echo .)ch \
--cc=davem@davemloft$(echo .)net \
--cc=f.fainelli@gmail$(echo .)com \
--cc=ganeshgr@chelsio$(echo .)com \
--cc=idosch@mellanox$(echo .)com \
--cc=jakub.kicinski@netronome$(echo .)com \
--cc=jhs@mojatatu$(echo .)com \
--cc=john.fastabend@gmail$(echo .)com \
--cc=john.hurley@netronome$(echo .)com \
--cc=leonro@mellanox$(echo .)com \
--cc=matanb@mellanox$(echo .)com \
--cc=michael.chan@broadcom$(echo .)com \
--cc=mlxsw@mellanox$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=nogahf@mellanox$(echo .)com \
--cc=ogerlitz@mellanox$(echo .)com \
--cc=pieter.jansenvanvuuren@netronome$(echo .)com \
--cc=saeedm@mellanox$(echo .)com \
--cc=simon.horman@netronome$(echo .)com \
--cc=vivien.didelot@savoirfairelinux$(echo .)com \
--cc=xiyou.wangcong@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox