* [PATCH bpf-next 1/3] bpf: support input xdp_md context in BPF_PROG_TEST_RUN
2021-05-24 22:05 [PATCH bpf-next 0/3] bpf: support input xdp_md context in BPF_PROG_TEST_RUN Zvi Effron
@ 2021-05-24 22:05 ` Zvi Effron
2021-05-24 22:05 ` [PATCH bpf-next 2/3] bpf: support specifying ingress via " Zvi Effron
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Zvi Effron @ 2021-05-24 22:05 UTC (permalink / raw)
To: bpf
Cc: Alexei Starovoitov, David S. Miller, Daniel Borkmann,
Jesper Dangaard Brouer, 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 | 80 +++++++++++++++++++++++++++++++++++++---
2 files changed, 74 insertions(+), 9 deletions(-)
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 418b9b813d65..5a8d9d5a0068 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..1eaa0959b03a 100644
--- a/net/bpf/test_run.c
+++ b/net/bpf/test_run.c
@@ -687,6 +687,45 @@ int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr,
return ret;
}
+static int convert_xdpmd_to_xdpb(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;
+
+ 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 convert_xdpb_to_xdpmd(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,35 +735,65 @@ 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)
+ 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->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 = convert_xdpmd_to_xdpb(&xdp, ctx);
+ if (ret) {
+ kfree(ctx);
+ kfree(data);
+ 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;
+
+ convert_xdpb_to_xdpmd(&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(ctx);
kfree(data);
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* [PATCH bpf-next 2/3] bpf: support specifying ingress via xdp_md context in BPF_PROG_TEST_RUN
2021-05-24 22:05 [PATCH bpf-next 0/3] bpf: support input xdp_md context in BPF_PROG_TEST_RUN Zvi Effron
2021-05-24 22:05 ` [PATCH bpf-next 1/3] " Zvi Effron
@ 2021-05-24 22:05 ` Zvi Effron
2021-05-24 22:05 ` [PATCH bpf-next 3/3] selftests/bpf: Add test for " Zvi Effron
2021-05-26 12:40 ` [PATCH bpf-next 0/3] bpf: support input " Daniel Borkmann
3 siblings, 0 replies; 6+ messages in thread
From: Zvi Effron @ 2021-05-24 22:05 UTC (permalink / raw)
To: bpf
Cc: Alexei Starovoitov, David S. Miller, Daniel Borkmann,
Jesper Dangaard Brouer, 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 | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c
index 1eaa0959b03a..d882a4831c18 100644
--- a/net/bpf/test_run.c
+++ b/net/bpf/test_run.c
@@ -709,9 +709,21 @@ static int convert_xdpmd_to_xdpb(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 3/3] selftests/bpf: Add test for xdp_md context in BPF_PROG_TEST_RUN
2021-05-24 22:05 [PATCH bpf-next 0/3] bpf: support input xdp_md context in BPF_PROG_TEST_RUN Zvi Effron
2021-05-24 22:05 ` [PATCH bpf-next 1/3] " Zvi Effron
2021-05-24 22:05 ` [PATCH bpf-next 2/3] bpf: support specifying ingress via " Zvi Effron
@ 2021-05-24 22:05 ` Zvi Effron
2021-05-26 21:05 ` Andrii Nakryiko
2021-05-26 12:40 ` [PATCH bpf-next 0/3] bpf: support input " Daniel Borkmann
3 siblings, 1 reply; 6+ messages in thread
From: Zvi Effron @ 2021-05-24 22:05 UTC (permalink / raw)
To: bpf
Cc: Alexei Starovoitov, David S. Miller, Daniel Borkmann,
Jesper Dangaard Brouer, 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 | 117 ++++++++++++++++++
.../bpf/progs/test_xdp_context_test_run.c | 22 ++++
2 files changed, 139 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..92ce2e4a5c30
--- /dev/null
+++ b/tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c
@@ -0,0 +1,117 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <test_progs.h>
+#include <network_helpers.h>
+
+void test_xdp_context_test_run(void)
+{
+ const char *file = "./test_xdp_context_test_run.o";
+ struct bpf_object *obj;
+ char data[sizeof(pkt_v4) + sizeof(__u32)];
+ char buf[128];
+ char bad_ctx[sizeof(struct xdp_md)];
+ struct xdp_md ctx_in, ctx_out;
+ struct bpf_test_run_opts tattr = {
+ .sz = sizeof(struct bpf_test_run_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;
+
+ err = bpf_prog_load(file, BPF_PROG_TYPE_XDP, &obj, &prog_fd);
+ if (CHECK_FAIL(err))
+ return;
+
+ *(__u32 *)data = XDP_PASS;
+ *(struct ipv4_packet *)(data + sizeof(__u32)) = pkt_v4;
+
+ memset(&ctx_in, 0, sizeof(ctx_in));
+ tattr.ctx_in = &ctx_in;
+ tattr.ctx_size_in = sizeof(ctx_in);
+
+ tattr.ctx_in = &ctx_in;
+ tattr.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, &tattr);
+ CHECK_ATTR(err || tattr.retval != XDP_PASS ||
+ tattr.data_size_out != sizeof(pkt_v4) ||
+ tattr.ctx_size_out != tattr.ctx_size_in ||
+ ctx_out.data_meta != 0 ||
+ ctx_out.data != ctx_out.data_meta ||
+ ctx_out.data_end != sizeof(pkt_v4), "xdp_md context",
+ "err %d errno %d retval %d data size out %d context size out %d data_meta %d data %d data_end %d\n",
+ err, errno, tattr.retval, tattr.data_size_out,
+ tattr.ctx_size_out, ctx_out.data_meta, ctx_out.data,
+ ctx_out.data_end);
+
+ /* Data past the end of the kernel's struct xdp_md must be 0 */
+ bad_ctx[sizeof(bad_ctx) - 1] = 1;
+ tattr.ctx_in = bad_ctx;
+ tattr.ctx_size_in = sizeof(bad_ctx);
+ err = bpf_prog_test_run_opts(prog_fd, &tattr);
+ CHECK_ATTR(!err || errno != 22, "bad context", "err %d errno %d\n",
+ err, errno);
+
+ /* The egress cannot be specified */
+ ctx_in.egress_ifindex = 1;
+ err = bpf_prog_test_run_opts(prog_fd, &tattr);
+ CHECK_ATTR(!err || errno != 22,
+ "nonzero egress index", "err %d errno %d\n", err, errno);
+
+ /* 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, &tattr);
+ CHECK_ATTR(!err || errno != 22, "nonzero data_meta",
+ "err %d errno %d\n", err, errno);
+
+ /* 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, &tattr);
+ CHECK_ATTR(!err || errno != 22, "metadata too long",
+ "err %d errno %d\n", err, errno);
+
+ /* Metadata's size must be a multiple of 4 */
+ ctx_in.data = 3;
+ err = bpf_prog_test_run_opts(prog_fd, &tattr);
+ CHECK_ATTR(!err || errno != 22, "multiple of 4",
+ "err %d errno %d\n", err, errno);
+
+ /* 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, &tattr);
+ CHECK_ATTR(!err || errno != 22, "data too long", "err %d errno %d\n",
+ err, errno);
+
+ ctx_in.data_end = sizeof(pkt_v4) + 4;
+ err = bpf_prog_test_run_opts(prog_fd, &tattr);
+ CHECK_ATTR(!err || errno != 22, "data too short", "err %d errno %d\n",
+ err, errno);
+
+ /* 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, &tattr);
+ CHECK_ATTR(!err || errno != 22, "no ingress if",
+ "err %d, rx_queue_index %d\n", err, ctx_out.rx_queue_index);
+
+ ctx_in.ingress_ifindex = 1;
+ ctx_in.rx_queue_index = 1;
+ err = bpf_prog_test_run_opts(prog_fd, &tattr);
+ CHECK_ATTR(!err || errno != 22, "invalid rx queue",
+ "err %d, rx_queue_index %d\n", err, ctx_out.rx_queue_index);
+
+ bpf_object__close(obj);
+}
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..c66a756b238e
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/test_xdp_context_test_run.c
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <linux/bpf.h>
+#include <bpf/bpf_helpers.h>
+
+int _version SEC("version") = 1;
+
+SEC("xdp_context")
+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* Re: [PATCH bpf-next 3/3] selftests/bpf: Add test for xdp_md context in BPF_PROG_TEST_RUN
2021-05-24 22:05 ` [PATCH bpf-next 3/3] selftests/bpf: Add test for " Zvi Effron
@ 2021-05-26 21:05 ` Andrii Nakryiko
0 siblings, 0 replies; 6+ messages in thread
From: Andrii Nakryiko @ 2021-05-26 21:05 UTC (permalink / raw)
To: Zvi Effron
Cc: bpf, Alexei Starovoitov, David S. Miller, Daniel Borkmann,
Jesper Dangaard Brouer, Cody Haas, Lisa Watanabe
On Mon, May 24, 2021 at 3:08 PM Zvi Effron <zeffron@riotgames.com> wrote:
>
> 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 | 117 ++++++++++++++++++
> .../bpf/progs/test_xdp_context_test_run.c | 22 ++++
> 2 files changed, 139 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..92ce2e4a5c30
> --- /dev/null
> +++ b/tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c
> @@ -0,0 +1,117 @@
> +// SPDX-License-Identifier: GPL-2.0
> +#include <test_progs.h>
> +#include <network_helpers.h>
> +
> +void test_xdp_context_test_run(void)
> +{
> + const char *file = "./test_xdp_context_test_run.o";
please use BPF skeleton for new tests
> + struct bpf_object *obj;
> + char data[sizeof(pkt_v4) + sizeof(__u32)];
> + char buf[128];
> + char bad_ctx[sizeof(struct xdp_md)];
> + struct xdp_md ctx_in, ctx_out;
> + struct bpf_test_run_opts tattr = {
> + .sz = sizeof(struct bpf_test_run_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;
> +
> + err = bpf_prog_load(file, BPF_PROG_TYPE_XDP, &obj, &prog_fd);
> + if (CHECK_FAIL(err))
> + return;
> +
> + *(__u32 *)data = XDP_PASS;
> + *(struct ipv4_packet *)(data + sizeof(__u32)) = pkt_v4;
> +
> + memset(&ctx_in, 0, sizeof(ctx_in));
> + tattr.ctx_in = &ctx_in;
> + tattr.ctx_size_in = sizeof(ctx_in);
> +
> + tattr.ctx_in = &ctx_in;
> + tattr.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, &tattr);
> + CHECK_ATTR(err || tattr.retval != XDP_PASS ||
please use ASSERT_xxx() macros instead of CHECK() variants
> + tattr.data_size_out != sizeof(pkt_v4) ||
> + tattr.ctx_size_out != tattr.ctx_size_in ||
> + ctx_out.data_meta != 0 ||
> + ctx_out.data != ctx_out.data_meta ||
> + ctx_out.data_end != sizeof(pkt_v4), "xdp_md context",
> + "err %d errno %d retval %d data size out %d context size out %d data_meta %d data %d data_end %d\n",
> + err, errno, tattr.retval, tattr.data_size_out,
> + tattr.ctx_size_out, ctx_out.data_meta, ctx_out.data,
> + ctx_out.data_end);
> +
[...]
> 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..c66a756b238e
> --- /dev/null
> +++ b/tools/testing/selftests/bpf/progs/test_xdp_context_test_run.c
> @@ -0,0 +1,22 @@
> +// SPDX-License-Identifier: GPL-2.0
> +#include <linux/bpf.h>
> +#include <bpf/bpf_helpers.h>
> +
> +int _version SEC("version") = 1;
this is obsolete, you can drop this variable completely
> +
> +SEC("xdp_context")
SEC("xdp") is a standard way for XDP programs, please use that
> +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 [flat|nested] 6+ messages in thread
* Re: [PATCH bpf-next 0/3] bpf: support input xdp_md context in BPF_PROG_TEST_RUN
2021-05-24 22:05 [PATCH bpf-next 0/3] bpf: support input xdp_md context in BPF_PROG_TEST_RUN Zvi Effron
` (2 preceding siblings ...)
2021-05-24 22:05 ` [PATCH bpf-next 3/3] selftests/bpf: Add test for " Zvi Effron
@ 2021-05-26 12:40 ` Daniel Borkmann
3 siblings, 0 replies; 6+ messages in thread
From: Daniel Borkmann @ 2021-05-26 12:40 UTC (permalink / raw)
To: Zvi Effron, bpf
Cc: Alexei Starovoitov, David S. Miller, Jesper Dangaard Brouer
On 5/25/21 12:05 AM, Zvi Effron wrote:
> This patchset add support for passing a xdp_md via ctx_in/ctx_out in bpf_attr
> for BPF_PROG_TEST_RUN of XDP programs.
>
> Patch 1 adds initial support for passing XDP meta data in addition to packet
> data.
>
> Patch 2 adds support for also specifying the ingress interface and rx queue.
>
> Patch 3 adds selftests to ensure functionality is correct.
>
> Zvi Effron (3):
> bpf: support input xdp_md context in BPF_PROG_TEST_RUN
> bpf: support specifying ingress via xdp_md context in
> BPF_PROG_TEST_RUN
> selftests/bpf: Add test for xdp_md context in BPF_PROG_TEST_RUN
Looks like this series is consistently causing a NULL pointer deref in the BPF CI:
- https://travis-ci.com/github/kernel-patches/bpf/builds/226936809
- https://travis-ci.com/github/kernel-patches/bpf/builds/226909818
Other runs on top of latest bpf-next are fine though:
- https://travis-ci.com/github/kernel-patches/bpf/builds/226936786
Please double check your series again and fix.
Thanks,
Daniel
^ permalink raw reply [flat|nested] 6+ messages in thread