diff mbox series

[v5,bpf-next,3/3] bpf: add selftest for BPF_ENABLE_STATS

Message ID 20200427234423.998085-4-songliubraving@fb.com
State Changes Requested
Delegated to: BPF Maintainers
Headers show
Series bpf: sharing bpf runtime stats with | expand

Commit Message

Song Liu April 27, 2020, 11:44 p.m. UTC 
Add test for  BPF_ENABLE_STATS, which should enable run_time_ns stats.

~/selftests/bpf# ./test_progs -t enable_stats  -v
test_enable_stats:PASS:skel_open_and_load 0 nsec
test_enable_stats:PASS:get_stats_fd 0 nsec
test_enable_stats:PASS:attach_raw_tp 0 nsec
test_enable_stats:PASS:get_prog_info 0 nsec
test_enable_stats:PASS:check_stats_enabled 0 nsec
Summary: 1/0 PASSED, 0 SKIPPED, 0 FAILED

Signed-off-by: Song Liu <songliubraving@fb.com>
---
 .../selftests/bpf/prog_tests/enable_stats.c   | 45 +++++++++++++++++++
 .../selftests/bpf/progs/test_enable_stats.c   | 28 ++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 tools/testing/selftests/bpf/prog_tests/enable_stats.c
 create mode 100644 tools/testing/selftests/bpf/progs/test_enable_stats.c

Comments

Yonghong Song April 28, 2020, 6:04 a.m. UTC | #1 
On 4/27/20 4:44 PM, Song Liu wrote:
> Add test for  BPF_ENABLE_STATS, which should enable run_time_ns stats.
> 
> ~/selftests/bpf# ./test_progs -t enable_stats  -v
> test_enable_stats:PASS:skel_open_and_load 0 nsec
> test_enable_stats:PASS:get_stats_fd 0 nsec
> test_enable_stats:PASS:attach_raw_tp 0 nsec
> test_enable_stats:PASS:get_prog_info 0 nsec
> test_enable_stats:PASS:check_stats_enabled 0 nsec
> Summary: 1/0 PASSED, 0 SKIPPED, 0 FAILED
> 
> Signed-off-by: Song Liu <songliubraving@fb.com>
> ---
>   .../selftests/bpf/prog_tests/enable_stats.c   | 45 +++++++++++++++++++
>   .../selftests/bpf/progs/test_enable_stats.c   | 28 ++++++++++++
>   2 files changed, 73 insertions(+)
>   create mode 100644 tools/testing/selftests/bpf/prog_tests/enable_stats.c
>   create mode 100644 tools/testing/selftests/bpf/progs/test_enable_stats.c
> 
> diff --git a/tools/testing/selftests/bpf/prog_tests/enable_stats.c b/tools/testing/selftests/bpf/prog_tests/enable_stats.c
> new file mode 100644
> index 000000000000..987fc743ab75
> --- /dev/null
> +++ b/tools/testing/selftests/bpf/prog_tests/enable_stats.c
> @@ -0,0 +1,45 @@
> +// SPDX-License-Identifier: GPL-2.0
> +#include <test_progs.h>
> +#include <sys/mman.h>
> +#include "test_enable_stats.skel.h"
> +
> +void test_enable_stats(void)
> +{
> +	struct test_enable_stats *skel;
> +	struct bpf_prog_info info = {};
> +	__u32 info_len = sizeof(info);
> +	int stats_fd, err, prog_fd;
> +	int duration = 0;
> +
> +	skel = test_enable_stats__open_and_load();
> +
> +	if (CHECK(!skel, "skel_open_and_load", "skeleton open/load failed\n"))
> +		return;
> +
> +	stats_fd = bpf_enable_stats(BPF_STATS_RUNTIME_CNT);
> +
> +	if (CHECK(stats_fd < 0, "get_stats_fd", "failed %d\n", errno))
> +		goto cleanup;
> +
> +	err = test_enable_stats__attach(skel);
> +
> +	if (CHECK(err, "attach_raw_tp", "err %d\n", err))
> +		goto cleanup;
> +
> +	usleep(1000);
> +
> +	prog_fd = bpf_program__fd(skel->progs.test_enable_stats);
> +	err = bpf_obj_get_info_by_fd(prog_fd, &info, &info_len);
> +
> +	if (CHECK(err, "get_prog_info",
> +		  "failed to get bpf_prog_info for fd %d\n", prog_fd))
> +		goto cleanup;
> +
> +	CHECK(info.run_time_ns == 0, "check_stats_enabled",
> +	      "failed to enable run_time_ns stats\n");
> +
> +cleanup:
> +	test_enable_stats__destroy(skel);
> +	if (stats_fd >= 0)
> +		close(stats_fd);
> +}
> diff --git a/tools/testing/selftests/bpf/progs/test_enable_stats.c b/tools/testing/selftests/bpf/progs/test_enable_stats.c
> new file mode 100644
> index 000000000000..f95ac0c94639
> --- /dev/null
> +++ b/tools/testing/selftests/bpf/progs/test_enable_stats.c
> @@ -0,0 +1,28 @@
> +// SPDX-License-Identifier: GPL-2.0
> +// Copyright (c) 2020 Facebook
> +
> +#include <linux/bpf.h>
> +#include <stdint.h>
> +#include <bpf/bpf_helpers.h>
> +
> +char _license[] SEC("license") = "GPL";
> +
> +struct {
> +	__uint(type, BPF_MAP_TYPE_ARRAY);
> +	__uint(max_entries, 1);
> +	__type(key, __u32);
> +	__type(value, __u64);
> +} count SEC(".maps");

