Skip to content

Commit cfc5424

Browse files
yonghong-songAlexei Starovoitov
yonghong-song
authored and
Alexei Starovoitov
committed
tools/bpf: rename *_info_cnt to nr_*_info
Rename all occurances of *_info_cnt field access to nr_*_info in tools directory. The local variables finfo_cnt, linfo_cnt and jited_linfo_cnt in function do_dump() of tools/bpf/bpftool/prog.c are also changed to nr_finfo, nr_linfo and nr_jited_linfo to keep naming convention consistent. Acked-by: Martin KaFai Lau <[email protected]> Signed-off-by: Yonghong Song <[email protected]> Signed-off-by: Alexei Starovoitov <[email protected]>
1 parent b4f8623 commit cfc5424

File tree

3 files changed

+56
-56
lines changed

3 files changed

+56
-56
lines changed

‎tools/bpf/bpftool/prog.c

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ static int do_dump(int argc, char **argv)
425425
{
426426
unsigned int finfo_rec_size, linfo_rec_size, jited_linfo_rec_size;
427427
void *func_info = NULL, *linfo = NULL, *jited_linfo = NULL;
428-
unsigned int finfo_cnt, linfo_cnt = 0, jited_linfo_cnt = 0;
428+
unsigned int nr_finfo, nr_linfo = 0, nr_jited_linfo = 0;
429429
struct bpf_prog_linfo *prog_linfo = NULL;
430430
unsigned long *func_ksyms = NULL;
431431
struct bpf_prog_info info = {};
@@ -537,10 +537,10 @@ static int do_dump(int argc, char **argv)
537537
}
538538
}
539539

