* Re: [PATCH bpf-next v2] selftests/bpf: Add a test for attaching a bpf fentry/fexit trace to an XDP program
2020-01-14 15:58 [PATCH bpf-next v2] selftests/bpf: Add a test for attaching a bpf fentry/fexit trace to an XDP program Eelco Chaudron
@ 2020-01-14 9:33 ` Maciej Fijalkowski
2020-01-14 18:49 ` Andrii Nakryiko
1 sibling, 0 replies; 4+ messages in thread
From: Maciej Fijalkowski @ 2020-01-14 9:33 UTC (permalink / raw)
To: Eelco Chaudron; +Cc: bpf, davem, ast, netdev
On Tue, Jan 14, 2020 at 03:58:16PM +0000, Eelco Chaudron wrote:
> Add a test that will attach a FENTRY and FEXIT program to the XDP test
> program. It will also verify data from the XDP context on FENTRY and
> verifies the return code on exit.
>
> Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
>
> ---
> v1 -> v2:
> - Changed code to use the BPF skeleton
> - Replace static volatile with global variable in eBPF code
>
> .../testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c | 69 ++++++++++++++++++++
> .../testing/selftests/bpf/progs/test_xdp_bpf2bpf.c | 44 +++++++++++++
> 2 files changed, 113 insertions(+)
> create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c
> create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_bpf2bpf.c
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c b/tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c
> new file mode 100644
> index 000000000000..e6e849df2632
> --- /dev/null
> +++ b/tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c
> @@ -0,0 +1,69 @@
> +// SPDX-License-Identifier: GPL-2.0
> +#include <test_progs.h>
> +#include <net/if.h>
> +#include "test_xdp.skel.h"
> +#include "test_xdp_bpf2bpf.skel.h"
> +
> +void test_xdp_bpf2bpf(void)
> +{
> +
> + struct test_xdp *pkt_skel = NULL;
> + struct test_xdp_bpf2bpf *ftrace_skel = NULL;
> + __u64 *ftrace_res;
Wanted to point out the RCT here but I see that
tools/testing/selftests/bpf/prog_tests don't really follow that rule.
> +
> + struct vip key4 = {.protocol = 6, .family = AF_INET};
> + struct iptnl_info value4 = {.family = AF_INET};
> + char buf[128];
> + struct iphdr *iph = (void *)buf + sizeof(struct ethhdr);
> + __u32 duration = 0, retval, size;
> + int err, pkt_fd, map_fd;
> +
> + /* Load XDP program to introspect */
> + pkt_skel = test_xdp__open_and_load();
> + if (CHECK(!pkt_skel, "pkt_skel_load", "test_xdp skeleton failed\n"))
> + return;
> +
> + pkt_fd = bpf_program__fd(pkt_skel->progs._xdp_tx_iptunnel);
> +
> + map_fd = bpf_map__fd(pkt_skel->maps.vip2tnl);
> + bpf_map_update_elem(map_fd, &key4, &value4, 0);
> +
> + DECLARE_LIBBPF_OPTS(bpf_object_open_opts, opts,
> + .attach_prog_fd = pkt_fd,
> + );
> +
> + ftrace_skel = test_xdp_bpf2bpf__open_opts(&opts);
> + if (CHECK(!ftrace_skel, "__open", "ftrace skeleton failed\n"))
> + goto out;
Hmm do you have here mixed tabs and spaces? Maybe my client messes this
line up.
> +
> + if (CHECK(test_xdp_bpf2bpf__load(ftrace_skel), "__load", "ftrace skeleton failed\n"))
line too long?
> + goto out;
> +
> + err = test_xdp_bpf2bpf__attach(ftrace_skel);
> + if (CHECK(err, "ftrace_attach", "ftrace attach failed: %d\n", err))
> + goto out;
> +
> + /* Run test program */
> + err = bpf_prog_test_run(pkt_fd, 1, &pkt_v4, sizeof(pkt_v4),
> + buf, &size, &retval, &duration);
> +
> + CHECK(err || retval != XDP_TX || size != 74 ||
> + iph->protocol != IPPROTO_IPIP, "ipv4",
> + "err %d errno %d retval %d size %d\n",
> + err, errno, retval, size);
> +
> + /* Verify test results */
> + ftrace_res = (__u64 *)ftrace_skel->bss;
> +
> + if (CHECK(ftrace_res[0] != if_nametoindex("lo"), "result",
> + "fentry failed err %llu\n", ftrace_res[0]))
> + goto out;
> +
> + if (CHECK(ftrace_res[1] != XDP_TX, "result",
> + "fexit failed err %llu\n", ftrace_res[1]))
> + goto out;
this goto doesn't really make sense, can be dropped.
> +
> +out:
> + test_xdp__destroy(pkt_skel);
> + test_xdp_bpf2bpf__destroy(ftrace_skel);
> +}
> diff --git a/tools/testing/selftests/bpf/progs/test_xdp_bpf2bpf.c b/tools/testing/selftests/bpf/progs/test_xdp_bpf2bpf.c
> new file mode 100644
> index 000000000000..74c78b30ae07
> --- /dev/null
> +++ b/tools/testing/selftests/bpf/progs/test_xdp_bpf2bpf.c
> @@ -0,0 +1,44 @@
> +// SPDX-License-Identifier: GPL-2.0
> +#include <linux/bpf.h>
> +#include "bpf_helpers.h"
> +#include "bpf_trace_helpers.h"
> +
> +struct net_device {
> + /* Structure does not need to contain all entries,
> + * as "preserve_access_index" will use BTF to fix this...
> + */
> + int ifindex;
> +} __attribute__((preserve_access_index));
> +
> +struct xdp_rxq_info {
> + /* Structure does not need to contain all entries,
> + * as "preserve_access_index" will use BTF to fix this...
> + */
> + struct net_device *dev;
> + __u32 queue_index;
> +} __attribute__((preserve_access_index));
> +
> +struct xdp_buff {
> + void *data;
> + void *data_end;
> + void *data_meta;
> + void *data_hard_start;
> + unsigned long handle;
> + struct xdp_rxq_info *rxq;
> +} __attribute__((preserve_access_index));
> +
> +__u64 test_result_fentry = 0;
> +BPF_TRACE_1("fentry/_xdp_tx_iptunnel", trace_on_entry,
> + struct xdp_buff *, xdp)
> +{
> + test_result_fentry = xdp->rxq->dev->ifindex;
> + return 0;
> +}
> +
> +__u64 test_result_fexit = 0;
> +BPF_TRACE_2("fexit/_xdp_tx_iptunnel", trace_on_exit,
> + struct xdp_buff*, xdp, int, ret)
> +{
> + test_result_fexit = ret;
> + return 0;
> +}
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH bpf-next v2] selftests/bpf: Add a test for attaching a bpf fentry/fexit trace to an XDP program
@ 2020-01-14 15:58 Eelco Chaudron
2020-01-14 9:33 ` Maciej Fijalkowski
2020-01-14 18:49 ` Andrii Nakryiko
0 siblings, 2 replies; 4+ messages in thread
From: Eelco Chaudron @ 2020-01-14 15:58 UTC (permalink / raw)
To: bpf; +Cc: davem, ast, netdev
Add a test that will attach a FENTRY and FEXIT program to the XDP test
program. It will also verify data from the XDP context on FENTRY and
verifies the return code on exit.
Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
---
v1 -> v2:
- Changed code to use the BPF skeleton
- Replace static volatile with global variable in eBPF code
.../testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c | 69 ++++++++++++++++++++
.../testing/selftests/bpf/progs/test_xdp_bpf2bpf.c | 44 +++++++++++++
2 files changed, 113 insertions(+)
create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c
create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_bpf2bpf.c
diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c b/tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c
new file mode 100644
index 000000000000..e6e849df2632
--- /dev/null
+++ b/tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c
@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <test_progs.h>
+#include <net/if.h>
+#include "test_xdp.skel.h"
+#include "test_xdp_bpf2bpf.skel.h"
+
+void test_xdp_bpf2bpf(void)
+{
+
+ struct test_xdp *pkt_skel = NULL;
+ struct test_xdp_bpf2bpf *ftrace_skel = NULL;
+ __u64 *ftrace_res;
+
+ struct vip key4 = {.protocol = 6, .family = AF_INET};
+ struct iptnl_info value4 = {.family = AF_INET};
+ char buf[128];
+ struct iphdr *iph = (void *)buf + sizeof(struct ethhdr);
+ __u32 duration = 0, retval, size;
+ int err, pkt_fd, map_fd;
+
+ /* Load XDP program to introspect */
+ pkt_skel = test_xdp__open_and_load();
+ if (CHECK(!pkt_skel, "pkt_skel_load", "test_xdp skeleton failed\n"))
+ return;
+
+ pkt_fd = bpf_program__fd(pkt_skel->progs._xdp_tx_iptunnel);
+
+ map_fd = bpf_map__fd(pkt_skel->maps.vip2tnl);
+ bpf_map_update_elem(map_fd, &key4, &value4, 0);
+
+ DECLARE_LIBBPF_OPTS(bpf_object_open_opts, opts,
+ .attach_prog_fd = pkt_fd,
+ );
+
+ ftrace_skel = test_xdp_bpf2bpf__open_opts(&opts);
+ if (CHECK(!ftrace_skel, "__open", "ftrace skeleton failed\n"))
+ goto out;
+
+ if (CHECK(test_xdp_bpf2bpf__load(ftrace_skel), "__load", "ftrace skeleton failed\n"))
+ goto out;
+
+ err = test_xdp_bpf2bpf__attach(ftrace_skel);
+ if (CHECK(err, "ftrace_attach", "ftrace attach failed: %d\n", err))
+ goto out;
+
+ /* Run test program */
+ err = bpf_prog_test_run(pkt_fd, 1, &pkt_v4, sizeof(pkt_v4),
+ buf, &size, &retval, &duration);
+
+ CHECK(err || retval != XDP_TX || size != 74 ||
+ iph->protocol != IPPROTO_IPIP, "ipv4",
+ "err %d errno %d retval %d size %d\n",
+ err, errno, retval, size);
+
+ /* Verify test results */
+ ftrace_res = (__u64 *)ftrace_skel->bss;
+
+ if (CHECK(ftrace_res[0] != if_nametoindex("lo"), "result",
+ "fentry failed err %llu\n", ftrace_res[0]))
+ goto out;
+
+ if (CHECK(ftrace_res[1] != XDP_TX, "result",
+ "fexit failed err %llu\n", ftrace_res[1]))
+ goto out;
+
+out:
+ test_xdp__destroy(pkt_skel);
+ test_xdp_bpf2bpf__destroy(ftrace_skel);
+}
diff --git a/tools/testing/selftests/bpf/progs/test_xdp_bpf2bpf.c b/tools/testing/selftests/bpf/progs/test_xdp_bpf2bpf.c
new file mode 100644
index 000000000000..74c78b30ae07
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/test_xdp_bpf2bpf.c
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <linux/bpf.h>
+#include "bpf_helpers.h"
+#include "bpf_trace_helpers.h"
+
+struct net_device {
+ /* Structure does not need to contain all entries,
+ * as "preserve_access_index" will use BTF to fix this...
+ */
+ int ifindex;
+} __attribute__((preserve_access_index));
+
+struct xdp_rxq_info {
+ /* Structure does not need to contain all entries,
+ * as "preserve_access_index" will use BTF to fix this...
+ */
+ struct net_device *dev;
+ __u32 queue_index;
+} __attribute__((preserve_access_index));
+
+struct xdp_buff {
+ void *data;
+ void *data_end;
+ void *data_meta;
+ void *data_hard_start;
+ unsigned long handle;
+ struct xdp_rxq_info *rxq;
+} __attribute__((preserve_access_index));
+
+__u64 test_result_fentry = 0;
+BPF_TRACE_1("fentry/_xdp_tx_iptunnel", trace_on_entry,
+ struct xdp_buff *, xdp)
+{
+ test_result_fentry = xdp->rxq->dev->ifindex;
+ return 0;
+}
+
+__u64 test_result_fexit = 0;
+BPF_TRACE_2("fexit/_xdp_tx_iptunnel", trace_on_exit,
+ struct xdp_buff*, xdp, int, ret)
+{
+ test_result_fexit = ret;
+ return 0;
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH bpf-next v2] selftests/bpf: Add a test for attaching a bpf fentry/fexit trace to an XDP program
2020-01-14 15:58 [PATCH bpf-next v2] selftests/bpf: Add a test for attaching a bpf fentry/fexit trace to an XDP program Eelco Chaudron
2020-01-14 9:33 ` Maciej Fijalkowski
@ 2020-01-14 18:49 ` Andrii Nakryiko
2020-01-15 13:12 ` Eelco Chaudron
1 sibling, 1 reply; 4+ messages in thread
From: Andrii Nakryiko @ 2020-01-14 18:49 UTC (permalink / raw)
To: Eelco Chaudron; +Cc: bpf, David S. Miller, Alexei Starovoitov, Networking
On Tue, Jan 14, 2020 at 7:58 AM Eelco Chaudron <echaudro@redhat.com> wrote:
>
> Add a test that will attach a FENTRY and FEXIT program to the XDP test
> program. It will also verify data from the XDP context on FENTRY and
> verifies the return code on exit.
>
> Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
>
> ---
> v1 -> v2:
> - Changed code to use the BPF skeleton
> - Replace static volatile with global variable in eBPF code
>
> .../testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c | 69 ++++++++++++++++++++
> .../testing/selftests/bpf/progs/test_xdp_bpf2bpf.c | 44 +++++++++++++
> 2 files changed, 113 insertions(+)
> create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c
> create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_bpf2bpf.c
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c b/tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c
> new file mode 100644
> index 000000000000..e6e849df2632
> --- /dev/null
> +++ b/tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c
> @@ -0,0 +1,69 @@
> +// SPDX-License-Identifier: GPL-2.0
> +#include <test_progs.h>
> +#include <net/if.h>
> +#include "test_xdp.skel.h"
> +#include "test_xdp_bpf2bpf.skel.h"
> +
> +void test_xdp_bpf2bpf(void)
> +{
> +
extra line
> + struct test_xdp *pkt_skel = NULL;
> + struct test_xdp_bpf2bpf *ftrace_skel = NULL;
something with indentation?
> + __u64 *ftrace_res;
> +
variable declarations shouldn't be split, probably?
> + struct vip key4 = {.protocol = 6, .family = AF_INET};
> + struct iptnl_info value4 = {.family = AF_INET};
> + char buf[128];
> + struct iphdr *iph = (void *)buf + sizeof(struct ethhdr);
> + __u32 duration = 0, retval, size;
> + int err, pkt_fd, map_fd;
> +
> + /* Load XDP program to introspect */
> + pkt_skel = test_xdp__open_and_load();
> + if (CHECK(!pkt_skel, "pkt_skel_load", "test_xdp skeleton failed\n"))
> + return;
> +
> + pkt_fd = bpf_program__fd(pkt_skel->progs._xdp_tx_iptunnel);
> +
> + map_fd = bpf_map__fd(pkt_skel->maps.vip2tnl);
> + bpf_map_update_elem(map_fd, &key4, &value4, 0);
> +
> + DECLARE_LIBBPF_OPTS(bpf_object_open_opts, opts,
> + .attach_prog_fd = pkt_fd,
> + );
DECLARE_LIBBPF_OPTS is a variable declaration, so should go together
with all other declarations. Compiler should complain about this, but
I guess selftests/bpf Makefile doesn't have necessary flags, that
other kernel code has. You can declare opts first and then initialize
some extra fields later:
DECLARE_LIBBPF_OPTS(bpf_object_open_opts, opts);
... later in code ...
opts.attach_prog_fd = pkt_fd;
> +
> + ftrace_skel = test_xdp_bpf2bpf__open_opts(&opts);
> + if (CHECK(!ftrace_skel, "__open", "ftrace skeleton failed\n"))
> + goto out;
> +
> + if (CHECK(test_xdp_bpf2bpf__load(ftrace_skel), "__load", "ftrace skeleton failed\n"))
> + goto out;
for consistency with attach check below and for readability, move out
load call into separate statement, it's easy to miss when it is inside
CHECK()
> +
> + err = test_xdp_bpf2bpf__attach(ftrace_skel);
> + if (CHECK(err, "ftrace_attach", "ftrace attach failed: %d\n", err))
> + goto out;
> +
> + /* Run test program */
> + err = bpf_prog_test_run(pkt_fd, 1, &pkt_v4, sizeof(pkt_v4),
> + buf, &size, &retval, &duration);
> +
> + CHECK(err || retval != XDP_TX || size != 74 ||
> + iph->protocol != IPPROTO_IPIP, "ipv4",
> + "err %d errno %d retval %d size %d\n",
> + err, errno, retval, size);
should it goto out here as well?
> +
> + /* Verify test results */
> + ftrace_res = (__u64 *)ftrace_skel->bss;
> +
> + if (CHECK(ftrace_res[0] != if_nametoindex("lo"), "result",
> + "fentry failed err %llu\n", ftrace_res[0]))
> + goto out;
> +
> + if (CHECK(ftrace_res[1] != XDP_TX, "result",
> + "fexit failed err %llu\n", ftrace_res[1]))
> + goto out;
why this casting? You can do access those variables much more
naturally with ftrace_skel->bss->test_result_fentry and
ftrace_skel->bss->test_result_fexit without making dangerous
assumptions about their offsets within data section.
> +
> +out:
> + test_xdp__destroy(pkt_skel);
> + test_xdp_bpf2bpf__destroy(ftrace_skel);
> +}
> diff --git a/tools/testing/selftests/bpf/progs/test_xdp_bpf2bpf.c b/tools/testing/selftests/bpf/progs/test_xdp_bpf2bpf.c
> new file mode 100644
> index 000000000000..74c78b30ae07
> --- /dev/null
> +++ b/tools/testing/selftests/bpf/progs/test_xdp_bpf2bpf.c
> @@ -0,0 +1,44 @@
> +// SPDX-License-Identifier: GPL-2.0
> +#include <linux/bpf.h>
> +#include "bpf_helpers.h"
> +#include "bpf_trace_helpers.h"
> +
> +struct net_device {
> + /* Structure does not need to contain all entries,
> + * as "preserve_access_index" will use BTF to fix this...
> + */
> + int ifindex;
> +} __attribute__((preserve_access_index));
> +
> +struct xdp_rxq_info {
> + /* Structure does not need to contain all entries,
> + * as "preserve_access_index" will use BTF to fix this...
> + */
> + struct net_device *dev;
> + __u32 queue_index;
> +} __attribute__((preserve_access_index));
> +
> +struct xdp_buff {
> + void *data;
> + void *data_end;
> + void *data_meta;
> + void *data_hard_start;
> + unsigned long handle;
> + struct xdp_rxq_info *rxq;
> +} __attribute__((preserve_access_index));
> +
> +__u64 test_result_fentry = 0;
> +BPF_TRACE_1("fentry/_xdp_tx_iptunnel", trace_on_entry,
> + struct xdp_buff *, xdp)
BPF_TRACE_x is no more, see BPF_PROG and how it's used for fentry/fexit tests:
SEC("fentry/_xdp_tx_iptunnel")
int BPF_PROG(trace_on_entry, struct xdp_buff *xdp)
> +{
> + test_result_fentry = xdp->rxq->dev->ifindex;
> + return 0;
> +}
> +
> +__u64 test_result_fexit = 0;
> +BPF_TRACE_2("fexit/_xdp_tx_iptunnel", trace_on_exit,
> + struct xdp_buff*, xdp, int, ret)
> +{
> + test_result_fexit = ret;
> + return 0;
> +}
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH bpf-next v2] selftests/bpf: Add a test for attaching a bpf fentry/fexit trace to an XDP program
2020-01-14 18:49 ` Andrii Nakryiko
@ 2020-01-15 13:12 ` Eelco Chaudron
0 siblings, 0 replies; 4+ messages in thread
From: Eelco Chaudron @ 2020-01-15 13:12 UTC (permalink / raw)
To: Andrii Nakryiko, maciej.fijalkowski
Cc: bpf, David S. Miller, Alexei Starovoitov, Networking
Andrii and Maciej thanks for your reviews, I’ve addressed all your
comments, and will send out a v3 soon…
//Eelco
On 14 Jan 2020, at 19:49, Andrii Nakryiko wrote:
> On Tue, Jan 14, 2020 at 7:58 AM Eelco Chaudron <echaudro@redhat.com>
> wrote:
>>
>> Add a test that will attach a FENTRY and FEXIT program to the XDP
>> test
>> program. It will also verify data from the XDP context on FENTRY and
>> verifies the return code on exit.
>>
>> Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
>>
>> ---
>> v1 -> v2:
>> - Changed code to use the BPF skeleton
>> - Replace static volatile with global variable in eBPF code
>>
>> .../testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c | 69
>> ++++++++++++++++++++
>> .../testing/selftests/bpf/progs/test_xdp_bpf2bpf.c | 44
>> +++++++++++++
>> 2 files changed, 113 insertions(+)
>> create mode 100644
>> tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c
>> create mode 100644
>> tools/testing/selftests/bpf/progs/test_xdp_bpf2bpf.c
>>
>> diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c
>> b/tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c
>> new file mode 100644
>> index 000000000000..e6e849df2632
>> --- /dev/null
>> +++ b/tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c
>> @@ -0,0 +1,69 @@
>> +// SPDX-License-Identifier: GPL-2.0
>> +#include <test_progs.h>
>> +#include <net/if.h>
>> +#include "test_xdp.skel.h"
>> +#include "test_xdp_bpf2bpf.skel.h"
>> +
>> +void test_xdp_bpf2bpf(void)
>> +{
>> +
>
> extra line
>
>> + struct test_xdp *pkt_skel = NULL;
>> + struct test_xdp_bpf2bpf *ftrace_skel = NULL;
>
> something with indentation?
>
>> + __u64 *ftrace_res;
>> +
>
> variable declarations shouldn't be split, probably?
>
>> + struct vip key4 = {.protocol = 6, .family = AF_INET};
>> + struct iptnl_info value4 = {.family = AF_INET};
>> + char buf[128];
>> + struct iphdr *iph = (void *)buf + sizeof(struct ethhdr);
>> + __u32 duration = 0, retval, size;
>> + int err, pkt_fd, map_fd;
>> +
>> + /* Load XDP program to introspect */
>> + pkt_skel = test_xdp__open_and_load();
>> + if (CHECK(!pkt_skel, "pkt_skel_load", "test_xdp skeleton
>> failed\n"))
>> + return;
>> +
>> + pkt_fd = bpf_program__fd(pkt_skel->progs._xdp_tx_iptunnel);
>> +
>> + map_fd = bpf_map__fd(pkt_skel->maps.vip2tnl);
>> + bpf_map_update_elem(map_fd, &key4, &value4, 0);
>> +
>> + DECLARE_LIBBPF_OPTS(bpf_object_open_opts, opts,
>> + .attach_prog_fd = pkt_fd,
>> + );
>
> DECLARE_LIBBPF_OPTS is a variable declaration, so should go together
> with all other declarations. Compiler should complain about this, but
> I guess selftests/bpf Makefile doesn't have necessary flags, that
> other kernel code has. You can declare opts first and then initialize
> some extra fields later:
>
> DECLARE_LIBBPF_OPTS(bpf_object_open_opts, opts);
>
> ... later in code ...
>
> opts.attach_prog_fd = pkt_fd;
>
>
>> +
>> + ftrace_skel = test_xdp_bpf2bpf__open_opts(&opts);
>> + if (CHECK(!ftrace_skel, "__open", "ftrace skeleton
>> failed\n"))
>> + goto out;
>> +
>> + if (CHECK(test_xdp_bpf2bpf__load(ftrace_skel), "__load",
>> "ftrace skeleton failed\n"))
>> + goto out;
>
> for consistency with attach check below and for readability, move out
> load call into separate statement, it's easy to miss when it is inside
> CHECK()
>
>> +
>> + err = test_xdp_bpf2bpf__attach(ftrace_skel);
>> + if (CHECK(err, "ftrace_attach", "ftrace attach failed: %d\n",
>> err))
>> + goto out;
>> +
>> + /* Run test program */
>> + err = bpf_prog_test_run(pkt_fd, 1, &pkt_v4, sizeof(pkt_v4),
>> + buf, &size, &retval, &duration);
>> +
>> + CHECK(err || retval != XDP_TX || size != 74 ||
>> + iph->protocol != IPPROTO_IPIP, "ipv4",
>> + "err %d errno %d retval %d size %d\n",
>> + err, errno, retval, size);
>
> should it goto out here as well?
>
>> +
>> + /* Verify test results */
>> + ftrace_res = (__u64 *)ftrace_skel->bss;
>> +
>> + if (CHECK(ftrace_res[0] != if_nametoindex("lo"), "result",
>> + "fentry failed err %llu\n", ftrace_res[0]))
>> + goto out;
>> +
>> + if (CHECK(ftrace_res[1] != XDP_TX, "result",
>> + "fexit failed err %llu\n", ftrace_res[1]))
>> + goto out;
>
> why this casting? You can do access those variables much more
> naturally with ftrace_skel->bss->test_result_fentry and
> ftrace_skel->bss->test_result_fexit without making dangerous
> assumptions about their offsets within data section.
>
>
>> +
>> +out:
>> + test_xdp__destroy(pkt_skel);
>> + test_xdp_bpf2bpf__destroy(ftrace_skel);
>> +}
>> diff --git a/tools/testing/selftests/bpf/progs/test_xdp_bpf2bpf.c
>> b/tools/testing/selftests/bpf/progs/test_xdp_bpf2bpf.c
>> new file mode 100644
>> index 000000000000..74c78b30ae07
>> --- /dev/null
>> +++ b/tools/testing/selftests/bpf/progs/test_xdp_bpf2bpf.c
>> @@ -0,0 +1,44 @@
>> +// SPDX-License-Identifier: GPL-2.0
>> +#include <linux/bpf.h>
>> +#include "bpf_helpers.h"
>> +#include "bpf_trace_helpers.h"
>> +
>> +struct net_device {
>> + /* Structure does not need to contain all entries,
>> + * as "preserve_access_index" will use BTF to fix this...
>> + */
>> + int ifindex;
>> +} __attribute__((preserve_access_index));
>> +
>> +struct xdp_rxq_info {
>> + /* Structure does not need to contain all entries,
>> + * as "preserve_access_index" will use BTF to fix this...
>> + */
>> + struct net_device *dev;
>> + __u32 queue_index;
>> +} __attribute__((preserve_access_index));
>> +
>> +struct xdp_buff {
>> + void *data;
>> + void *data_end;
>> + void *data_meta;
>> + void *data_hard_start;
>> + unsigned long handle;
>> + struct xdp_rxq_info *rxq;
>> +} __attribute__((preserve_access_index));
>> +
>> +__u64 test_result_fentry = 0;
>> +BPF_TRACE_1("fentry/_xdp_tx_iptunnel", trace_on_entry,
>> + struct xdp_buff *, xdp)
>
> BPF_TRACE_x is no more, see BPF_PROG and how it's used for
> fentry/fexit tests:
>
> SEC("fentry/_xdp_tx_iptunnel")
> int BPF_PROG(trace_on_entry, struct xdp_buff *xdp)
>
>> +{
>> + test_result_fentry = xdp->rxq->dev->ifindex;
>> + return 0;
>> +}
>> +
>> +__u64 test_result_fexit = 0;
>> +BPF_TRACE_2("fexit/_xdp_tx_iptunnel", trace_on_exit,
>> + struct xdp_buff*, xdp, int, ret)
>> +{
>> + test_result_fexit = ret;
>> + return 0;
>> +}
>>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-01-15 13:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-14 15:58 [PATCH bpf-next v2] selftests/bpf: Add a test for attaching a bpf fentry/fexit trace to an XDP program Eelco Chaudron
2020-01-14 9:33 ` Maciej Fijalkowski
2020-01-14 18:49 ` Andrii Nakryiko
2020-01-15 13:12 ` Eelco Chaudron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).