bpf: expose program stats via bpf_prog_info

Return bpf program run_time_ns and run_cnt via bpf_prog_info

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index bcdd2474eee7549655358698cb509b95b7babc27..2e308e90ffead86979c0a6c71dcd723de0746326 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -2813,6 +2813,8 @@ struct bpf_prog_info {
        __u32 jited_line_info_rec_size;
        __u32 nr_prog_tags;
        __aligned_u64 prog_tags;
+       __u64 run_time_ns;
+       __u64 run_cnt;
 } __attribute__((aligned(8)));
 
 struct bpf_map_info {

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 31cf66fc3f5cfab93ea26265da363f6936ba6cc4..174581dfe225f102c70fe9d9896a45258277c7d5 100644 (file)
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -2152,6 +2152,7 @@ static int bpf_prog_get_info_by_fd(struct bpf_prog *prog,
        struct bpf_prog_info __user *uinfo = u64_to_user_ptr(attr->info.info);
        struct bpf_prog_info info = {};
        u32 info_len = attr->info.info_len;
+       struct bpf_prog_stats stats;
        char __user *uinsns;
        u32 ulen;
        int err;
@@ -2191,6 +2192,10 @@ static int bpf_prog_get_info_by_fd(struct bpf_prog *prog,
        if (err)
                return err;
 
+       bpf_prog_get_stats(prog, &stats);
+       info.run_time_ns = stats.nsecs;
+       info.run_cnt = stats.cnt;
+
        if (!capable(CAP_SYS_ADMIN)) {
                info.jited_prog_len = 0;
                info.xlated_prog_len = 0;