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:42:28 +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 20/21] virtio-net: convert to standard XDP stats Now that we have 1:1 correspondence between the driver XDP stats and the standard XDP stats, we can go forth and convert the driver to expose XDP statistics via our standard interface. Signed-off-by: Alexander Lobakin <alexandr.lobakin@...el.com> Reviewed-by: Jesse Brandeburg <jesse.brandeburg@...el.com> --- drivers/net/virtio_net.c | 52 ++++++++++++++++++++++++++++++++++------ 1 file changed, 45 insertions(+), 7 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index acad099006cd..df1fe36cf089 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -101,8 +101,6 @@ struct virtnet_rq_stats { static const struct virtnet_stat_desc virtnet_sq_stats_desc[] = { { "packets", VIRTNET_SQ_STAT(packets) }, { "bytes", VIRTNET_SQ_STAT(bytes) }, - { "xdp_xmit", VIRTNET_SQ_STAT(xdp_xmit) }, - { "xdp_xmit_drops", VIRTNET_SQ_STAT(xdp_xmit_drops) }, { "kicks", VIRTNET_SQ_STAT(kicks) }, }; @@ -110,11 +108,6 @@ static const struct virtnet_stat_desc virtnet_rq_stats_desc[] = { { "packets", VIRTNET_RQ_STAT(packets) }, { "bytes", VIRTNET_RQ_STAT(bytes) }, { "drops", VIRTNET_RQ_STAT(drops) }, - { "xdp_packets", VIRTNET_RQ_STAT(xdp_packets) }, - { "xdp_tx", VIRTNET_RQ_STAT(xdp_tx) }, - { "xdp_redirects", VIRTNET_RQ_STAT(xdp_redirects) }, - { "xdp_drops", VIRTNET_RQ_STAT(xdp_drops) }, - { "xdp_errors", VIRTNET_RQ_STAT(xdp_errors) }, { "kicks", VIRTNET_RQ_STAT(kicks) }, }; @@ -2295,6 +2288,49 @@ static void virtnet_get_ethtool_stats(struct net_device *dev, } } +static int virtnet_get_std_stats_channels(struct net_device *dev, u32 sset) +{ + const struct virtnet_info *vi = netdev_priv(dev); + + switch (sset) { + case ETH_SS_STATS_XDP: + return vi->curr_queue_pairs; + default: + return -EOPNOTSUPP; + } +} + +static void virtnet_get_xdp_stats(struct net_device *dev, + struct ethtool_xdp_stats *xdp_stats) +{ + const struct virtnet_info *vi = netdev_priv(dev); + u32 i; + + for (i = 0; i < vi->curr_queue_pairs; i++) { + const struct virtnet_rq_stats *rqs = &vi->rq[i].stats; + const struct virtnet_sq_stats *sqs = &vi->sq[i].stats; + struct ethtool_xdp_stats *iter = xdp_stats + i; + u32 start; + + do { + start = u64_stats_fetch_begin_irq(&rqs->syncp); + + iter->packets = rqs->xdp_packets; + iter->tx = rqs->xdp_tx; + iter->redirect = rqs->xdp_redirects; + iter->drop = rqs->xdp_drops; + iter->errors = rqs->xdp_errors; + } while (u64_stats_fetch_retry_irq(&rqs->syncp, start)); + + do { + start = u64_stats_fetch_begin_irq(&sqs->syncp); + + iter->xmit = sqs->xdp_xmit; + iter->xmit_drops = sqs->xdp_xmit_drops; + } while (u64_stats_fetch_retry_irq(&sqs->syncp, start)); + } +} + static void virtnet_get_channels(struct net_device *dev, struct ethtool_channels *channels) { @@ -2409,6 +2445,8 @@ static const struct ethtool_ops virtnet_ethtool_ops = { .set_link_ksettings = virtnet_set_link_ksettings, .set_coalesce = virtnet_set_coalesce, .get_coalesce = virtnet_get_coalesce, + .get_std_stats_channels = virtnet_get_std_stats_channels, + .get_xdp_stats = virtnet_get_xdp_stats, }; static void virtnet_freeze_down(struct virtio_device *vdev) -- 2.31.1
Powered by blists - more mailing lists