diff mbox series

[bpf-next,v2] selftests/bpf: add more stats into veristat

Message ID 20241206134929.89997-1-mykyta.yatsenko5@gmail.com (mailing list archive)
State Superseded
Delegated to: BPF
Headers show
Series [bpf-next,v2] selftests/bpf: add more stats into veristat | expand

Checks

Context Check Description
bpf/vmtest-bpf-next-PR success PR summary
netdev/series_format success Single patches do not need cover letters
netdev/tree_selection success Clearly marked for bpf-next
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/build_tools success Errors and warnings before: 0 (+0) this patch: 0 (+0)
netdev/cc_maintainers warning 12 maintainers not CCed: haoluo@google.com jolsa@kernel.org mykolal@fb.com yonghong.song@linux.dev kpsingh@kernel.org song@kernel.org sdf@fomichev.me eddyz87@gmail.com linux-kselftest@vger.kernel.org shuah@kernel.org martin.lau@linux.dev john.fastabend@gmail.com
netdev/build_clang success Errors and warnings before: 0 this patch: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/checkpatch warning WARNING: Comparisons should place the constant on the right side of the test WARNING: Prefer kstrto<type> to single variable sscanf WARNING: line length of 142 exceeds 80 columns WARNING: line length of 87 exceeds 80 columns WARNING: line length of 91 exceeds 80 columns
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
bpf/vmtest-bpf-next-VM_Test-15 success Logs for s390x-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-33 success Logs for x86_64-llvm-17 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-34 success Logs for x86_64-llvm-17 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-41 success Logs for x86_64-llvm-18 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-42 success Logs for x86_64-llvm-18 / test (test_progs_cpuv4, false, 360) / test_progs_cpuv4 on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-43 success Logs for x86_64-llvm-18 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-1 success Logs for ShellCheck
bpf/vmtest-bpf-next-VM_Test-0 success Logs for Lint
bpf/vmtest-bpf-next-VM_Test-2 success Logs for Unittests
bpf/vmtest-bpf-next-VM_Test-3 success Logs for Validate matrix.py
bpf/vmtest-bpf-next-VM_Test-5 success Logs for aarch64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-6 success Logs for aarch64-gcc / test (test_maps, false, 360) / test_maps on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-4 success Logs for aarch64-gcc / build / build for aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-9 success Logs for aarch64-gcc / test (test_verifier, false, 360) / test_verifier on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-11 success Logs for aarch64-gcc / veristat-meta
bpf/vmtest-bpf-next-VM_Test-12 success Logs for s390x-gcc / build / build for s390x with gcc
bpf/vmtest-bpf-next-VM_Test-13 success Logs for s390x-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-10 success Logs for aarch64-gcc / veristat-kernel
bpf/vmtest-bpf-next-VM_Test-17 success Logs for s390x-gcc / veristat-kernel
bpf/vmtest-bpf-next-VM_Test-16 success Logs for s390x-gcc / test (test_verifier, false, 360) / test_verifier on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-18 success Logs for s390x-gcc / veristat-meta
bpf/vmtest-bpf-next-VM_Test-20 success Logs for x86_64-gcc / build / build for x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-19 success Logs for set-matrix
bpf/vmtest-bpf-next-VM_Test-21 success Logs for x86_64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-30 success Logs for x86_64-llvm-17 / build / build for x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-31 success Logs for x86_64-llvm-17 / build-release / build for x86_64 with llvm-17-O2
bpf/vmtest-bpf-next-VM_Test-36 success Logs for x86_64-llvm-17 / veristat-kernel
bpf/vmtest-bpf-next-VM_Test-39 success Logs for x86_64-llvm-18 / build-release / build for x86_64 with llvm-18-O2
bpf/vmtest-bpf-next-VM_Test-38 success Logs for x86_64-llvm-18 / build / build for x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-37 success Logs for x86_64-llvm-17 / veristat-meta
bpf/vmtest-bpf-next-VM_Test-46 success Logs for x86_64-llvm-18 / veristat-meta
bpf/vmtest-bpf-next-VM_Test-45 success Logs for x86_64-llvm-18 / veristat-kernel
bpf/vmtest-bpf-next-VM_Test-7 success Logs for aarch64-gcc / test (test_progs, false, 360) / test_progs on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-8 success Logs for aarch64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-14 success Logs for s390x-gcc / test (test_progs, false, 360) / test_progs on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-22 success Logs for x86_64-gcc / test (test_maps, false, 360) / test_maps on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-23 success Logs for x86_64-gcc / test (test_progs, false, 360) / test_progs on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-24 success Logs for x86_64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-25 success Logs for x86_64-gcc / test (test_progs_no_alu32_parallel, true, 30) / test_progs_no_alu32_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-27 success Logs for x86_64-gcc / test (test_verifier, false, 360) / test_verifier on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-29 success Logs for x86_64-gcc / veristat-meta / x86_64-gcc veristat_meta
bpf/vmtest-bpf-next-VM_Test-26 success Logs for x86_64-gcc / test (test_progs_parallel, true, 30) / test_progs_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-28 success Logs for x86_64-gcc / veristat-kernel / x86_64-gcc veristat_kernel
bpf/vmtest-bpf-next-VM_Test-32 success Logs for x86_64-llvm-17 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-35 success Logs for x86_64-llvm-17 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-44 success Logs for x86_64-llvm-18 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-40 success Logs for x86_64-llvm-18 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-18

