netdev - Re: [PATCH net-next v2 10/14] virtio_net: merge: remove skip

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CACGkMEuQ9dW6SjTJ6R_zDz7e4JTwb9TKrO5YN51=J9b4PWOAfg@mail.gmail.com>
Date:   Thu, 20 Apr 2023 14:10:18 +0800
From:   Jason Wang <jasowang@...hat.com>
To:     Xuan Zhuo <xuanzhuo@...ux.alibaba.com>
Cc:     netdev@...r.kernel.org, "Michael S. Tsirkin" <mst@...hat.com>,
        "David S. Miller" <davem@...emloft.net>,
        Eric Dumazet <edumazet@...gle.com>,
        Jakub Kicinski <kuba@...nel.org>,
        Paolo Abeni <pabeni@...hat.com>,
        Alexei Starovoitov <ast@...nel.org>,
        Daniel Borkmann <daniel@...earbox.net>,
        Jesper Dangaard Brouer <hawk@...nel.org>,
        John Fastabend <john.fastabend@...il.com>,
        virtualization@...ts.linux-foundation.org, bpf@...r.kernel.org
Subject: Re: [PATCH net-next v2 10/14] virtio_net: merge: remove skip_xdp

On Tue, Apr 18, 2023 at 2:53 PM Xuan Zhuo <xuanzhuo@...ux.alibaba.com> wrote:
>
> Now, the logic of merge xdp process is simple, we can remove the
> skip_xdp.
>
> Signed-off-by: Xuan Zhuo <xuanzhuo@...ux.alibaba.com>

Acked-by: Jason Wang <jasowang@...hat.com>

Thanks

> ---
>  drivers/net/virtio_net.c | 23 ++++++++++-------------
>  1 file changed, 10 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index 42e9927e316b..a4bb25f39f12 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -1390,7 +1390,6 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
>         struct page *page = virt_to_head_page(buf);
>         int offset = buf - page_address(page);
>         struct sk_buff *head_skb, *curr_skb;
> -       struct bpf_prog *xdp_prog;
>         unsigned int truesize = mergeable_ctx_to_truesize(ctx);
>         unsigned int headroom = mergeable_ctx_to_headroom(ctx);
>         unsigned int tailroom = headroom ? sizeof(struct skb_shared_info) : 0;
> @@ -1406,22 +1405,20 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
>                 goto err_skb;
>         }
>
> -       if (likely(!vi->xdp_enabled)) {
> -               xdp_prog = NULL;
> -               goto skip_xdp;
> -       }
> +       if (unlikely(vi->xdp_enabled)) {
> +               struct bpf_prog *xdp_prog;
>
> -       rcu_read_lock();
> -       xdp_prog = rcu_dereference(rq->xdp_prog);
> -       if (xdp_prog) {
> -               head_skb = receive_mergeable_xdp(dev, vi, rq, xdp_prog, buf, ctx,
> -                                                len, xdp_xmit, stats);
> +               rcu_read_lock();
> +               xdp_prog = rcu_dereference(rq->xdp_prog);
> +               if (xdp_prog) {
> +                       head_skb = receive_mergeable_xdp(dev, vi, rq, xdp_prog, buf, ctx,
> +                                                        len, xdp_xmit, stats);
> +                       rcu_read_unlock();
> +                       return head_skb;
> +               }
>                 rcu_read_unlock();
> -               return head_skb;
>         }
> -       rcu_read_unlock();
>
> -skip_xdp:
>         head_skb = page_to_skb(vi, rq, page, offset, len, truesize, headroom);
>         curr_skb = head_skb;
>
> --
> 2.32.0.3.g01195cf9f
>