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: <20230403145047.33065-1-kal.conley@dectris.com> <20230403145047.33065-3-kal.conley@dectris.com>
In-Reply-To: <20230403145047.33065-3-kal.conley@dectris.com>
From:   Magnus Karlsson <magnus.karlsson@gmail.com>
Date:   Tue, 4 Apr 2023 08:27:46 +0200
Message-ID: <CAJ8uoz31-=tvN_eCfxYRS8bWkgFSj=BE6oy5uLmq6UmTGys4ew@mail.gmail.com>
Subject: Re: [PATCH bpf-next 2/2] selftests: xsk: Add test case for packets at
 end of UMEM
To:     Kal Conley <kal.conley@dectris.com>
Cc:     =?UTF-8?B?QmrDtnJuIFTDtnBlbA==?= <bjorn@kernel.org>,
        Magnus Karlsson <magnus.karlsson@intel.com>,
        Maciej Fijalkowski <maciej.fijalkowski@intel.com>,
        Jonathan Lemon <jonathan.lemon@gmail.com>,
        Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Andrii Nakryiko <andrii@kernel.org>,
        Martin KaFai Lau <martin.lau@linux.dev>,
        Song Liu <song@kernel.org>, Yonghong Song <yhs@fb.com>,
        John Fastabend <john.fastabend@gmail.com>,
        KP Singh <kpsingh@kernel.org>,
        Stanislav Fomichev <sdf@google.com>,
        Hao Luo <haoluo@google.com>, Jiri Olsa <jolsa@kernel.org>,
        Mykola Lysenko <mykolal@fb.com>, Shuah Khan <shuah@kernel.org>,
        netdev@vger.kernel.org, bpf@vger.kernel.org,
        linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Mon, 3 Apr 2023 at 16:52, Kal Conley <kal.conley@dectris.com> wrote:
>
> Add test case to testapp_invalid_desc for valid packets at the end of
> the UMEM.

Thanks.

Acked-by: Magnus Karlsson <magnus.karlsson@intel.com>

> Signed-off-by: Kal Conley <kal.conley@dectris.com>
> ---
>  tools/testing/selftests/bpf/xskxceiver.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/xskxceiver.c b/tools/testing/selftests/bpf/xskxceiver.c
> index 3956f5db84f3..34a1f32fe752 100644
> --- a/tools/testing/selftests/bpf/xskxceiver.c
> +++ b/tools/testing/selftests/bpf/xskxceiver.c
> @@ -1662,6 +1662,8 @@ static void testapp_invalid_desc(struct test_spec *test)
>                 {-2, PKT_SIZE, 0, false},
>                 /* Packet too large */
>                 {0x2000, XSK_UMEM__INVALID_FRAME_SIZE, 0, false},
> +               /* Up to end of umem allowed */
> +               {umem_size - PKT_SIZE, PKT_SIZE, 0, true},
>                 /* After umem ends */
>                 {umem_size, PKT_SIZE, 0, false},
>                 /* Straddle the end of umem */
> @@ -1675,16 +1677,17 @@ static void testapp_invalid_desc(struct test_spec *test)
>
>         if (test->ifobj_tx->umem->unaligned_mode) {
>                 /* Crossing a page boundrary allowed */
> -               pkts[6].valid = true;
> +               pkts[7].valid = true;
>         }
>         if (test->ifobj_tx->umem->frame_size == XSK_UMEM__DEFAULT_FRAME_SIZE / 2) {
>                 /* Crossing a 2K frame size boundrary not allowed */
> -               pkts[7].valid = false;
> +               pkts[8].valid = false;
>         }
>
>         if (test->ifobj_tx->shared_umem) {
>                 pkts[4].addr += umem_size;
>                 pkts[5].addr += umem_size;
> +               pkts[6].addr += umem_size;
>         }
>
>         pkt_stream_generate_custom(test, pkts, ARRAY_SIZE(pkts));
> --
> 2.39.2
>