Commit Message

Mykyta Yatsenko Dec. 6, 2024, 1:49 p.m. UTC 
From: Mykyta Yatsenko <yatsenko@meta.com>

Extend veristat to collect and print more stats, namely:
  - program size in instructions
  - jited program size in bytes
  - program type
  - attach type
  - stack depth

Signed-off-by: Mykyta Yatsenko <yatsenko@meta.com>
---
 tools/testing/selftests/bpf/veristat.c | 68 +++++++++++++++++++++++---
 1 file changed, 62 insertions(+), 6 deletions(-)

Comments

Andrii Nakryiko Dec. 6, 2024, 10:25 p.m. UTC | #1 
On Fri, Dec 6, 2024 at 5:51 AM Mykyta Yatsenko
<mykyta.yatsenko5@gmail.com> wrote:
>
> From: Mykyta Yatsenko <yatsenko@meta.com>
>
> Extend veristat to collect and print more stats, namely:
>   - program size in instructions
>   - jited program size in bytes
>   - program type
>   - attach type
>   - stack depth
>
> Signed-off-by: Mykyta Yatsenko <yatsenko@meta.com>
> ---
>  tools/testing/selftests/bpf/veristat.c | 68 +++++++++++++++++++++++---
>  1 file changed, 62 insertions(+), 6 deletions(-)
>

looks good besides the PATH_MAX use, let's fix that (plus a few
nitpicks with style).

pw-bot: cr

> diff --git a/tools/testing/selftests/bpf/veristat.c b/tools/testing/selftests/bpf/veristat.c
> index e12ef953fba8..cda8c83ebf24 100644
> --- a/tools/testing/selftests/bpf/veristat.c
> +++ b/tools/testing/selftests/bpf/veristat.c

[...]

> @@ -688,6 +698,11 @@ static struct stat_def {
>         [PEAK_STATES] = { "Peak states", {"peak_states"}, },
>         [MAX_STATES_PER_INSN] = { "Max states per insn", {"max_states_per_insn"}, },
>         [MARK_READ_MAX_LEN] = { "Max mark read length", {"max_mark_read_len", "mark_read"}, },
> +       [SIZE] = { "Prog size", {"prog_size"}, },

nit: "Prog size" -> "Program size", this is UI ;)

