From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
To: netdev@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>,
Xuan Zhuo <xuanzhuo@linux.alibaba.com>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Jesper Dangaard Brouer <hawk@kernel.org>,
John Fastabend <john.fastabend@gmail.com>,
Stanislav Fomichev <sdf@google.com>,
Amritha Nambiar <amritha.nambiar@intel.com>,
Larysa Zaremba <larysa.zaremba@intel.com>,
Sridhar Samudrala <sridhar.samudrala@intel.com>,
Maciej Fijalkowski <maciej.fijalkowski@intel.com>,
virtualization@lists.linux.dev, bpf@vger.kernel.org
Subject: [PATCH net-next v5 6/9] virtio_net: add the total stats field
Date: Mon, 18 Mar 2024 19:05:59 +0800 [thread overview]
Message-ID: <20240318110602.37166-7-xuanzhuo@linux.alibaba.com> (raw)
In-Reply-To: <20240318110602.37166-1-xuanzhuo@linux.alibaba.com>
Now, we just show the stats of every queue.
But for the user, the total values of every stat may are valuable.
NIC statistics:
rx_packets: 373522
rx_bytes: 85919736
rx_drops: 0
rx_xdp_packets: 0
rx_xdp_tx: 0
rx_xdp_redirects: 0
rx_xdp_drops: 0
rx_kicks: 11125
rx_hw_notifications: 0
rx_hw_packets: 1325870
rx_hw_bytes: 263348963
rx_hw_interrupts: 0
rx_hw_drops: 1451
rx_hw_drop_overruns: 0
rx_hw_csum_valid: 1325870
rx_hw_needs_csum: 1325870
rx_hw_csum_none: 0
rx_hw_csum_bad: 0
rx_hw_ratelimit_packets: 0
rx_hw_ratelimit_bytes: 0
tx_packets: 10050
tx_bytes: 1230176
tx_xdp_tx: 0
tx_xdp_tx_drops: 0
tx_kicks: 10050
tx_timeouts: 0
tx_hw_notifications: 0
tx_hw_packets: 32281
tx_hw_bytes: 4315590
tx_hw_interrupts: 0
tx_hw_drops: 0
tx_hw_drop_malformed: 0
tx_hw_csum_none: 0
tx_hw_needs_csum: 32281
tx_hw_ratelimit_packets: 0
tx_hw_ratelimit_bytes: 0
rx0_packets: 373522
rx0_bytes: 85919736
rx0_drops: 0
rx0_xdp_packets: 0
rx0_xdp_tx: 0
rx0_xdp_redirects: 0
rx0_xdp_drops: 0
rx0_kicks: 11125
rx0_hw_notifications: 0
rx0_hw_packets: 1325870
rx0_hw_bytes: 263348963
rx0_hw_interrupts: 0
rx0_hw_drops: 1451
rx0_hw_drop_overruns: 0
rx0_hw_csum_valid: 1325870
rx0_hw_needs_csum: 1325870
rx0_hw_csum_none: 0
rx0_hw_csum_bad: 0
rx0_hw_ratelimit_packets: 0
rx0_hw_ratelimit_bytes: 0
tx0_packets: 10050
tx0_bytes: 1230176
tx0_xdp_tx: 0
tx0_xdp_tx_drops: 0
tx0_kicks: 10050
tx0_timeouts: 0
tx0_hw_notifications: 0
tx0_hw_packets: 32281
tx0_hw_bytes: 4315590
tx0_hw_interrupts: 0
tx0_hw_drops: 0
tx0_hw_drop_malformed: 0
tx0_hw_csum_none: 0
tx0_hw_needs_csum: 32281
tx0_hw_ratelimit_packets: 0
tx0_hw_ratelimit_bytes: 0
Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
---
drivers/net/virtio_net.c | 65 ++++++++++++++++++++++++++++++++++++----
1 file changed, 60 insertions(+), 5 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 27ed25e70177..12dc1d0d8d2b 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -3419,6 +3419,7 @@ static int virtnet_set_channels(struct net_device *dev,
return err;
}
+/* qid == -1: for rx/tx queue total field */
static void virtnet_get_stats_string(struct virtnet_info *vi, int type, int qid, u8 **data)
{
struct virtnet_stats_map *m;
@@ -3446,7 +3447,10 @@ static void virtnet_get_stats_string(struct virtnet_info *vi, int type, int qid,
continue;
}
- ethtool_sprintf(&p, "%s%u%s_%s", tp, qid, hw, desc);
+ if (qid < 0)
+ ethtool_sprintf(&p, "%s%s_%s", tp, hw, desc);
+ else
+ ethtool_sprintf(&p, "%s%u%s_%s", tp, qid, hw, desc);
}
}
@@ -3484,6 +3488,49 @@ static void virtnet_stats_ctx_init(struct virtnet_info *vi,
}
}
+/* stats_sum_queue - Calculate the sum of the same fields in sq or rq.
+ * @sum: the position to store the sum values
+ * @num: field num
+ * @q_value: the first queue fields
+ * @q_num: number of the queues
+ */
+static void stats_sum_queue(u64 *sum, u32 num, u64 *q_value, u32 q_num)
+{
+ u32 step = num;
+ int i, j;
+ u64 *p;
+
+ for (i = 0; i < num; ++i) {
+ p = sum + i;
+ *p = 0;
+
+ for (j = 0; j < q_num; ++j)
+ *p += *(q_value + i + j * step);
+ }
+}
+
+static void virtnet_fill_total_fields(struct virtnet_info *vi,
+ struct virtnet_stats_ctx *ctx)
+{
+ u64 *data, *first_rx_q, *first_tx_q;
+ u32 num_cq, num_rx, num_tx;
+
+ num_cq = ctx->desc_num[VIRTNET_Q_TYPE_CQ];
+ num_rx = ctx->desc_num[VIRTNET_Q_TYPE_RX];
+ num_tx = ctx->desc_num[VIRTNET_Q_TYPE_TX];
+
+ first_rx_q = ctx->data + num_rx + num_tx + num_cq;
+ first_tx_q = first_rx_q + vi->curr_queue_pairs * num_rx;
+
+ data = ctx->data;
+
+ stats_sum_queue(data, num_rx, first_rx_q, vi->curr_queue_pairs);
+
+ data = ctx->data + num_rx;
+
+ stats_sum_queue(data, num_tx, first_tx_q, vi->curr_queue_pairs);
+}
+
/* virtnet_fill_stats - copy the stats to ethtool -S
* The stats source is the device or the driver.
*
@@ -3512,12 +3559,14 @@ static void virtnet_fill_stats(struct virtnet_info *vi, u32 qid,
num_tx = ctx->desc_num[VIRTNET_Q_TYPE_TX];
queue_type = vq_type(vi, qid);
- offset = 0;
+
+ /* skip the total fields of pairs */
+ offset = num_rx + num_tx;
if (queue_type == VIRTNET_Q_TYPE_TX)
- offset = num_cq + num_rx * vi->curr_queue_pairs + num_tx * (qid / 2);
+ offset += num_cq + num_rx * vi->curr_queue_pairs + num_tx * (qid / 2);
else if (queue_type == VIRTNET_Q_TYPE_RX)
- offset = num_cq + num_rx * (qid / 2);
+ offset += num_cq + num_rx * (qid / 2);
for (i = 0; i < ARRAY_SIZE(virtio_net_stats_map); ++i) {
m = &virtio_net_stats_map[i];
@@ -3653,6 +3702,9 @@ static void virtnet_get_strings(struct net_device *dev, u32 stringset, u8 *data)
switch (stringset) {
case ETH_SS_STATS:
+ virtnet_get_stats_string(vi, VIRTNET_Q_TYPE_RX, -1, &p);
+ virtnet_get_stats_string(vi, VIRTNET_Q_TYPE_TX, -1, &p);
+
virtnet_get_stats_string(vi, VIRTNET_Q_TYPE_CQ, 0, &p);
for (i = 0; i < vi->curr_queue_pairs; ++i)
@@ -3694,7 +3746,8 @@ static int virtnet_get_sset_count(struct net_device *dev, int sset)
pair_count = ctx.desc_num[VIRTNET_Q_TYPE_RX] + ctx.desc_num[VIRTNET_Q_TYPE_TX];
- return ctx.desc_num[VIRTNET_Q_TYPE_CQ] + vi->curr_queue_pairs * pair_count;
+ return pair_count + ctx.desc_num[VIRTNET_Q_TYPE_CQ] +
+ vi->curr_queue_pairs * pair_count;
default:
return -EOPNOTSUPP;
}
@@ -3728,6 +3781,8 @@ static void virtnet_get_ethtool_stats(struct net_device *dev,
virtnet_fill_stats(vi, i * 2 + 1, &ctx, stats_base, true, 0);
} while (u64_stats_fetch_retry(&sq->stats.syncp, start));
}
+
+ virtnet_fill_total_fields(vi, &ctx);
}
static void virtnet_get_channels(struct net_device *dev,
--
2.32.0.3.g01195cf9f
next prev parent reply other threads:[~2024-03-18 11:06 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-18 11:05 [PATCH net-next v5 0/9] virtio-net: support device stats Xuan Zhuo
2024-03-18 11:05 ` [PATCH net-next v5 1/9] virtio_net: introduce device stats feature and structures Xuan Zhuo
2024-04-10 6:09 ` Jason Wang
2024-03-18 11:05 ` [PATCH net-next v5 2/9] virtio_net: virtnet_send_command supports command-specific-result Xuan Zhuo
2024-04-10 6:09 ` Jason Wang
2024-04-10 10:50 ` Xuan Zhuo
2024-03-18 11:05 ` [PATCH net-next v5 3/9] virtio_net: remove "_queue" from ethtool -S Xuan Zhuo
2024-04-10 6:09 ` Jason Wang
2024-03-18 11:05 ` [PATCH net-next v5 4/9] virtio_net: support device stats Xuan Zhuo
2024-04-10 6:09 ` Jason Wang
2024-04-10 10:52 ` Xuan Zhuo
2024-04-11 6:09 ` Jason Wang
2024-04-15 2:42 ` Xuan Zhuo
2024-04-15 6:45 ` Jason Wang
2024-04-15 8:11 ` Xuan Zhuo
2024-04-15 8:34 ` Jason Wang
2024-03-18 11:05 ` [PATCH net-next v5 5/9] virtio_net: stats map include driver stats Xuan Zhuo
2024-03-18 11:05 ` Xuan Zhuo [this message]
2024-03-18 11:06 ` [PATCH net-next v5 7/9] virtio_net: rename stat tx_timeout to timeout Xuan Zhuo
2024-04-10 6:09 ` Jason Wang
2024-03-18 11:06 ` [PATCH net-next v5 8/9] netdev: add queue stats Xuan Zhuo
2024-03-18 11:06 ` [PATCH net-next v5 9/9] virtio-net: support queue stat Xuan Zhuo
2024-03-18 11:52 ` [PATCH net-next v5 0/9] virtio-net: support device stats Jiri Pirko
2024-03-18 11:53 ` Xuan Zhuo
2024-03-18 12:19 ` Jiri Pirko
2024-03-19 10:12 ` Paolo Abeni
2024-03-20 8:04 ` Xuan Zhuo
2024-03-20 12:23 ` Jiri Pirko
2024-03-21 3:38 ` Jakub Kicinski
2024-03-21 3:54 ` Xuan Zhuo
2024-03-21 12:42 ` Simon Horman
2024-03-20 9:45 ` Xuan Zhuo
2024-04-22 20:33 ` Michael S. Tsirkin
2024-04-23 5:54 ` Xuan Zhuo
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=20240318110602.37166-7-xuanzhuo@linux.alibaba.com \
--to=xuanzhuo@linux.alibaba.com \
--cc=amritha.nambiar@intel.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hawk@kernel.org \
--cc=jasowang@redhat.com \
--cc=john.fastabend@gmail.com \
--cc=kuba@kernel.org \
--cc=larysa.zaremba@intel.com \
--cc=maciej.fijalkowski@intel.com \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sdf@google.com \
--cc=sridhar.samudrala@intel.com \
--cc=virtualization@lists.linux.dev \
/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).