* [PATCH bpf-next v3 1/3] bpf: support input xdp_md context in BPF_PROG_TEST_RUN
2021-06-02 19:08 [PATCH bpf-next v3 0/3] bpf: support input xdp_md context in BPF_PROG_TEST_RUN Zvi Effron
@ 2021-06-02 19:08 ` Zvi Effron
2021-06-03 4:34 ` Martin KaFai Lau
2021-06-02 19:08 ` [PATCH bpf-next v3 2/3] bpf: support specifying ingress via " Zvi Effron
2021-06-02 19:08 ` [PATCH bpf-next v3 3/3] selftests/bpf: Add test for " Zvi Effron
2 siblings, 1 reply; 6+ messages in thread
From: Zvi Effron @ 2021-06-02 19:08 UTC (permalink / raw)
To: bpf
Cc: Alexei Starovoitov, David S. Miller, Daniel Borkmann,
Jesper Dangaard Brouer, Andrii Nakryiko, Maciej Fijalkowski,
Zvi Effron, Cody Haas, Lisa Watanabe
Support passing a xdp_md via ctx_in/ctx_out in bpf_attr for
BPF_PROG_TEST_RUN.
The intended use case is to pass some XDP meta data to the test runs of
XDP programs that are used as tail calls.
For programs that use bpf_prog_test_run_xdp, support xdp_md input and
output. Unlike with an actual xdp_md during a non-test run, data_meta must
be 0 because it must point to the start of the provided user data. From
the initial xdp_md, use data and data_end to adjust the pointers in the
generated xdp_buff. All other non-zero fields are prohibited (with
EINVAL). If the user has set ctx_out/ctx_size_out, copy the (potentially
different) xdp_md back to the userspace.
We require all fields of input xdp_md except the ones we explicitly
support to be set to zero. The expectation is that in the future we might
add support for more fields and we want to fail explicitly if the user
runs the program on the kernel where we don't yet support them.
Co-developed-by: Cody Haas <chaas@riotgames.com>
Signed-off-by: Cody Haas <chaas@riotgames.com>
Co-developed-by: Lisa Watanabe <lwatanabe@riotgames.com>
Signed-off-by: Lisa Watanabe <lwatanabe@riotgames.com>
Signed-off-by: Zvi Effron <zeffron@riotgames.com>
---
include/uapi/linux/bpf.h | 3 --
net/bpf/test_run.c | 82 ++++++++++++++++++++++++++++++++++++----
2 files changed, 75 insertions(+), 10 deletions(-)
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 2c1ba70abbf1..a9dcf3d8c85a 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -324,9 +324,6 @@ union bpf_iter_link_info {
* **BPF_PROG_TYPE_SK_LOOKUP**
* *data_in* and *data_out* must be NULL.
*
- * **BPF_PROG_TYPE_XDP**
- * *ctx_in* and *ctx_out* must be NULL.
- *
* **BPF_PROG_TYPE_RAW_TRACEPOINT**,
* **BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE**
*
diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c
index aa47af349ba8..ae8741dd2a54 100644
--- a/net/bpf/test_run.c
+++ b/net/bpf/test_run.c
@@ -687,6 +687,43 @@ int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr,
return ret;
}
+static int xdp_convert_md_to_buff(struct xdp_buff *xdp, struct xdp_md *xdp_md)
+{
+ void *data;
+ u32 metalen;
+
+ if (!xdp_md)
+ return 0;
+
+ if (xdp_md->egress_ifindex != 0)
+ return -EINVAL;
+
+ metalen = xdp_md->data - xdp_md->data_meta;
+ data = xdp->data_meta + metalen;
+ if (data > xdp->data_end)
+ return -EINVAL;
+ xdp->data = data;
+
+ if (xdp_md->data_end - xdp_md->data != xdp->data_end - xdp->data)
+ return -EINVAL;
+
+ if (xdp_md->ingress_ifindex != 0 || xdp_md->rx_queue_index != 0)
+ return -EINVAL;
+
+ return 0;
+}
+
+static void xdp_convert_buff_to_md(struct xdp_buff *xdp, struct xdp_md *xdp_md)
+{
+ if (!xdp_md)
+ return;
+
+ /* xdp_md->data_meta must always point to the start of the out buffer */
+ xdp_md->data_meta = 0;
+ xdp_md->data = xdp->data - xdp->data_meta;
+ xdp_md->data_end = xdp->data_end - xdp->data_meta;
+}
+
int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr,
union bpf_attr __user *uattr)
{
@@ -696,36 +733,68 @@ int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr,
u32 repeat = kattr->test.repeat;
struct netdev_rx_queue *rxqueue;
struct xdp_buff xdp = {};
+ struct xdp_md *ctx = NULL;
u32 retval, duration;
u32 max_data_sz;
+ u32 metalen;
void *data;
int ret;
- if (kattr->test.ctx_in || kattr->test.ctx_out)
- return -EINVAL;
+ ctx = bpf_ctx_init(kattr, sizeof(struct xdp_md));
+ if (IS_ERR(ctx))
+ return PTR_ERR(ctx);
+
+ /* There can't be user provided data before the metadata */
+ if (ctx) {
+ if (ctx->data_meta != 0)
+ return -EINVAL;
+ metalen = ctx->data - ctx->data_meta;
+ if (unlikely((metalen & (sizeof(__u32) - 1)) ||
+ metalen > 32))
+ return -EINVAL;
+ /* Metadata is allocated from the headroom */
+ headroom -= metalen;
+ }
/* XDP have extra tailroom as (most) drivers use full page */
max_data_sz = 4096 - headroom - tailroom;
data = bpf_test_init(kattr, max_data_sz, headroom, tailroom);
- if (IS_ERR(data))
+ if (IS_ERR(data)) {
+ kfree(ctx);
return PTR_ERR(data);
+ }
rxqueue = __netif_get_rx_queue(current->nsproxy->net_ns->loopback_dev, 0);
xdp_init_buff(&xdp, headroom + max_data_sz + tailroom,
&rxqueue->xdp_rxq);
xdp_prepare_buff(&xdp, data, headroom, size, true);
+ ret = xdp_convert_md_to_buff(&xdp, ctx);
+ if (ret) {
+ kfree(data);
+ kfree(ctx);
+ return ret;
+ }
+
bpf_prog_change_xdp(NULL, prog);
ret = bpf_test_run(prog, &xdp, repeat, &retval, &duration, true);
if (ret)
goto out;
- if (xdp.data != data + headroom || xdp.data_end != xdp.data + size)
- size = xdp.data_end - xdp.data;
- ret = bpf_test_finish(kattr, uattr, xdp.data, size, retval, duration);
+
+ if (xdp.data_meta != data + headroom || xdp.data_end != xdp.data_meta + size)
+ size = xdp.data_end - xdp.data_meta;
+
+ xdp_convert_buff_to_md(&xdp, ctx);
+
+ ret = bpf_test_finish(kattr, uattr, xdp.data_meta, size, retval, duration);
+ if (!ret)
+ ret = bpf_ctx_finish(kattr, uattr, ctx,
+ sizeof(struct xdp_md));
out:
bpf_prog_change_xdp(prog, NULL);
kfree(data);
+ kfree(ctx);
return ret;
}
@@ -809,7 +878,6 @@ int bpf_prog_test_run_flow_dissector(struct bpf_prog *prog,
if (!ret)
ret = bpf_ctx_finish(kattr, uattr, user_ctx,
sizeof(struct bpf_flow_keys));
-
out:
kfree(user_ctx);
kfree(data);
--
2.31.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH bpf-next v3 1/3] bpf: support input xdp_md context in BPF_PROG_TEST_RUN
2021-06-02 19:08 ` [PATCH bpf-next v3 1/3] " Zvi Effron
@ 2021-06-03 4:34 ` Martin KaFai Lau
2021-06-04 18:55 ` Zvi Effron
0 siblings, 1 reply; 6+ messages in thread
From: Martin KaFai Lau @ 2021-06-03 4:34 UTC (permalink / raw)
To: Zvi Effron
Cc: bpf, Alexei Starovoitov, David S. Miller, Daniel Borkmann,
Jesper Dangaard Brouer, Andrii Nakryiko, Maciej Fijalkowski,
Cody Haas, Lisa Watanabe
On Wed, Jun 02, 2021 at 07:08:13PM +0000, Zvi Effron wrote:
[ ... ]
> diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c
> index aa47af349ba8..ae8741dd2a54 100644
> --- a/net/bpf/test_run.c
> +++ b/net/bpf/test_run.c
> @@ -687,6 +687,43 @@ int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr,
> return ret;
> }
>
> +static int xdp_convert_md_to_buff(struct xdp_buff *xdp, struct xdp_md *xdp_md)
> +{
> + void *data;
> + u32 metalen;
> +
> + if (!xdp_md)
> + return 0;
> +
> + if (xdp_md->egress_ifindex != 0)
> + return -EINVAL;
> +
> + metalen = xdp_md->data - xdp_md->data_meta;
Remove "- xdp_md->data_meta". It is 0.
> + data = xdp->data_meta + metalen;
> + if (data > xdp->data_end)
This test and...
> + return -EINVAL;
> + xdp->data = data;
> +
> + if (xdp_md->data_end - xdp_md->data != xdp->data_end - xdp->data)
this one. It is because the user input "xdp_md->data_end" does not
match with kattr->test.data_size_in? These tests are disconnected from
where the actual invalid input is. How about direclty testing
xdp_md->data_end in bpf_prog_test_run_xdp() instead?
> + return -EINVAL;
> +
> + if (xdp_md->ingress_ifindex != 0 || xdp_md->rx_queue_index != 0)
> + return -EINVAL;
> +
> + return 0;
> +}
> +
> +static void xdp_convert_buff_to_md(struct xdp_buff *xdp, struct xdp_md *xdp_md)
> +{
> + if (!xdp_md)
> + return;
> +
> + /* xdp_md->data_meta must always point to the start of the out buffer */
> + xdp_md->data_meta = 0;
> + xdp_md->data = xdp->data - xdp->data_meta;
> + xdp_md->data_end = xdp->data_end - xdp->data_meta;
> +}
> +
> int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr,
> union bpf_attr __user *uattr)
> {
> @@ -696,36 +733,68 @@ int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr,
> u32 repeat = kattr->test.repeat;
> struct netdev_rx_queue *rxqueue;
> struct xdp_buff xdp = {};
> + struct xdp_md *ctx = NULL;
"= NULL" is not needed.
> u32 retval, duration;
> u32 max_data_sz;
> + u32 metalen;
> void *data;
> int ret;
>
> - if (kattr->test.ctx_in || kattr->test.ctx_out)
> - return -EINVAL;
> + ctx = bpf_ctx_init(kattr, sizeof(struct xdp_md));
> + if (IS_ERR(ctx))
> + return PTR_ERR(ctx);
> +
> + /* There can't be user provided data before the metadata */
> + if (ctx) {
> + if (ctx->data_meta != 0)
nit. "if (ctx->data_meta)".
> + return -EINVAL;
> + metalen = ctx->data - ctx->data_meta;
It is confusing. "ctx->data_meta != 0" has just been checked.
> + if (unlikely((metalen & (sizeof(__u32) - 1)) ||
> + metalen > 32))
> + return -EINVAL;
> + /* Metadata is allocated from the headroom */
> + headroom -= metalen;
> + }
>
> /* XDP have extra tailroom as (most) drivers use full page */
> max_data_sz = 4096 - headroom - tailroom;
>
> data = bpf_test_init(kattr, max_data_sz, headroom, tailroom);
> - if (IS_ERR(data))
> + if (IS_ERR(data)) {
> + kfree(ctx);
> return PTR_ERR(data);
> + }
>
> rxqueue = __netif_get_rx_queue(current->nsproxy->net_ns->loopback_dev, 0);
> xdp_init_buff(&xdp, headroom + max_data_sz + tailroom,
> &rxqueue->xdp_rxq);
> xdp_prepare_buff(&xdp, data, headroom, size, true);
>
> + ret = xdp_convert_md_to_buff(&xdp, ctx);
> + if (ret) {
> + kfree(data);
> + kfree(ctx);
> + return ret;
> + }
> +
> bpf_prog_change_xdp(NULL, prog);
> ret = bpf_test_run(prog, &xdp, repeat, &retval, &duration, true);
> if (ret)
> goto out;
> - if (xdp.data != data + headroom || xdp.data_end != xdp.data + size)
> - size = xdp.data_end - xdp.data;
> - ret = bpf_test_finish(kattr, uattr, xdp.data, size, retval, duration);
> +
> + if (xdp.data_meta != data + headroom || xdp.data_end != xdp.data_meta + size)
> + size = xdp.data_end - xdp.data_meta;
> +
> + xdp_convert_buff_to_md(&xdp, ctx);
> +
> + ret = bpf_test_finish(kattr, uattr, xdp.data_meta, size, retval, duration);
> + if (!ret)
> + ret = bpf_ctx_finish(kattr, uattr, ctx,
> + sizeof(struct xdp_md));
> out:
> bpf_prog_change_xdp(prog, NULL);
> kfree(data);
> + kfree(ctx);
> return ret;
> }
>
> @@ -809,7 +878,6 @@ int bpf_prog_test_run_flow_dissector(struct bpf_prog *prog,
> if (!ret)
> ret = bpf_ctx_finish(kattr, uattr, user_ctx,
> sizeof(struct bpf_flow_keys));
> -
> out:
> kfree(user_ctx);
> kfree(data);
> --
> 2.31.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH bpf-next v3 1/3] bpf: support input xdp_md context in BPF_PROG_TEST_RUN
2021-06-03 4:34 ` Martin KaFai Lau
@ 2021-06-04 18:55 ` Zvi Effron
0 siblings, 0 replies; 6+ messages in thread
From: Zvi Effron @ 2021-06-04 18:55 UTC (permalink / raw)
To: Martin KaFai Lau
Cc: bpf, Alexei Starovoitov, David S. Miller, Daniel Borkmann,
Jesper Dangaard Brouer, Andrii Nakryiko, Maciej Fijalkowski,
Cody Haas, Lisa Watanabe
On Wed, Jun 2, 2021 at 9:34 PM Martin KaFai Lau <kafai@fb.com> wrote:
>
> On Wed, Jun 02, 2021 at 07:08:13PM +0000, Zvi Effron wrote:
> > + data = xdp->data_meta + metalen;
> > + if (data > xdp->data_end)
> This test and...
>
> > + return -EINVAL;
> > + xdp->data = data;
> > +
> > + if (xdp_md->data_end - xdp_md->data != xdp->data_end - xdp->data)
> this one. It is because the user input "xdp_md->data_end" does not
> match with kattr->test.data_size_in? These tests are disconnected from
> where the actual invalid input is. How about direclty testing
> xdp_md->data_end in bpf_prog_test_run_xdp() instead?
>
The first test is required because it's possible that the user provided value
for `xdp_md->data` could be greater than the user provided value for
`xdp_md->data_end`. For example, a user could pass a struct xdp_md that looked
like this:
```
struct xdp_md {
.data_meta = 0,
.data = 12,
.data_end = 8,
};
```
We're moving the test and making it more clear what it's testing for in our
next patch version.
The second test can be eliminated by moving the test for xdp_md->data_end
against kattr->test.data_size_in as you suggest, which also allows simplifying
the surrounding code. We're updating that in our next patch version.
We're also addressing your other feedback in our next patch version.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH bpf-next v3 2/3] bpf: support specifying ingress via xdp_md context in BPF_PROG_TEST_RUN
2021-06-02 19:08 [PATCH bpf-next v3 0/3] bpf: support input xdp_md context in BPF_PROG_TEST_RUN Zvi Effron
2021-06-02 19:08 ` [PATCH bpf-next v3 1/3] " Zvi Effron
@ 2021-06-02 19:08 ` Zvi Effron
2021-06-02 19:08 ` [PATCH bpf-next v3 3/3] selftests/bpf: Add test for " Zvi Effron
2 siblings, 0 replies; 6+ messages in thread
From: Zvi Effron @ 2021-06-02 19:08 UTC (permalink / raw)
To: bpf
Cc: Alexei Starovoitov, David S. Miller, Daniel Borkmann,
Jesper Dangaard Brouer, Andrii Nakryiko, Maciej Fijalkowski,
Zvi Effron, Cody Haas, Lisa Watanabe
Support specifying the ingress_ifindex and rx_queue_index of xdp_md
contexts for BPF_PROG_TEST_RUN.
The intended use case is to allow testing XDP programs that make decisions
based on the ingress interface or RX queue.
If ingress_ifindex is specified, look up the device by the provided index
in the current namespace and use its xdp_rxq for the xdp_buff. If the
rx_queue_index is out of range, or is non-zero when the ingress_ifindex is
0, return EINVAL.
Co-developed-by: Cody Haas <chaas@riotgames.com>
Signed-off-by: Cody Haas <chaas@riotgames.com>
Co-developed-by: Lisa Watanabe <lwatanabe@riotgames.com>
Signed-off-by: Lisa Watanabe <lwatanabe@riotgames.com>
Signed-off-by: Zvi Effron <zeffron@riotgames.com>
---
net/bpf/test_run.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c
index ae8741dd2a54..f139b4ca420f 100644
--- a/net/bpf/test_run.c
+++ b/net/bpf/test_run.c
@@ -691,6 +691,8 @@ static int xdp_convert_md_to_buff(struct xdp_buff *xdp, struct xdp_md *xdp_md)
{
void *data;
u32 metalen;
+ struct net_device *device;
+ struct netdev_rx_queue *rxqueue;
if (!xdp_md)
return 0;
@@ -707,9 +709,21 @@ static int xdp_convert_md_to_buff(struct xdp_buff *xdp, struct xdp_md *xdp_md)
if (xdp_md->data_end - xdp_md->data != xdp->data_end - xdp->data)
return -EINVAL;
- if (xdp_md->ingress_ifindex != 0 || xdp_md->rx_queue_index != 0)
+ if (!xdp_md->ingress_ifindex && xdp_md->rx_queue_index)
return -EINVAL;
+ if (xdp_md->ingress_ifindex) {
+ device = dev_get_by_index(current->nsproxy->net_ns, xdp_md->ingress_ifindex);
+ if (!device)
+ return -EINVAL;
+
+ if (xdp_md->rx_queue_index >= device->real_num_rx_queues)
+ return -EINVAL;
+
+ rxqueue = __netif_get_rx_queue(device, xdp_md->rx_queue_index);
+ xdp->rxq = &rxqueue->xdp_rxq;
+ }
+
return 0;
}
--
2.31.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH bpf-next v3 3/3] selftests/bpf: Add test for xdp_md context in BPF_PROG_TEST_RUN
2021-06-02 19:08 [PATCH bpf-next v3 0/3] bpf: support input xdp_md context in BPF_PROG_TEST_RUN Zvi Effron
2021-06-02 19:08 ` [PATCH bpf-next v3 1/3] " Zvi Effron
2021-06-02 19:08 ` [PATCH bpf-next v3 2/3] bpf: support specifying ingress via " Zvi Effron
@ 2021-06-02 19:08 ` Zvi Effron
2 siblings, 0 replies; 6+ messages in thread
From: Zvi Effron @ 2021-06-02 19:08 UTC (permalink / raw)
To: bpf
Cc: Alexei Starovoitov, David S. Miller, Daniel Borkmann,
Jesper Dangaard Brouer, Andrii Nakryiko, Maciej Fijalkowski,
Zvi Effron, Cody Haas, Lisa Watanabe
Add a test for using xdp_md as a context to BPF_PROG_TEST_RUN for XDP
programs.
The test uses a BPF program that takes in a return value from XDP
metadata, then reduces the size of the XDP metadata by 4 bytes.
Test cases validate the possible failure cases for passing in invalid
xdp_md contexts, that the return value is successfully passed
in, and that the adjusted metadata is successfully copied out.
Co-developed-by: Cody Haas <chaas@riotgames.com>
Signed-off-by: Cody Haas <chaas@riotgames.com>
Co-developed-by: Lisa Watanabe <lwatanabe@riotgames.com>
Signed-off-by: Lisa Watanabe <lwatanabe@riotgames.com>
Signed-off-by: Zvi Effron <zeffron@riotgames.com>
---
.../bpf/prog_tests/xdp_context_test_run.c | 114 ++++++++++++++++++
.../bpf/progs/test_xdp_context_test_run.c | 20 +++
2 files changed, 134 insertions(+)
create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c
create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_context_test_run.c
diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c b/tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c
new file mode 100644
index 000000000000..0dbdebbc66ce
--- /dev/null
+++ b/tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c
@@ -0,0 +1,114 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <test_progs.h>
+#include <network_helpers.h>
+#include "test_xdp_context_test_run.skel.h"
+
+void test_xdp_context_test_run(void)
+{
+ struct test_xdp_context_test_run *skel = NULL;
+ char data[sizeof(pkt_v4) + sizeof(__u32)];
+ char buf[128];
+ char bad_ctx[sizeof(struct xdp_md)];
+ struct xdp_md ctx_in, ctx_out;
+ DECLARE_LIBBPF_OPTS(bpf_test_run_opts, opts,
+ .data_in = &data,
+ .data_out = buf,
+ .data_size_in = sizeof(data),
+ .data_size_out = sizeof(buf),
+ .ctx_out = &ctx_out,
+ .ctx_size_out = sizeof(ctx_out),
+ .repeat = 1,
+ );
+ int err, prog_fd;
+
+ skel = test_xdp_context_test_run__open_and_load();
+ if (!ASSERT_OK_PTR(skel, "skel"))
+ return;
+ prog_fd = bpf_program__fd(skel->progs._xdp_context);
+
+ *(__u32 *)data = XDP_PASS;
+ *(struct ipv4_packet *)(data + sizeof(__u32)) = pkt_v4;
+
+ memset(&ctx_in, 0, sizeof(ctx_in));
+ opts.ctx_in = &ctx_in;
+ opts.ctx_size_in = sizeof(ctx_in);
+
+ opts.ctx_in = &ctx_in;
+ opts.ctx_size_in = sizeof(ctx_in);
+ ctx_in.data_meta = 0;
+ ctx_in.data = sizeof(__u32);
+ ctx_in.data_end = ctx_in.data + sizeof(pkt_v4);
+ err = bpf_prog_test_run_opts(prog_fd, &opts);
+ ASSERT_OK(err, "bpf_prog_test_run(test1)");
+ ASSERT_EQ(opts.retval, XDP_PASS, "test1-retval");
+ ASSERT_EQ(opts.data_size_out, sizeof(pkt_v4), "test1-datasize");
+ ASSERT_EQ(opts.ctx_size_out, opts.ctx_size_in, "test1-ctxsize");
+ ASSERT_EQ(ctx_out.data_meta, 0, "test1-datameta");
+ ASSERT_EQ(ctx_out.data, ctx_out.data_meta, "test1-data");
+ ASSERT_EQ(ctx_out.data_end, sizeof(pkt_v4), "test1-dataend");
+
+ /* Data past the end of the kernel's struct xdp_md must be 0 */
+ bad_ctx[sizeof(bad_ctx) - 1] = 1;
+ opts.ctx_in = bad_ctx;
+ opts.ctx_size_in = sizeof(bad_ctx);
+ err = bpf_prog_test_run_opts(prog_fd, &opts);
+ ASSERT_EQ(errno, 22, "test2-errno");
+ ASSERT_ERR(err, "bpf_prog_test_run(test2)");
+
+ /* The egress cannot be specified */
+ ctx_in.egress_ifindex = 1;
+ err = bpf_prog_test_run_opts(prog_fd, &opts);
+ ASSERT_EQ(errno, 22, "test3-errno");
+ ASSERT_ERR(err, "bpf_prog_test_run(test3)");
+
+ /* data_meta must reference the start of data */
+ ctx_in.data_meta = sizeof(__u32);
+ ctx_in.data = ctx_in.data_meta;
+ ctx_in.data_end = ctx_in.data + sizeof(pkt_v4);
+ ctx_in.egress_ifindex = 0;
+ err = bpf_prog_test_run_opts(prog_fd, &opts);
+ ASSERT_EQ(errno, 22, "test4-errno");
+ ASSERT_ERR(err, "bpf_prog_test_run(test4)");
+
+ /* Metadata must be 32 bytes or smaller */
+ ctx_in.data_meta = 0;
+ ctx_in.data = sizeof(__u32)*9;
+ ctx_in.data_end = ctx_in.data + sizeof(pkt_v4);
+ err = bpf_prog_test_run_opts(prog_fd, &opts);
+ ASSERT_EQ(errno, 22, "test5-errno");
+ ASSERT_ERR(err, "bpf_prog_test_run(test5)");
+
+ /* Metadata's size must be a multiple of 4 */
+ ctx_in.data = 3;
+ err = bpf_prog_test_run_opts(prog_fd, &opts);
+ ASSERT_EQ(errno, 22, "test6-errno");
+ ASSERT_ERR(err, "bpf_prog_test_run(test6)");
+
+ /* Total size of data must match data_end - data_meta */
+ ctx_in.data = 0;
+ ctx_in.data_end = sizeof(pkt_v4) - 4;
+ err = bpf_prog_test_run_opts(prog_fd, &opts);
+ ASSERT_EQ(errno, 22, "test7-errno");
+ ASSERT_ERR(err, "bpf_prog_test_run(test7)");
+
+ ctx_in.data_end = sizeof(pkt_v4) + 4;
+ err = bpf_prog_test_run_opts(prog_fd, &opts);
+ ASSERT_EQ(errno, 22, "test8-errno");
+ ASSERT_ERR(err, "bpf_prog_test_run(test8)");
+
+ /* RX queue cannot be specified without specifying an ingress */
+ ctx_in.data_end = sizeof(pkt_v4);
+ ctx_in.ingress_ifindex = 0;
+ ctx_in.rx_queue_index = 1;
+ err = bpf_prog_test_run_opts(prog_fd, &opts);
+ ASSERT_EQ(errno, 22, "test9-errno");
+ ASSERT_ERR(err, "bpf_prog_test_run(test9)");
+
+ ctx_in.ingress_ifindex = 1;
+ ctx_in.rx_queue_index = 1;
+ err = bpf_prog_test_run_opts(prog_fd, &opts);
+ ASSERT_EQ(errno, 22, "test10-errno");
+ ASSERT_ERR(err, "bpf_prog_test_run(test10)");
+
+ test_xdp_context_test_run__destroy(skel);
+}
diff --git a/tools/testing/selftests/bpf/progs/test_xdp_context_test_run.c b/tools/testing/selftests/bpf/progs/test_xdp_context_test_run.c
new file mode 100644
index 000000000000..56fd0995b67c
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/test_xdp_context_test_run.c
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <linux/bpf.h>
+#include <bpf/bpf_helpers.h>
+
+SEC("xdp")
+int _xdp_context(struct xdp_md *xdp)
+{
+ void *data = (void *)(unsigned long)xdp->data;
+ __u32 *metadata = (void *)(unsigned long)xdp->data_meta;
+ __u32 ret;
+
+ if (metadata + 1 > data)
+ return XDP_ABORTED;
+ ret = *metadata;
+ if (bpf_xdp_adjust_meta(xdp, 4))
+ return XDP_ABORTED;
+ return ret;
+}
+
+char _license[] SEC("license") = "GPL";
--
2.31.1
^ permalink raw reply related [flat|nested] 6+ messages in thread