bpf.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
To: netdev@vger.kernel.org
Cc: "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>,
	Alexei Starovoitov <ast@kernel.org>,
	Daniel Borkmann <daniel@iogearbox.net>,
	Jesper Dangaard Brouer <hawk@kernel.org>,
	John Fastabend <john.fastabend@gmail.com>,
	virtualization@lists.linux.dev, bpf@vger.kernel.org
Subject: [PATCH net-next 15/17] virtio_net: xsk: rx: free the unused xsk buffer
Date: Tue, 16 Jan 2024 17:43:11 +0800	[thread overview]
Message-ID: <20240116094313.119939-16-xuanzhuo@linux.alibaba.com> (raw)
In-Reply-To: <20240116094313.119939-1-xuanzhuo@linux.alibaba.com>

Since this will be called in other circumstances(freeze), we must check
whether it is xsk's buffer in this function. It cannot be judged outside
this function.

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

diff --git a/drivers/net/virtio/main.c b/drivers/net/virtio/main.c
index 35f0daaea7e5..81d390781a4f 100644
--- a/drivers/net/virtio/main.c
+++ b/drivers/net/virtio/main.c
@@ -4146,6 +4146,14 @@ void virtnet_rq_free_unused_bufs(struct virtqueue *vq)
 	rq = &vi->rq[i];
 
 	while ((buf = virtqueue_detach_unused_buf(vq)) != NULL) {
+		if (rq->xsk.pool) {
+			struct xdp_buff *xdp;
+
+			xdp = (struct xdp_buff *)buf;
+			xsk_buff_free(xdp);
+			continue;
+		}
+
 		if (virtqueue_get_dma_premapped(rq->vq))
 			virtnet_rq_unmap(rq, buf, 0);
 
-- 
2.32.0.3.g01195cf9f


  parent reply	other threads:[~2024-01-16  9:43 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-16  9:42 [PATCH net-next 00/17] virtio-net: support AF_XDP zero copy (3/3) Xuan Zhuo
2024-01-16  9:42 ` [PATCH net-next 01/17] virtio_net: separate virtnet_rx_resize() Xuan Zhuo
2024-01-16  9:42 ` [PATCH net-next 02/17] virtio_net: separate virtnet_tx_resize() Xuan Zhuo
2024-01-16  9:42 ` [PATCH net-next 03/17] virtio_net: xsk: bind/unbind xsk Xuan Zhuo
2024-01-16  9:43 ` [PATCH net-next 04/17] virtio_net: xsk: prevent disable tx napi Xuan Zhuo
2024-01-16  9:43 ` [PATCH net-next 05/17] virtio_net: move some api to header Xuan Zhuo
2024-01-16  9:43 ` [PATCH net-next 06/17] virtio_net: xsk: tx: support xmit xsk buffer Xuan Zhuo
2024-01-16  9:43 ` [PATCH net-next 07/17] virtio_net: xsk: tx: support wakeup Xuan Zhuo
2024-01-16  9:43 ` [PATCH net-next 08/17] virtio_net: xsk: tx: handle the transmitted xsk buffer Xuan Zhuo
2024-01-16  9:43 ` [PATCH net-next 09/17] virtio_net: xsk: tx: free the unused " Xuan Zhuo
2024-01-16  9:43 ` [PATCH net-next 10/17] virtio_net: separate receive_mergeable Xuan Zhuo
2024-01-16  9:43 ` [PATCH net-next 11/17] virtio_net: separate receive_buf Xuan Zhuo
2024-01-16  9:43 ` [PATCH net-next 12/17] virtio_net: xsk: rx: support fill with xsk buffer Xuan Zhuo
2024-01-16  9:43 ` [PATCH net-next 13/17] virtio_net: xsk: rx: support recv merge mode Xuan Zhuo
2024-01-16  9:43 ` [PATCH net-next 14/17] virtio_net: xsk: rx: support recv small mode Xuan Zhuo
2024-01-16  9:43 ` Xuan Zhuo [this message]
2024-01-16  9:43 ` [PATCH net-next 16/17] virtio_net: update tx timeout record Xuan Zhuo
2024-01-16  9:43 ` [PATCH net-next 17/17] virtio_net: xdp_features add NETDEV_XDP_ACT_XSK_ZEROCOPY Xuan Zhuo
2024-01-16 12:37 ` [PATCH net-next 00/17] virtio-net: support AF_XDP zero copy (3/3) Paolo Abeni
2024-01-16 15:07   ` Jakub Kicinski
2024-01-16 20:46     ` Michael S. Tsirkin
2024-01-17  5:53       ` Xuan Zhuo
2024-01-17  5:55     ` Xuan Zhuo
2024-01-22  4:24       ` 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=20240116094313.119939-16-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=jasowang@redhat.com \
    --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.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).