| Message ID | 20231229073108.57778-17-xuanzhuo@linux.alibaba.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | virtio-net: support AF_XDP zero copy | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for net-next, async |
| netdev/apply | fail | Patch does not apply to net-next |
Hi Xuan,
kernel test robot noticed the following build warnings:
[auto build test WARNING on mst-vhost/linux-next]
[cannot apply to net-next/main linus/master horms-ipvs/master v6.7-rc7 next-20231222]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Xuan-Zhuo/virtio_net-rename-free_old_xmit_skbs-to-free_old_xmit/20231229-155253
base: https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git linux-next
patch link: https://lore.kernel.org/r/20231229073108.57778-17-xuanzhuo%40linux.alibaba.com
patch subject: [PATCH net-next v3 16/27] virtio_net: xsk: tx: support xmit xsk buffer
config: x86_64-randconfig-004-20231229 (https://download.01.org/0day-ci/archive/20231230/202312300834.bOCLH0Mi-lkp@intel.com/config)
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231230/202312300834.bOCLH0Mi-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202312300834.bOCLH0Mi-lkp@intel.com/
All warnings (new ones prefixed by >>):
In function 'virtnet_xsk_xmit_one',
inlined from 'virtnet_xsk_xmit_batch' at drivers/net/virtio/xsk.c:58:9,
inlined from 'virtnet_xsk_xmit' at drivers/net/virtio/xsk.c:80:9:
>> drivers/net/virtio/xsk.c:34:16: warning: 'virtqueue_add_outbuf' accessing 32 bytes in a region of size 8 [-Wstringop-overflow=]
34 | return virtqueue_add_outbuf(sq->vq, sq->sg, 2,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
35 | virtnet_xsk_to_ptr(desc->len), GFP_ATOMIC);
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/net/virtio/xsk.c:34:16: note: referencing argument 2 of type 'struct scatterlist[0]'
In file included from include/linux/virtio_config.h:7,
from include/uapi/linux/virtio_net.h:30,
from include/linux/virtio_net.h:8,
from drivers/net/virtio/virtio_net.h:8,
from drivers/net/virtio/xsk.c:6:
include/linux/virtio.h: In function 'virtnet_xsk_xmit':
include/linux/virtio.h:42:5: note: in a call to function 'virtqueue_add_outbuf'
42 | int virtqueue_add_outbuf(struct virtqueue *vq,
| ^~~~~~~~~~~~~~~~~~~~
vim +/virtqueue_add_outbuf +34 drivers/net/virtio/xsk.c
16
17 static int virtnet_xsk_xmit_one(struct virtnet_sq *sq,
18 struct xsk_buff_pool *pool,
19 struct xdp_desc *desc)
20 {
21 struct virtnet_info *vi;
22 dma_addr_t addr;
23
24 vi = sq->vq->vdev->priv;
25
26 addr = xsk_buff_raw_get_dma(pool, desc->addr);
27 xsk_buff_raw_dma_sync_for_device(pool, addr, desc->len);
28
29 sg_init_table(sq->sg, 2);
30
31 sg_fill_dma(sq->sg, sq->xsk.hdr_dma_address, vi->hdr_len);
32 sg_fill_dma(sq->sg + 1, addr, desc->len);
33
> 34 return virtqueue_add_outbuf(sq->vq, sq->sg, 2,
35 virtnet_xsk_to_ptr(desc->len), GFP_ATOMIC);
36 }
37
38 static int virtnet_xsk_xmit_batch(struct virtnet_sq *sq,
39 struct xsk_buff_pool *pool,
40 unsigned int budget,
41 u64 *kicks)
42 {
43 struct xdp_desc *descs = pool->tx_descs;
44 u32 nb_pkts, max_pkts, i;
45 bool kick = false;
46 int err;
47
48 /* Every xsk tx packet needs two desc(virtnet header and packet). So we
49 * use sq->vq->num_free / 2 as the limitation.
50 */
51 max_pkts = min_t(u32, budget, sq->vq->num_free / 2);
52
53 nb_pkts = xsk_tx_peek_release_desc_batch(pool, max_pkts);
54 if (!nb_pkts)
55 return 0;
56
57 for (i = 0; i < nb_pkts; i++) {
> 58 err = virtnet_xsk_xmit_one(sq, pool, &descs[i]);
59 if (unlikely(err))
60 break;
61
62 kick = true;
63 }
64
65 if (kick && virtqueue_kick_prepare(sq->vq) && virtqueue_notify(sq->vq))
66 (*kicks)++;
67
68 return i;
69 }
70
diff --git a/drivers/net/virtio/main.c b/drivers/net/virtio/main.c index 6ab1f3418139..cb6c8916f605 100644 --- a/drivers/net/virtio/main.c +++ b/drivers/net/virtio/main.c @@ -612,9 +612,9 @@ static void free_old_xmit(struct virtnet_sq *sq, bool in_napi) u64_stats_update_end(&sq->stats.syncp); } -static void check_sq_full_and_disable(struct virtnet_info *vi, - struct net_device *dev, - struct virtnet_sq *sq) +void virtnet_check_sq_full_and_disable(struct virtnet_info *vi, + struct net_device *dev, + struct virtnet_sq *sq) { bool use_napi = sq->napi.weight; int qnum; @@ -772,7 +772,7 @@ static int virtnet_xdp_xmit(struct net_device *dev, ret = nxmit; if (!virtnet_is_xdp_raw_buffer_queue(vi, sq - vi->sq)) - check_sq_full_and_disable(vi, dev, sq); + virtnet_check_sq_full_and_disable(vi, dev, sq); if (flags & XDP_XMIT_FLUSH) { if (virtqueue_kick_prepare(sq->vq) && virtqueue_notify(sq->vq)) @@ -2042,6 +2042,7 @@ static int virtnet_poll_tx(struct napi_struct *napi, int budget) struct virtnet_info *vi = sq->vq->vdev->priv; unsigned int index = vq2txq(sq->vq); struct netdev_queue *txq; + bool xsk_busy = false; int opaque; bool done; @@ -2054,11 +2055,20 @@ 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(sq, true); + + if (sq->xsk.pool) + xsk_busy = virtnet_xsk_xmit(sq, sq->xsk.pool, budget); + else + free_old_xmit(sq, true); if (sq->vq->num_free >= 2 + MAX_SKB_FRAGS) netif_tx_wake_queue(txq); + if (xsk_busy) { + __netif_tx_unlock(txq); + return budget; + } + opaque = virtqueue_enable_cb_prepare(sq->vq); done = napi_complete_done(napi, 0); @@ -2173,7 +2183,7 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev) nf_reset_ct(skb); } - check_sq_full_and_disable(vi, dev, sq); + virtnet_check_sq_full_and_disable(vi, dev, sq); if (kick || netif_xmit_stopped(txq)) { if (virtqueue_kick_prepare(sq->vq) && virtqueue_notify(sq->vq)) { diff --git a/drivers/net/virtio/virtio_net.h b/drivers/net/virtio/virtio_net.h index 6888b0b767c6..7dcbd1d40fba 100644 --- a/drivers/net/virtio/virtio_net.h +++ b/drivers/net/virtio/virtio_net.h @@ -9,6 +9,7 @@ #include <net/xdp_sock_drv.h> #define VIRTIO_XDP_FLAG BIT(0) +#define VIRTIO_XSK_FLAG BIT(1) /* RX packet size EWMA. The average packet size is used to determine the packet * buffer size when refilling RX rings. As the entire RX ring may be refilled @@ -289,4 +290,7 @@ void virtnet_tx_pause(struct virtnet_info *vi, struct virtnet_sq *sq); void virtnet_tx_resume(struct virtnet_info *vi, struct virtnet_sq *sq); void virtnet_sq_free_unused_bufs(struct virtqueue *vq); void virtnet_rq_free_unused_bufs(struct virtqueue *vq); +void virtnet_check_sq_full_and_disable(struct virtnet_info *vi, + struct net_device *dev, + struct virtnet_sq *sq); #endif diff --git a/drivers/net/virtio/xsk.c b/drivers/net/virtio/xsk.c index 68fa1c422b41..d2a96424ade9 100644 --- a/drivers/net/virtio/xsk.c +++ b/drivers/net/virtio/xsk.c @@ -4,9 +4,97 @@ */ #include "virtio_net.h" +#include "xsk.h" static struct virtio_net_hdr_mrg_rxbuf xsk_hdr; +static void sg_fill_dma(struct scatterlist *sg, dma_addr_t addr, u32 len) +{ + sg->dma_address = addr; + sg->length = len; +} + +static int virtnet_xsk_xmit_one(struct virtnet_sq *sq, + struct xsk_buff_pool *pool, + struct xdp_desc *desc) +{ + struct virtnet_info *vi; + dma_addr_t addr; + + vi = sq->vq->vdev->priv; + + addr = xsk_buff_raw_get_dma(pool, desc->addr); + xsk_buff_raw_dma_sync_for_device(pool, addr, desc->len); + + sg_init_table(sq->sg, 2); + + sg_fill_dma(sq->sg, sq->xsk.hdr_dma_address, vi->hdr_len); + sg_fill_dma(sq->sg + 1, addr, desc->len); + + return virtqueue_add_outbuf(sq->vq, sq->sg, 2, + virtnet_xsk_to_ptr(desc->len), GFP_ATOMIC); +} + +static int virtnet_xsk_xmit_batch(struct virtnet_sq *sq, + struct xsk_buff_pool *pool, + unsigned int budget, + u64 *kicks) +{ + struct xdp_desc *descs = pool->tx_descs; + u32 nb_pkts, max_pkts, i; + bool kick = false; + int err; + + /* Every xsk tx packet needs two desc(virtnet header and packet). So we + * use sq->vq->num_free / 2 as the limitation. + */ + max_pkts = min_t(u32, budget, sq->vq->num_free / 2); + + nb_pkts = xsk_tx_peek_release_desc_batch(pool, max_pkts); + if (!nb_pkts) + return 0; + + for (i = 0; i < nb_pkts; i++) { + err = virtnet_xsk_xmit_one(sq, pool, &descs[i]); + if (unlikely(err)) + break; + + kick = true; + } + + if (kick && virtqueue_kick_prepare(sq->vq) && virtqueue_notify(sq->vq)) + (*kicks)++; + + return i; +} + +bool virtnet_xsk_xmit(struct virtnet_sq *sq, struct xsk_buff_pool *pool, + int budget) +{ + struct virtnet_info *vi = sq->vq->vdev->priv; + u64 bytes = 0, packets = 0, kicks = 0; + int sent; + + virtnet_free_old_xmit(sq, true, &bytes, &packets); + + sent = virtnet_xsk_xmit_batch(sq, pool, budget, &kicks); + + if (!virtnet_is_xdp_raw_buffer_queue(vi, sq - vi->sq)) + virtnet_check_sq_full_and_disable(vi, vi->dev, sq); + + u64_stats_update_begin(&sq->stats.syncp); + u64_stats_add(&sq->stats.packets, packets); + u64_stats_add(&sq->stats.bytes, bytes); + u64_stats_add(&sq->stats.kicks, kicks); + u64_stats_add(&sq->stats.xdp_tx, sent); + u64_stats_update_end(&sq->stats.syncp); + + if (xsk_uses_need_wakeup(pool)) + xsk_set_tx_need_wakeup(pool); + + return sent == budget; +} + static int virtnet_rq_bind_xsk_pool(struct virtnet_info *vi, struct virtnet_rq *rq, struct xsk_buff_pool *pool) { diff --git a/drivers/net/virtio/xsk.h b/drivers/net/virtio/xsk.h index 1918285c310c..73ca8cd5308b 100644 --- a/drivers/net/virtio/xsk.h +++ b/drivers/net/virtio/xsk.h @@ -3,5 +3,18 @@ #ifndef __XSK_H__ #define __XSK_H__ +#define VIRTIO_XSK_FLAG_OFFSET 4 + +static inline void *virtnet_xsk_to_ptr(u32 len) +{ + unsigned long p; + + p = len << VIRTIO_XSK_FLAG_OFFSET; + + return (void *)(p | VIRTIO_XSK_FLAG); +} + 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); #endif
The driver's tx napi is very important for XSK. It is responsible for obtaining data from the XSK queue and sending it out. At the beginning, we need to trigger tx napi. Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com> --- drivers/net/virtio/main.c | 22 ++++++--- drivers/net/virtio/virtio_net.h | 4 ++ drivers/net/virtio/xsk.c | 88 +++++++++++++++++++++++++++++++++ drivers/net/virtio/xsk.h | 13 +++++ 4 files changed, 121 insertions(+), 6 deletions(-)