> +       [JITED_SIZE] = { "Jited size", {"prog_size_jited"}, },
> +       [STACK] = {"Stack depth", {"stack_depth", "stack"}, },
> +       [PROG_TYPE] = { "Program type", {"prog_type"}, },
> +       [ATTACH_TYPE] = { "Attach type", {"attach_type", }, },
>  };
>
>  static bool parse_stat_id_var(const char *name, size_t len, int *id,
> @@ -835,7 +850,8 @@ static char verif_log_buf[64 * 1024];
>  static int parse_verif_log(char * const buf, size_t buf_sz, struct verif_stats *s)
>  {
>         const char *cur;
> -       int pos, lines;
> +       int pos, lines, sub_stack;
> +       char *save_ptr, *token, stack[PATH_MAX + 1] = {'\0'};

PATH_MAX is both an overkill and is unrelated to stack depth string.
Let's just hard-code it to something like 256 or 512, and drop the
STR/_STR stuff

>
>         buf[buf_sz - 1] = '\0';
>
> @@ -853,15 +869,24 @@ static int parse_verif_log(char * const buf, size_t buf_sz, struct verif_stats *
>
>                 if (1 == sscanf(cur, "verification time %ld usec\n", &s->stats[DURATION]))
>                         continue;
> -               if (6 == sscanf(cur, "processed %ld insns (limit %*d) max_states_per_insn %ld total_states %ld peak_states %ld mark_read %ld",
> +               if (5 == sscanf(cur, "processed %ld insns (limit %*d) max_states_per_insn %ld total_states %ld peak_states %ld mark_read %ld",
>                                 &s->stats[TOTAL_INSNS],
>                                 &s->stats[MAX_STATES_PER_INSN],
>                                 &s->stats[TOTAL_STATES],
>                                 &s->stats[PEAK_STATES],
>                                 &s->stats[MARK_READ_MAX_LEN]))
>                         continue;
> -       }
>
> +               if (1 == sscanf(cur, "stack depth %" STR(PATH_MAX) "s", stack))
> +                       continue;
> +       }
> +       token = strtok_r(stack, "+", &save_ptr);
> +       while (token && token - stack < PATH_MAX) {

why this PATH_MAX condition? I'm not following what we are guarding
against here, tbh

> +               if (sscanf(token, "%d", &sub_stack) == 0)
> +                       break;
> +               s->stats[STACK] += sub_stack;
> +               token = strtok_r(NULL, "+", &save_ptr);
> +       }

for the strtok_r() loop, see parse_stats(), I think it's nicer than
having to separate strtok_r() calls

>         return 0;
>  }
>
> @@ -1146,8 +1171,11 @@ static int process_prog(const char *filename, struct bpf_object *obj, struct bpf
>         char *buf;
>         int buf_sz, log_level;
>         struct verif_stats *stats;
> +       struct bpf_prog_info info;
> +       __u32 info_len = sizeof(info);
>         int err = 0;
>         void *tmp;
> +       int fd;
>
>         if (!should_process_file_prog(base_filename, bpf_program__name(prog))) {
>                 env.progs_skipped++;
> @@ -1196,6 +1224,14 @@ static int process_prog(const char *filename, struct bpf_object *obj, struct bpf
>         stats->file_name = strdup(base_filename);
>         stats->prog_name = strdup(bpf_program__name(prog));
>         stats->stats[VERDICT] = err == 0; /* 1 - success, 0 - failure */
> +       stats->stats[SIZE] = bpf_program__insn_cnt(prog);
> +       stats->stats[PROG_TYPE] = bpf_program__type(prog);
> +       stats->stats[ATTACH_TYPE] = bpf_program__expected_attach_type(prog);

styling nit: I'd add an empty line here to separate multi-line
jited_size logic a bit

> +       fd = bpf_program__fd(prog);
> +       memset(&info, 0, info_len);

styling nit: and I'd invert here to keep fd > 0 check right next to fd
= assignment

> +       if (fd > 0 && bpf_prog_get_info_by_fd(fd, &info, &info_len) == 0)
> +               stats->stats[JITED_SIZE] = info.jited_prog_len;
> +
>         parse_verif_log(buf, buf_sz, stats);
>
>         if (env.verbose) {
> @@ -1309,6 +1345,11 @@ static int cmp_stat(const struct verif_stats *s1, const struct verif_stats *s2,
>         case PROG_NAME:
>                 cmp = strcmp(s1->prog_name, s2->prog_name);
>                 break;
> +       case ATTACH_TYPE:
> +       case PROG_TYPE:
> +       case SIZE:
> +       case JITED_SIZE:
> +       case STACK:
>         case VERDICT:
>         case DURATION:
>         case TOTAL_INSNS:
> @@ -1523,12 +1564,27 @@ static void prepare_value(const struct verif_stats *s, enum stat_id id,
>                 else
>                         *str = s->stats[VERDICT] ? "success" : "failure";
>                 break;
> +       case ATTACH_TYPE:
> +               if (!s)
> +                       *str = "N/A";
> +               else
> +                       *str = libbpf_bpf_attach_type_str(s->stats[ATTACH_TYPE]) ? : "N/A";
> +               break;
> +       case PROG_TYPE:
> +               if (!s)
> +                       *str = "N/A";
> +               else
> +                       *str = libbpf_bpf_prog_type_str(s->stats[PROG_TYPE]) ? : "N/A";

another nitpick: we normally have "?:" together without a space
between those characters

> +               break;
>         case DURATION:
>         case TOTAL_INSNS:
>         case TOTAL_STATES:
>         case PEAK_STATES:
>         case MAX_STATES_PER_INSN:
>         case MARK_READ_MAX_LEN:
> +       case STACK:
> +       case SIZE:
> +       case JITED_SIZE:
>                 *val = s ? s->stats[id] : 0;
>                 break;
>         default:
> --
> 2.47.1
>
diff mbox series

Patch

diff --git a/tools/testing/selftests/bpf/veristat.c b/tools/testing/selftests/bpf/veristat.c
index e12ef953fba8..cda8c83ebf24 100644
--- a/tools/testing/selftests/bpf/veristat.c
+++ b/tools/testing/selftests/bpf/veristat.c
@@ -26,6 +26,9 @@ 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 #endif
 
+#define _STR(x) #x
+#define STR(x) _STR(x)
+
 enum stat_id {
 	VERDICT,
 	DURATION,
@@ -34,6 +37,11 @@  enum stat_id {
 	PEAK_STATES,
 	MAX_STATES_PER_INSN,
 	MARK_READ_MAX_LEN,
+	SIZE,
+	JITED_SIZE,
+	STACK,
+	PROG_TYPE,
+	ATTACH_TYPE,
 
 	FILE_NAME,
 	PROG_NAME,
@@ -640,19 +648,21 @@  static int append_filter_file(const char *path)
 }
 
 static const struct stat_specs default_output_spec = {
-	.spec_cnt = 7,
+	.spec_cnt = 8,
 	.ids = {
 		FILE_NAME, PROG_NAME, VERDICT, DURATION,
-		TOTAL_INSNS, TOTAL_STATES, PEAK_STATES,
+		TOTAL_INSNS, TOTAL_STATES, SIZE, JITED_SIZE
 	},
 };
 
 static const struct stat_specs default_csv_output_spec = {
-	.spec_cnt = 9,
+	.spec_cnt = 14,
 	.ids = {
 		FILE_NAME, PROG_NAME, VERDICT, DURATION,
 		TOTAL_INSNS, TOTAL_STATES, PEAK_STATES,
 		MAX_STATES_PER_INSN, MARK_READ_MAX_LEN,
+		SIZE, JITED_SIZE, PROG_TYPE, ATTACH_TYPE,
+		STACK,
 	},
 };
 
@@ -688,6 +698,11 @@  static struct stat_def {
 	[PEAK_STATES] = { "Peak states", {"peak_states"}, },
 	[MAX_STATES_PER_INSN] = { "Max states per insn", {"max_states_per_insn"}, },
 	[MARK_READ_MAX_LEN] = { "Max mark read length", {"max_mark_read_len", "mark_read"}, },
+	[SIZE] = { "Prog size", {"prog_size"}, },
+	[JITED_SIZE] = { "Jited size", {"prog_size_jited"}, },
+	[STACK] = {"Stack depth", {"stack_depth", "stack"}, },
+	[PROG_TYPE] = { "Program type", {"prog_type"}, },
+	[ATTACH_TYPE] = { "Attach type", {"attach_type", }, },
 };
 
 static bool parse_stat_id_var(const char *name, size_t len, int *id,
@@ -835,7 +850,8 @@  static char verif_log_buf[64 * 1024];
 static int parse_verif_log(char * const buf, size_t buf_sz, struct verif_stats *s)
 {
 	const char *cur;
-	int pos, lines;
+	int pos, lines, sub_stack;
+	char *save_ptr, *token, stack[PATH_MAX + 1] = {'\0'};
 
 	buf[buf_sz - 1] = '\0';
 
@@ -853,15 +869,24 @@  static int parse_verif_log(char * const buf, size_t buf_sz, struct verif_stats *
 
 		if (1 == sscanf(cur, "verification time %ld usec\n", &s->stats[DURATION]))
 			continue;
-		if (6 == sscanf(cur, "processed %ld insns (limit %*d) max_states_per_insn %ld total_states %ld peak_states %ld mark_read %ld",
+		if (5 == sscanf(cur, "processed %ld insns (limit %*d) max_states_per_insn %ld total_states %ld peak_states %ld mark_read %ld",
 				&s->stats[TOTAL_INSNS],
 				&s->stats[MAX_STATES_PER_INSN],
 				&s->stats[TOTAL_STATES],
 				&s->stats[PEAK_STATES],
 				&s->stats[MARK_READ_MAX_LEN]))
 			continue;
-	}
 
+		if (1 == sscanf(cur, "stack depth %" STR(PATH_MAX) "s", stack))
+			continue;
+	}
+	token = strtok_r(stack, "+", &save_ptr);
+	while (token && token - stack < PATH_MAX) {
+		if (sscanf(token, "%d", &sub_stack) == 0)
+			break;
+		s->stats[STACK] += sub_stack;
+		token = strtok_r(NULL, "+", &save_ptr);
+	}
 	return 0;
 }
 
@@ -1146,8 +1171,11 @@  static int process_prog(const char *filename, struct bpf_object *obj, struct bpf
 	char *buf;
 	int buf_sz, log_level;
 	struct verif_stats *stats;
+	struct bpf_prog_info info;
+	__u32 info_len = sizeof(info);
 	int err = 0;
 	void *tmp;
+	int fd;
 
 	if (!should_process_file_prog(base_filename, bpf_program__name(prog))) {
 		env.progs_skipped++;
@@ -1196,6 +1224,14 @@  static int process_prog(const char *filename, struct bpf_object *obj, struct bpf
 	stats->file_name = strdup(base_filename);
 	stats->prog_name = strdup(bpf_program__name(prog));
 	stats->stats[VERDICT] = err == 0; /* 1 - success, 0 - failure */
+	stats->stats[SIZE] = bpf_program__insn_cnt(prog);
+	stats->stats[PROG_TYPE] = bpf_program__type(prog);
+	stats->stats[ATTACH_TYPE] = bpf_program__expected_attach_type(prog);
+	fd = bpf_program__fd(prog);
+	memset(&info, 0, info_len);
+	if (fd > 0 && bpf_prog_get_info_by_fd(fd, &info, &info_len) == 0)
+		stats->stats[JITED_SIZE] = info.jited_prog_len;
+
 	parse_verif_log(buf, buf_sz, stats);
 
 	if (env.verbose) {
@@ -1309,6 +1345,11 @@  static int cmp_stat(const struct verif_stats *s1, const struct verif_stats *s2,
 	case PROG_NAME:
 		cmp = strcmp(s1->prog_name, s2->prog_name);
 		break;
+	case ATTACH_TYPE:
+	case PROG_TYPE:
+	case SIZE:
+	case JITED_SIZE:
+	case STACK:
 	case VERDICT:
 	case DURATION:
 	case TOTAL_INSNS:
@@ -1523,12 +1564,27 @@  static void prepare_value(const struct verif_stats *s, enum stat_id id,
 		else
 			*str = s->stats[VERDICT] ? "success" : "failure";
 		break;
+	case ATTACH_TYPE:
+		if (!s)
+			*str = "N/A";
+		else
+			*str = libbpf_bpf_attach_type_str(s->stats[ATTACH_TYPE]) ? : "N/A";
+		break;
+	case PROG_TYPE:
+		if (!s)
+			*str = "N/A";
+		else
+			*str = libbpf_bpf_prog_type_str(s->stats[PROG_TYPE]) ? : "N/A";
+		break;
 	case DURATION:
 	case TOTAL_INSNS:
 	case TOTAL_STATES:
 	case PEAK_STATES:
 	case MAX_STATES_PER_INSN:
 	case MARK_READ_MAX_LEN:
+	case STACK:
+	case SIZE:
+	case JITED_SIZE:
 		*val = s ? s->stats[id] : 0;
 		break;
 	default: