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>,
virtualization@lists.linux-foundation.org, bpf@vger.kernel.org
Subject: [PATCH net-next v1 15/19] virtio_net: xsk: rx: introduce add_recvbuf_xsk()
Date: Mon, 16 Oct 2023 20:00:29 +0800 [thread overview]
Message-ID: <20231016120033.26933-16-xuanzhuo@linux.alibaba.com> (raw)
In-Reply-To: <20231016120033.26933-1-xuanzhuo@linux.alibaba.com>
Implement the logic of filling vq with XSK buffer.
Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
---
drivers/net/virtio/main.c | 13 +++++++
drivers/net/virtio/virtio_net.h | 5 +++
drivers/net/virtio/xsk.c | 66 ++++++++++++++++++++++++++++++++-
drivers/net/virtio/xsk.h | 2 +
4 files changed, 85 insertions(+), 1 deletion(-)
diff --git a/drivers/net/virtio/main.c b/drivers/net/virtio/main.c
index 58bb38f9b453..0e740447b142 100644
--- a/drivers/net/virtio/main.c
+++ b/drivers/net/virtio/main.c
@@ -1787,9 +1787,20 @@ static int add_recvbuf_mergeable(struct virtnet_info *vi,
static bool try_fill_recv(struct virtnet_info *vi, struct virtnet_rq *rq,
gfp_t gfp)
{
+ struct xsk_buff_pool *pool;
int err;
bool oom;
+ rcu_read_lock();
+ pool = rcu_dereference(rq->xsk.pool);
+ if (pool) {
+ err = virtnet_add_recvbuf_xsk(vi, rq, pool, gfp);
+ oom = err == -ENOMEM;
+ rcu_read_unlock();
+ goto kick;
+ }
+ rcu_read_unlock();
+
do {
if (vi->mergeable_rx_bufs)
err = add_recvbuf_mergeable(vi, rq, gfp);
@@ -1802,6 +1813,8 @@ static bool try_fill_recv(struct virtnet_info *vi, struct virtnet_rq *rq,
if (err)
break;
} while (rq->vq->num_free);
+
+kick:
if (virtqueue_kick_prepare(rq->vq) && virtqueue_notify(rq->vq)) {
unsigned long flags;
diff --git a/drivers/net/virtio/virtio_net.h b/drivers/net/virtio/virtio_net.h
index d4e620a084f4..6e71622fca45 100644
--- a/drivers/net/virtio/virtio_net.h
+++ b/drivers/net/virtio/virtio_net.h
@@ -156,6 +156,11 @@ struct virtnet_rq {
/* xdp rxq used by xsk */
struct xdp_rxq_info xdp_rxq;
+
+ struct xdp_buff **xsk_buffs;
+ u32 nxt_idx;
+ u32 num;
+ u32 size;
} xsk;
};
diff --git a/drivers/net/virtio/xsk.c b/drivers/net/virtio/xsk.c
index 973e783260c3..841fb078882a 100644
--- a/drivers/net/virtio/xsk.c
+++ b/drivers/net/virtio/xsk.c
@@ -37,6 +37,58 @@ static void virtnet_xsk_check_queue(struct virtnet_sq *sq)
netif_stop_subqueue(dev, qnum);
}
+static int virtnet_add_recvbuf_batch(struct virtnet_info *vi, struct virtnet_rq *rq,
+ struct xsk_buff_pool *pool, gfp_t gfp)
+{
+ struct xdp_buff **xsk_buffs;
+ dma_addr_t addr;
+ u32 len, i;
+ int err = 0;
+
+ xsk_buffs = rq->xsk.xsk_buffs;
+
+ if (rq->xsk.nxt_idx >= rq->xsk.num) {
+ rq->xsk.num = xsk_buff_alloc_batch(pool, xsk_buffs, rq->xsk.size);
+ if (!rq->xsk.num)
+ return -ENOMEM;
+ rq->xsk.nxt_idx = 0;
+ }
+
+ while (rq->xsk.nxt_idx < rq->xsk.num) {
+ i = rq->xsk.nxt_idx;
+
+ /* use the part of XDP_PACKET_HEADROOM as the virtnet hdr space */
+ addr = xsk_buff_xdp_get_dma(xsk_buffs[i]) - vi->hdr_len;
+ len = xsk_pool_get_rx_frame_size(pool) + vi->hdr_len;
+
+ sg_init_table(rq->sg, 1);
+ sg_fill_dma(rq->sg, addr, len);
+
+ err = virtqueue_add_inbuf(rq->vq, rq->sg, 1, xsk_buffs[i], gfp);
+ if (err)
+ return err;
+
+ rq->xsk.nxt_idx++;
+ }
+
+ return 0;
+}
+
+int virtnet_add_recvbuf_xsk(struct virtnet_info *vi, struct virtnet_rq *rq,
+ struct xsk_buff_pool *pool, gfp_t gfp)
+{
+ int err;
+
+ do {
+ err = virtnet_add_recvbuf_batch(vi, rq, pool, gfp);
+ if (err)
+ return err;
+
+ } while (rq->vq->num_free);
+
+ return 0;
+}
+
static int virtnet_xsk_xmit_one(struct virtnet_sq *sq,
struct xsk_buff_pool *pool,
struct xdp_desc *desc)
@@ -244,7 +296,7 @@ static int virtnet_xsk_pool_enable(struct net_device *dev,
struct virtnet_sq *sq;
struct device *dma_dev;
dma_addr_t hdr_dma;
- int err;
+ int err, size;
/* In big_packets mode, xdp cannot work, so there is no need to
* initialize xsk of rq.
@@ -276,6 +328,16 @@ static int virtnet_xsk_pool_enable(struct net_device *dev,
if (!dma_dev)
return -EPERM;
+ size = virtqueue_get_vring_size(rq->vq);
+
+ rq->xsk.xsk_buffs = kcalloc(size, sizeof(*rq->xsk.xsk_buffs), GFP_KERNEL);
+ if (!rq->xsk.xsk_buffs)
+ return -ENOMEM;
+
+ rq->xsk.size = size;
+ rq->xsk.nxt_idx = 0;
+ rq->xsk.num = 0;
+
hdr_dma = dma_map_single(dma_dev, &xsk_hdr, vi->hdr_len, DMA_TO_DEVICE);
if (dma_mapping_error(dma_dev, hdr_dma))
return -ENOMEM;
@@ -338,6 +400,8 @@ static int virtnet_xsk_pool_disable(struct net_device *dev, u16 qid)
err1 = virtnet_sq_bind_xsk_pool(vi, sq, NULL);
err2 = virtnet_rq_bind_xsk_pool(vi, rq, NULL);
+ kfree(rq->xsk.xsk_buffs);
+
return err1 | err2;
}
diff --git a/drivers/net/virtio/xsk.h b/drivers/net/virtio/xsk.h
index 7ebc9bda7aee..bef41a3f954e 100644
--- a/drivers/net/virtio/xsk.h
+++ b/drivers/net/virtio/xsk.h
@@ -23,4 +23,6 @@ int virtnet_xsk_pool_setup(struct net_device *dev, struct netdev_bpf *xdp);
bool virtnet_xsk_xmit(struct virtnet_sq *sq, struct xsk_buff_pool *pool,
int budget);
int virtnet_xsk_wakeup(struct net_device *dev, u32 qid, u32 flag);
+int virtnet_add_recvbuf_xsk(struct virtnet_info *vi, struct virtnet_rq *rq,
+ struct xsk_buff_pool *pool, gfp_t gfp);
#endif
--
2.32.0.3.g01195cf9f
next prev parent reply other threads:[~2023-10-16 12:00 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-16 12:00 [PATCH net-next v1 00/19] virtio-net: support AF_XDP zero copy Xuan Zhuo
2023-10-16 12:00 ` [PATCH net-next v1 01/19] virtio_net: rename free_old_xmit_skbs to free_old_xmit Xuan Zhuo
2023-10-19 4:17 ` Jason Wang
2023-10-16 12:00 ` [PATCH net-next v1 02/19] virtio_net: unify the code for recycling the xmit ptr Xuan Zhuo
2023-10-19 4:23 ` Jason Wang
2023-10-16 12:00 ` [PATCH net-next v1 03/19] virtio_net: independent directory Xuan Zhuo
2023-10-19 6:10 ` Jason Wang
2023-10-16 12:00 ` [PATCH net-next v1 04/19] virtio_net: move to virtio_net.h Xuan Zhuo
2023-10-19 6:12 ` Jason Wang
2023-10-19 7:16 ` Xuan Zhuo
2023-10-20 6:59 ` Jason Wang
2023-10-16 12:00 ` [PATCH net-next v1 05/19] virtio_net: add prefix virtnet to all struct/api inside virtio_net.h Xuan Zhuo
2023-10-19 6:14 ` Jason Wang
2023-10-19 6:36 ` Michael S. Tsirkin
2023-10-16 12:00 ` [PATCH net-next v1 06/19] virtio_net: separate virtnet_rx_resize() Xuan Zhuo
2023-10-19 6:17 ` Jason Wang
2023-10-16 12:00 ` [PATCH net-next v1 07/19] virtio_net: separate virtnet_tx_resize() Xuan Zhuo
2023-10-19 6:18 ` Jason Wang
2023-10-16 12:00 ` [PATCH net-next v1 08/19] virtio_net: sq support premapped mode Xuan Zhuo
2023-10-20 6:50 ` Jason Wang
2023-10-20 7:16 ` Xuan Zhuo
2023-10-16 12:00 ` [PATCH net-next v1 09/19] virtio_net: xsk: bind/unbind xsk Xuan Zhuo
2023-10-20 6:51 ` Jason Wang
2023-10-20 7:28 ` Xuan Zhuo
2023-10-16 12:00 ` [PATCH net-next v1 10/19] virtio_net: xsk: prevent disable tx napi Xuan Zhuo
2023-10-20 6:51 ` Jason Wang
2023-10-16 12:00 ` [PATCH net-next v1 11/19] virtio_net: xsk: tx: support tx Xuan Zhuo
2023-10-20 6:52 ` Jason Wang
2023-10-20 8:06 ` Xuan Zhuo
2023-10-16 12:00 ` [PATCH net-next v1 12/19] virtio_net: xsk: tx: support wakeup Xuan Zhuo
2023-10-20 6:52 ` Jason Wang
2023-10-20 8:09 ` Xuan Zhuo
2023-10-16 12:00 ` [PATCH net-next v1 13/19] virtio_net: xsk: tx: virtnet_free_old_xmit() distinguishes xsk buffer Xuan Zhuo
2023-10-16 23:44 ` Jakub Kicinski
2023-10-17 2:02 ` Xuan Zhuo
2023-10-19 6:38 ` Michael S. Tsirkin
2023-10-19 7:13 ` Xuan Zhuo
2023-10-19 8:42 ` Michael S. Tsirkin
2023-10-16 12:00 ` [PATCH net-next v1 14/19] virtio_net: xsk: tx: virtnet_sq_free_unused_buf() check " Xuan Zhuo
2023-10-20 6:53 ` Jason Wang
2023-10-16 12:00 ` Xuan Zhuo [this message]
2023-10-20 6:56 ` [PATCH net-next v1 15/19] virtio_net: xsk: rx: introduce add_recvbuf_xsk() Jason Wang
2023-10-23 6:56 ` Xuan Zhuo
2023-10-16 12:00 ` [PATCH net-next v1 16/19] virtio_net: xsk: rx: introduce receive_xsk() to recv xsk buffer Xuan Zhuo
2023-10-20 6:57 ` Jason Wang
2023-10-23 2:39 ` Xuan Zhuo
2023-11-15 2:35 ` Xuan Zhuo
2023-10-16 12:00 ` [PATCH net-next v1 17/19] virtio_net: xsk: rx: virtnet_rq_free_unused_buf() check " Xuan Zhuo
2023-10-16 12:00 ` [PATCH net-next v1 18/19] virtio_net: update tx timeout record Xuan Zhuo
2023-10-20 6:57 ` Jason Wang
2023-10-16 12:00 ` [PATCH net-next v1 19/19] virtio_net: xdp_features add NETDEV_XDP_ACT_XSK_ZEROCOPY Xuan Zhuo
2023-10-17 2:53 ` [PATCH net-next v1 00/19] virtio-net: support AF_XDP zero copy Jason Wang
2023-10-17 3:02 ` Xuan Zhuo
2023-10-17 3:20 ` Jason Wang
2023-10-17 3:22 ` Xuan Zhuo
2023-10-17 3:28 ` Jason Wang
2023-10-17 5:27 ` Jason Wang
2023-10-17 6:06 ` Xuan Zhuo
2023-10-17 6:26 ` Jason Wang
2023-10-17 6:43 ` Xuan Zhuo
2023-10-17 11:19 ` Xuan Zhuo
2023-10-18 2:46 ` Jason Wang
2023-10-18 2:56 ` Xuan Zhuo
2023-10-18 3:32 ` Xuan Zhuo
2023-10-18 3:40 ` Jason Wang
2023-10-18 1:02 ` 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=20231016120033.26933-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-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).