Received-SPF: pass (google.com: domain of linux-kernel+bounces-147869-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Precedence: bulk
MIME-Version: 1.0
References: <20240416061943.407082-1-liangchen.linux@gmail.com> <CACGkMEuJBdsePgszsM51DZc1GvF0naorHDsMR+SGZ1SiA6jrZQ@mail.gmail.com>
In-Reply-To: <CACGkMEuJBdsePgszsM51DZc1GvF0naorHDsMR+SGZ1SiA6jrZQ@mail.gmail.com>
From: Liang Chen <liangchen.linux@gmail.com>
Date: Wed, 17 Apr 2024 10:55:19 +0800
Message-ID: <CAKhg4tLsjeJASbdvDumBrbhkddGs4xAV0y5QPv=nhrHcZdSM0g@mail.gmail.com>
Subject: Re: [PATCH net-next v8] virtio_net: Support RX hash XDP hint
To: Jason Wang <jasowang@redhat.com>
Cc: mst@redhat.com, xuanzhuo@linux.alibaba.com, hengqi@linux.alibaba.com, 
	davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, 
	hawk@kernel.org, john.fastabend@gmail.com, netdev@vger.kernel.org, 
	virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, 
	bpf@vger.kernel.org, daniel@iogearbox.net, ast@kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Tue, Apr 16, 2024 at 3:20=E2=80=AFPM Jason Wang <jasowang@redhat.com> wr=
ote:
>
> On Tue, Apr 16, 2024 at 2:20=E2=80=AFPM Liang Chen <liangchen.linux@gmail=
com> wrote:
> >
> > The RSS hash report is a feature that's part of the virtio specificatio=
n.
> > Currently, virtio backends like qemu, vdpa (mlx5), and potentially vhos=
t
> > (still a work in progress as per [1]) support this feature. While the
> > capability to obtain the RSS hash has been enabled in the normal path,
> > it's currently missing in the XDP path. Therefore, we are introducing
> > XDP hints through kfuncs to allow XDP programs to access the RSS hash.
> >
> > 1.
> > https://lore.kernel.org/all/20231015141644.260646-1-akihiko.odaki@dayni=
x.com/#r
> >
> > Signed-off-by: Liang Chen <liangchen.linux@gmail.com>
> > ---
> >   Changes from v7:
> > - use table lookup for rss hash type
> >   Changes from v6:
> > - fix a coding style issue
> >   Changes from v5:
> > - Preservation of the hash value has been dropped, following the conclu=
sion
> >   from discussions in V3 reviews. The virtio_net driver doesn't
> >   accessing/using the virtio_net_hdr after the XDP program execution, s=
o
> >   nothing tragic should happen. As to the xdp program, if it smashes th=
e
> >   entry in virtio header, it is likely buggy anyways. Additionally, loo=
king
> >   up the Intel IGC driver,  it also does not bother with this particula=
r
> >   aspect.
> > ---
> >  drivers/net/virtio_net.c        | 42 +++++++++++++++++++++++++++++++++
> >  include/uapi/linux/virtio_net.h |  1 +
> >  2 files changed, 43 insertions(+)
> >
> > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> > index c22d1118a133..1d750009f615 100644
> > --- a/drivers/net/virtio_net.c
> > +++ b/drivers/net/virtio_net.c
> > @@ -4621,6 +4621,47 @@ static void virtnet_set_big_packets(struct virtn=
et_info *vi, const int mtu)
> >         }
> >  }
> >
> > +static enum xdp_rss_hash_type
> > +virtnet_xdp_rss_type[VIRTIO_NET_HASH_REPORT_MAX_TABLE] =3D {
> > +       [VIRTIO_NET_HASH_REPORT_NONE] =3D XDP_RSS_TYPE_NONE,
> > +       [VIRTIO_NET_HASH_REPORT_IPv4] =3D XDP_RSS_TYPE_L3_IPV4,
> > +       [VIRTIO_NET_HASH_REPORT_TCPv4] =3D XDP_RSS_TYPE_L4_IPV4_TCP,
> > +       [VIRTIO_NET_HASH_REPORT_UDPv4] =3D XDP_RSS_TYPE_L4_IPV4_UDP,
> > +       [VIRTIO_NET_HASH_REPORT_IPv6] =3D XDP_RSS_TYPE_L3_IPV6,
> > +       [VIRTIO_NET_HASH_REPORT_TCPv6] =3D XDP_RSS_TYPE_L4_IPV6_TCP,
> > +       [VIRTIO_NET_HASH_REPORT_UDPv6] =3D XDP_RSS_TYPE_L4_IPV6_UDP,
> > +       [VIRTIO_NET_HASH_REPORT_IPv6_EX] =3D XDP_RSS_TYPE_L3_IPV6_EX,
> > +       [VIRTIO_NET_HASH_REPORT_TCPv6_EX] =3D XDP_RSS_TYPE_L4_IPV6_TCP_=
EX,
> > +       [VIRTIO_NET_HASH_REPORT_UDPv6_EX] =3D XDP_RSS_TYPE_L4_IPV6_UDP_=
EX
> > +};
> > +
> > +static int virtnet_xdp_rx_hash(const struct xdp_md *_ctx, u32 *hash,
> > +                              enum xdp_rss_hash_type *rss_type)
> > +{
> > +       const struct xdp_buff *xdp =3D (void *)_ctx;
> > +       struct virtio_net_hdr_v1_hash *hdr_hash;
> > +       struct virtnet_info *vi;
> > +       u16 hash_report;
> > +
> > +       if (!(xdp->rxq->dev->features & NETIF_F_RXHASH))
> > +               return -ENODATA;
> > +
> > +       vi =3D netdev_priv(xdp->rxq->dev);
> > +       hdr_hash =3D (struct virtio_net_hdr_v1_hash *)(xdp->data - vi->=
hdr_len);
> > +       hash_report =3D __le16_to_cpu(hdr_hash->hash_report);
> > +
> > +       if (hash_report >=3D VIRTIO_NET_HASH_REPORT_MAX_TABLE)
> > +               hash_report =3D VIRTIO_NET_HASH_REPORT_NONE;
> > +
> > +       *rss_type =3D virtnet_xdp_rss_type[hash_report];
> > +       *hash =3D __le32_to_cpu(hdr_hash->hash_value);
> > +       return 0;
> > +}
> > +
> > +static const struct xdp_metadata_ops virtnet_xdp_metadata_ops =3D {
> > +       .xmo_rx_hash                    =3D virtnet_xdp_rx_hash,
> > +};
> > +
> >  static int virtnet_probe(struct virtio_device *vdev)
> >  {
> >         int i, err =3D -ENOMEM;
> > @@ -4747,6 +4788,7 @@ static int virtnet_probe(struct virtio_device *vd=
ev)
> >                                   VIRTIO_NET_RSS_HASH_TYPE_UDP_EX);
> >
> >                 dev->hw_features |=3D NETIF_F_RXHASH;
> > +               dev->xdp_metadata_ops =3D &virtnet_xdp_metadata_ops;
> >         }
> >
> >         if (vi->has_rss_hash_report)
> > diff --git a/include/uapi/linux/virtio_net.h b/include/uapi/linux/virti=
o_net.h
> > index cc65ef0f3c3e..3ee695450096 100644
> > --- a/include/uapi/linux/virtio_net.h
> > +++ b/include/uapi/linux/virtio_net.h
> > @@ -176,6 +176,7 @@ struct virtio_net_hdr_v1_hash {
> >  #define VIRTIO_NET_HASH_REPORT_IPv6_EX         7
> >  #define VIRTIO_NET_HASH_REPORT_TCPv6_EX        8
> >  #define VIRTIO_NET_HASH_REPORT_UDPv6_EX        9
> > +#define VIRTIO_NET_HASH_REPORT_MAX_TABLE      10
>
> This should not be part of uAPI. It may confuse the userspace.
>

Sure. I will just move it to virtio_net.c right above the table
definition. Thanks!

> Others look good.
>
> Thanks
>
> >         __le16 hash_report;
> >         __le16 padding;
> >  };
> > --
> > 2.40.1
> >
>