On Thu, 21 Dec 2023 11:32:49 +0800, Jason Wang <jasowang@xxxxxxxxxx> wrote:
> On Thu, Dec 7, 2023 at 4:04 PM Xuan Zhuo <xuanzhuo@xxxxxxxxxxxxxxxxx> wrote:
> >
> > If the xsk is enabling, the xsk tx will share the send queue.
> > But the xsk requires that the send queue use the premapped mode.
> > So the send queue must support premapped mode.
> >
> > command: pktgen_sample01_simple.sh -i eth0 -s 16/1400 -d 10.0.0.123 -m 00:16:3e:12:e1:3e -n 0 -p 100
> > matchine: ecs.ebmg6e.26xlarge of Aliyun
> > cpu: Intel(R) Xeon(R) Platinum 8269CY CPU @ 2.50GHz
> > iommu mode: intel_iommu=on iommu.strict=1 iommu=nopt
> >
> > | iommu off | iommu on
> > ----------------------|-----------------------------------------------------
> > | 16 | 1400 | 16 | 1400
> > ----------------------|-----------------------------------------------------
> > Before: |1716796.00 | 1581829.00 | 390756.00 | 374493.00
> > After(premapped off): |1733794.00 | 1576259.00 | 390189.00 | 378128.00
> > After(premapped on): |1707107.00 | 1562917.00 | 385667.00 | 373584.00
> >
> > Signed-off-by: Xuan Zhuo <xuanzhuo@xxxxxxxxxxxxxxxxx>
> > ---
> > drivers/net/virtio/main.c | 120 ++++++++++++++++++++++++++++----
>
> Any reason to depend this series to the relocation series?
This patch set will be located in the virtio-net support AF_XDP patch set.
>
> > drivers/net/virtio/virtio_net.h | 10 ++-
> > 2 files changed, 117 insertions(+), 13 deletions(-)
> >
> > diff --git a/drivers/net/virtio/main.c b/drivers/net/virtio/main.c
> > index 83f24de00497..9600ffe1af86 100644
> > --- a/drivers/net/virtio/main.c
> > +++ b/drivers/net/virtio/main.c
> > @@ -167,13 +167,39 @@ static struct xdp_frame *ptr_to_xdp(void *ptr)
> > return (struct xdp_frame *)((unsigned long)ptr & ~VIRTIO_XDP_FLAG);
> > }
> >
> > +static void virtnet_sq_unmap_buf(struct virtnet_sq *sq, struct virtio_dma_head *dma)
> > +{
> > + int i;
> > +
> > + if (!dma)
> > + return;
> > +
> > + for (i = 0; i < dma->next; ++i)
> > + virtqueue_dma_unmap_single_attrs(sq->vq,
> > + dma->items[i].addr,
> > + dma->items[i].length,
> > + DMA_TO_DEVICE, 0);
> > + dma->next = 0;
> > +}
> > +
> > static void __free_old_xmit(struct virtnet_sq *sq, bool in_napi,
> > u64 *bytes, u64 *packets)
> > {
> > + struct virtio_dma_head *dma;
> > unsigned int len;
> > void *ptr;
> >
> > - while ((ptr = virtqueue_get_buf(sq->vq, &len)) != NULL) {
> > + if (virtqueue_get_dma_premapped(sq->vq)) {
> > + dma = &sq->dma.head;
> > + dma->num = ARRAY_SIZE(sq->dma.items);
> > + dma->next = 0;
> > + } else {
> > + dma = NULL;
> > + }
> > +
> > + while ((ptr = virtqueue_get_buf_ctx_dma(sq->vq, &len, dma, NULL)) != NULL) {
> > + virtnet_sq_unmap_buf(sq, dma);
> > +
> > if (!is_xdp_frame(ptr)) {
> > struct sk_buff *skb = ptr;
> >
> > @@ -567,16 +593,70 @@ static void *virtnet_rq_alloc(struct virtnet_rq *rq, u32 size, gfp_t gfp)
> > return buf;
> > }
> >
> > -static void virtnet_rq_set_premapped(struct virtnet_info *vi)
> > +static void virtnet_set_premapped(struct virtnet_info *vi)
> > {
> > int i;
> >
> > - /* disable for big mode */
> > - if (!vi->mergeable_rx_bufs && vi->big_packets)
> > - return;
> > + for (i = 0; i < vi->max_queue_pairs; i++) {
> > + virtqueue_set_dma_premapped(vi->sq[i].vq);
> >
> > - for (i = 0; i < vi->max_queue_pairs; i++)
> > - virtqueue_set_dma_premapped(vi->rq[i].vq);
> > + /* disable for big mode */
>
> Let's use a TODO here.
This will be fixed.
Thanks.
>
> Other looks good.
>
> Thanks
>
