All of lore.kernel.org
 help / color / mirror / Atom feed
From: Xie Yongji <xieyongji@bytedance.com>
To: mst@redhat.com, jasowang@redhat.com, stefanha@redhat.com
Cc: amit@kernel.org, arei.gonglei@huawei.com, airlied@linux.ie,
	kraxel@redhat.com, dan.j.williams@intel.com,
	johannes@sipsolutions.net, ohad@wizery.com,
	bjorn.andersson@linaro.org, david@redhat.com, vgoyal@redhat.com,
	miklos@szeredi.hu, sgarzare@redhat.com,
	virtualization@lists.linux-foundation.org,
	linux-kernel@vger.kernel.org
Subject: [RFC PATCH 07/17] virtio_net: Remove unused used length
Date: Mon, 17 May 2021 17:08:26 +0800	[thread overview]
Message-ID: <20210517090836.533-8-xieyongji@bytedance.com> (raw)
In-Reply-To: <20210517090836.533-1-xieyongji@bytedance.com>

The used length is not used in some cases. Let's drop it
and pass NULL to virtqueue_get_buf() instead.

Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
---
 drivers/net/virtio_net.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 5ca7d6780add..01e54e99cae6 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -500,7 +500,6 @@ static int virtnet_xdp_xmit(struct net_device *dev,
 	struct receive_queue *rq = vi->rq;
 	struct bpf_prog *xdp_prog;
 	struct send_queue *sq;
-	unsigned int len;
 	int packets = 0;
 	int bytes = 0;
 	int drops = 0;
@@ -525,7 +524,7 @@ static int virtnet_xdp_xmit(struct net_device *dev,
 	}
 
 	/* Free up any pending old buffers before queueing new ones. */
-	while ((ptr = virtqueue_get_buf(sq->vq, &len)) != NULL) {
+	while ((ptr = virtqueue_get_buf(sq->vq, NULL)) != NULL) {
 		if (likely(is_xdp_frame(ptr))) {
 			struct xdp_frame *frame = ptr_to_xdp(ptr);
 
@@ -1378,12 +1377,11 @@ static int virtnet_receive(struct receive_queue *rq, int budget,
 
 static void free_old_xmit_skbs(struct send_queue *sq, bool in_napi)
 {
-	unsigned int len;
 	unsigned int packets = 0;
 	unsigned int bytes = 0;
 	void *ptr;
 
-	while ((ptr = virtqueue_get_buf(sq->vq, &len)) != NULL) {
+	while ((ptr = virtqueue_get_buf(sq->vq, NULL)) != NULL) {
 		if (likely(!is_xdp_frame(ptr))) {
 			struct sk_buff *skb = ptr;
 
@@ -1681,7 +1679,7 @@ static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd,
 				 struct scatterlist *out)
 {
 	struct scatterlist *sgs[4], hdr, stat;
-	unsigned out_num = 0, tmp;
+	unsigned out_num = 0;
 
 	/* Caller should know better */
 	BUG_ON(!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ));
@@ -1709,7 +1707,7 @@ static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd,
 	/* Spin for a response, the kick causes an ioport write, trapping
 	 * into the hypervisor, so the request should be handled immediately.
 	 */
-	while (!virtqueue_get_buf(vi->cvq, &tmp) &&
+	while (!virtqueue_get_buf(vi->cvq, NULL) &&
 	       !virtqueue_is_broken(vi->cvq))
 		cpu_relax();
 
-- 
2.11.0


  parent reply	other threads:[~2021-05-17  9:11 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-17  9:08 [RFC PATCH 00/17] Add validation for used length Xie Yongji
2021-05-17  9:08 ` [RFC PATCH 01/17] virtio_ring: Avoid reading unneeded " Xie Yongji
2021-05-17  9:11   ` Johannes Berg
2021-05-17  9:11     ` Johannes Berg
2021-05-17  9:41     ` Yongji Xie
2021-05-17  9:08 ` [RFC PATCH 02/17] virtio-blk: Remove unused " Xie Yongji
2021-05-17  9:08 ` [RFC PATCH 03/17] virtio_console: " Xie Yongji
2021-05-17  9:08 ` [RFC PATCH 04/17] crypto: virtio - " Xie Yongji
2021-05-17  9:08 ` [RFC PATCH 05/17] drm/virtio: " Xie Yongji
2021-05-17  9:08 ` [RFC PATCH 06/17] caif_virtio: " Xie Yongji
2021-05-17  9:08 ` Xie Yongji [this message]
2021-05-17  9:08 ` [RFC PATCH 08/17] mac80211_hwsim: " Xie Yongji
2021-05-17  9:08 ` [RFC PATCH 09/17] virtio_pmem: " Xie Yongji
2021-05-17  9:08 ` [RFC PATCH 10/17] rpmsg: virtio: " Xie Yongji
2021-05-17  9:08 ` [RFC PATCH 11/17] virtio_scsi: " Xie Yongji
2021-05-17  9:08 ` [RFC PATCH 12/17] virtio_balloon: " Xie Yongji
2021-05-17  9:08 ` [RFC PATCH 13/17] virtio_input: " Xie Yongji
2021-05-17  9:08 ` [RFC PATCH 14/17] virtio_mem: " Xie Yongji
2021-05-17  9:08 ` [RFC PATCH 15/17] virtiofs: " Xie Yongji
2021-05-17  9:08 ` [RFC PATCH 16/17] vsock: " Xie Yongji
2021-05-17  9:08 ` [RFC PATCH 17/17] virtio_ring: Add validation for " Xie Yongji
2021-05-17 23:39   ` Michael S. Tsirkin
2021-05-17 23:39     ` Michael S. Tsirkin
2021-05-25  1:31     ` Jason Wang
2021-05-25  1:31       ` Jason Wang
2021-05-25  5:08       ` Yongji Xie
2021-05-17 23:40 ` [RFC PATCH 00/17] " Michael S. Tsirkin
2021-05-17 23:40   ` Michael S. Tsirkin
2021-05-18  8:29   ` Yongji Xie
2021-05-18  9:52     ` Michael S. Tsirkin
2021-05-18  9:52       ` Michael S. Tsirkin
2021-05-18 12:28       ` Yongji Xie

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=20210517090836.533-8-xieyongji@bytedance.com \
    --to=xieyongji@bytedance.com \
    --cc=airlied@linux.ie \
    --cc=amit@kernel.org \
    --cc=arei.gonglei@huawei.com \
    --cc=bjorn.andersson@linaro.org \
    --cc=dan.j.williams@intel.com \
    --cc=david@redhat.com \
    --cc=jasowang@redhat.com \
    --cc=johannes@sipsolutions.net \
    --cc=kraxel@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=miklos@szeredi.hu \
    --cc=mst@redhat.com \
    --cc=ohad@wizery.com \
    --cc=sgarzare@redhat.com \
    --cc=stefanha@redhat.com \
    --cc=vgoyal@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.