bpf: support input xdp_md context in BPF_PROG_TEST_RUN
Subsystems (5)
v4 cover bpf: support input xdp_md context in BPF_PROG_TEST_RUN
This patchset adds support for passing an 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.
Changelog:
----------v3->v4
v3: https://lore.kernel.org/bpf/[email protected]/
* Clean up nits
* Validate xdp_md->data_end in bpf_prog_test_run_xdp
* Remove intermediate metalen variables
v2 -> v3
v2: https://lore.kernel.org/bpf/[email protected]/
* Check errno first in selftests
* Use DECLARE_LIBBPF_OPTS
* Rename tattr to opts in selftests
* Remove extra new line
* Rename convert_xdpmd_to_xdpb to xdp_convert_md_to_buff
* Rename convert_xdpb_to_xdpmd to xdp_convert_buff_to_md
* Move declaration of device and rxqueue in xdp_convert_md_to_buff to patch 2
* Reorder the kfree calls in bpf_prog_test_run_xdp
v1 -> v2
v1: https://lore.kernel.org/bpf/[email protected]
* Fix null pointer dereference with no context
* Use the BPF skeleton and replace CHECK with ASSERT macros
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
include/uapi/linux/bpf.h | 3 - net/bpf/test_run.c | 91 ++++++++++++-- .../bpf/prog_tests/xdp_context_test_run.c | 114 ++++++++++++++++++ .../bpf/progs/test_xdp_context_test_run.c | 20 +++ 4 files changed, 218 insertions(+), 10 deletions(-) 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
base-commit: 56b8b7f9533b5c40cbc1266b5cc6a3b19dfd2aad
Signature · 1 line
2.31.1
PATCH v4 1/3 bpf: support input xdp_md context in BPF_PROG_TEST_RUN
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.
--- include/uapi/linux/bpf.h | 3 -- net/bpf/test_run.c | 77 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 70 insertions(+), 10 deletions(-)
include/uapi/linux/bpf.h +0 -3
@@ -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** *
net/bpf/test_run.c +70 -7
119 lines not on this page · raw message
Signature · 1 line
2.31.1
Quoted 48 lines · Zvi Effron
Support passing a
xdp_mdvia ctx_in/ctx_out inbpf_attrforBPF_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, supportxdp_mdinput and output. Unlike with an actualxdp_mdduring a non-test run,data_metamust be 0 because it must point to the start of the provided user data. From the initialxdp_md, use data anddata_endto adjust the pointers in the generatedxdp_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_mdback to the userspace.We require all fields of input
xdp_mdexcept 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 <[email protected]>Signed-off-by Cody Haas <[email protected]>Co-developed-by Lisa Watanabe <[email protected]>Signed-off-by Lisa Watanabe <[email protected]>Signed-off-by Zvi Effron <[email protected]>--- include/uapi/linux/bpf.h | 3 -- net/bpf/test_run.c | 77 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 70 insertions(+), 10 deletions(-)include/uapi/linux/bpf.h +0
-3@@ -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** * net/bpf/test_run.c +0
-0
net/bpf/test_run.c int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr, · line 690
Quoted 4 lines
net/bpf/test_run.c +1
-0@@ -687,6 +687,38 @@ 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)
Should the order of parameters be switched to (xdp_md, xdp)? This will follow the convention of below function xdp_convert_buff_to_md().
Quoted 6 lines
net/bpf/test_run.c +6
-0+{ +void *data; + +if (!xdp_md) +return 0 ; +
net/bpf/test_run.c int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr, · line 706
Quoted 10 lines
net/bpf/test_run.c +10
-0+if (xdp_md->egress_ifindex !=0 ) +return -EINVAL ; + +if (xdp_md->data > xdp_md->data_end) +return -EINVAL ; + + xdp->data = xdp->data_meta + xdp_md->data; + +if (xdp_md->ingress_ifindex !=0 || xdp_md->rx_queue_index !=0 ) +return -EINVAL ;
It would be good if you did all error checking before doing xdp->data
assignment. Also looks like xdp_md error checking happens here andbpf_prog_test_run_xdp(). If it is hard to put all error checking
in bpf_prog_test_run_xdp(), at least put "xdp_md->data > xdp_md->data_end) in bpf_prog_test_run_xdp(), so this function only checks *_ifindex and rx_queue_index?
Quoted 19 lines
net/bpf/test_run.c +15
-0+ +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) {
net/bpf/test_run.c int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr, · line 731
Quoted 4 lines
net/bpf/test_run.c +1
-0@@ -696,36 +728,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;
Let us try to maintain reverse christmas tree?
Quoted 9 lines
net/bpf/test_run.c +2
-2u32 retval, duration;u32 max_data_sz;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))
net/bpf/test_run.c int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr, · line 748
Quoted 10 lines
net/bpf/test_run.c +10
-0+return PTR_ERR (ctx); + +/* There can't be user provided data before the metadata */ +if (ctx) { +if (ctx->data_meta) +return -EINVAL ; +if (ctx->data_end != size) +return -EINVAL ; +if (unlikely ((ctx->data & (sizeof (__u32) -1 )) || + ctx->data >32 ))
Why 32? Should it be sizeof(struct xdp_md)?
net/bpf/test_run.c int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr, · line 749
Quoted 1 line
net/bpf/test_run.c +1
-0+return -EINVAL ;
As I mentioned in early comments, it would be good if we can do some or all input parameter validation here.
net/bpf/test_run.c int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr, · line 751
Quoted 2 lines
net/bpf/test_run.c +2
-0+/* Metadata is allocated from the headroom */ + headroom -= ctx->data;
sizeof(struct xdp_md) should be smaller than headroom (XDP_PACKET_HEADROOM), so we don't need to a check, but some comments might be helpful so people looking at the
code doesn't need to double check.
Quoted 57 lines
net/bpf/test_run.c +22
-5+ }/* 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 +873,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);
Quoted 72 lines · Yonghong Song
Quoted 48 lines · Zvi Effron
Support passing a
xdp_mdvia ctx_in/ctx_out inbpf_attrforBPF_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, supportxdp_mdinput and output. Unlike with an actualxdp_mdduring a non-test run,data_metamust be 0 because it must point to the start of the provided user data. From the initialxdp_md, use data anddata_endto adjust the pointers in the generatedxdp_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_mdback to the userspace.We require all fields of input
xdp_mdexcept 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 <[email protected]>Signed-off-by Cody Haas <[email protected]>Co-developed-by Lisa Watanabe <[email protected]>Signed-off-by Lisa Watanabe <[email protected]>Signed-off-by Zvi Effron <[email protected]>--- include/uapi/linux/bpf.h | 3 -- net/bpf/test_run.c | 77 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 70 insertions(+), 10 deletions(-)include/uapi/linux/bpf.h +0
-3@@ -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** * net/bpf/test_run.c +0
-0net/bpf/test_run.c int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr, · line 689
Quoted 3 lines
net/bpf/test_run.c +1
-0@@ -687,6 +687,38 @@ 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)Should the order of parameters be switched to (
xdp_md, xdp)? This will follow the convention of below functionxdp_convert_buff_to_md().Quoted 14 lines
net/bpf/test_run.c +14
-0+{ +void *data; + +if (!xdp_md) +return 0 ; + +if (xdp_md->egress_ifindex !=0 ) +return -EINVAL ; + +if (xdp_md->data > xdp_md->data_end) +return -EINVAL ; + + xdp->data = xdp->data_meta + xdp_md->data; +
Quoted 8 lines
net/bpf/test_run.c int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr, · line 706
Quoted 2 lines
net/bpf/test_run.c +2
-0+if (xdp_md->ingress_ifindex !=0 || xdp_md->rx_queue_index !=0 ) +return -EINVAL ;It would be good if you did all error checking before doing
xdp->dataassignment. Also looks likexdp_mderror checking happens here andbpf_prog_test_run_xdp(). If it is hard to put all error checking inbpf_prog_test_run_xdp(), at least put "xdp_md->data>xdp_md->data_end) inbpf_prog_test_run_xdp(),
+1 on at least all data_meta/data/data_end checks should be in one place in bpf_prog_test_run_xdp().
Quoted 4 lines
so this function only
checks*_ifindexandrx_queue_index?
Quoted 11 lines
net/bpf/test_run.c int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr, · line 717
Quoted 11 lines
net/bpf/test_run.c +11
-0+ +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 ;
Is this necessary? data_meta should not have been changed.
Quoted 4 lines
Quoted 4 lines
net/bpf/test_run.c +4
-0+ xdp_md->data = xdp->data - xdp->data_meta; + xdp_md->data_end = xdp->data_end - xdp->data_meta; +} +
Quoted 10 lines · Yonghong Song
Quoted 6 lines · Zvi Effron
net/bpf/test_run.c +0
-0@@ -687,6 +687,38 @@ int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr,return ret; }
Quoted 5 lines
net/bpf/test_run.c int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr, · line 690
Quoted 1 line
net/bpf/test_run.c +1
-0+static int xdp_convert_md_to_buff (struct xdp_buff *xdp,struct xdp_md *xdp_md)Should the order of parameters be switched to (
xdp_md, xdp)? This will follow the convention of below functionxdp_convert_buff_to_md().
The order was done to match the skb versions of these functions, which seem to have the output format first and the input format second, which is why the order flips between conversion functions. We're not particular about order, so we can definitely make it consistent.
Quoted 15 lines
Quoted 15 lines
net/bpf/test_run.c +15
-0+{ +void *data; + +if (!xdp_md) +return 0 ; + +if (xdp_md->egress_ifindex !=0 ) +return -EINVAL ; + +if (xdp_md->data > xdp_md->data_end) +return -EINVAL ; + + xdp->data = xdp->data_meta + xdp_md->data; + +if (xdp_md->ingress_ifindex !=0 || xdp_md->rx_queue_index !=0 )
Quoted 9 lines
net/bpf/test_run.c int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr, · line 706
Quoted 1 line
net/bpf/test_run.c +1
-0+return -EINVAL ;It would be good if you did all error checking before doing
xdp->dataassignment. Also looks likexdp_mderror checking happens here andbpf_prog_test_run_xdp(). If it is hard to put all error checking inbpf_prog_test_run_xdp(), at least put "xdp_md->data>xdp_md->data_end) inbpf_prog_test_run_xdp(), so this function only checks*_ifindexandrx_queue_index?
bpf_prog_test_run_xdp() was already a large function, which is why this was turned into a helper. Initially, we tried to have all xdp_md related logic in the helper, with only the required logic in bpf_prog_test_run_xdp(). Based on a prior suggestion, we moved one additional check from the helper to bpf_prog_test_run_xdp() as it simplified the logic. It's not clear to us what benefit moving the other checks to bpf_prog_test_run_xdp() provides, but it does reduce the benefit of having the helper function.
Quoted 7 lines
net/bpf/test_run.c int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr, · line 731
Quoted 5 lines
net/bpf/test_run.c +1
-0@@ -696,36 +728,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;Let us try to maintain reverse christmas tree?
Sure.
Quoted 21 lines
Quoted 10 lines
net/bpf/test_run.c +2
-2u32 retval, duration;u32 max_data_sz;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))net/bpf/test_run.c int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr, · line 748
Quoted 10 lines
net/bpf/test_run.c +10
-0+return PTR_ERR (ctx); + +/* There can't be user provided data before the metadata */ +if (ctx) { +if (ctx->data_meta) +return -EINVAL ; +if (ctx->data_end != size) +return -EINVAL ; +if (unlikely ((ctx->data & (sizeof (__u32) -1 )) || + ctx->data >32 ))
Quoted 1 line
Why 32? Should it be
sizeof(struct xdp_md)?
This is not checking the context itself, but the amount of metadata. XDP allows at most 32 bytes of metadata.
Quoted 8 lines
net/bpf/test_run.c int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr, · line 751
Quoted 3 lines
net/bpf/test_run.c +2
-0+/* Metadata is allocated from the headroom */ + headroom -= ctx->data;
sizeof(struct xdp_md)should be smaller than headroom (XDP_PACKET_HEADROOM), so we don't need to a check, but some comments might be helpful so people looking at the code doesn't need to double check.
We're not sure what check you're referring to, as there's no check here. This subtraction is, as the comment says, because the XDP metadata is allocated out of the XDP headroom, so the headroom size needs to be reduced by the metadata size.
Quoted 17 lines · Zvi Effron
Quoted 10 lines · Yonghong Song
Quoted 6 lines · Zvi Effron
net/bpf/test_run.c +0
-0@@ -687,6 +687,38 @@ int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr,return ret; }Quoted 5 lines
net/bpf/test_run.c int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr, · line 690
Quoted 1 line
net/bpf/test_run.c +1
-0+static int xdp_convert_md_to_buff (struct xdp_buff *xdp,struct xdp_md *xdp_md)Should the order of parameters be switched to (
xdp_md, xdp)? This will follow the convention of below functionxdp_convert_buff_to_md().
Quoted 4 lines
The order was done to match the skb versions of these functions, which seem to have the output format first and the input format second, which is why the order flips between conversion functions. We're not particular about order, so we can definitely make it consistent.
But for another function we have
+static void xdp_convert_buff_to_md(struct xdp_buff *xdp, struct xdp_md *xdp_md)
The input first and the output second. In my opinion, in the same file, we should keep the same ordering convention.
Quoted 26 lines
Quoted 16 lines
Quoted 16 lines
net/bpf/test_run.c +15
-0+{ +void *data; + +if (!xdp_md) +return 0 ; + +if (xdp_md->egress_ifindex !=0 ) +return -EINVAL ; + +if (xdp_md->data > xdp_md->data_end) +return -EINVAL ; + + xdp->data = xdp->data_meta + xdp_md->data; + +if (xdp_md->ingress_ifindex !=0 || xdp_md->rx_queue_index !=0 )Quoted 9 lines
net/bpf/test_run.c int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr, · line 706
Quoted 1 line
net/bpf/test_run.c +1
-0+return -EINVAL ;It would be good if you did all error checking before doing
xdp->dataassignment. Also looks likexdp_mderror checking happens here andbpf_prog_test_run_xdp(). If it is hard to put all error checking inbpf_prog_test_run_xdp(), at least put "xdp_md->data>xdp_md->data_end) inbpf_prog_test_run_xdp(), so this function only checks*_ifindexandrx_queue_index?
Quoted 7 lines
bpf_prog_test_run_xdp()was already a large function, which is why this was turned into a helper. Initially, we tried to have allxdp_mdrelated logic in the helper, with only the required logic inbpf_prog_test_run_xdp(). Based on a prior suggestion, we moved one additional check from the helper tobpf_prog_test_run_xdp()as it simplified the logic. It's not clear to us what benefit moving the other checks tobpf_prog_test_run_xdp()provides, but it does reduce the benefit of having the helper function.
At least put "if (xdp_md->data > xdp_md->data_end)" checking in the bpf_prog_test_run_xdp() as similar fields are already checked there.
It is okay to put *_ifindex/rx_queue_index in this function since you need to get device for checking and there is no need to get device twice.
Quoted 33 lines
Quoted 8 lines
net/bpf/test_run.c int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr, · line 731
Quoted 6 lines
net/bpf/test_run.c +1
-0@@ -696,36 +728,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;Let us try to maintain reverse christmas tree?
Sure.
Quoted 21 lines
Quoted 20 lines
net/bpf/test_run.c +12
-2u32 retval, duration;u32 max_data_sz;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) +return -EINVAL ; +if (ctx->data_end != size) +return -EINVAL ; +if (unlikely ((ctx->data & (sizeof (__u32) -1 )) || + ctx->data >32 ))
Quoted 4 lines
Quoted 1 line
Why 32? Should it be
sizeof(struct xdp_md)?This is not checking the context itself, but the amount of metadata. XDP allows at most 32 bytes of metadata.
Do we have a macro for this "32"? It would be good if we have one. Otherwise, some comments will be good.
Previously I am thinking just enforce ctx->data to be sizeof(struct xdp_md). But think twice, this is a little bit too restricted. So your current handling is fine.
Quoted 10 lines
Quoted 9 lines
net/bpf/test_run.c int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr, · line 751
Quoted 4 lines
net/bpf/test_run.c +2
-0+/* Metadata is allocated from the headroom */ + headroom -= ctx->data;
sizeof(struct xdp_md)should be smaller than headroom (XDP_PACKET_HEADROOM), so we don't need to a check, but some comments might be helpful so people looking at the code doesn't need to double check.
Quoted 4 lines
We're not sure what check you're referring to, as there's no check here. This subtraction is, as the comment says, because the XDP metadata is allocated out of the XDP headroom, so the headroom size needs to be reduced by the metadata size.
I am wondering whether we need to check
if (headroom < ctx->data)
return -EINVAL;
headroom -= ctx->data;
We have
headroom = XDP_PACKET_HEADROOM;
ctx->data <= 32
so we should be okay.
PATCH v4 2/3 bpf: support specifying ingress via xdp_md context in BPF_PROG_TEST_RUN
In reply to Zvi EffronSupport 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.
--- net/bpf/test_run.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
net/bpf/test_run.c +15 -1
@@ -690,6 +690,8 @@ int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr,static int xdp_convert_md_to_buff (struct xdp_buff *xdp,struct xdp_md *xdp_md) {void *data; +struct net_device *device; +struct netdev_rx_queue *rxqueue;if (!xdp_md)return 0 ;
@@ -702,9 +704,21 @@ static int xdp_convert_md_to_buff(struct xdp_buff *xdp, struct xdp_md *xdp_md) xdp->data = xdp->data_meta + xdp_md->data; -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 ; }
Signature · 1 line
2.31.1
Re: [PATCH bpf-next v4 2/3] bpf: support specifying ingress via xdp_md context in BPF_PROG_TEST_RUN
Quoted 25 lines · Zvi Effron
Support specifying the
ingress_ifindexandrx_queue_indexofxdp_mdcontexts forBPF_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_ifindexis specified, look up the device by the provided index in the current namespace and use itsxdp_rxqfor thexdp_buff. If therx_queue_indexis out of range, or is non-zero when theingress_ifindexis 0, return EINVAL.Co-developed-by Cody Haas <[email protected]>Signed-off-by Cody Haas <[email protected]>Co-developed-by Lisa Watanabe <[email protected]>Signed-off-by Lisa Watanabe <[email protected]>Signed-off-by Zvi Effron <[email protected]>--- net/bpf/test_run.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)net/bpf/test_run.c +0
-0
net/bpf/test_run.c int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr, · line 694
Quoted 5 lines
net/bpf/test_run.c +2
-0@@ -690,6 +690,8 @@ int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr,static int xdp_convert_md_to_buff (struct xdp_buff *xdp,struct xdp_md *xdp_md) {void *data; +struct net_device *device; +struct netdev_rx_queue *rxqueue;
reverse christmas tree?
net/bpf/test_run.c static int xdp_convert_md_to_buff(struct xdp_buff *xdp, struct xdp_md *xdp_md) · line 708
Quoted 10 lines
net/bpf/test_run.c +1
-1if (!xdp_md)return 0 ;@@ -702,9 +704,21 @@ static int xdp_convert_md_to_buff(struct xdp_buff *xdp, struct xdp_md *xdp_md) xdp->data = xdp->data_meta + xdp_md->data; -if (xdp_md->ingress_ifindex !=0 || xdp_md->rx_queue_index !=0 ) +if (!xdp_md->ingress_ifindex && xdp_md->rx_queue_index)return -EINVAL ;
xdp_md->ingress_ifindex and xdp_md->rx_queue_index are used three times each in this function here. Maybe worthwhile to assign them to temporary variables?
Quoted 17 lines
net/bpf/test_run.c +12
-0+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 ; }
PATCH v4 3/3 selftests/bpf: Add test for xdp_md context in BPF_PROG_TEST_RUN
In reply to Zvi EffronAdd 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.
--- .../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
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +114 -0
@@ -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); +}
tools/testing/selftests/bpf/progs/test_xdp_context_test_run.c new file +20 -0
@@ -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";
Signature · 1 line
2.31.1
Re: [PATCH bpf-next v4 3/3] selftests/bpf: Add test for xdp_md context in BPF_PROG_TEST_RUN
Quoted 55 lines · Zvi Effron
Add a test for using
xdp_mdas a context toBPF_PROG_TEST_RUNfor 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_mdcontexts, that the return value is successfully passed in, and that the adjusted metadata is successfully copied out.Co-developed-by Cody Haas <[email protected]>Signed-off-by Cody Haas <[email protected]>Co-developed-by Lisa Watanabe <[email protected]>Signed-off-by Lisa Watanabe <[email protected]>Signed-off-by Zvi Effron <[email protected]>--- .../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.ccreate mode 100644tools/testing/selftests/bpf/progs/test_xdp_context_test_run.ctools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +27
-0@@ -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);
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c line 37
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +10
-0+ + *(__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);
The above two assignments are redundant.
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c line 47
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +10
-0+ 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" );
I suggest just to test ctx_out.data == 0. It just happens the input data - meta = 4 and bpf program adjuested by 4. If they are not the same, the result won't be equal to data_meta.
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c line 56
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +9
-0+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)" );
I suggest to drop this test. Basically you did here is to have non-zero egress_ifindex which is not allowed. You have a test below.
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c line 61
Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +5
-0+ +/* 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" );
Use EINVAL explicitly? The same for below a few other cases.
Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +8
-0+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);
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c line 79
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +10
-0+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)" );
This test is not necessary if ctx size should be <= sizeof(struct xdp_md). So far, I think we can require it must be sizeof(struct xdp_md). If in the future, kernel struct xdp_md is extended, it may be changed to accept both old and new xdp_md's similar to other uapi data strcture like struct bpf_prog_info if there is a desire. In my opinion, the kernel should just stick to sizeof(struct xdp_md) size since the functionality is implemented as a *testing* mechanism.
Quoted 22 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +22
-0+ +/* 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 ;
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c line 111
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +10
-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)" );
Why this failure? I guess it is due to device search failure, right? So this test MAY succeed if the underlying host happens with a proper configuration with ingress_ifindex = 1 and rx_queue_index = 1, right?
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +3
-0+ +test_xdp_context_test_run__destroy (skel); +}tools/testing/selftests/bpf/progs/test_xdp_context_test_run.c new file +0
-0
tools/testing/selftests/bpf/progs/test_xdp_context_test_run.c line 6
Quoted 6 lines
tools/testing/selftests/bpf/progs/test_xdp_context_test_run.c new file +6
-0@@ -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)
Maybe drop prefix "_" from the function name?
tools/testing/selftests/bpf/progs/test_xdp_context_test_run.c line 9
Quoted 3 lines
tools/testing/selftests/bpf/progs/test_xdp_context_test_run.c new file +3
-0+{ +void *data = (void *)(unsigned long )xdp->data; +__u32 *metadata = (void *)(unsigned long )xdp->data_meta;
The above code is okay as verifier will rewrite correctly with actual address. But I still suggest to use "long" instead of "unsigned long" to be consistent with other bpf programs.
Quoted 12 lines
tools/testing/selftests/bpf/progs/test_xdp_context_test_run.c new file +11
-0+__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";
Re: [PATCH bpf-next v4 3/3] selftests/bpf: Add test for xdp_md context in BPF_PROG_TEST_RUN
Quoted 9 lines · Yonghong Song
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c line 37
Quoted 5 lines · Zvi Effron
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +5
-0+ opts.ctx_in = &ctx_in; + opts.ctx_size_in =sizeof (ctx_in); + + opts.ctx_in = &ctx_in; + opts.ctx_size_in =sizeof (ctx_in);The above two assignments are redundant.
Good catch.
Quoted 11 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c line 47
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +10
-0+ 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" );
Quoted 4 lines
I suggest just to test ctx_out.data == 0. It just happens the input data - meta = 4 and bpf program adjuested by 4. If they are not the same, the result won't be equal to
data_meta.
Sure.
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c line 56
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +9
-0+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)" );
Quoted 4 lines
I suggest to drop this test. Basically you did here is to have non-zero
egress_ifindexwhich is not allowed. You have a test below.
We think the actual correction here is that bad_ctx is supposed to be one byte larger than than struct xdp_md. It is misdeclared. We'll correct that.
Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c line 61
Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +5
-0+ +/* 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" );Use EINVAL explicitly? The same for below a few other cases.
Good suggestion.
Quoted 21 lines
Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +8
-0+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);tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c line 79
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +10
-0+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)" );This test is not necessary if ctx size should be
<=sizeof(struct xdp_md). So far, I think we can
Quoted 9 lines
require it must be
sizeof(struct xdp_md). If in the future, kernel structxdp_mdis extended, it may be changed to accept both old and new xdp_md's similar to other uapi data strcture like structbpf_prog_infoif there is a desire. In my opinion, the kernel should just stick tosizeof(struct xdp_md)size since the functionality is implemented as a *testing* mechanism.
You might be confusing the context (struct xdp_md) with the XDP metadata (data just before the frame data). XDP allows at most 32 bytes of metadata. This test is verifying that a metadata size >32 bytes is rejected.
Quoted 11 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c line 111
Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +5
-0+ 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)" );Why this failure? I guess it is due to device search failure, right? So this test MAY succeed if the underlying host happens with a proper configuration with
ingress_ifindex= 1 andrx_queue_index= 1, right?
I may be making incorrect assumptions, but my understanding is that interface index 1 is always the loopback interface, and the loopback interface only ever (in current kernels) has one rx queue. If that's not the case, we'll need to adjust (or remove) the test.
Quoted 9 lines
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +3
-0+ +test_xdp_context_test_run__destroy (skel); +}tools/testing/selftests/bpf/progs/test_xdp_context_test_run.c new file +0
-0@@ -0,0 +1,20 @@
Quoted 9 lines
tools/testing/selftests/bpf/progs/test_xdp_context_test_run.c line 6
Quoted 6 lines
tools/testing/selftests/bpf/progs/test_xdp_context_test_run.c new file +6
-0+// SPDX-License-Identifier: GPL-2.0 +#include <linux/bpf.h> +#include <bpf/bpf_helpers.h> + +SEC("xdp") +int _xdp_context (struct xdp_md *xdp)Maybe drop prefix "_" from the function name?
Sure.
Quoted 8 lines
tools/testing/selftests/bpf/progs/test_xdp_context_test_run.c line 9
Quoted 3 lines
tools/testing/selftests/bpf/progs/test_xdp_context_test_run.c new file +3
-0+{ +void *data = (void *)(unsigned long )xdp->data; +__u32 *metadata = (void *)(unsigned long )xdp->data_meta;The above code is okay as verifier will rewrite correctly with actual address. But I still suggest to use "long" instead of "unsigned long" to be consistent with other bpf programs.
Sure.
Re: [PATCH bpf-next v4 3/3] selftests/bpf: Add test for xdp_md context in BPF_PROG_TEST_RUN
Quoted 91 lines · Zvi Effron
Quoted 9 lines · Yonghong Song
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c line 37
Quoted 5 lines · Zvi Effron
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +5
-0+ opts.ctx_in = &ctx_in; + opts.ctx_size_in =sizeof (ctx_in); + + opts.ctx_in = &ctx_in; + opts.ctx_size_in =sizeof (ctx_in);The above two assignments are redundant.
Good catch.
Quoted 11 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c line 47
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +10
-0+ 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" );Quoted 4 lines
I suggest just to test ctx_out.data == 0. It just happens the input data - meta = 4 and bpf program adjuested by 4. If they are not the same, the result won't be equal to
data_meta.Sure.
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c line 56
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +9
-0+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)" );Quoted 4 lines
I suggest to drop this test. Basically you did here is to have non-zero
egress_ifindexwhich is not allowed. You have a test below.We think the actual correction here is that
bad_ctxis supposed to be one byte larger than than structxdp_md. It is misdeclared. We'll correct that.Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c line 61
Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +5
-0+ +/* 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" );Use EINVAL explicitly? The same for below a few other cases.
Good suggestion.
Quoted 21 lines
Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +8
-0+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);tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c line 79
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +10
-0+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)" );This test is not necessary if ctx size should be
<=sizeof(struct xdp_md). So far, I think we canQuoted 9 lines
require it must be
sizeof(struct xdp_md). If in the future, kernel structxdp_mdis extended, it may be changed to accept both old and new xdp_md's similar to other uapi data strcture like structbpf_prog_infoif there is a desire. In my opinion, the kernel should just stick tosizeof(struct xdp_md)size since the functionality is implemented as a *testing* mechanism.
Quoted 3 lines
You might be confusing the context (struct
xdp_md) with the XDP metadata (data just before the frame data). XDP allows at most 32 bytes of metadata. This test is verifying that a metadata size >32 bytes is rejected.
Right, you can keep this test. Previously I suggested to enforce sizeof(struct xdp_md) as the ctx size, but that may be too restrictive.
Quoted 13 lines
Quoted 7 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c line 111
Quoted 6 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +5
-0+ 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)" );Quoted 5 lines
Why this failure? I guess it is due to device search failure, right? So this test MAY succeed if the underlying host happens with a proper configuration with
ingress_ifindex= 1 andrx_queue_index= 1, right?
Quoted 4 lines
I may be making incorrect assumptions, but my understanding is that interface index 1 is always the loopback interface, and the loopback interface only ever (in current kernels) has one rx queue. If that's not the case, we'll need to adjust (or remove) the test.
You could be correct. Please add some comments though.
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +3
-0+ +test_xdp_context_test_run__destroy (skel); +}
[...]
Re: [PATCH bpf-next v4 3/3] selftests/bpf: Add test for xdp_md context in BPF_PROG_TEST_RUN
In reply to Zvi EffronQuoted 123 lines · Zvi Effron
Add a test for using
xdp_mdas a context toBPF_PROG_TEST_RUNfor 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_mdcontexts, that the return value is successfully passed in, and that the adjusted metadata is successfully copied out.Co-developed-by Cody Haas <[email protected]>Signed-off-by Cody Haas <[email protected]>Co-developed-by Lisa Watanabe <[email protected]>Signed-off-by Lisa Watanabe <[email protected]>Signed-off-by Zvi Effron <[email protected]>--- .../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.ccreate mode 100644tools/testing/selftests/bpf/progs/test_xdp_context_test_run.ctools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +95
-0@@ -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);
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c line 105
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +10
-0+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)" );
Also, these failure tests are very similar. I suggest to have a static function to do the common work. This should simplify the code and also it will be clear for each test what are ctx_in parameters. In current form, one may have to search previous test to get some parameter value. For example, for the above, one has to search previous tests to find ctx_in.data = 0 and ctx_in.data_meta = 0.
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file +9
-0+ + 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); +}
[...]