virtualization.lists.linux-foundation.org archive mirror
 help / color / mirror / Atom feed
From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
To: netdev@vger.kernel.org
Cc: Jesper Dangaard Brouer <hawk@kernel.org>,
	Daniel Borkmann <daniel@iogearbox.net>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	John Fastabend <john.fastabend@gmail.com>,
	Alexei Starovoitov <ast@kernel.org>,
	virtualization@lists.linux-foundation.org,
	Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>,
	bpf@vger.kernel.org, Paolo Abeni <pabeni@redhat.com>,
	"David S. Miller" <davem@davemloft.net>
Subject: [PATCH 09/16] virtio_net: introduce virtnet_rq_update_stats()
Date: Tue, 28 Mar 2023 17:28:40 +0800	[thread overview]
Message-ID: <20230328092847.91643-10-xuanzhuo@linux.alibaba.com> (raw)
In-Reply-To: <20230328092847.91643-1-xuanzhuo@linux.alibaba.com>

Separating the code of updating rq stats.

This is prepare for separating the code of ethtool.

Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
---
 drivers/net/virtio/virtnet.c | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/drivers/net/virtio/virtnet.c b/drivers/net/virtio/virtnet.c
index 84b90333dc77..36c747e43b3f 100644
--- a/drivers/net/virtio/virtnet.c
+++ b/drivers/net/virtio/virtnet.c
@@ -1550,6 +1550,21 @@ static void refill_work(struct work_struct *work)
 	}
 }
 
+static void virtnet_rq_update_stats(struct virtnet_rq *rq, struct virtnet_rq_stats *stats)
+{
+	int i;
+
+	u64_stats_update_begin(&rq->stats.syncp);
+	for (i = 0; i < VIRTNET_RQ_STATS_LEN; i++) {
+		size_t offset = virtnet_rq_stats_desc[i].offset;
+		u64 *item;
+
+		item = (u64 *)((u8 *)&rq->stats + offset);
+		*item += *(u64 *)((u8 *)stats + offset);
+	}
+	u64_stats_update_end(&rq->stats.syncp);
+}
+
 static int virtnet_receive(struct virtnet_rq *rq, int budget,
 			   unsigned int *xdp_xmit)
 {
@@ -1557,7 +1572,6 @@ static int virtnet_receive(struct virtnet_rq *rq, int budget,
 	struct virtnet_rq_stats stats = {};
 	unsigned int len;
 	void *buf;
-	int i;
 
 	if (!vi->big_packets || vi->mergeable_rx_bufs) {
 		void *ctx;
@@ -1584,15 +1598,7 @@ static int virtnet_receive(struct virtnet_rq *rq, int budget,
 		}
 	}
 
-	u64_stats_update_begin(&rq->stats.syncp);
-	for (i = 0; i < VIRTNET_RQ_STATS_LEN; i++) {
-		size_t offset = virtnet_rq_stats_desc[i].offset;
-		u64 *item;
-
-		item = (u64 *)((u8 *)&rq->stats + offset);
-		*item += *(u64 *)((u8 *)&stats + offset);
-	}
-	u64_stats_update_end(&rq->stats.syncp);
+	virtnet_rq_update_stats(rq, &stats);
 
 	return stats.packets;
 }
-- 
2.32.0.3.g01195cf9f

_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

  parent reply	other threads:[~2023-03-28  9:29 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-28  9:28 [PATCH 00/16] virtio-net: split virtio-net.c Xuan Zhuo
2023-03-28  9:28 ` [PATCH 01/16] virtio_net: add a separate directory for virtio-net Xuan Zhuo
2023-03-28  9:28 ` [PATCH 02/16] virtio_net: move struct to header file Xuan Zhuo
     [not found]   ` <20230329211826.0657f947@kernel.org>
2023-03-30  6:01     ` Xuan Zhuo
2023-03-28  9:28 ` [PATCH 03/16] virtio_net: add prefix to the struct inside " Xuan Zhuo
2023-03-28  9:28 ` [PATCH 04/16] virtio_net: separating cpu-related funs Xuan Zhuo
2023-03-28  9:28 ` [PATCH 05/16] virtio_net: separate virtnet_ctrl_set_queues() Xuan Zhuo
2023-03-28  9:28 ` [PATCH 06/16] virtio_net: separate virtnet_ctrl_set_mac_address() Xuan Zhuo
2023-03-28  9:28 ` [PATCH 07/16] virtio_net: remove lock from virtnet_ack_link_announce() Xuan Zhuo
2023-03-28  9:28 ` [PATCH 08/16] virtio_net: separating the APIs of cq Xuan Zhuo
2023-03-28  9:28 ` Xuan Zhuo [this message]
2023-03-28  9:28 ` [PATCH 10/16] virtio_net: separating the funcs of ethtool Xuan Zhuo
2023-03-28  9:28 ` [PATCH 11/16] virtio_net: introduce virtnet_dev_rx_queue_group() Xuan Zhuo
2023-03-28  9:28 ` [PATCH 12/16] virtio_net: introduce virtnet_get_netdev() Xuan Zhuo
     [not found]   ` <20230329212203.3c3bf199@kernel.org>
2023-03-30  6:01     ` Xuan Zhuo
2023-03-28  9:28 ` [PATCH 13/16] virtio_net: prepare for virtio Xuan Zhuo
2023-03-28  9:28 ` [PATCH 14/16] virtio_net: move virtnet_[en/dis]able_delayed_refill to header file Xuan Zhuo
2023-03-28  9:28 ` [PATCH 15/16] virtio_net: add APIs to register/unregister virtio driver Xuan Zhuo
2023-03-28  9:28 ` [PATCH 16/16] virtio_net: separating the virtio code Xuan Zhuo
     [not found]   ` <20230329211552.27efa412@kernel.org>
2023-03-30  6:00     ` Xuan Zhuo
2023-03-30  6:17 ` [PATCH 00/16] virtio-net: split virtio-net.c Michael S. Tsirkin
2023-03-31  7:21   ` Xuan Zhuo
2023-03-31  7:35     ` Jason Wang
2023-03-31  7:48       ` Xuan Zhuo
2023-03-31  8:00         ` Michael S. Tsirkin
2023-03-31  8:10           ` 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=20230328092847.91643-10-xuanzhuo@linux.alibaba.com \
    --to=xuanzhuo@linux.alibaba.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=john.fastabend@gmail.com \
    --cc=kuba@kernel.org \
    --cc=mst@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=virtualization@lists.linux-foundation.org \
    /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).