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 87E95C10F1B for ; Tue, 27 Dec 2022 07:56:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229724AbiL0H4k (ORCPT ); Tue, 27 Dec 2022 02:56:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52198 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229676AbiL0H4j (ORCPT ); Tue, 27 Dec 2022 02:56:39 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF891B1A for ; Mon, 26 Dec 2022 23:55:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672127752; 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=xV7l+8VYiJaFZmcUPBmZ52ru+09AM8Gi4rJWK0hXomw=; b=GY09kJin6BceKNEarebsal/yllKrBRuXrkz42cjnF9FrXMmC4I3JVePkf9R4cLY3J7nTIk N/uwhez2FSHQn274588C5vNUBqmJD9tzL+G1mEjuEVDs9xAj51yFfBRGjRRWcV3zmnlkuv gjIE9y6YjxinvcY1hFEFMPYxtWBS6pQ= Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-479-BfM73G-jNp2nbFhGSdtz1Q-1; Tue, 27 Dec 2022 02:55:51 -0500 X-MC-Unique: BfM73G-jNp2nbFhGSdtz1Q-1 Received: by mail-pj1-f72.google.com with SMTP id h6-20020a17090aa88600b00223fccff2efso10618284pjq.6 for ; Mon, 26 Dec 2022 23:55:51 -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=xV7l+8VYiJaFZmcUPBmZ52ru+09AM8Gi4rJWK0hXomw=; b=3rN2RM/nuiOWlzQF6AJpa6dJRF+uCu8x2HpkPdZCrnVUG4e2eWx+b4GkY3QB0D0Aax 49X1iyQNQv0z4S0aE4PzIJ94uBuP847bY5la1+N/Odxo08rHUWd1MX5zduKl9/1BbvXP xQE+AqbLR6cM5TMf7S1d4F9v3O7WfDI3fTsEfdMbQePAkCIcMAhiQ1qRd9wHQ/qgL/se MDv0kq6Z9rzLQpA2+de657hw0sGe2Msz03pYnWPLgroZANJm7aoIzO8FyYKmTH2kWNZk 5U8a66GjLIJ1iwrcKujAQ0ZNP2oPq4sTqLhdYKhFzNaYRmWxmmFMWHQaGCavsI8G4Phi WJ4A== X-Gm-Message-State: AFqh2kr/Z+l6bj0c2Y9YHnW0fEXBZvSIrXgVcnu7ngFpv0Sqxy79Ulkj lxv6iG39f2YNjs2C0Jqly+toXSjA2tZsQEhwPmUQPdTjvaqg6BTPzvRuete4h9FmJjsh/6hvJmT hW4Dc5KrF9zRO X-Received: by 2002:a17:90b:4a8c:b0:225:a8f2:fa38 with SMTP id lp12-20020a17090b4a8c00b00225a8f2fa38mr21774825pjb.21.1672127750484; Mon, 26 Dec 2022 23:55:50 -0800 (PST) X-Google-Smtp-Source: AMrXdXsZXqOmVTLrlDijfx38V90ccDJjUgiNJV9sF7IAkUmpIxpdd6KS5N1aN75o6OdzPIWJyjraRA== X-Received: by 2002:a17:90b:4a8c:b0:225:a8f2:fa38 with SMTP id lp12-20020a17090b4a8c00b00225a8f2fa38mr21774804pjb.21.1672127750230; Mon, 26 Dec 2022 23:55:50 -0800 (PST) Received: from [10.72.13.143] ([43.228.180.230]) by smtp.gmail.com with ESMTPSA id ms2-20020a17090b234200b002194319662asm10070691pjb.42.2022.12.26.23.55.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 26 Dec 2022 23:55:49 -0800 (PST) Message-ID: <7ac52b7e-05ea-600b-bb8a-15124c6c007d@redhat.com> Date: Tue, 27 Dec 2022 15:55:43 +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 8/9] virtio_net: remove xdp related info from page_to_skb() 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-9-hengqi@linux.alibaba.com> From: Jason Wang In-Reply-To: <20221220141449.115918-9-hengqi@linux.alibaba.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org 在 2022/12/20 22:14, Heng Qi 写道: > For the clear construction of xdp_buff, we remove the xdp processing > interleaved with page_to_skb(). Now, the logic of xdp and building > skb from xdp are separate and independent. > > Signed-off-by: Heng Qi > Reviewed-by: Xuan Zhuo Acked-by: Jason Wang Thanks > --- > drivers/net/virtio_net.c | 41 +++++++++------------------------------- > 1 file changed, 9 insertions(+), 32 deletions(-) > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index 4e12196fcfd4..398ffe2a5084 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -439,9 +439,7 @@ static unsigned int mergeable_ctx_to_truesize(void *mrg_ctx) > static struct sk_buff *page_to_skb(struct virtnet_info *vi, > struct receive_queue *rq, > struct page *page, unsigned int offset, > - unsigned int len, unsigned int truesize, > - bool hdr_valid, unsigned int metasize, > - unsigned int headroom) > + unsigned int len, unsigned int truesize) > { > struct sk_buff *skb; > struct virtio_net_hdr_mrg_rxbuf *hdr; > @@ -459,21 +457,11 @@ static struct sk_buff *page_to_skb(struct virtnet_info *vi, > else > hdr_padded_len = sizeof(struct padded_vnet_hdr); > > - /* If headroom is not 0, there is an offset between the beginning of the > - * data and the allocated space, otherwise the data and the allocated > - * space are aligned. > - * > - * Buffers with headroom use PAGE_SIZE as alloc size, see > - * add_recvbuf_mergeable() + get_mergeable_buf_len() > - */ > - truesize = headroom ? PAGE_SIZE : truesize; > - tailroom = truesize - headroom; > - buf = p - headroom; > - > + buf = p; > len -= hdr_len; > offset += hdr_padded_len; > p += hdr_padded_len; > - tailroom -= hdr_padded_len + len; > + tailroom = truesize - hdr_padded_len - len; > > shinfo_size = SKB_DATA_ALIGN(sizeof(struct skb_shared_info)); > > @@ -503,7 +491,7 @@ static struct sk_buff *page_to_skb(struct virtnet_info *vi, > if (len <= skb_tailroom(skb)) > copy = len; > else > - copy = ETH_HLEN + metasize; > + copy = ETH_HLEN; > skb_put_data(skb, p, copy); > > len -= copy; > @@ -542,19 +530,11 @@ static struct sk_buff *page_to_skb(struct virtnet_info *vi, > give_pages(rq, page); > > ok: > - /* hdr_valid means no XDP, so we can copy the vnet header */ > - if (hdr_valid) { > - hdr = skb_vnet_hdr(skb); > - memcpy(hdr, hdr_p, hdr_len); > - } > + hdr = skb_vnet_hdr(skb); > + memcpy(hdr, hdr_p, hdr_len); > if (page_to_free) > put_page(page_to_free); > > - if (metasize) { > - __skb_pull(skb, metasize); > - skb_metadata_set(skb, metasize); > - } > - > return skb; > } > > @@ -934,7 +914,7 @@ static struct sk_buff *receive_big(struct net_device *dev, > { > struct page *page = buf; > struct sk_buff *skb = > - page_to_skb(vi, rq, page, 0, len, PAGE_SIZE, true, 0, 0); > + page_to_skb(vi, rq, page, 0, len, PAGE_SIZE); > > stats->bytes += len - vi->hdr_len; > if (unlikely(!skb)) > @@ -1222,9 +1202,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, > rcu_read_unlock(); > put_page(page); > head_skb = page_to_skb(vi, rq, xdp_page, offset, > - len, PAGE_SIZE, false, > - metasize, > - headroom); > + len, PAGE_SIZE); > return head_skb; > } > break; > @@ -1289,8 +1267,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, > rcu_read_unlock(); > > skip_xdp: > - head_skb = page_to_skb(vi, rq, page, offset, len, truesize, !xdp_prog, > - metasize, headroom); > + head_skb = page_to_skb(vi, rq, page, offset, len, truesize); > curr_skb = head_skb; > > if (unlikely(!curr_skb))