From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out30-130.freemail.mail.aliyun.com (out30-130.freemail.mail.aliyun.com [115.124.30.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0B563824AF; Mon, 1 Jul 2024 08:34:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.130 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719822880; cv=none; b=ucEUeKFOUZd3dwOWbdX6tTf5ovDQrsAFRMflXsmqpAg1MNRUobhLfl0slGqzAS/BN7jl1jiDKMt6fq1m0mA2eSGZyQ0eP4t6VARAgkLon4m0MhwnH/hAuFwwdmYfKOhpNp85/ZJZG7j4qkexibXkBPX7N/IbEJdCMsBQR9YwkHg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719822880; c=relaxed/simple; bh=C/QQObNSrRFu1AlLgCOhHSs6K370gxPgRoUUusgyv9c=; h=Message-ID:Subject:Date:From:To:Cc:References:In-Reply-To: Content-Type; b=AQmUaIcbHLYAlfGhkoWZM2lCju/xaCsuuOVjqLlWFAAM5IWDmtUBZA2Y3ZOo8akMHAONVEv43FdHnlgdyTibQW2mg4FlVSsgwxqXXaQJ7e8UjDWGz+TwNjrj67A3qOeRUs/wQf/Z/IpCON1VQ6wrzVTWnm3crIHXnojgmSwaGRc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com; spf=pass smtp.mailfrom=linux.alibaba.com; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b=WhGL5lSx; arc=none smtp.client-ip=115.124.30.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b="WhGL5lSx" DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1719822870; h=Message-ID:Subject:Date:From:To:Content-Type; bh=cRxQlpP3W38cpYFo3zUi1MSuJXJaetK/a8wQs27sTp0=; b=WhGL5lSx/xpvhOVqaewsxarzrkJP/rIfDDn4fIAuRm8SyAKvXoQOFCRI4aasu8YKHC2+HzePH6Ksv1clZ5f3O/OqI+wqu3aBj/V70LYLYIO2db91fF4keuorbl7tFQa6QaaEuJMR5aYEF16dJ1S4IDbTJQsjglzECrbSt2Ujemg= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R121e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033037067110;MF=xuanzhuo@linux.alibaba.com;NM=1;PH=DS;RN=14;SR=0;TI=SMTPD_---0W9c.kOb_1719822869; Received: from localhost(mailfrom:xuanzhuo@linux.alibaba.com fp:SMTPD_---0W9c.kOb_1719822869) by smtp.aliyun-inc.com; Mon, 01 Jul 2024 16:34:29 +0800 Message-ID: <1719822850.714056-2-xuanzhuo@linux.alibaba.com> Subject: Re: [PATCH net-next v6 07/10] virtio_net: xsk: rx: support fill with xsk buffer Date: Mon, 1 Jul 2024 16:34:10 +0800 From: Xuan Zhuo To: Jason Wang Cc: netdev@vger.kernel.org, "Michael S. Tsirkin" , =?utf-8?q?Eugenio_P=C3=A9rez?= , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , virtualization@lists.linux.dev, bpf@vger.kernel.org References: <20240618075643.24867-1-xuanzhuo@linux.alibaba.com> <20240618075643.24867-8-xuanzhuo@linux.alibaba.com> <1719553356.2373846-2-xuanzhuo@linux.alibaba.com> In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: On Mon, 1 Jul 2024 11:05:33 +0800, Jason Wang wrote: > On Fri, Jun 28, 2024 at 1:44=E2=80=AFPM Xuan Zhuo wrote: > > > > On Fri, 28 Jun 2024 10:19:37 +0800, Jason Wang wr= ote: > > > On Tue, Jun 18, 2024 at 3:57=E2=80=AFPM Xuan Zhuo wrote: > > > > > > > > Implement the logic of filling rq with XSK buffers. > > > > > > > > Signed-off-by: Xuan Zhuo > > > > --- > > > > drivers/net/virtio_net.c | 68 ++++++++++++++++++++++++++++++++++++= ++-- > > > > 1 file changed, 66 insertions(+), 2 deletions(-) > > > > > > > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > > > > index 2bbc715f22c6..2ac5668a94ce 100644 > > > > --- a/drivers/net/virtio_net.c > > > > +++ b/drivers/net/virtio_net.c > > > > @@ -355,6 +355,8 @@ struct receive_queue { > > > > > > > > /* xdp rxq used by xsk */ > > > > struct xdp_rxq_info xdp_rxq; > > > > + > > > > + struct xdp_buff **xsk_buffs; > > > > } xsk; > > > > }; > > > > > > > > @@ -1032,6 +1034,53 @@ static void check_sq_full_and_disable(struct= virtnet_info *vi, > > > > } > > > > } > > > > > > > > +static void sg_fill_dma(struct scatterlist *sg, dma_addr_t addr, u= 32 len) > > > > +{ > > > > + sg->dma_address =3D addr; > > > > + sg->length =3D len; > > > > +} > > > > + > > > > +static int virtnet_add_recvbuf_xsk(struct virtnet_info *vi, struct= receive_queue *rq, > > > > + struct xsk_buff_pool *pool, gfp_= t gfp) > > > > +{ > > > > + struct xdp_buff **xsk_buffs; > > > > + dma_addr_t addr; > > > > + u32 len, i; > > > > + int err =3D 0; > > > > + int num; > > > > + > > > > + xsk_buffs =3D rq->xsk.xsk_buffs; > > > > + > > > > + num =3D xsk_buff_alloc_batch(pool, xsk_buffs, rq->vq->num_f= ree); > > > > + if (!num) > > > > + return -ENOMEM; > > > > + > > > > + len =3D xsk_pool_get_rx_frame_size(pool) + vi->hdr_len; > > > > + > > > > + for (i =3D 0; i < num; ++i) { > > > > + /* use the part of XDP_PACKET_HEADROOM as the virtn= et hdr space */ > > > > + addr =3D xsk_buff_xdp_get_dma(xsk_buffs[i]) - vi->h= dr_len; > > > > > > We had VIRTIO_XDP_HEADROOM, can we reuse it? Or if it's redundant > > > let's send a patch to switch to XDP_PACKET_HEADROOM. > > > > Do you mean replace it inside the comment? > > I meant a patch to s/VIRTIO_XDP_HEADROOM/XDP_PACKET_HEADROOM/g. I see. > > > > > I want to describe use the headroom of xsk, the size of the headroom is > > XDP_PACKET_HEADROOM. > > > > > > > > Btw, the code assumes vi->hdr_len < xsk_pool_get_headroom(). It's > > > better to fail if it's not true when enabling xsk. > > > > It is ok. > > I mean do we need a check to fail xsk binding if vi->hdr_len > > xsk_pool_get_headroom() or it has been guaranteed by the code already. YES. Thanks. > > Thanks > > > > > Thanks. > > > > > > > > > > Thanks > > > > > >