540-
finfo_cnt = info.func_info_cnt;
540+
nr_finfo = info.nr_func_info;
541541
finfo_rec_size = info.func_info_rec_size;
542-
if (finfo_cnt && finfo_rec_size) {
543-
func_info = malloc(finfo_cnt * finfo_rec_size);
542+
if (nr_finfo && finfo_rec_size) {
543+
func_info = malloc(nr_finfo * finfo_rec_size);
544544
if (!func_info) {
545545
p_err("mem alloc failed");
546546
close(fd);
@@ -549,9 +549,9 @@ static int do_dump(int argc, char **argv)
549549
}
550550

551551
linfo_rec_size = info.line_info_rec_size;
552-
if (info.line_info_cnt && linfo_rec_size && info.btf_id) {
553-
linfo_cnt = info.line_info_cnt;
554-
linfo = malloc(linfo_cnt * linfo_rec_size);
552+
if (info.nr_line_info && linfo_rec_size && info.btf_id) {
553+
nr_linfo = info.nr_line_info;
554+
linfo = malloc(nr_linfo * linfo_rec_size);
555555
if (!linfo) {
556556
p_err("mem alloc failed");
557557
close(fd);
@@ -560,13 +560,13 @@ static int do_dump(int argc, char **argv)
560560
}
561561

562562
jited_linfo_rec_size = info.jited_line_info_rec_size;
563-
if (info.jited_line_info_cnt &&
563+
if (info.nr_jited_line_info &&
564564
jited_linfo_rec_size &&
565565
info.nr_jited_ksyms &&
566566
info.nr_jited_func_lens &&
567567
info.btf_id) {
568-
jited_linfo_cnt = info.jited_line_info_cnt;
569-
jited_linfo = malloc(jited_linfo_cnt * jited_linfo_rec_size);
568+
nr_jited_linfo = info.nr_jited_line_info;
569+
jited_linfo = malloc(nr_jited_linfo * jited_linfo_rec_size);
570570
if (!jited_linfo) {
571571
p_err("mem alloc failed");
572572
close(fd);
@@ -582,13 +582,13 @@ static int do_dump(int argc, char **argv)
582582
info.nr_jited_ksyms = nr_func_ksyms;
583583
info.jited_func_lens = ptr_to_u64(func_lens);
584584
info.nr_jited_func_lens = nr_func_lens;
585-
info.func_info_cnt = finfo_cnt;
585+
info.nr_func_info = nr_finfo;
586586
info.func_info_rec_size = finfo_rec_size;
587587
info.func_info = ptr_to_u64(func_info);
588-
info.line_info_cnt = linfo_cnt;
588+
info.nr_line_info = nr_linfo;
589589
info.line_info_rec_size = linfo_rec_size;
590590
info.line_info = ptr_to_u64(linfo);
591-
info.jited_line_info_cnt = jited_linfo_cnt;
591+
info.nr_jited_line_info = nr_jited_linfo;
592592
info.jited_line_info_rec_size = jited_linfo_rec_size;
593593
info.jited_line_info = ptr_to_u64(jited_linfo);
594594

@@ -614,9 +614,9 @@ static int do_dump(int argc, char **argv)
614614
goto err_free;
615615
}
616616

617-
if (info.func_info_cnt != finfo_cnt) {
618-
p_err("incorrect func_info_cnt %d vs. expected %d",
619-
info.func_info_cnt, finfo_cnt);
617+
if (info.nr_func_info != nr_finfo) {
618+
p_err("incorrect nr_func_info %d vs. expected %d",
619+
info.nr_func_info, nr_finfo);
620620
goto err_free;
621621
}
622622

@@ -630,12 +630,12 @@ static int do_dump(int argc, char **argv)
630630
/* kernel.kptr_restrict is set. No func_info available. */
631631
free(func_info);
632632
func_info = NULL;
633-
finfo_cnt = 0;
633+
nr_finfo = 0;
634634
}
635635

636-
if (linfo && info.line_info_cnt != linfo_cnt) {
637-
p_err("incorrect line_info_cnt %u vs. expected %u",
638-
info.line_info_cnt, linfo_cnt);
636+
if (linfo && info.nr_line_info != nr_linfo) {
637+
p_err("incorrect nr_line_info %u vs. expected %u",
638+
info.nr_line_info, nr_linfo);
639639
goto err_free;
640640
}
641641

@@ -645,9 +645,9 @@ static int do_dump(int argc, char **argv)
645645
goto err_free;
646646
}
647647

648-
if (jited_linfo && info.jited_line_info_cnt != jited_linfo_cnt) {
649-
p_err("incorrect jited_line_info_cnt %u vs. expected %u",
650-
info.jited_line_info_cnt, jited_linfo_cnt);
648+
if (jited_linfo && info.nr_jited_line_info != nr_jited_linfo) {
649+
p_err("incorrect nr_jited_line_info %u vs. expected %u",
650+
info.nr_jited_line_info, nr_jited_linfo);
651651
goto err_free;
652652
}
653653

@@ -670,7 +670,7 @@ static int do_dump(int argc, char **argv)
670670
goto err_free;
671671
}
672672

673-
if (linfo_cnt) {
673+
if (nr_linfo) {
674674
prog_linfo = bpf_prog_linfo__new(&info);
675675
if (!prog_linfo)
676676
p_info("error in processing bpf_line_info. continue without it.");

‎tools/lib/bpf/bpf_prog_linfo.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ struct bpf_prog_linfo *bpf_prog_linfo__new(const struct bpf_prog_info *info)
105105
struct bpf_prog_linfo *prog_linfo;
106106
__u32 nr_linfo, nr_jited_func;
107107

108-
nr_linfo = info->line_info_cnt;
108+
nr_linfo = info->nr_line_info;
109109

110110
/*
111111
* Test !info->line_info because the kernel may NULL
@@ -138,7 +138,7 @@ struct bpf_prog_linfo *bpf_prog_linfo__new(const struct bpf_prog_info *info)
138138
nr_jited_func = info->nr_jited_ksyms;
139139
if (!nr_jited_func ||
140140
!info->jited_line_info ||
141-
info->jited_line_info_cnt != nr_linfo ||
141+
info->nr_jited_line_info != nr_linfo ||
142142
info->jited_line_info_rec_size < sizeof(__u64) ||
143143
info->nr_jited_func_lens != nr_jited_func ||
144144
!info->jited_ksyms ||

‎tools/testing/selftests/bpf/test_btf.c

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2548,9 +2548,9 @@ static int do_test_file(unsigned int test_num)
25482548
err = -1;
25492549
goto done;
25502550
}
2551-
if (CHECK(info.func_info_cnt != 3,
2552-
"incorrect info.func_info_cnt (1st) %d",
2553-
info.func_info_cnt)) {
2551+
if (CHECK(info.nr_func_info != 3,
2552+
"incorrect info.nr_func_info (1st) %d",
2553+
info.nr_func_info)) {
25542554
err = -1;
25552555
goto done;
25562556
}
@@ -2561,15 +2561,15 @@ static int do_test_file(unsigned int test_num)
25612561
goto done;
25622562
}
25632563

2564-
func_info = malloc(info.func_info_cnt * rec_size);
2564+
func_info = malloc(info.nr_func_info * rec_size);
25652565
if (CHECK(!func_info, "out of memory")) {
25662566
err = -1;
25672567
goto done;
25682568
}
25692569

25702570
/* reset info to only retrieve func_info related data */
25712571
memset(&info, 0, sizeof(info));
2572-
info.func_info_cnt = 3;
2572+
info.nr_func_info = 3;
25732573
info.func_info_rec_size = rec_size;
25742574
info.func_info = ptr_to_u64(func_info);
25752575

@@ -2580,9 +2580,9 @@ static int do_test_file(unsigned int test_num)
25802580
err = -1;
25812581
goto done;
25822582
}
2583-
if (CHECK(info.func_info_cnt != 3,
2584-
"incorrect info.func_info_cnt (2nd) %d",
2585-
info.func_info_cnt)) {
2583+
if (CHECK(info.nr_func_info != 3,
2584+
"incorrect info.nr_func_info (2nd) %d",
2585+
info.nr_func_info)) {
25862586
err = -1;
25872587
goto done;
25882588
}
@@ -3544,9 +3544,9 @@ static int test_get_finfo(const struct prog_info_raw_test *test,
35443544
fprintf(stderr, "%s\n", btf_log_buf);
35453545
return -1;
35463546
}
3547-
if (CHECK(info.func_info_cnt != test->func_info_cnt,
3548-
"incorrect info.func_info_cnt (1st) %d",
3549-
info.func_info_cnt)) {
3547+
if (CHECK(info.nr_func_info != test->func_info_cnt,
3548+
"incorrect info.nr_func_info (1st) %d",
3549+
info.nr_func_info)) {
35503550
return -1;
35513551
}
35523552

@@ -3556,16 +3556,16 @@ static int test_get_finfo(const struct prog_info_raw_test *test,
35563556
return -1;
35573557
}
35583558

3559-
if (!info.func_info_cnt)
3559+
if (!info.nr_func_info)
35603560
return 0;
35613561

3562-
func_info = malloc(info.func_info_cnt * rec_size);
3562+
func_info = malloc(info.nr_func_info * rec_size);
35633563
if (CHECK(!func_info, "out of memory"))
35643564
return -1;
35653565

35663566
/* reset info to only retrieve func_info related data */
35673567
memset(&info, 0, sizeof(info));
3568-
info.func_info_cnt = test->func_info_cnt;
3568+
info.nr_func_info = test->func_info_cnt;
35693569
info.func_info_rec_size = rec_size;
35703570
info.func_info = ptr_to_u64(func_info);
35713571
err = bpf_obj_get_info_by_fd(prog_fd, &info, &info_len);
@@ -3574,9 +3574,9 @@ static int test_get_finfo(const struct prog_info_raw_test *test,
35743574
err = -1;
35753575
goto done;
35763576
}
3577-
if (CHECK(info.func_info_cnt != test->func_info_cnt,
3578-
"incorrect info.func_info_cnt (2nd) %d",
3579-
info.func_info_cnt)) {
3577+
if (CHECK(info.nr_func_info != test->func_info_cnt,
3578+
"incorrect info.nr_func_info (2nd) %d",
3579+
info.nr_func_info)) {
35803580
err = -1;
35813581
goto done;
35823582
}
@@ -3648,14 +3648,14 @@ static int test_get_linfo(const struct prog_info_raw_test *test,
36483648
nr_jited_func_lens = 1;
36493649
}
36503650

3651-
if (CHECK(info.line_info_cnt != cnt ||
3652-
info.jited_line_info_cnt != jited_cnt ||
3651+
if (CHECK(info.nr_line_info != cnt ||
3652+
info.nr_jited_line_info != jited_cnt ||
36533653
info.nr_jited_ksyms != nr_jited_ksyms ||
36543654
info.nr_jited_func_lens != nr_jited_func_lens ||
3655-
(!info.line_info_cnt && info.jited_line_info_cnt),
3656-
"info: line_info_cnt:%u(expected:%u) jited_line_info_cnt:%u(expected:%u) nr_jited_ksyms:%u(expected:%u) nr_jited_func_lens:%u(expected:%u)",
3657-
info.line_info_cnt, cnt,
3658-
info.jited_line_info_cnt, jited_cnt,
3655+
(!info.nr_line_info && info.nr_jited_line_info),
3656+
"info: nr_line_info:%u(expected:%u) nr_jited_line_info:%u(expected:%u) nr_jited_ksyms:%u(expected:%u) nr_jited_func_lens:%u(expected:%u)",
3657+
info.nr_line_info, cnt,
3658+
info.nr_jited_line_info, jited_cnt,
36593659
info.nr_jited_ksyms, nr_jited_ksyms,
36603660
info.nr_jited_func_lens, nr_jited_func_lens)) {
36613661
err = -1;
@@ -3684,7 +3684,7 @@ static int test_get_linfo(const struct prog_info_raw_test *test,
36843684
err = -1;
36853685
goto done;
36863686
}
3687-
info.line_info_cnt = cnt;
3687+
info.nr_line_info = cnt;
36883688
info.line_info_rec_size = rec_size;
36893689
info.line_info = ptr_to_u64(linfo);
36903690

@@ -3700,7 +3700,7 @@ static int test_get_linfo(const struct prog_info_raw_test *test,
37003700
goto done;
37013701
}
37023702

3703-
info.jited_line_info_cnt = jited_cnt;
3703+
info.nr_jited_line_info = jited_cnt;
37043704
info.jited_line_info_rec_size = jited_rec_size;
37053705
info.jited_line_info = ptr_to_u64(jited_linfo);
37063706
info.nr_jited_ksyms = nr_jited_ksyms;
@@ -3717,15 +3717,15 @@ static int test_get_linfo(const struct prog_info_raw_test *test,
37173717
*/
37183718
if (CHECK(err == -1 ||
37193719
!info.line_info ||
3720-
info.line_info_cnt != cnt ||
3720+
info.nr_line_info != cnt ||
37213721
(jited_cnt && !info.jited_line_info) ||
3722-
info.jited_line_info_cnt != jited_cnt ||
3722+
info.nr_jited_line_info != jited_cnt ||
37233723
info.line_info_rec_size != rec_size ||
37243724
info.jited_line_info_rec_size != jited_rec_size,
3725-
"err:%d errno:%d info: line_info_cnt:%u(expected:%u) jited_line_info_cnt:%u(expected:%u) line_info_rec_size:%u(expected:%u) jited_linfo_rec_size:%u(expected:%u) line_info:%p jited_line_info:%p",
3725+
"err:%d errno:%d info: nr_line_info:%u(expected:%u) nr_jited_line_info:%u(expected:%u) line_info_rec_size:%u(expected:%u) jited_linfo_rec_size:%u(expected:%u) line_info:%p jited_line_info:%p",
37263726
err, errno,
3727-
info.line_info_cnt, cnt,
3728-
info.jited_line_info_cnt, jited_cnt,
3727+
info.nr_line_info, cnt,
3728+
info.nr_jited_line_info, jited_cnt,
37293729
info.line_info_rec_size, rec_size,
37303730
info.jited_line_info_rec_size, jited_rec_size,
37313731
(void *)(long)info.line_info,

0 commit comments

Comments
 (0)