2023-04-03 14:52:50

by Kal Cutter Conley

Subject: [PATCH bpf-next 2/2] selftests: xsk: Add test case for packets at end of UMEM

Add test case to testapp_invalid_desc for valid packets at the end of
the UMEM.

Signed-off-by: Kal Conley <[email protected]>
---
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

2023-04-04 06:40:43

by Magnus Karlsson

Subject: Re: [PATCH bpf-next 2/2] selftests: xsk: Add test case for packets at end of UMEM

On Mon, 3 Apr 2023 at 16:52, Kal Conley <[email protected]> wrote:
>
> Add test case to testapp_invalid_desc for valid packets at the end of
> the UMEM.

Thanks.

Acked-by: Magnus Karlsson <[email protected]>

> Signed-off-by: Kal Conley <[email protected]>
> ---
> 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
>