| 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
| ||
|
Date: Tue, 3 Aug 2021 18:36:30 +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 10/21] ethernet, mvneta: convert to standard XDP stats
Replace custom Ethtools XDP statistics with the standard infra based
one (7 basic fields).
This driver uses global [per-cpu] stats, no other callbacks needed.
Signed-off-by: Alexander Lobakin <alexandr.lobakin@...el.com>
Reviewed-by: Jesse Brandeburg <jesse.brandeburg@...el.com>
---
drivers/net/ethernet/marvell/mvneta.c | 108 +++++++++++++-------------
1 file changed, 52 insertions(+), 56 deletions(-)
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index f030d5b7bdee..9015c8b45395 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -345,13 +345,6 @@ enum {
ETHTOOL_STAT_EEE_WAKEUP,
ETHTOOL_STAT_SKB_ALLOC_ERR,
ETHTOOL_STAT_REFILL_ERR,
- ETHTOOL_XDP_REDIRECT,
- ETHTOOL_XDP_PASS,
- ETHTOOL_XDP_DROP,
- ETHTOOL_XDP_TX,
- ETHTOOL_XDP_TX_ERR,
- ETHTOOL_XDP_XMIT,
- ETHTOOL_XDP_XMIT_DROPS,
ETHTOOL_MAX_STATS,
};
@@ -406,13 +399,6 @@ static const struct mvneta_statistic mvneta_statistics[] = {
{ ETHTOOL_STAT_EEE_WAKEUP, T_SW, "eee_wakeup_errors", },
{ ETHTOOL_STAT_SKB_ALLOC_ERR, T_SW, "skb_alloc_errors", },
{ ETHTOOL_STAT_REFILL_ERR, T_SW, "refill_errors", },
- { ETHTOOL_XDP_REDIRECT, T_SW, "rx_xdp_redirect", },
- { ETHTOOL_XDP_PASS, T_SW, "rx_xdp_pass", },
- { ETHTOOL_XDP_DROP, T_SW, "rx_xdp_drop", },
- { ETHTOOL_XDP_TX, T_SW, "rx_xdp_tx", },
- { ETHTOOL_XDP_TX_ERR, T_SW, "rx_xdp_tx_errors", },
- { ETHTOOL_XDP_XMIT, T_SW, "tx_xdp_xmit", },
- { ETHTOOL_XDP_XMIT_DROPS, T_SW, "tx_xdp_xmit_drops", },
};
struct mvneta_stats {
@@ -4630,38 +4616,17 @@ mvneta_ethtool_update_pcpu_stats(struct mvneta_port *pp,
for_each_possible_cpu(cpu) {
struct mvneta_pcpu_stats *stats;
u64 skb_alloc_error;
- u64 xdp_xmit_drops;
u64 refill_error;
- u64 xdp_redirect;
- u64 xdp_tx_err;
- u64 xdp_pass;
- u64 xdp_drop;
- u64 xdp_xmit;
- u64 xdp_tx;
stats = per_cpu_ptr(pp->stats, cpu);
do {
start = u64_stats_fetch_begin_irq(&stats->syncp);
skb_alloc_error = stats->es.skb_alloc_error;
refill_error = stats->es.refill_error;
- xdp_redirect = stats->es.ps.xdp_redirect;
- xdp_pass = stats->es.ps.xdp_pass;
- xdp_drop = stats->es.ps.xdp_drop;
- xdp_xmit = stats->es.ps.xdp_xmit;
- xdp_xmit_drops = stats->es.ps.xdp_xmit_drops;
- xdp_tx = stats->es.ps.xdp_tx;
- xdp_tx_err = stats->es.ps.xdp_tx_err;
} while (u64_stats_fetch_retry_irq(&stats->syncp, start));
es->skb_alloc_error += skb_alloc_error;
es->refill_error += refill_error;
- es->ps.xdp_redirect += xdp_redirect;
- es->ps.xdp_pass += xdp_pass;
- es->ps.xdp_drop += xdp_drop;
- es->ps.xdp_xmit += xdp_xmit;
- es->ps.xdp_xmit_drops += xdp_xmit_drops;
- es->ps.xdp_tx += xdp_tx;
- es->ps.xdp_tx_err += xdp_tx_err;
}
}
@@ -4702,27 +4667,6 @@ static void mvneta_ethtool_update_stats(struct mvneta_port *pp)
case ETHTOOL_STAT_REFILL_ERR:
pp->ethtool_stats[i] = stats.refill_error;
break;
- case ETHTOOL_XDP_REDIRECT:
- pp->ethtool_stats[i] = stats.ps.xdp_redirect;
- break;
- case ETHTOOL_XDP_PASS:
- pp->ethtool_stats[i] = stats.ps.xdp_pass;
- break;
- case ETHTOOL_XDP_DROP:
- pp->ethtool_stats[i] = stats.ps.xdp_drop;
- break;
- case ETHTOOL_XDP_TX:
- pp->ethtool_stats[i] = stats.ps.xdp_tx;
- break;
- case ETHTOOL_XDP_TX_ERR:
- pp->ethtool_stats[i] = stats.ps.xdp_tx_err;
- break;
- case ETHTOOL_XDP_XMIT:
- pp->ethtool_stats[i] = stats.ps.xdp_xmit;
- break;
- case ETHTOOL_XDP_XMIT_DROPS:
- pp->ethtool_stats[i] = stats.ps.xdp_xmit_drops;
- break;
}
break;
}
@@ -4748,6 +4692,57 @@ static int mvneta_ethtool_get_sset_count(struct net_device *dev, int sset)
return -EOPNOTSUPP;
}
+static void mvneta_ethtool_get_xdp_stats(struct net_device *dev,
+ struct ethtool_xdp_stats *xdp_stats)
+{
+ const struct mvneta_port *pp = netdev_priv(dev);
+ u32 cpu;
+
+ xdp_stats->drop = 0;
+ xdp_stats->pass = 0;
+ xdp_stats->redirect = 0;
+ xdp_stats->tx = 0;
+ xdp_stats->tx_errors = 0;
+ xdp_stats->xmit = 0;
+ xdp_stats->xmit_drops = 0;
+
+ for_each_possible_cpu(cpu) {
+ const struct mvneta_pcpu_stats *stats;
+ const struct mvneta_stats *ps;
+ u64 xdp_xmit_drops;
+ u64 xdp_redirect;
+ u64 xdp_tx_err;
+ u64 xdp_pass;
+ u64 xdp_drop;
+ u64 xdp_xmit;
+ u64 xdp_tx;
+ u32 start;
+
+ stats = per_cpu_ptr(pp->stats, cpu);
+ ps = &stats->es.ps;
+
+ do {
+ start = u64_stats_fetch_begin_irq(&stats->syncp);
+
+ xdp_drop = ps->xdp_drop;
+ xdp_pass = ps->xdp_pass;
+ xdp_redirect = ps->xdp_redirect;
+ xdp_tx = ps->xdp_tx;
+ xdp_tx_err = ps->xdp_tx_err;
+ xdp_xmit = ps->xdp_xmit;
+ xdp_xmit_drops = ps->xdp_xmit_drops;
+ } while (u64_stats_fetch_retry_irq(&stats->syncp, start));
+
+ xdp_stats->drop += xdp_drop;
+ xdp_stats->pass += xdp_pass;
+ xdp_stats->redirect += xdp_redirect;
+ xdp_stats->tx += xdp_tx;
+ xdp_stats->tx_errors += xdp_tx_err;
+ xdp_stats->xmit += xdp_xmit;
+ xdp_stats->xmit_drops += xdp_xmit_drops;
+ }
+}
+
static u32 mvneta_ethtool_get_rxfh_indir_size(struct net_device *dev)
{
return MVNETA_RSS_LU_TABLE_SIZE;
@@ -5025,6 +5020,7 @@ static const struct ethtool_ops mvneta_eth_tool_ops = {
.set_wol = mvneta_ethtool_set_wol,
.get_eee = mvneta_ethtool_get_eee,
.set_eee = mvneta_ethtool_set_eee,
+ .get_xdp_stats = mvneta_ethtool_get_xdp_stats,
};
/* Initialize hw */
--
2.31.1
Powered by blists - more mailing lists