bpf: rename *_info_cnt to nr_*_info in bpf_prog_info
authorYonghong Song <yhs@fb.com>
Mon, 10 Dec 2018 22:14:08 +0000 (14:14 -0800)
committerAlexei Starovoitov <ast@kernel.org>
Mon, 10 Dec 2018 22:51:45 +0000 (14:51 -0800)
commit11d8b82d2222cade12caad2c125f23023777dcbc
tree0a7255b7e81824ff6714e6e7694f329c18a1d740
parent7a5725ddc6e18aab61f647c0996d3b7eb03ff5cb
bpf: rename *_info_cnt to nr_*_info in bpf_prog_info

In uapi bpf.h, currently we have the following fields in
the struct bpf_prog_info:
__u32 func_info_cnt;
__u32 line_info_cnt;
__u32 jited_line_info_cnt;
The above field names "func_info_cnt" and "line_info_cnt"
also appear in union bpf_attr for program loading.

The original intention is to keep the names the same
between bpf_prog_info and bpf_attr
so it will imply what we returned to user space will be
the same as what the user space passed to the kernel.

Such a naming convention in bpf_prog_info is not consistent
with other fields like:
        __u32 nr_jited_ksyms;
        __u32 nr_jited_func_lens;

This patch made this adjustment so in bpf_prog_info
newly introduced *_info_cnt becomes nr_*_info.

Acked-by: Song Liu <songliubraving@fb.com>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Signed-off-by: Yonghong Song <yhs@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
include/uapi/linux/bpf.h
kernel/bpf/syscall.c