Looks like a global variable can be used here?

> +
> +SEC("raw_tracepoint/sys_enter")
> +int test_enable_stats(void *ctx)
> +{
> +	__u32 key = 0;
> +	__u64 *val;
> +
> +	val = bpf_map_lookup_elem(&count, &key);
> +	if (val)
> +		*val += 1;
> +
> +	return 0;
> +}
>
Song Liu April 28, 2020, 10:09 p.m. UTC | #2 
> On Apr 27, 2020, at 11:04 PM, Yonghong Song <yhs@fb.com> wrote:
> 
> 
> 
> On 4/27/20 4:44 PM, Song Liu wrote:
>> Add test for  BPF_ENABLE_STATS, which should enable run_time_ns stats.
>> ~/selftests/bpf# ./test_progs -t enable_stats  -v
>> test_enable_stats:PASS:skel_open_and_load 0 nsec
>> test_enable_stats:PASS:get_stats_fd 0 nsec
>> test_enable_stats:PASS:attach_raw_tp 0 nsec
>> test_enable_stats:PASS:get_prog_info 0 nsec
>> test_enable_stats:PASS:check_stats_enabled 0 nsec
>> Summary: 1/0 PASSED, 0 SKIPPED, 0 FAILED
>> Signed-off-by: Song Liu <songliubraving@fb.com>
>> ---
>>  .../selftests/bpf/prog_tests/enable_stats.c   | 45 +++++++++++++++++++
>>  .../selftests/bpf/progs/test_enable_stats.c   | 28 ++++++++++++
>>  2 files changed, 73 insertions(+)
>>  create mode 100644 tools/testing/selftests/bpf/prog_tests/enable_stats.c
>>  create mode 100644 tools/testing/selftests/bpf/progs/test_enable_stats.c
>> diff --git a/tools/testing/selftests/bpf/prog_tests/enable_stats.c b/tools/testing/selftests/bpf/prog_tests/enable_stats.c
>> new file mode 100644
>> index 000000000000..987fc743ab75
>> --- /dev/null
>> +++ b/tools/testing/selftests/bpf/prog_tests/enable_stats.c
>> @@ -0,0 +1,45 @@
>> +// SPDX-License-Identifier: GPL-2.0
>> +#include <test_progs.h>
>> +#include <sys/mman.h>
>> +#include "test_enable_stats.skel.h"
>> +
>> +void test_enable_stats(void)
>> +{
>> +	struct test_enable_stats *skel;
>> +	struct bpf_prog_info info = {};
>> +	__u32 info_len = sizeof(info);
>> +	int stats_fd, err, prog_fd;
>> +	int duration = 0;
>> +
>> +	skel = test_enable_stats__open_and_load();
>> +
>> +	if (CHECK(!skel, "skel_open_and_load", "skeleton open/load failed\n"))
>> +		return;
>> +
>> +	stats_fd = bpf_enable_stats(BPF_STATS_RUNTIME_CNT);
>> +
>> +	if (CHECK(stats_fd < 0, "get_stats_fd", "failed %d\n", errno))
>> +		goto cleanup;
>> +
>> +	err = test_enable_stats__attach(skel);
>> +
>> +	if (CHECK(err, "attach_raw_tp", "err %d\n", err))
>> +		goto cleanup;
>> +
>> +	usleep(1000);
>> +
>> +	prog_fd = bpf_program__fd(skel->progs.test_enable_stats);
>> +	err = bpf_obj_get_info_by_fd(prog_fd, &info, &info_len);
>> +
>> +	if (CHECK(err, "get_prog_info",
>> +		  "failed to get bpf_prog_info for fd %d\n", prog_fd))
>> +		goto cleanup;
>> +
>> +	CHECK(info.run_time_ns == 0, "check_stats_enabled",
>> +	      "failed to enable run_time_ns stats\n");
>> +
>> +cleanup:
>> +	test_enable_stats__destroy(skel);
>> +	if (stats_fd >= 0)
>> +		close(stats_fd);
>> +}
>> diff --git a/tools/testing/selftests/bpf/progs/test_enable_stats.c b/tools/testing/selftests/bpf/progs/test_enable_stats.c
>> new file mode 100644
>> index 000000000000..f95ac0c94639
>> --- /dev/null
>> +++ b/tools/testing/selftests/bpf/progs/test_enable_stats.c
>> @@ -0,0 +1,28 @@
>> +// SPDX-License-Identifier: GPL-2.0
>> +// Copyright (c) 2020 Facebook
>> +
>> +#include <linux/bpf.h>
>> +#include <stdint.h>
>> +#include <bpf/bpf_helpers.h>
>> +
>> +char _license[] SEC("license") = "GPL";
>> +
>> +struct {
>> +	__uint(type, BPF_MAP_TYPE_ARRAY);
>> +	__uint(max_entries, 1);
>> +	__type(key, __u32);
>> +	__type(value, __u64);
>> +} count SEC(".maps");
> 
> Looks like a global variable can be used here?

