Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

Daniel Borkmann says:

====================
pull-request: bpf-next 2019-03-04

The following pull-request contains BPF updates for your *net-next* tree.

The main changes are:

1) Add AF_XDP support to libbpf. Rationale is to facilitate writing
   AF_XDP applications by offering higher-level APIs that hide many
   of the details of the AF_XDP uapi. Sample programs are converted
   over to this new interface as well, from Magnus.

2) Introduce a new cant_sleep() macro for annotation of functions
   that cannot sleep and use it in BPF_PROG_RUN() to assert that
   BPF programs run under preemption disabled context, from Peter.

3) Introduce per BPF prog stats in order to monitor the usage
   of BPF; this is controlled by kernel.bpf_stats_enabled sysctl
   knob where monitoring tools can make use of this to efficiently
   determine the average cost of programs, from Alexei.

4) Split up BPF selftest's test_progs similarly as we already
   did with test_verifier. This allows to further reduce merge
   conflicts in future and to get more structure into our
   quickly growing BPF selftest suite, from Stanislav.

5) Fix a bug in BTF's dedup algorithm which can cause an infinite
   loop in some circumstances; also various BPF doc fixes and
   improvements, from Andrii.

6) Various BPF sample cleanups and migration to libbpf in order
   to further isolate the old sample loader code (so we can get
   rid of it at some point), from Jakub.

7) Add a new BPF helper for BPF cgroup skb progs that allows
   to set ECN CE code point and a Host Bandwidth Manager (HBM)
   sample program for limiting the bandwidth used by v2 cgroups,
   from Lawrence.

8) Enable write access to skb->queue_mapping from tc BPF egress
   programs in order to let BPF pick TX queue, from Jesper.

9) Fix a bug in BPF spinlock handling for map-in-map which did
   not propagate spin_lock_off to the meta map, from Yonghong.

10) Fix a bug in the new per-CPU BPF prog counters to properly
    initialize stats for each CPU, from Eric.

11) Add various BPF helper prototypes to selftest's bpf_helpers.h,
    from Willem.

12) Fix various BPF samples bugs in XDP and tracing progs,
    from Toke, Daniel and Yonghong.

13) Silence preemption splat in test_bpf after BPF_PROG_RUN()
    enforces it now everywhere, from Anders.

14) Fix a signedness bug in libbpf's btf_dedup_ref_type() to
    get error handling working, from Dan.

15) Fix bpftool documentation and auto-completion with regards
    to stream_{verdict,parser} attach types, from Alban.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 37 insertions, 2 deletions

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 797a99c7493e..bc34cf9fe9ee 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -1283,24 +1283,54 @@ static int bpf_prog_release(struct inode *inode, struct file *filp)
         return 0;
 }
 
+static void bpf_prog_get_stats(const struct bpf_prog *prog,
+                               struct bpf_prog_stats *stats)
+{
+        u64 nsecs = 0, cnt = 0;
+        int cpu;
+
+        for_each_possible_cpu(cpu) {
+                const struct bpf_prog_stats *st;
+                unsigned int start;
+                u64 tnsecs, tcnt;
+
+                st = per_cpu_ptr(prog->aux->stats, cpu);
+                do {
+                        start = u64_stats_fetch_begin_irq(&st->syncp);
+                        tnsecs = st->nsecs;
+                        tcnt = st->cnt;
+                } while (u64_stats_fetch_retry_irq(&st->syncp, start));
+                nsecs += tnsecs;
+                cnt += tcnt;
+        }
+        stats->nsecs = nsecs;
+        stats->cnt = cnt;
+}
+
 #ifdef CONFIG_PROC_FS
 static void bpf_prog_show_fdinfo(struct seq_file *m, struct file *filp)
 {
         const struct bpf_prog *prog = filp->private_data;
         char prog_tag[sizeof(prog->tag) * 2 + 1] = { };
+        struct bpf_prog_stats stats;
 
+        bpf_prog_get_stats(prog, &stats);
         bin2hex(prog_tag, prog->tag, sizeof(prog->tag));
         seq_printf(m,
                    "prog_type:\t%u\n"
                    "prog_jited:\t%u\n"
                    "prog_tag:\t%s\n"
                    "memlock:\t%llu\n"
-                   "prog_id:\t%u\n",
+                   "prog_id:\t%u\n"
+                   "run_time_ns:\t%llu\n"
+                   "run_cnt:\t%llu\n",
                    prog->type,
                    prog->jited,
                    prog_tag,
                    prog->pages * 1ULL << PAGE_SHIFT,
-                   prog->aux->id);
+                   prog->aux->id,
+                   stats.nsecs,
+                   stats.cnt);
 }
 #endif
 
@@ -2122,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;
@@ -2161,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;