tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

selftests/bpf: Add more stats into veristat

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>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20241209130455.94592-1-mykyta.yatsenko5@gmail.com

authored by

Mykyta Yatsenko and committed by
Andrii Nakryiko 82c1f13d 442bc81b

+58 -6
+58 -6
tools/testing/selftests/bpf/veristat.c
··· 34 34 PEAK_STATES, 35 35 MAX_STATES_PER_INSN, 36 36 MARK_READ_MAX_LEN, 37 + SIZE, 38 + JITED_SIZE, 39 + STACK, 40 + PROG_TYPE, 41 + ATTACH_TYPE, 37 42 38 43 FILE_NAME, 39 44 PROG_NAME, ··· 645 640 } 646 641 647 642 static const struct stat_specs default_output_spec = { 648 - .spec_cnt = 7, 643 + .spec_cnt = 8, 649 644 .ids = { 650 645 FILE_NAME, PROG_NAME, VERDICT, DURATION, 651 - TOTAL_INSNS, TOTAL_STATES, PEAK_STATES, 646 + TOTAL_INSNS, TOTAL_STATES, SIZE, JITED_SIZE 652 647 }, 653 648 }; 654 649 655 650 static const struct stat_specs default_csv_output_spec = { 656 - .spec_cnt = 9, 651 + .spec_cnt = 14, 657 652 .ids = { 658 653 FILE_NAME, PROG_NAME, VERDICT, DURATION, 659 654 TOTAL_INSNS, TOTAL_STATES, PEAK_STATES, 660 655 MAX_STATES_PER_INSN, MARK_READ_MAX_LEN, 656 + SIZE, JITED_SIZE, PROG_TYPE, ATTACH_TYPE, 657 + STACK, 661 658 }, 662 659 }; 663 660 ··· 695 688 [PEAK_STATES] = { "Peak states", {"peak_states"}, }, 696 689 [MAX_STATES_PER_INSN] = { "Max states per insn", {"max_states_per_insn"}, }, 697 690 [MARK_READ_MAX_LEN] = { "Max mark read length", {"max_mark_read_len", "mark_read"}, }, 691 + [SIZE] = { "Program size", {"prog_size"}, }, 692 + [JITED_SIZE] = { "Jited size", {"prog_size_jited"}, }, 693 + [STACK] = {"Stack depth", {"stack_depth", "stack"}, }, 694 + [PROG_TYPE] = { "Program type", {"prog_type"}, }, 695 + [ATTACH_TYPE] = { "Attach type", {"attach_type", }, }, 698 696 }; 699 697 700 698 static bool parse_stat_id_var(const char *name, size_t len, int *id, ··· 847 835 static int parse_verif_log(char * const buf, size_t buf_sz, struct verif_stats *s) 848 836 { 849 837 const char *cur; 850 - int pos, lines; 838 + int pos, lines, sub_stack, cnt = 0; 839 + char *state = NULL, *token, stack[512]; 851 840 852 841 buf[buf_sz - 1] = '\0'; 853 842 ··· 866 853 867 854 if (1 == sscanf(cur, "verification time %ld usec\n", &s->stats[DURATION])) 868 855 continue; 869 - if (6 == sscanf(cur, "processed %ld insns (limit %*d) max_states_per_insn %ld total_states %ld peak_states %ld mark_read %ld", 856 + if (5 == sscanf(cur, "processed %ld insns (limit %*d) max_states_per_insn %ld total_states %ld peak_states %ld mark_read %ld", 870 857 &s->stats[TOTAL_INSNS], 871 858 &s->stats[MAX_STATES_PER_INSN], 872 859 &s->stats[TOTAL_STATES], 873 860 &s->stats[PEAK_STATES], 874 861 &s->stats[MARK_READ_MAX_LEN])) 875 862 continue; 876 - } 877 863 864 + if (1 == sscanf(cur, "stack depth %511s", stack)) 865 + continue; 866 + } 867 + while ((token = strtok_r(cnt++ ? NULL : stack, "+", &state))) { 868 + if (sscanf(token, "%d", &sub_stack) == 0) 869 + break; 870 + s->stats[STACK] += sub_stack; 871 + } 878 872 return 0; 879 873 } 880 874 ··· 1166 1146 char *buf; 1167 1147 int buf_sz, log_level; 1168 1148 struct verif_stats *stats; 1149 + struct bpf_prog_info info; 1150 + __u32 info_len = sizeof(info); 1169 1151 int err = 0; 1170 1152 void *tmp; 1153 + int fd; 1171 1154 1172 1155 if (!should_process_file_prog(base_filename, bpf_program__name(prog))) { 1173 1156 env.progs_skipped++; ··· 1219 1196 stats->file_name = strdup(base_filename); 1220 1197 stats->prog_name = strdup(bpf_program__name(prog)); 1221 1198 stats->stats[VERDICT] = err == 0; /* 1 - success, 0 - failure */ 1199 + stats->stats[SIZE] = bpf_program__insn_cnt(prog); 1200 + stats->stats[PROG_TYPE] = bpf_program__type(prog); 1201 + stats->stats[ATTACH_TYPE] = bpf_program__expected_attach_type(prog); 1202 + 1203 + memset(&info, 0, info_len); 1204 + fd = bpf_program__fd(prog); 1205 + if (fd > 0 && bpf_prog_get_info_by_fd(fd, &info, &info_len) == 0) 1206 + stats->stats[JITED_SIZE] = info.jited_prog_len; 1207 + 1222 1208 parse_verif_log(buf, buf_sz, stats); 1223 1209 1224 1210 if (env.verbose) { ··· 1341 1309 case PROG_NAME: 1342 1310 cmp = strcmp(s1->prog_name, s2->prog_name); 1343 1311 break; 1312 + case ATTACH_TYPE: 1313 + case PROG_TYPE: 1314 + case SIZE: 1315 + case JITED_SIZE: 1316 + case STACK: 1344 1317 case VERDICT: 1345 1318 case DURATION: 1346 1319 case TOTAL_INSNS: ··· 1560 1523 else 1561 1524 *str = s->stats[VERDICT] ? "success" : "failure"; 1562 1525 break; 1526 + case ATTACH_TYPE: 1527 + if (!s) 1528 + *str = "N/A"; 1529 + else 1530 + *str = libbpf_bpf_attach_type_str(s->stats[ATTACH_TYPE]) ?: "N/A"; 1531 + break; 1532 + case PROG_TYPE: 1533 + if (!s) 1534 + *str = "N/A"; 1535 + else 1536 + *str = libbpf_bpf_prog_type_str(s->stats[PROG_TYPE]) ?: "N/A"; 1537 + break; 1563 1538 case DURATION: 1564 1539 case TOTAL_INSNS: 1565 1540 case TOTAL_STATES: 1566 1541 case PEAK_STATES: 1567 1542 case MAX_STATES_PER_INSN: 1568 1543 case MARK_READ_MAX_LEN: 1544 + case STACK: 1545 + case SIZE: 1546 + case JITED_SIZE: 1569 1547 *val = s ? s->stats[id] : 0; 1570 1548 break; 1571 1549 default: