From: Alexander Lobakin <alexandr.lobakin@intel.com>
To: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: Alexander Lobakin <alexandr.lobakin@intel.com>,
Jesse Brandeburg <jesse.brandeburg@intel.com>,
Lukasz Czapnik <lukasz.czapnik@intel.com>,
Marcin Kubiak <marcin.kubiak@intel.com>,
Michal Kubiak <michal.kubiak@intel.com>,
Michal Swiatkowski <michal.swiatkowski@intel.com>,
Jonathan Corbet <corbet@lwn.net>,
Netanel Belgazal <netanel@amazon.com>,
Arthur Kiyanovski <akiyano@amazon.com>,
Guy Tzalik <gtzalik@amazon.com>,
Saeed Bishara <saeedb@amazon.com>,
Ioana Ciornei <ioana.ciornei@nxp.com>,
Claudiu Manoil <claudiu.manoil@nxp.com>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Marcin Wojtas <mw@semihalf.com>,
Russell King <linux@armlinux.org.uk>,
Edward Cree <ecree.xilinx@gmail.com>,
Martin Habets <habetsm.xilinx@gmail.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Jesper Dangaard Brouer <hawk@kernel.org>,
John Fastabend <john.fastabend@gmail.com>,
Andrii Nakryiko <andrii@kernel.org>,
Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
Yonghong Song <yhs@fb.com>, KP Singh <kpsingh@kernel.org>,
Shay Agroskin <shayagr@amazon.com>,
Sameeh Jubran <sameehj@amazon.com>,
Alexander Duyck <alexanderduyck@fb.com>,
Danielle Ratson <danieller@nvidia.com>,
Ido Schimmel <idosch@nvidia.com>, Andrew Lunn <andrew@lunn.ch>,
Vladyslav Tarasiuk <vladyslavt@nvidia.com>,
Arnd Bergmann <arnd@arndb.de>,
Andrew Morton <akpm@linux-foundation.org>,
Jian Shen <shenjian15@huawei.com>,
Petr Vorel <petr.vorel@gmail.com>, Dan Murphy <dmurphy@ti.com>,
Yangbo Lu <yangbo.lu@nxp.com>, Michal Kubecek <mkubecek@suse.cz>,
Zheng Yongjun <zhengyongjun3@huawei.com>,
Heiner Kallweit <hkallweit1@gmail.com>,
YueHaibing <yuehaibing@huawei.com>,
Johannes Berg <johannes@sipsolutions.net>,
netdev@vger.kernel.org, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org,
virtualization@lists.linux-foundation.org, bpf@vger.kernel.org
Subject: [PATCH net-next 12/21] ethernet, mvpp2: convert to standard XDP stats
Date: Tue, 3 Aug 2021 18:36:32 +0200 [thread overview]
Message-ID: <20210803163641.3743-13-alexandr.lobakin@intel.com> (raw)
In-Reply-To: <20210803163641.3743-1-alexandr.lobakin@intel.com>
Convert PPv2 driver to provide standard XDP statistics instead of
custom-defined Ethtool stats. This also allows to greatly simplify
stats filling code.
In the same fashion as mvneta, the driver uses global XDP counters.
Signed-off-by: Alexander Lobakin <alexandr.lobakin@intel.com>
Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
---
.../net/ethernet/marvell/mvpp2/mvpp2_main.c | 90 +++++--------------
1 file changed, 20 insertions(+), 70 deletions(-)
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index a3aee1a6d760..ed34f8fefced 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -1824,16 +1824,6 @@ static void mvpp2_port_loopback_set(struct mvpp2_port *port,
writel(val, port->base + MVPP2_GMAC_CTRL_1_REG);
}
-enum {
- ETHTOOL_XDP_REDIRECT,
- ETHTOOL_XDP_PASS,
- ETHTOOL_XDP_DROP,
- ETHTOOL_XDP_TX,
- ETHTOOL_XDP_TX_ERR,
- ETHTOOL_XDP_XMIT,
- ETHTOOL_XDP_XMIT_DROPS,
-};
-
struct mvpp2_ethtool_counter {
unsigned int offset;
const char string[ETH_GSTRING_LEN];
@@ -1926,21 +1916,10 @@ static const struct mvpp2_ethtool_counter mvpp2_ethtool_rxq_regs[] = {
{ MVPP2_RX_PKTS_BM_DROP_CTR, "rxq_%d_packets_bm_drops" },
};
-static const struct mvpp2_ethtool_counter mvpp2_ethtool_xdp[] = {
- { ETHTOOL_XDP_REDIRECT, "rx_xdp_redirect", },
- { ETHTOOL_XDP_PASS, "rx_xdp_pass", },
- { ETHTOOL_XDP_DROP, "rx_xdp_drop", },
- { ETHTOOL_XDP_TX, "rx_xdp_tx", },
- { ETHTOOL_XDP_TX_ERR, "rx_xdp_tx_errors", },
- { ETHTOOL_XDP_XMIT, "tx_xdp_xmit", },
- { ETHTOOL_XDP_XMIT_DROPS, "tx_xdp_xmit_drops", },
-};
-
#define MVPP2_N_ETHTOOL_STATS(ntxqs, nrxqs) (ARRAY_SIZE(mvpp2_ethtool_mib_regs) + \
ARRAY_SIZE(mvpp2_ethtool_port_regs) + \
(ARRAY_SIZE(mvpp2_ethtool_txq_regs) * (ntxqs)) + \
- (ARRAY_SIZE(mvpp2_ethtool_rxq_regs) * (nrxqs)) + \
- ARRAY_SIZE(mvpp2_ethtool_xdp))
+ (ARRAY_SIZE(mvpp2_ethtool_rxq_regs) * (nrxqs)))
static void mvpp2_ethtool_get_strings(struct net_device *netdev, u32 sset,
u8 *data)
@@ -1979,20 +1958,23 @@ static void mvpp2_ethtool_get_strings(struct net_device *netdev, u32 sset,
data += ETH_GSTRING_LEN;
}
}
-
- for (i = 0; i < ARRAY_SIZE(mvpp2_ethtool_xdp); i++) {
- strscpy(data, mvpp2_ethtool_xdp[i].string,
- ETH_GSTRING_LEN);
- data += ETH_GSTRING_LEN;
- }
}
-static void
-mvpp2_get_xdp_stats(struct mvpp2_port *port, struct mvpp2_pcpu_stats *xdp_stats)
+static void mvpp2_ethtool_get_xdp_stats(struct net_device *dev,
+ struct ethtool_xdp_stats *xdp_stats)
{
+ const struct mvpp2_port *port = netdev_priv(dev);
unsigned int start;
unsigned int cpu;
+ xdp_stats->redirect = 0;
+ xdp_stats->pass = 0;
+ xdp_stats->drop = 0;
+ xdp_stats->xmit = 0;
+ xdp_stats->xmit_drops = 0;
+ xdp_stats->tx = 0;
+ xdp_stats->tx_errors = 0;
+
/* Gather XDP Statistics */
for_each_possible_cpu(cpu) {
struct mvpp2_pcpu_stats *cpu_stats;
@@ -2016,20 +1998,18 @@ mvpp2_get_xdp_stats(struct mvpp2_port *port, struct mvpp2_pcpu_stats *xdp_stats)
xdp_tx_err = cpu_stats->xdp_tx_err;
} while (u64_stats_fetch_retry_irq(&cpu_stats->syncp, start));
- xdp_stats->xdp_redirect += xdp_redirect;
- xdp_stats->xdp_pass += xdp_pass;
- xdp_stats->xdp_drop += xdp_drop;
- xdp_stats->xdp_xmit += xdp_xmit;
- xdp_stats->xdp_xmit_drops += xdp_xmit_drops;
- xdp_stats->xdp_tx += xdp_tx;
- xdp_stats->xdp_tx_err += xdp_tx_err;
+ xdp_stats->redirect += xdp_redirect;
+ xdp_stats->pass += xdp_pass;
+ xdp_stats->drop += xdp_drop;
+ xdp_stats->xmit += xdp_xmit;
+ xdp_stats->xmit_drops += xdp_xmit_drops;
+ xdp_stats->tx += xdp_tx;
+ xdp_stats->tx_errors += xdp_tx_err;
}
}
static void mvpp2_read_stats(struct mvpp2_port *port)
{
- struct mvpp2_pcpu_stats xdp_stats = {};
- const struct mvpp2_ethtool_counter *s;
u64 *pstats;
int i, q;
@@ -2057,37 +2037,6 @@ static void mvpp2_read_stats(struct mvpp2_port *port)
*pstats++ += mvpp2_read_index(port->priv,
port->first_rxq + q,
mvpp2_ethtool_rxq_regs[i].offset);
-
- /* Gather XDP Statistics */
- mvpp2_get_xdp_stats(port, &xdp_stats);
-
- for (i = 0, s = mvpp2_ethtool_xdp;
- s < mvpp2_ethtool_xdp + ARRAY_SIZE(mvpp2_ethtool_xdp);
- s++, i++) {
- switch (s->offset) {
- case ETHTOOL_XDP_REDIRECT:
- *pstats++ = xdp_stats.xdp_redirect;
- break;
- case ETHTOOL_XDP_PASS:
- *pstats++ = xdp_stats.xdp_pass;
- break;
- case ETHTOOL_XDP_DROP:
- *pstats++ = xdp_stats.xdp_drop;
- break;
- case ETHTOOL_XDP_TX:
- *pstats++ = xdp_stats.xdp_tx;
- break;
- case ETHTOOL_XDP_TX_ERR:
- *pstats++ = xdp_stats.xdp_tx_err;
- break;
- case ETHTOOL_XDP_XMIT:
- *pstats++ = xdp_stats.xdp_xmit;
- break;
- case ETHTOOL_XDP_XMIT_DROPS:
- *pstats++ = xdp_stats.xdp_xmit_drops;
- break;
- }
- }
}
static void mvpp2_gather_hw_statistics(struct work_struct *work)
@@ -5735,6 +5684,7 @@ static const struct ethtool_ops mvpp2_eth_tool_ops = {
.set_rxfh = mvpp2_ethtool_set_rxfh,
.get_rxfh_context = mvpp2_ethtool_get_rxfh_context,
.set_rxfh_context = mvpp2_ethtool_set_rxfh_context,
+ .get_xdp_stats = mvpp2_ethtool_get_xdp_stats,
};
/* Used for PPv2.1, or PPv2.2 with the old Device Tree binding that
--
2.31.1
next prev parent reply other threads:[~2021-08-03 16:38 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-03 16:36 [PATCH net-next 00/21] ethtool, stats: introduce and use standard XDP stats Alexander Lobakin
2021-08-03 16:36 ` [PATCH net-next 01/21] ethtool, stats: use a shorthand pointer in stats_prepare_data() Alexander Lobakin
2021-08-03 16:36 ` [PATCH net-next 02/21] ethtool, stats: add compile-time checks for standard stats Alexander Lobakin
2021-08-03 16:36 ` [PATCH net-next 03/21] ethtool, stats: introduce standard XDP statistics Alexander Lobakin
2021-08-03 20:49 ` Jakub Kicinski
2021-08-03 23:57 ` Saeed Mahameed
2021-08-04 12:36 ` Jakub Kicinski
2021-08-04 15:53 ` Alexander Lobakin
2021-08-04 16:57 ` Jakub Kicinski
2021-08-05 11:18 ` Alexander Lobakin
2021-08-05 13:31 ` Jakub Kicinski
2021-08-04 16:17 ` David Ahern
2021-08-04 16:44 ` Jakub Kicinski
2021-08-04 17:28 ` David Ahern
2021-08-04 18:27 ` Saeed Mahameed
2021-08-05 0:43 ` David Ahern
2021-08-05 2:14 ` Saeed Mahameed
2021-08-12 12:19 ` Jesper Dangaard Brouer
2021-10-26 9:23 ` Alexander Lobakin
2021-11-05 16:44 ` Alexander Lobakin
2021-11-08 11:37 ` Toke Høiland-Jørgensen
2021-11-08 13:21 ` Alexander Lobakin
2021-11-08 18:09 ` Toke Høiland-Jørgensen
2021-08-03 16:36 ` [PATCH net-next 04/21] ethernet, dpaa2: simplify per-channel Ethtool stats counting Alexander Lobakin
2021-08-03 16:36 ` [PATCH net-next 05/21] ethernet, dpaa2: convert to standard XDP stats Alexander Lobakin
2021-08-03 16:36 ` [PATCH net-next 06/21] ethernet, ena: constify src and syncp args of ena_safe_update_stat() Alexander Lobakin
2021-08-03 16:36 ` [PATCH net-next 07/21] ethernet, ena: convert to standard XDP stats Alexander Lobakin
2021-08-04 13:04 ` Shay Agroskin
2021-08-04 15:24 ` Alexander Lobakin
2021-08-03 16:36 ` [PATCH net-next 08/21] ethernet, enetc: " Alexander Lobakin
2021-08-03 16:36 ` [PATCH net-next 09/21] ethernet, mvneta: rename xdp_xmit_err to xdp_xmit_drops Alexander Lobakin
2021-08-03 16:36 ` [PATCH net-next 10/21] ethernet, mvneta: convert to standard XDP stats Alexander Lobakin
2021-08-03 16:36 ` [PATCH net-next 11/21] ethernet, mvpp2: rename xdp_xmit_err to xdp_xmit_drops Alexander Lobakin
2021-08-03 16:36 ` Alexander Lobakin [this message]
2021-08-03 16:36 ` [PATCH net-next 13/21] ethernet, sfc: convert to standard XDP stats Alexander Lobakin
2021-08-03 17:59 ` Edward Cree
2021-08-03 16:36 ` [PATCH net-next 14/21] veth: rename rx_drops to xdp_errors Alexander Lobakin
2021-08-03 16:36 ` [PATCH net-next 15/21] veth: rename xdp_xmit_errors to xdp_xmit_drops Alexander Lobakin
2021-08-03 16:36 ` [PATCH net-next 16/21] veth: rename drop xdp_ suffix from packets and bytes stats Alexander Lobakin
2021-08-03 16:36 ` [PATCH net-next 17/21] veth: convert to standard XDP stats Alexander Lobakin
2021-08-03 16:36 ` [PATCH net-next 18/21] virtio-net: rename xdp_tx{,__drops} SQ stats to xdp_xmit{,__drops} Alexander Lobakin
2021-08-03 16:42 ` Alexander Lobakin
2021-08-03 16:42 ` [PATCH net-next 19/21] virtio-net: don't mix error-caused drops with XDP_DROP cases Alexander Lobakin
2021-08-03 16:42 ` [PATCH net-next 20/21] virtio-net: convert to standard XDP stats Alexander Lobakin
2021-08-03 16:42 ` [PATCH net-next 21/21] Documentation, ethtool-netlink: update standard statistics documentation Alexander Lobakin
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=20210803163641.3743-13-alexandr.lobakin@intel.com \
--to=alexandr.lobakin@intel.com \
--cc=akiyano@amazon.com \
--cc=akpm@linux-foundation.org \
--cc=alexanderduyck@fb.com \
--cc=andrew@lunn.ch \
--cc=andrii@kernel.org \
--cc=arnd@arndb.de \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=claudiu.manoil@nxp.com \
--cc=corbet@lwn.net \
--cc=daniel@iogearbox.net \
--cc=danieller@nvidia.com \
--cc=davem@davemloft.net \
--cc=dmurphy@ti.com \
--cc=ecree.xilinx@gmail.com \
--cc=gtzalik@amazon.com \
--cc=habetsm.xilinx@gmail.com \
--cc=hawk@kernel.org \
--cc=hkallweit1@gmail.com \
--cc=idosch@nvidia.com \
--cc=ioana.ciornei@nxp.com \
--cc=jasowang@redhat.com \
--cc=jesse.brandeburg@intel.com \
--cc=johannes@sipsolutions.net \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=lukasz.czapnik@intel.com \
--cc=marcin.kubiak@intel.com \
--cc=michal.kubiak@intel.com \
--cc=michal.swiatkowski@intel.com \
--cc=mkubecek@suse.cz \
--cc=mst@redhat.com \
--cc=mw@semihalf.com \
--cc=netanel@amazon.com \
--cc=netdev@vger.kernel.org \
--cc=petr.vorel@gmail.com \
--cc=saeedb@amazon.com \
--cc=sameehj@amazon.com \
--cc=shayagr@amazon.com \
--cc=shenjian15@huawei.com \
--cc=songliubraving@fb.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=vladyslavt@nvidia.com \
--cc=yangbo.lu@nxp.com \
--cc=yhs@fb.com \
--cc=yuehaibing@huawei.com \
--cc=zhengyongjun3@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).