From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
To: virtualization@lists.linux.dev
Cc: "Richard Weinberger" <richard@nod.at>,
"Anton Ivanov" <anton.ivanov@cambridgegreys.com>,
"Johannes Berg" <johannes@sipsolutions.net>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Jason Wang" <jasowang@redhat.com>,
"Xuan Zhuo" <xuanzhuo@linux.alibaba.com>,
"David S. Miller" <davem@davemloft.net>,
"Eric Dumazet" <edumazet@google.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
"Hans de Goede" <hdegoede@redhat.com>,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>,
"Vadim Pasternak" <vadimp@nvidia.com>,
"Bjorn Andersson" <andersson@kernel.org>,
"Mathieu Poirier" <mathieu.poirier@linaro.org>,
"Cornelia Huck" <cohuck@redhat.com>,
"Halil Pasic" <pasic@linux.ibm.com>,
"Eric Farman" <farman@linux.ibm.com>,
"Heiko Carstens" <hca@linux.ibm.com>,
"Vasily Gorbik" <gor@linux.ibm.com>,
"Alexander Gordeev" <agordeev@linux.ibm.com>,
"Christian Borntraeger" <borntraeger@linux.ibm.com>,
"Sven Schnelle" <svens@linux.ibm.com>,
"Alexei Starovoitov" <ast@kernel.org>,
"Daniel Borkmann" <daniel@iogearbox.net>,
"Jesper Dangaard Brouer" <hawk@kernel.org>,
"John Fastabend" <john.fastabend@gmail.com>,
linux-um@lists.infradead.org, netdev@vger.kernel.org,
platform-driver-x86@vger.kernel.org,
linux-remoteproc@vger.kernel.org, linux-s390@vger.kernel.org,
kvm@vger.kernel.org, bpf@vger.kernel.org
Subject: [PATCH vhost v3 18/19] virtio_net: rename free_old_xmit_skbs to free_old_xmit
Date: Thu, 29 Feb 2024 15:20:43 +0800 [thread overview]
Message-ID: <20240229072044.77388-19-xuanzhuo@linux.alibaba.com> (raw)
In-Reply-To: <20240229072044.77388-1-xuanzhuo@linux.alibaba.com>
Since free_old_xmit_skbs not only deals with skb, but also xdp frame and
subsequent added xsk, so change the name of this function to
free_old_xmit.
Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Acked-by: Jason Wang <jasowang@redhat.com>
---
drivers/net/virtio_net.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 62f65e2cacd5..7715bb7032ec 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -787,7 +787,7 @@ static void virtnet_rq_unmap_free_buf(struct virtqueue *vq, void *buf)
virtnet_rq_free_buf(vi, rq, buf);
}
-static void free_old_xmit_skbs(struct send_queue *sq, bool in_napi)
+static void free_old_xmit(struct send_queue *sq, bool in_napi)
{
struct virtnet_sq_free_stats stats = {0};
@@ -841,7 +841,7 @@ static void check_sq_full_and_disable(struct virtnet_info *vi,
virtqueue_napi_schedule(&sq->napi, sq->vq);
} else if (unlikely(!virtqueue_enable_cb_delayed(sq->vq))) {
/* More just got used, free them then recheck. */
- free_old_xmit_skbs(sq, false);
+ free_old_xmit(sq, false);
if (sq->vq->num_free >= 2+MAX_SKB_FRAGS) {
netif_start_subqueue(dev, qnum);
virtqueue_disable_cb(sq->vq);
@@ -2137,7 +2137,7 @@ static void virtnet_poll_cleantx(struct receive_queue *rq)
do {
virtqueue_disable_cb(sq->vq);
- free_old_xmit_skbs(sq, true);
+ free_old_xmit(sq, true);
} while (unlikely(!virtqueue_enable_cb_delayed(sq->vq)));
if (sq->vq->num_free >= 2 + MAX_SKB_FRAGS)
@@ -2285,7 +2285,7 @@ static int virtnet_poll_tx(struct napi_struct *napi, int budget)
txq = netdev_get_tx_queue(vi->dev, index);
__netif_tx_lock(txq, raw_smp_processor_id());
virtqueue_disable_cb(sq->vq);
- free_old_xmit_skbs(sq, true);
+ free_old_xmit(sq, true);
if (sq->vq->num_free >= 2 + MAX_SKB_FRAGS)
netif_tx_wake_queue(txq);
@@ -2375,7 +2375,7 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
if (use_napi)
virtqueue_disable_cb(sq->vq);
- free_old_xmit_skbs(sq, false);
+ free_old_xmit(sq, false);
} while (use_napi && kick &&
unlikely(!virtqueue_enable_cb_delayed(sq->vq)));
--
2.32.0.3.g01195cf9f
next prev parent reply other threads:[~2024-02-29 7:21 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-29 7:20 [PATCH vhost v3 00/19] virtio: drivers maintain dma info for premapped vq Xuan Zhuo
2024-02-29 7:20 ` [PATCH vhost v3 01/19] virtio_ring: introduce vring_need_unmap_buffer Xuan Zhuo
2024-02-29 7:20 ` [PATCH vhost v3 02/19] virtio_ring: packed: remove double check of the unmap ops Xuan Zhuo
2024-02-29 7:20 ` [PATCH vhost v3 03/19] virtio_ring: packed: structure the indirect desc table Xuan Zhuo
2024-02-29 7:20 ` [PATCH vhost v3 04/19] virtio_ring: split: remove double check of the unmap ops Xuan Zhuo
2024-02-29 7:20 ` [PATCH vhost v3 05/19] virtio_ring: split: structure the indirect desc table Xuan Zhuo
2024-02-29 7:20 ` [PATCH vhost v3 06/19] virtio_ring: no store dma info when unmap is not needed Xuan Zhuo
2024-02-29 7:20 ` [PATCH vhost v3 07/19] virtio: find_vqs: pass struct instead of multi parameters Xuan Zhuo
2024-02-29 7:20 ` [PATCH vhost v3 08/19] virtio: vring_create_virtqueue: " Xuan Zhuo
2024-02-29 7:20 ` [PATCH vhost v3 09/19] virtio: vring_new_virtqueue(): " Xuan Zhuo
2024-02-29 7:20 ` [PATCH vhost v3 10/19] virtio_ring: simplify the parameters of the funcs related to vring_create/new_virtqueue() Xuan Zhuo
2024-02-29 7:20 ` [PATCH vhost v3 11/19] virtio: find_vqs: add new parameter premapped Xuan Zhuo
2024-02-29 7:20 ` [PATCH vhost v3 12/19] virtio_ring: export premapped to driver by struct virtqueue Xuan Zhuo
2024-02-29 7:20 ` [PATCH vhost v3 13/19] virtio_net: set premapped mode by find_vqs() Xuan Zhuo
2024-02-29 7:20 ` [PATCH vhost v3 14/19] virtio_ring: remove api of setting vq premapped Xuan Zhuo
2024-02-29 7:20 ` [PATCH vhost v3 15/19] virtio_ring: introduce dma map api for page Xuan Zhuo
2024-02-29 7:20 ` [PATCH vhost v3 16/19] virtio_ring: introduce virtqueue_dma_map_sg_attrs Xuan Zhuo
2024-02-29 7:20 ` [PATCH vhost v3 17/19] virtio_net: unify the code for recycling the xmit ptr Xuan Zhuo
2024-02-29 7:20 ` Xuan Zhuo [this message]
2024-02-29 7:20 ` [PATCH vhost v3 19/19] virtio_net: sq support premapped mode Xuan Zhuo
2024-02-29 8:21 ` [PATCH vhost v3 00/19] virtio: drivers maintain dma info for premapped vq Michael S. Tsirkin
2024-02-29 9:02 ` Xuan Zhuo
2024-02-29 9:34 ` Michael S. Tsirkin
2024-02-29 9:36 ` Xuan Zhuo
2024-02-29 9:41 ` Johannes Berg
2024-02-29 9:42 ` Xuan Zhuo
2024-03-06 9:54 ` Xuan Zhuo
2024-03-07 5:28 ` Jason Wang
2024-03-07 8:06 ` Xuan Zhuo
2024-03-08 6:03 ` Jason Wang
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=20240229072044.77388-19-xuanzhuo@linux.alibaba.com \
--to=xuanzhuo@linux.alibaba.com \
--cc=agordeev@linux.ibm.com \
--cc=andersson@kernel.org \
--cc=anton.ivanov@cambridgegreys.com \
--cc=ast@kernel.org \
--cc=borntraeger@linux.ibm.com \
--cc=bpf@vger.kernel.org \
--cc=cohuck@redhat.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=farman@linux.ibm.com \
--cc=gor@linux.ibm.com \
--cc=hawk@kernel.org \
--cc=hca@linux.ibm.com \
--cc=hdegoede@redhat.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=jasowang@redhat.com \
--cc=johannes@sipsolutions.net \
--cc=john.fastabend@gmail.com \
--cc=kuba@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-um@lists.infradead.org \
--cc=mathieu.poirier@linaro.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=richard@nod.at \
--cc=svens@linux.ibm.com \
--cc=vadimp@nvidia.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).