From: Lorenzo Bianconi <lorenzo@kernel.org>
To: bpf@vger.kernel.org, netdev@vger.kernel.org
Cc: lorenzo.bianconi@redhat.com, davem@davemloft.net,
kuba@kernel.org, ast@kernel.org, daniel@iogearbox.net,
shayagr@amazon.com, sameehj@amazon.com, john.fastabend@gmail.com,
dsahern@kernel.org, brouer@redhat.com, echaudro@redhat.com,
jasowang@redhat.com, alexander.duyck@gmail.com, saeed@kernel.org,
maciej.fijalkowski@intel.com, magnus.karlsson@intel.com,
tirthendu.sarkar@intel.com
Subject: [PATCH v9 bpf-next 14/14] bpf: update xdp_adjust_tail selftest to include multi-buffer
Date: Mon, 14 Jun 2021 14:49:52 +0200 [thread overview]
Message-ID: <34f4d322ac5adc13915520349bf8b556982d904e.1623674025.git.lorenzo@kernel.org> (raw)
In-Reply-To: <cover.1623674025.git.lorenzo@kernel.org>
From: Eelco Chaudron <echaudro@redhat.com>
This change adds test cases for the multi-buffer scenarios when shrinking
and growing.
Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
.../bpf/prog_tests/xdp_adjust_tail.c | 105 ++++++++++++++++++
.../bpf/progs/test_xdp_adjust_tail_grow.c | 10 +-
.../bpf/progs/test_xdp_adjust_tail_shrink.c | 32 +++++-
3 files changed, 140 insertions(+), 7 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c b/tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c
index d5c98f2cb12f..b936beaba797 100644
--- a/tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c
+++ b/tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c
@@ -130,6 +130,107 @@ void test_xdp_adjust_tail_grow2(void)
bpf_object__close(obj);
}
+void test_xdp_adjust_mb_tail_shrink(void)
+{
+ const char *file = "./test_xdp_adjust_tail_shrink.o";
+ __u32 duration, retval, size, exp_size;
+ struct bpf_object *obj;
+ static char buf[9000];
+ int err, prog_fd;
+
+ /* For the individual test cases, the first byte in the packet
+ * indicates which test will be run.
+ */
+
+ err = bpf_prog_load(file, BPF_PROG_TYPE_XDP, &obj, &prog_fd);
+ if (CHECK_FAIL(err))
+ return;
+
+ /* Test case removing 10 bytes from last frag, NOT freeing it */
+ buf[0] = 0;
+ exp_size = sizeof(buf) - 10;
+ err = bpf_prog_test_run(prog_fd, 1, buf, sizeof(buf),
+ buf, &size, &retval, &duration);
+
+ CHECK(err || retval != XDP_TX || size != exp_size,
+ "9k-10b", "err %d errno %d retval %d[%d] size %d[%u]\n",
+ err, errno, retval, XDP_TX, size, exp_size);
+
+ /* Test case removing one of two pages, assuming 4K pages */
+ buf[0] = 1;
+ exp_size = sizeof(buf) - 4100;
+ err = bpf_prog_test_run(prog_fd, 1, buf, sizeof(buf),
+ buf, &size, &retval, &duration);
+
+ CHECK(err || retval != XDP_TX || size != exp_size,
+ "9k-1p", "err %d errno %d retval %d[%d] size %d[%u]\n",
+ err, errno, retval, XDP_TX, size, exp_size);
+
+ /* Test case removing two pages resulting in a non mb xdp_buff */
+ buf[0] = 2;
+ exp_size = sizeof(buf) - 8200;
+ err = bpf_prog_test_run(prog_fd, 1, buf, sizeof(buf),
+ buf, &size, &retval, &duration);
+
+ CHECK(err || retval != XDP_TX || size != exp_size,
+ "9k-2p", "err %d errno %d retval %d[%d] size %d[%u]\n",
+ err, errno, retval, XDP_TX, size, exp_size);
+
+ bpf_object__close(obj);
+}
+
+void test_xdp_adjust_mb_tail_grow(void)
+{
+ const char *file = "./test_xdp_adjust_tail_grow.o";
+ __u32 duration, retval, size, exp_size;
+ static char buf[16384];
+ struct bpf_object *obj;
+ int err, i, prog_fd;
+
+ err = bpf_prog_load(file, BPF_PROG_TYPE_XDP, &obj, &prog_fd);
+ if (CHECK_FAIL(err))
+ return;
+
+ /* Test case add 10 bytes to last frag */
+ memset(buf, 1, sizeof(buf));
+ size = 9000;
+ exp_size = size + 10;
+ err = bpf_prog_test_run(prog_fd, 1, buf, size,
+ buf, &size, &retval, &duration);
+
+ CHECK(err || retval != XDP_TX || size != exp_size,
+ "9k+10b", "err %d retval %d[%d] size %d[%u]\n",
+ err, retval, XDP_TX, size, exp_size);
+
+ for (i = 0; i < 9000; i++)
+ CHECK(buf[i] != 1, "9k+10b-old",
+ "Old data not all ok, offset %i is failing [%u]!\n",
+ i, buf[i]);
+
+ for (i = 9000; i < 9010; i++)
+ CHECK(buf[i] != 0, "9k+10b-new",
+ "New data not all ok, offset %i is failing [%u]!\n",
+ i, buf[i]);
+
+ for (i = 9010; i < sizeof(buf); i++)
+ CHECK(buf[i] != 1, "9k+10b-untouched",
+ "Unused data not all ok, offset %i is failing [%u]!\n",
+ i, buf[i]);
+
+ /* Test a too large grow */
+ memset(buf, 1, sizeof(buf));
+ size = 9001;
+ exp_size = size;
+ err = bpf_prog_test_run(prog_fd, 1, buf, size,
+ buf, &size, &retval, &duration);
+
+ CHECK(err || retval != XDP_DROP || size != exp_size,
+ "9k+10b", "err %d retval %d[%d] size %d[%u]\n",
+ err, retval, XDP_TX, size, exp_size);
+
+ bpf_object__close(obj);
+}
+
void test_xdp_adjust_tail(void)
{
if (test__start_subtest("xdp_adjust_tail_shrink"))
@@ -138,4 +239,8 @@ void test_xdp_adjust_tail(void)
test_xdp_adjust_tail_grow();
if (test__start_subtest("xdp_adjust_tail_grow2"))
test_xdp_adjust_tail_grow2();
+ if (test__start_subtest("xdp_adjust_mb_tail_shrink"))
+ test_xdp_adjust_mb_tail_shrink();
+ if (test__start_subtest("xdp_adjust_mb_tail_grow"))
+ test_xdp_adjust_mb_tail_grow();
}
diff --git a/tools/testing/selftests/bpf/progs/test_xdp_adjust_tail_grow.c b/tools/testing/selftests/bpf/progs/test_xdp_adjust_tail_grow.c
index 3d66599eee2e..3d43defb0e00 100644
--- a/tools/testing/selftests/bpf/progs/test_xdp_adjust_tail_grow.c
+++ b/tools/testing/selftests/bpf/progs/test_xdp_adjust_tail_grow.c
@@ -7,11 +7,10 @@ int _xdp_adjust_tail_grow(struct xdp_md *xdp)
{
void *data_end = (void *)(long)xdp->data_end;
void *data = (void *)(long)xdp->data;
- unsigned int data_len;
+ int data_len = bpf_xdp_get_buff_len(xdp);
int offset = 0;
/* Data length determine test case */
- data_len = data_end - data;
if (data_len == 54) { /* sizeof(pkt_v4) */
offset = 4096; /* test too large offset */
@@ -20,7 +19,12 @@ int _xdp_adjust_tail_grow(struct xdp_md *xdp)
} else if (data_len == 64) {
offset = 128;
} else if (data_len == 128) {
- offset = 4096 - 256 - 320 - data_len; /* Max tail grow 3520 */
+ /* Max tail grow 3520 */
+ offset = 4096 - 256 - 320 - data_len;
+ } else if (data_len == 9000) {
+ offset = 10;
+ } else if (data_len == 9001) {
+ offset = 4096;
} else {
return XDP_ABORTED; /* No matching test */
}
diff --git a/tools/testing/selftests/bpf/progs/test_xdp_adjust_tail_shrink.c b/tools/testing/selftests/bpf/progs/test_xdp_adjust_tail_shrink.c
index 22065a9cfb25..64177597ac29 100644
--- a/tools/testing/selftests/bpf/progs/test_xdp_adjust_tail_shrink.c
+++ b/tools/testing/selftests/bpf/progs/test_xdp_adjust_tail_shrink.c
@@ -14,14 +14,38 @@ int _version SEC("version") = 1;
SEC("xdp_adjust_tail_shrink")
int _xdp_adjust_tail_shrink(struct xdp_md *xdp)
{
- void *data_end = (void *)(long)xdp->data_end;
- void *data = (void *)(long)xdp->data;
+ __u8 *data_end = (void *)(long)xdp->data_end;
+ __u8 *data = (void *)(long)xdp->data;
int offset = 0;
- if (data_end - data == 54) /* sizeof(pkt_v4) */
+ switch (bpf_xdp_get_buff_len(xdp)) {
+ case 54:
+ /* sizeof(pkt_v4) */
offset = 256; /* shrink too much */
- else
+ break;
+ case 9000:
+ /* Multi-buffer test cases */
+ if (data + 1 > data_end)
+ return XDP_DROP;
+
+ switch (data[0]) {
+ case 0:
+ offset = 10;
+ break;
+ case 1:
+ offset = 4100;
+ break;
+ case 2:
+ offset = 8200;
+ break;
+ default:
+ return XDP_DROP;
+ }
+ break;
+ default:
offset = 20;
+ break;
+ }
if (bpf_xdp_adjust_tail(xdp, 0 - offset))
return XDP_DROP;
return XDP_TX;
--
2.31.1
next prev parent reply other threads:[~2021-06-14 12:52 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-14 12:49 [PATCH v9 bpf-next 00/14] mvneta: introduce XDP multi-buffer support Lorenzo Bianconi
2021-06-14 12:49 ` [PATCH v9 bpf-next 01/14] net: skbuff: add data_len field to skb_shared_info Lorenzo Bianconi
2021-06-28 19:58 ` Alexander Duyck
2021-06-29 12:44 ` Lorenzo Bianconi
2021-06-29 17:08 ` Jakub Kicinski
2021-06-29 18:18 ` Alexander Duyck
2021-06-29 18:37 ` Jakub Kicinski
2021-06-29 19:11 ` Jesper Dangaard Brouer
2021-06-29 19:18 ` Lorenzo Bianconi
2021-06-29 20:45 ` Alexander Duyck
2021-06-14 12:49 ` [PATCH v9 bpf-next 02/14] xdp: introduce flags field in xdp_buff/xdp_frame Lorenzo Bianconi
2021-06-28 20:14 ` Alexander Duyck
2021-06-29 12:43 ` Lorenzo Bianconi
2021-06-29 13:07 ` Alexander Duyck
2021-06-29 13:25 ` Lorenzo Bianconi
2021-07-05 15:52 ` Lorenzo Bianconi
2021-07-05 21:35 ` Alexander Duyck
2021-07-06 11:53 ` Lorenzo Bianconi
2021-07-06 14:04 ` Alexander Duyck
2021-07-06 17:47 ` Lorenzo Bianconi
2021-06-14 12:49 ` [PATCH v9 bpf-next 03/14] net: mvneta: update mb bit before passing the xdp buffer to eBPF layer Lorenzo Bianconi
2021-06-14 12:49 ` [PATCH v9 bpf-next 04/14] xdp: add multi-buff support to xdp_return_{buff/frame} Lorenzo Bianconi
2021-06-14 12:49 ` [PATCH v9 bpf-next 05/14] net: mvneta: add multi buffer support to XDP_TX Lorenzo Bianconi
2021-06-14 12:49 ` [PATCH v9 bpf-next 06/14] net: mvneta: enable jumbo frames for XDP Lorenzo Bianconi
2021-06-14 12:49 ` [PATCH v9 bpf-next 07/14] net: xdp: add multi-buff support to xdp_build_skb_from_frame Lorenzo Bianconi
2021-06-28 21:05 ` Alexander Duyck
2021-06-29 18:34 ` Lorenzo Bianconi
2021-06-14 12:49 ` [PATCH v9 bpf-next 08/14] bpf: add multi-buff support to the bpf_xdp_adjust_tail() API Lorenzo Bianconi
2021-06-22 23:37 ` John Fastabend
2021-06-24 9:26 ` Eelco Chaudron
2021-06-24 14:24 ` John Fastabend
2021-06-24 15:16 ` Zvi Effron
2021-06-29 13:19 ` Lorenzo Bianconi
2021-06-29 13:27 ` Toke Høiland-Jørgensen
2021-07-06 21:44 ` Backwards compatibility for XDP multi-buff (was: Re: [PATCH v9 bpf-next 08/14] bpf: add multi-buff support to the bpf_xdp_adjust_tail() API) Toke Høiland-Jørgensen
2021-06-14 12:49 ` [PATCH v9 bpf-next 09/14] bpf: introduce bpf_xdp_get_buff_len helper Lorenzo Bianconi
2021-06-14 12:49 ` [PATCH v9 bpf-next 10/14] bpf: add multi-buffer support to xdp copy helpers Lorenzo Bianconi
2021-06-22 23:49 ` John Fastabend
2021-06-24 9:42 ` Eelco Chaudron
2021-06-24 14:28 ` John Fastabend
2021-06-25 8:25 ` Eelco Chaudron
2021-06-29 13:23 ` Lorenzo Bianconi
2021-07-06 10:15 ` Eelco Chaudron
2021-06-14 12:49 ` [PATCH v9 bpf-next 11/14] bpf: move user_size out of bpf_test_init Lorenzo Bianconi
2021-06-14 12:49 ` [PATCH v9 bpf-next 12/14] bpf: introduce multibuff support to bpf_prog_test_run_xdp() Lorenzo Bianconi
2021-06-14 12:49 ` [PATCH v9 bpf-next 13/14] bpf: test_run: add xdp_shared_info pointer in bpf_test_finish signature Lorenzo Bianconi
2021-06-14 12:49 ` Lorenzo Bianconi [this message]
2021-06-22 23:18 ` [PATCH v9 bpf-next 00/14] mvneta: introduce XDP multi-buffer support John Fastabend
2021-06-23 3:41 ` David Ahern
2021-06-23 5:48 ` John Fastabend
2021-06-23 14:40 ` David Ahern
2021-06-24 14:22 ` John Fastabend
2021-07-01 7:56 ` Magnus Karlsson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=34f4d322ac5adc13915520349bf8b556982d904e.1623674025.git.lorenzo@kernel.org \
--to=lorenzo@kernel.org \
--cc=alexander.duyck@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=brouer@redhat.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=echaudro@redhat.com \
--cc=jasowang@redhat.com \
--cc=john.fastabend@gmail.com \
--cc=kuba@kernel.org \
--cc=lorenzo.bianconi@redhat.com \
--cc=maciej.fijalkowski@intel.com \
--cc=magnus.karlsson@intel.com \
--cc=netdev@vger.kernel.org \
--cc=saeed@kernel.org \
--cc=sameehj@amazon.com \
--cc=shayagr@amazon.com \
--cc=tirthendu.sarkar@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).