Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <168042409059.4051476.8176861613304493950.stgit@firesoul> <168042420344.4051476.9107061652824513113.stgit@firesoul>
In-Reply-To: <168042420344.4051476.9107061652824513113.stgit@firesoul>
From:   Alexei Starovoitov <alexei.starovoitov@gmail.com>
Date:   Sun, 2 Apr 2023 08:49:49 -0700
Message-ID: <CAADnVQ+JEP0sOyOOWbYKHackb4PmNYYcDGXnksucJt2mQGwi7g@mail.gmail.com>
Subject: Re: [PATCH bpf V6 5/5] selftests/bpf: Adjust bpf_xdp_metadata_rx_hash
 for new arg
To:     Jesper Dangaard Brouer <brouer@redhat.com>
Cc:     bpf <bpf@vger.kernel.org>, Stanislav Fomichev <sdf@google.com>,
        =?UTF-8?B?VG9rZSBIw7hpbGFuZC1Kw7hyZ2Vuc2Vu?= <toke@redhat.com>,
        Network Development <netdev@vger.kernel.org>,
        LKML <linux-kernel@vger.kernel.org>,
        Martin KaFai Lau <martin.lau@kernel.org>,
        Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Alexander Lobakin <alexandr.lobakin@intel.com>,
        Larysa Zaremba <larysa.zaremba@intel.com>,
        xdp-hints@xdp-project.net, anthony.l.nguyen@intel.com,
        "Song, Yoong Siang" <yoong.siang.song@intel.com>,
        "Ong, Boon Leong" <boon.leong.ong@intel.com>,
        intel-wired-lan <intel-wired-lan@lists.osuosl.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Jesse Brandeburg <jesse.brandeburg@intel.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Eric Dumazet <edumazet@google.com>,
        John Fastabend <john.fastabend@gmail.com>,
        Jesper Dangaard Brouer <hawk@kernel.org>,
        "David S. Miller" <davem@davemloft.net>,
        Tariq Toukan <tariqt@nvidia.com>,
        Saeed Mahameed <saeedm@nvidia.com>,
        Leon Romanovsky <leon@kernel.org>, linux-rdma@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Sun, Apr 2, 2023 at 1:30=E2=80=AFAM Jesper Dangaard Brouer <brouer@redha=
t.com> wrote:
>
> Update BPF selftests to use the new RSS type argument for kfunc
> bpf_xdp_metadata_rx_hash.
>
> Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
> Acked-by: Toke H=C3=B8iland-J=C3=B8rgensen <toke@redhat.com>
> Acked-by: Stanislav Fomichev <sdf@google.com>
> ---
>  .../selftests/bpf/prog_tests/xdp_metadata.c        |    2 ++
>  .../testing/selftests/bpf/progs/xdp_hw_metadata.c  |   14 +++++++++-----
>  tools/testing/selftests/bpf/progs/xdp_metadata.c   |    6 +++---
>  tools/testing/selftests/bpf/progs/xdp_metadata2.c  |    7 ++++---
>  tools/testing/selftests/bpf/xdp_hw_metadata.c      |    2 +-
>  tools/testing/selftests/bpf/xdp_metadata.h         |    1 +
>  6 files changed, 20 insertions(+), 12 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c b/tool=
s/testing/selftests/bpf/prog_tests/xdp_metadata.c
> index aa4beae99f4f..8c5e98da9ae9 100644
> --- a/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c
> +++ b/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c
> @@ -273,6 +273,8 @@ static int verify_xsk_metadata(struct xsk *xsk)
>         if (!ASSERT_NEQ(meta->rx_hash, 0, "rx_hash"))
>                 return -1;
>
> +       ASSERT_EQ(meta->rx_hash_type, 0, "rx_hash_type");
> +
>         xsk_ring_cons__release(&xsk->rx, 1);
>         refill_rx(xsk, comp_addr);
>
> diff --git a/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c b/tools/=
testing/selftests/bpf/progs/xdp_hw_metadata.c
> index 4c55b4d79d3d..7b3fc12e96d6 100644
> --- a/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c
> +++ b/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c
> @@ -14,8 +14,8 @@ struct {
>
>  extern int bpf_xdp_metadata_rx_timestamp(const struct xdp_md *ctx,
>                                          __u64 *timestamp) __ksym;
> -extern int bpf_xdp_metadata_rx_hash(const struct xdp_md *ctx,
> -                                   __u32 *hash) __ksym;
> +extern int bpf_xdp_metadata_rx_hash(const struct xdp_md *ctx, __u32 *has=
h,
> +                                   enum xdp_rss_hash_type *rss_type) __k=
sym;
>
>  SEC("xdp")
>  int rx(struct xdp_md *ctx)
> @@ -74,10 +74,14 @@ int rx(struct xdp_md *ctx)
>         else
>                 meta->rx_timestamp =3D 0; /* Used by AF_XDP as not avail =
signal */
>
> -       if (!bpf_xdp_metadata_rx_hash(ctx, &meta->rx_hash))
> -               bpf_printk("populated rx_hash with %u", meta->rx_hash);
> -       else
> +       if (!bpf_xdp_metadata_rx_hash(ctx, &meta->rx_hash, &meta->rx_hash=
_type)) {
> +               bpf_printk("populated rx_hash:0x%X type:0x%X",
> +                          meta->rx_hash, meta->rx_hash_type);
> +               if (!(meta->rx_hash_type & XDP_RSS_L4))
> +                       bpf_printk("rx_hash low quality L3 hash type");
> +       } else {
>                 meta->rx_hash =3D 0; /* Used by AF_XDP as not avail signa=
l */
> +       }

Didn't we agree in the previous thread to remove these printks and
replace them with actual stats that user space can see?