| Message ID | 20230403145047.33065-3-kal.conley@dectris.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ccd1b2933f8cbc09a8667992425996f19bf62c15 |
| Headers | show |
| Series | [bpf-next,1/2] selftests: xsk: Use correct UMEM size in testapp_invalid_desc | expand |
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 >
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));
Add test case to testapp_invalid_desc for valid packets at the end of the UMEM. Signed-off-by: Kal Conley <kal.conley@dectris.com> --- tools/testing/selftests/bpf/xskxceiver.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)