aboutsummaryrefslogtreecommitdiffstats
path: root/tools/include/uapi/linux
diff options
context:
space:
mode:
authorAlexei Starovoitov <ast@kernel.org>2018-12-10 14:51:45 -0800
committerAlexei Starovoitov <ast@kernel.org>2018-12-10 14:51:46 -0800
commitaa570ff4fd3682d35cdcc5190c380e6c4d7d08e2 (patch)
tree5821df7fea9335a55010c21dcfba92e704c92d32 /tools/include/uapi/linux
parentbpf: clean up bpf_prog_get_info_by_fd() (diff)
parenttools/bpf: rename *_info_cnt to nr_*_info (diff)
downloadlinux-dev-aa570ff4fd3682d35cdcc5190c380e6c4d7d08e2.tar.xz
linux-dev-aa570ff4fd3682d35cdcc5190c380e6c4d7d08e2.zip
Merge branch 'rename-info_cnt-to-nr_info'
Yonghong Song says: ==================== Before func_info and line_info are added to the kernel, there are several fields in structure bpf_prog_info specifying the "count" of a user buffer, e.g., __u32 nr_jited_ksyms; __u32 nr_jited_func_lens; The naming convention has the prefix "nr_". The func_info and line_info support added several fields __u32 func_info_cnt; __u32 line_info_cnt; __u32 jited_line_info_cnt; to indicate the "count" of buffers func_info, line_info and jited_line_info. The original intention is to keep the field names the same as those in structure bpf_attr, so it will be clear that the "count" returned to user space will be the same as the one passed to the kernel during prog load. Unfortunately, the field names *_info_cnt are not consistent with other existing fields in bpf_prog_info. This patch set renamed the fields *_info_cnt to nr_*_info to keep naming convention consistent. ==================== Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to '')
-rw-r--r--tools/include/uapi/linux/bpf.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index 6ad50b6471d3..620ee1f919cf 100644
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@ -2695,11 +2695,11 @@ struct bpf_prog_info {
__u32 btf_id;
__u32 func_info_rec_size;
__aligned_u64 func_info;
- __u32 func_info_cnt;
- __u32 line_info_cnt;
+ __u32 nr_func_info;
+ __u32 nr_line_info;
__aligned_u64 line_info;
__aligned_u64 jited_line_info;
- __u32 jited_line_info_cnt;
+ __u32 nr_jited_line_info;
__u32 line_info_rec_size;
__u32 jited_line_info_rec_size;
} __attribute__((aligned(8)));