From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28DD4C46467 for ; Tue, 27 Dec 2022 07:13:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229641AbiL0HNI (ORCPT ); Tue, 27 Dec 2022 02:13:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229533AbiL0HNG (ORCPT ); Tue, 27 Dec 2022 02:13:06 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 220486355 for ; Mon, 26 Dec 2022 23:12:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672125136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3xbSpmIT0V9UbrBBeK6SZDnItYFd1W/oZ/ou2OvHw7I=; b=L6bSmi5RVuF8tCaBMLGJc1y6nRE9s6VcztQHnPTnUa1VoToxq0dLt9rOodYjDAljwKazdG LJUeOyXPr+es1Pj99YfWCghaRlug2uKanG0c+8L6UBVtNECQYoFYLjjOC1+iSiexaZ7OBX VvAbl2paeY3oyyjAW+fV/qHBEalQdc8= Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-74-hD3bg12ZMPSG9JTg9Q0iMQ-1; Tue, 27 Dec 2022 02:12:14 -0500 X-MC-Unique: hD3bg12ZMPSG9JTg9Q0iMQ-1 Received: by mail-pg1-f200.google.com with SMTP id l63-20020a639142000000b0047942953738so6345062pge.15 for ; Mon, 26 Dec 2022 23:12:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3xbSpmIT0V9UbrBBeK6SZDnItYFd1W/oZ/ou2OvHw7I=; b=Bb8jMVmEJ4dATyLpQ5zFvUc8NuM46pyzqHE7WVT9yFR21luzLvqVY7b0JR84uiRTVZ 3DWvPz8Fo0DFLRIDIQyPJ0kQSgy32ikeg9mUFzjRMTu4qNmbKLl2mq/1BSrf0ZxIZknT GYjHuVm4Djcos/jwBwVTgBKEA+w7j1koFAIrnq+2ReOC7+uK0d0Tr5voHmjacmvtcrxa HpQTWnIAkpVl8ixRhDmSjoow/OuQIV7DuwHd6zgZpUTZShsYAWTj63BsMP8P32RBUt4q lf2BBFJsef4DQHYyoFyx898qUlo3HeD/nMk1p68A40s7273/nnS7G80A03RHkTa1/X7V iYow== X-Gm-Message-State: AFqh2kpQ+DEgpAEzBE0W5mltL39pWOn9NS2rDnTomFETyR27HJ+Ajg9d VRWBzfB6ohf/eUwnbQLz/a7uh7F09ISTsAgHqhfdvCqQfvhEefb8mLPCXDNWBLGE0XxcEBB71MQ lm5Nu4C33cT8BqAks X-Received: by 2002:a05:6a00:1da2:b0:580:f804:d704 with SMTP id z34-20020a056a001da200b00580f804d704mr9356645pfw.28.1672125133891; Mon, 26 Dec 2022 23:12:13 -0800 (PST) X-Google-Smtp-Source: AMrXdXsgLbeqx0NIBQBq3frQeMu1mbJ4AsJ39+9ZQ66fvH1Peg/unpM4+pVBQheDJLWWx3xNPqTTBg== X-Received: by 2002:a05:6a00:1da2:b0:580:f804:d704 with SMTP id z34-20020a056a001da200b00580f804d704mr9356627pfw.28.1672125133633; Mon, 26 Dec 2022 23:12:13 -0800 (PST) Received: from [10.72.13.143] ([43.228.180.230]) by smtp.gmail.com with ESMTPSA id y131-20020a626489000000b00574679561b4sm7869305pfb.134.2022.12.26.23.12.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 26 Dec 2022 23:12:12 -0800 (PST) Message-ID: Date: Tue, 27 Dec 2022 15:12:07 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Subject: Re: [PATCH v2 6/9] virtio_net: transmit the multi-buffer xdp Content-Language: en-US To: Heng Qi , netdev@vger.kernel.org, bpf@vger.kernel.org Cc: "Michael S . Tsirkin" , Paolo Abeni , Jakub Kicinski , John Fastabend , "David S . Miller" , Daniel Borkmann , Alexei Starovoitov , Eric Dumazet , Xuan Zhuo References: <20221220141449.115918-1-hengqi@linux.alibaba.com> <20221220141449.115918-7-hengqi@linux.alibaba.com> From: Jason Wang In-Reply-To: <20221220141449.115918-7-hengqi@linux.alibaba.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 在 2022/12/20 22:14, Heng Qi 写道: > This serves as the basis for XDP_TX and XDP_REDIRECT > to send a multi-buffer xdp_frame. > > Signed-off-by: Heng Qi > Reviewed-by: Xuan Zhuo > --- > drivers/net/virtio_net.c | 27 ++++++++++++++++++++++----- > 1 file changed, 22 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index 40bc58fa57f5..9f31bfa7f9a6 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -563,22 +563,39 @@ static int __virtnet_xdp_xmit_one(struct virtnet_info *vi, > struct xdp_frame *xdpf) > { > struct virtio_net_hdr_mrg_rxbuf *hdr; > - int err; > + struct skb_shared_info *shinfo; > + u8 nr_frags = 0; > + int err, i; > > if (unlikely(xdpf->headroom < vi->hdr_len)) > return -EOVERFLOW; > > - /* Make room for virtqueue hdr (also change xdpf->headroom?) */ > + if (unlikely(xdp_frame_has_frags(xdpf))) { > + shinfo = xdp_get_shared_info_from_frame(xdpf); > + nr_frags = shinfo->nr_frags; > + } > + > + /* Need to adjust this to calculate the correct postion > + * for shinfo of the xdpf. > + */ > + xdpf->headroom -= vi->hdr_len; Any reason we need to do this here? (Or if it is, is it only needed for multibuffer XDP?) Other looks good. Thanks > xdpf->data -= vi->hdr_len; > /* Zero header and leave csum up to XDP layers */ > hdr = xdpf->data; > memset(hdr, 0, vi->hdr_len); > xdpf->len += vi->hdr_len; > > - sg_init_one(sq->sg, xdpf->data, xdpf->len); > + sg_init_table(sq->sg, nr_frags + 1); > + sg_set_buf(sq->sg, xdpf->data, xdpf->len); > + for (i = 0; i < nr_frags; i++) { > + skb_frag_t *frag = &shinfo->frags[i]; > + > + sg_set_page(&sq->sg[i + 1], skb_frag_page(frag), > + skb_frag_size(frag), skb_frag_off(frag)); > + } > > - err = virtqueue_add_outbuf(sq->vq, sq->sg, 1, xdp_to_ptr(xdpf), > - GFP_ATOMIC); > + err = virtqueue_add_outbuf(sq->vq, sq->sg, nr_frags + 1, > + xdp_to_ptr(xdpf), GFP_ATOMIC); > if (unlikely(err)) > return -ENOSPC; /* Caller handle free/refcnt */ >