We can use global variable. But it doesn't really matter for this test.
Any BPF program will work here. Do we really need a v6 for this change? 

Thanks,
Song
Alexei Starovoitov April 28, 2020, 10:13 p.m. UTC | #3 
On Tue, Apr 28, 2020 at 3:09 PM Song Liu <songliubraving@fb.com> wrote:
> >> +
> >> +struct {
> >> +    __uint(type, BPF_MAP_TYPE_ARRAY);
> >> +    __uint(max_entries, 1);
> >> +    __type(key, __u32);
> >> +    __type(value, __u64);
> >> +} count SEC(".maps");
> >
> > Looks like a global variable can be used here?
>
> We can use global variable. But it doesn't really matter for this test.
> Any BPF program will work here. Do we really need a v6 for this change?

yes. please.
Otherwise folks will copy paste this inefficiency into future tests.
diff mbox series

Patch

diff --git a/tools/testing/selftests/bpf/prog_tests/enable_stats.c b/tools/testing/selftests/bpf/prog_tests/enable_stats.c
new file mode 100644
index 000000000000..987fc743ab75
--- /dev/null
+++ b/tools/testing/selftests/bpf/prog_tests/enable_stats.c
@@ -0,0 +1,45 @@ 
+// SPDX-License-Identifier: GPL-2.0
+#include <test_progs.h>
+#include <sys/mman.h>
+#include "test_enable_stats.skel.h"
+
+void test_enable_stats(void)
+{
+	struct test_enable_stats *skel;
+	struct bpf_prog_info info = {};
+	__u32 info_len = sizeof(info);
+	int stats_fd, err, prog_fd;
+	int duration = 0;
+
+	skel = test_enable_stats__open_and_load();
+
+	if (CHECK(!skel, "skel_open_and_load", "skeleton open/load failed\n"))
+		return;
+
+	stats_fd = bpf_enable_stats(BPF_STATS_RUNTIME_CNT);
+
+	if (CHECK(stats_fd < 0, "get_stats_fd", "failed %d\n", errno))
+		goto cleanup;
+
+	err = test_enable_stats__attach(skel);
+
+	if (CHECK(err, "attach_raw_tp", "err %d\n", err))
+		goto cleanup;
+
+	usleep(1000);
+
+	prog_fd = bpf_program__fd(skel->progs.test_enable_stats);
+	err = bpf_obj_get_info_by_fd(prog_fd, &info, &info_len);
+
+	if (CHECK(err, "get_prog_info",
+		  "failed to get bpf_prog_info for fd %d\n", prog_fd))
+		goto cleanup;
+
+	CHECK(info.run_time_ns == 0, "check_stats_enabled",
+	      "failed to enable run_time_ns stats\n");
+
+cleanup:
+	test_enable_stats__destroy(skel);
+	if (stats_fd >= 0)
+		close(stats_fd);
+}
diff --git a/tools/testing/selftests/bpf/progs/test_enable_stats.c b/tools/testing/selftests/bpf/progs/test_enable_stats.c
new file mode 100644
index 000000000000..f95ac0c94639
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/test_enable_stats.c
@@ -0,0 +1,28 @@ 
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (c) 2020 Facebook
+
+#include <linux/bpf.h>
+#include <stdint.h>
+#include <bpf/bpf_helpers.h>
+
+char _license[] SEC("license") = "GPL";
+
+struct {
+	__uint(type, BPF_MAP_TYPE_ARRAY);
+	__uint(max_entries, 1);
+	__type(key, __u32);
+	__type(value, __u64);
+} count SEC(".maps");
+
+SEC("raw_tracepoint/sys_enter")
+int test_enable_stats(void *ctx)
+{
+	__u32 key = 0;
+	__u64 *val;
+
+	val = bpf_map_lookup_elem(&count, &key);
+	if (val)
+		*val += 1;
+
+	return 0;
+}