| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20210803163641.3743-13-alexandr.lobakin@intel.com>
Date: Tue, 3 Aug 2021 18:36:32 +0200
From: Alexander Lobakin <alexandr.lobakin@...el.com>
To: "David S. Miller" <davem@...emloft.net>,
Jakub Kicinski <kuba@...nel.org>
Cc: Alexander Lobakin <alexandr.lobakin@...el.com>,
Jesse Brandeburg <jesse.brandeburg@...el.com>,
Lukasz Czapnik <lukasz.czapnik@...el.com>,
Marcin Kubiak <marcin.kubiak@...el.com>,
Michal Kubiak <michal.kubiak@...el.com>,
Michal Swiatkowski <michal.swiatkowski@...el.com>,
Jonathan Corbet <corbet@....net>,
Netanel Belgazal <netanel@...zon.com>,
Arthur Kiyanovski <akiyano@...zon.com>,
Guy Tzalik <gtzalik@...zon.com>,
Saeed Bishara <saeedb@...zon.com>,
Ioana Ciornei <ioana.ciornei@....com>,
Claudiu Manoil <claudiu.manoil@....com>,
Thomas Petazzoni <thomas.petazzoni@...tlin.com>,
Marcin Wojtas <mw@...ihalf.com>,
Russell King <linux@...linux.org.uk>,
Edward Cree <ecree.xilinx@...il.com>,
Martin Habets <habetsm.xilinx@...il.com>,
"Michael S. Tsirkin" <mst@...hat.com>,
Jason Wang <jasowang@...hat.com>,
Alexei Starovoitov <ast@...nel.org>,
Daniel Borkmann <daniel@...earbox.net>,
Jesper Dangaard Brouer <hawk@...nel.org>,
John Fastabend <john.fastabend@...il.com>,
Andrii Nakryiko <andrii@...nel.org>,
Martin KaFai Lau <kafai@...com>,
Song Liu <songliubraving@...com>, Yonghong Song <yhs@...com>,
KP Singh <kpsingh@...nel.org>,
Shay Agroskin <shayagr@...zon.com>,
Sameeh Jubran <sameehj@...zon.com>,
Alexander Duyck <alexanderduyck@...com>,
Danielle Ratson <danieller@...dia.com>,
Ido Schimmel <idosch@...dia.com>, Andrew Lunn <andrew@...n.ch>,
Vladyslav Tarasiuk <vladyslavt@...dia.com>,
Arnd Bergmann <arnd@...db.de>,
Andrew Morton <akpm@...ux-foundation.org>,
Jian Shen <shenjian15@...wei.com>,
Petr Vorel <petr.vorel@...il.com>, Dan Murphy <dmurphy@...com>,
Yangbo Lu <yangbo.lu@....com>,
Michal Kubecek <mkubecek@...e.cz>,
Zheng Yongjun <zhengyongjun3@...wei.com>,
Heiner Kallweit <hkallweit1@...il.com>,
YueHaibing <yuehaibing@...wei.com>,
Johannes Berg <johannes@...solutions.net>,
netdev@...r.kernel.org, linux-doc@...r.kernel.org,
linux-kernel@...r.kernel.org,
virtualization@...ts.linux-foundation.org, bpf@...r.kernel.org
Subject: [PATCH net-next 12/21] ethernet, mvpp2: convert to standard XDP stats
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@...el.com>
Reviewed-by: Jesse Brandeburg <jesse.brandeburg@...el.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
Powered by blists - more mailing lists