Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf changes from Ingo Molnar:
 "Core kernel changes:

   - One of the more interesting features in this cycle is the ability
     to attach eBPF programs (user-defined, sandboxed bytecode executed
     by the kernel) to kprobes.

     This allows user-defined instrumentation on a live kernel image
     that can never crash, hang or interfere with the kernel negatively.
     (Right now it's limited to root-only, but in the future we might
     allow unprivileged use as well.)

     (Alexei Starovoitov)

   - Another non-trivial feature is per event clockid support: this
     allows, amongst other things, the selection of different clock
     sources for event timestamps traced via perf.

     This feature is sought by people who'd like to merge perf generated
     events with external events that were measured with different
     clocks:

       - cluster wide profiling

       - for system wide tracing with user-space events,

       - JIT profiling events

     etc.  Matching perf tooling support is added as well, available via
     the -k, --clockid <clockid> parameter to perf record et al.

     (Peter Zijlstra)

  Hardware enablement kernel changes:

   - x86 Intel Processor Trace (PT) support: which is a hardware tracer
     on steroids, available on Broadwell CPUs.

     The hardware trace stream is directly output into the user-space
     ring-buffer, using the 'AUX' data format extension that was added
     to the perf core to support hardware constraints such as the
     necessity to have the tracing buffer physically contiguous.

     This patch-set was developed for two years and this is the result.
     A simple way to make use of this is to use BTS tracing, the PT
     driver emulates BTS output - available via the 'intel_bts' PMU.
     More explicit PT specific tooling support is in the works as well -
     will probably be ready by 4.2.

     (Alexander Shishkin, Peter Zijlstra)

   - x86 Intel Cache QoS Monitoring (CQM) support: this is a hardware
     feature of Intel Xeon CPUs that allows the measurement and
     allocation/partitioning of caches to individual workloads.

     These kernel changes expose the measurement side as a new PMU
     driver, which exposes various QoS related PMU events.  (The
     partitioning change is work in progress and is planned to be merged
     as a cgroup extension.)

     (Matt Fleming, Peter Zijlstra; CPU feature detection by Peter P
     Waskiewicz Jr)

   - x86 Intel Haswell LBR call stack support: this is a new Haswell
     feature that allows the hardware recording of call chains, plus
     tooling support.  To activate this feature you have to enable it
     via the new 'lbr' call-graph recording option:

        perf record --call-graph lbr
        perf report

     or:

        perf top --call-graph lbr

     This hardware feature is a lot faster than stack walk or dwarf
     based unwinding, but has some limitations:

       - It reuses the current LBR facility, so LBR call stack and
         branch record can not be enabled at the same time.

       - It is only available for user-space callchains.

     (Yan, Zheng)

   - x86 Intel Broadwell CPU support and various event constraints and
     event table fixes for earlier models.

     (Andi Kleen)

   - x86 Intel HT CPUs event scheduling workarounds.  This is a complex
     CPU bug affecting the SNB,IVB,HSW families that results in counter
     value corruption.  The mitigation code is automatically enabled and
     is transparent.

     (Maria Dimakopoulou, Stephane Eranian)

  The perf tooling side had a ton of changes in this cycle as well, so
  I'm only able to list the user visible changes here, in addition to
  the tooling changes outlined above:

  User visible changes affecting all tools:

      - Improve support of compressed kernel modules (Jiri Olsa)
      - Save DSO loading errno to better report errors (Arnaldo Carvalho de Melo)
      - Bash completion for subcommands (Yunlong Song)
      - Add 'I' event modifier for perf_event_attr.exclude_idle bit (Jiri Olsa)
      - Support missing -f to override perf.data file ownership. (Yunlong Song)
      - Show the first event with an invalid filter (David Ahern, Arnaldo Carvalho de Melo)

  User visible changes in individual tools:

    'perf data':

        New tool for converting perf.data to other formats, initially
        for the CTF (Common Trace Format) from LTTng (Jiri Olsa,
        Sebastian Siewior)

    'perf diff':

        Add --kallsyms option (David Ahern)

    'perf list':

        Allow listing events with 'tracepoint' prefix (Yunlong Song)

        Sort the output of the command (Yunlong Song)

    'perf kmem':

        Respect -i option (Jiri Olsa)

        Print big numbers using thousands' group (Namhyung Kim)

        Allow -v option (Namhyung Kim)

        Fix alignment of slab result table (Namhyung Kim)

    'perf probe':

        Support multiple probes on different binaries on the same command line (Masami Hiramatsu)

        Support unnamed union/structure members data collection. (Masami Hiramatsu)

        Check kprobes blacklist when adding new events. (Masami Hiramatsu)

    'perf record':

        Teach 'perf record' about perf_event_attr.clockid (Peter Zijlstra)

        Support recording running/enabled time (Andi Kleen)

    'perf sched':

        Improve the performance of 'perf sched replay' on high CPU core count machines (Yunlong Song)

    'perf report' and 'perf top':

        Allow annotating entries in callchains in the hists browser (Arnaldo Carvalho de Melo)

        Indicate which callchain entries are annotated in the
        TUI hists browser (Arnaldo Carvalho de Melo)

        Add pid/tid filtering to 'report' and 'script' commands (David Ahern)

        Consider PERF_RECORD_ events with cpumode == 0 in 'perf top', removing one
        cause of long term memory usage buildup, i.e. not processing PERF_RECORD_EXIT
        events (Arnaldo Carvalho de Melo)

    'perf stat':

        Report unsupported events properly (Suzuki K. Poulose)

        Output running time and run/enabled ratio in CSV mode (Andi Kleen)

    'perf trace':

        Handle legacy syscalls tracepoints (David Ahern, Arnaldo Carvalho de Melo)

        Only insert blank duration bracket when tracing syscalls (Arnaldo Carvalho de Melo)

        Filter out the trace pid when no threads are specified (Arnaldo Carvalho de Melo)

        Dump stack on segfaults (Arnaldo Carvalho de Melo)

        No need to explicitely enable evsels for workload started from perf, let it
        be enabled via perf_event_attr.enable_on_exec, removing some events that take
        place in the 'perf trace' before a workload is really started by it.
        (Arnaldo Carvalho de Melo)

        Allow mixing with tracepoints and suppressing plain syscalls. (Arnaldo Carvalho de Melo)

  There's also been a ton of infrastructure work done, such as the
  split-out of perf's build system into tools/build/ and other changes -
  see the shortlog and changelog for details"

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (358 commits)
  perf/x86/intel/pt: Clean up the control flow in pt_pmu_hw_init()
  perf evlist: Fix type for references to data_head/tail
  perf probe: Check the orphaned -x option
  perf probe: Support multiple probes on different binaries
  perf buildid-list: Fix segfault when show DSOs with hits
  perf tools: Fix cross-endian analysis
  perf tools: Fix error path to do closedir() when synthesizing threads
  perf tools: Fix synthesizing fork_event.ppid for non-main thread
  perf tools: Add 'I' event modifier for exclude_idle bit
  perf report: Don't call map__kmap if map is NULL.
  perf tests: Fix attr tests
  perf probe: Fix ARM 32 building error
  perf tools: Merge all perf_event_attr print functions
  perf record: Add clockid parameter
  perf sched replay: Use replay_repeat to calculate the runavg of cpu usage instead of the default value 10
  perf sched replay: Support using -f to override perf.data file ownership
  perf sched replay: Fix the EMFILE error caused by the limitation of the maximum open files
  perf sched replay: Handle the dead halt of sem_wait when create_tasks() fails for any task
  perf sched replay: Fix the segmentation fault problem caused by pr_err in threads
  perf sched replay: Realloc the memory of pid_to_task stepwise to adapt to the different pid_max configurations
  ...

16 files changed, 779 insertions, 12 deletions

diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile
index b5b3600dcdf5..fe98fb226e6e 100644
--- a/samples/bpf/Makefile
+++ b/samples/bpf/Makefile
@@ -6,23 +6,39 @@ hostprogs-y := test_verifier test_maps
 hostprogs-y += sock_example
 hostprogs-y += sockex1
 hostprogs-y += sockex2
+hostprogs-y += tracex1
+hostprogs-y += tracex2
+hostprogs-y += tracex3
+hostprogs-y += tracex4
 
 test_verifier-objs := test_verifier.o libbpf.o
 test_maps-objs := test_maps.o libbpf.o
 sock_example-objs := sock_example.o libbpf.o
 sockex1-objs := bpf_load.o libbpf.o sockex1_user.o
 sockex2-objs := bpf_load.o libbpf.o sockex2_user.o
+tracex1-objs := bpf_load.o libbpf.o tracex1_user.o
+tracex2-objs := bpf_load.o libbpf.o tracex2_user.o
+tracex3-objs := bpf_load.o libbpf.o tracex3_user.o
+tracex4-objs := bpf_load.o libbpf.o tracex4_user.o
 
 # Tell kbuild to always build the programs
 always := $(hostprogs-y)
 always += sockex1_kern.o
 always += sockex2_kern.o
+always += tracex1_kern.o
+always += tracex2_kern.o
+always += tracex3_kern.o
+always += tracex4_kern.o
 
 HOSTCFLAGS += -I$(objtree)/usr/include
 
 HOSTCFLAGS_bpf_load.o += -I$(objtree)/usr/include -Wno-unused-variable
 HOSTLOADLIBES_sockex1 += -lelf
 HOSTLOADLIBES_sockex2 += -lelf
+HOSTLOADLIBES_tracex1 += -lelf
+HOSTLOADLIBES_tracex2 += -lelf
+HOSTLOADLIBES_tracex3 += -lelf
+HOSTLOADLIBES_tracex4 += -lelf -lrt
 
 # point this to your LLVM backend with bpf support
 LLC=$(srctree)/tools/bpf/llvm/bld/Debug+Asserts/bin/llc
diff --git a/samples/bpf/bpf_helpers.h b/samples/bpf/bpf_helpers.h
index ca0333146006..1c872bcf5a80 100644
--- a/samples/bpf/bpf_helpers.h
+++ b/samples/bpf/bpf_helpers.h
@@ -15,6 +15,12 @@ static int (*bpf_map_update_elem)(void *map, void *key, void *value,
         (void *) BPF_FUNC_map_update_elem;
 static int (*bpf_map_delete_elem)(void *map, void *key) =
         (void *) BPF_FUNC_map_delete_elem;
+static int (*bpf_probe_read)(void *dst, int size, void *unsafe_ptr) =
+        (void *) BPF_FUNC_probe_read;
+static unsigned long long (*bpf_ktime_get_ns)(void) =
+        (void *) BPF_FUNC_ktime_get_ns;
+static int (*bpf_trace_printk)(const char *fmt, int fmt_size, ...) =
+        (void *) BPF_FUNC_trace_printk;
 
 /* llvm builtin functions that eBPF C program may use to
  * emit BPF_LD_ABS and BPF_LD_IND instructions
diff --git a/samples/bpf/bpf_load.c b/samples/bpf/bpf_load.c
index 1831d236382b..38dac5a53b51 100644
--- a/samples/bpf/bpf_load.c
+++ b/samples/bpf/bpf_load.c
@@ -8,29 +8,70 @@
 #include <unistd.h>
 #include <string.h>
 #include <stdbool.h>
+#include <stdlib.h>
 #include <linux/bpf.h>
 #include <linux/filter.h>
+#include <linux/perf_event.h>
+#include <sys/syscall.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <poll.h>
 #include "libbpf.h"
 #include "bpf_helpers.h"
 #include "bpf_load.h"
 
+#define DEBUGFS "/sys/kernel/debug/tracing/"
+
 static char license[128];
+static int kern_version;
 static bool processed_sec[128];
 int map_fd[MAX_MAPS];
 int prog_fd[MAX_PROGS];
+int event_fd[MAX_PROGS];
 int prog_cnt;
 
 static int load_and_attach(const char *event, struct bpf_insn *prog, int size)
 {
-        int fd;
         bool is_socket = strncmp(event, "socket", 6) == 0;
-
-        if (!is_socket)
-                /* tracing events tbd */
+        bool is_kprobe = strncmp(event, "kprobe/", 7) == 0;
+        bool is_kretprobe = strncmp(event, "kretprobe/", 10) == 0;
+        enum bpf_prog_type prog_type;
+        char buf[256];
+        int fd, efd, err, id;
+        struct perf_event_attr attr = {};
+
+        attr.type = PERF_TYPE_TRACEPOINT;
+        attr.sample_type = PERF_SAMPLE_RAW;
+        attr.sample_period = 1;
+        attr.wakeup_events = 1;
+
+        if (is_socket) {
+                prog_type = BPF_PROG_TYPE_SOCKET_FILTER;
+        } else if (is_kprobe || is_kretprobe) {
+                prog_type = BPF_PROG_TYPE_KPROBE;
+        } else {
+                printf("Unknown event '%s'\n", event);
                 return -1;
+        }
+
+        if (is_kprobe || is_kretprobe) {
+                if (is_kprobe)
+                        event += 7;
+                else
+                        event += 10;
+
+                snprintf(buf, sizeof(buf),
+                         "echo '%c:%s %s' >> /sys/kernel/debug/tracing/kprobe_events",
+                         is_kprobe ? 'p' : 'r', event, event);
+                err = system(buf);
+                if (err < 0) {
+                        printf("failed to create kprobe '%s' error '%s'\n",
+                               event, strerror(errno));
+                        return -1;
+                }
+        }
 
-        fd = bpf_prog_load(BPF_PROG_TYPE_SOCKET_FILTER,
-                           prog, size, license);
+        fd = bpf_prog_load(prog_type, prog, size, license, kern_version);
 
         if (fd < 0) {
                 printf("bpf_prog_load() err=%d\n%s", errno, bpf_log_buf);
@@ -39,6 +80,41 @@ static int load_and_attach(const char *event, struct bpf_insn *prog, int size)
 
         prog_fd[prog_cnt++] = fd;
 
+        if (is_socket)
+                return 0;
+
+        strcpy(buf, DEBUGFS);
+        strcat(buf, "events/kprobes/");
+        strcat(buf, event);
+        strcat(buf, "/id");
+
+        efd = open(buf, O_RDONLY, 0);
+        if (efd < 0) {
+                printf("failed to open event %s\n", event);
+                return -1;
+        }
+
+        err = read(efd, buf, sizeof(buf));
+        if (err < 0 || err >= sizeof(buf)) {
+                printf("read from '%s' failed '%s'\n", event, strerror(errno));
+                return -1;
+        }
+
+        close(efd);
+
+        buf[err] = 0;
+        id = atoi(buf);
+        attr.config = id;
+
+        efd = perf_event_open(&attr, -1/*pid*/, 0/*cpu*/, -1/*group_fd*/, 0);
+        if (efd < 0) {
+                printf("event %d fd %d err %s\n", id, efd, strerror(errno));
+                return -1;
+        }
+        event_fd[prog_cnt - 1] = efd;
+        ioctl(efd, PERF_EVENT_IOC_ENABLE, 0);
+        ioctl(efd, PERF_EVENT_IOC_SET_BPF, fd);
+
         return 0;
 }
 
@@ -135,6 +211,9 @@ int load_bpf_file(char *path)
         if (gelf_getehdr(elf, &ehdr) != &ehdr)
                 return 1;
 
+        /* clear all kprobes */
+        i = system("echo \"\" > /sys/kernel/debug/tracing/kprobe_events");
+
         /* scan over all elf sections to get license and map info */
         for (i = 1; i < ehdr.e_shnum; i++) {
 
@@ -149,6 +228,14 @@ int load_bpf_file(char *path)
                 if (strcmp(shname, "license") == 0) {
                         processed_sec[i] = true;
                         memcpy(license, data->d_buf, data->d_size);
+                } else if (strcmp(shname, "version") == 0) {
+                        processed_sec[i] = true;
+                        if (data->d_size != sizeof(int)) {
+                                printf("invalid size of version section %zd\n",
+                                       data->d_size);
+                                return 1;
+                        }
+                        memcpy(&kern_version, data->d_buf, sizeof(int));
                 } else if (strcmp(shname, "maps") == 0) {
                         processed_sec[i] = true;
                         if (load_maps(data->d_buf, data->d_size))
@@ -178,7 +265,8 @@ int load_bpf_file(char *path)
                         if (parse_relo_and_apply(data, symbols, &shdr, insns))
                                 continue;
 
-                        if (memcmp(shname_prog, "events/", 7) == 0 ||
+                        if (memcmp(shname_prog, "kprobe/", 7) == 0 ||
+                            memcmp(shname_prog, "kretprobe/", 10) == 0 ||
                             memcmp(shname_prog, "socket", 6) == 0)
                                 load_and_attach(shname_prog, insns, data_prog->d_size);
                 }
@@ -193,7 +281,8 @@ int load_bpf_file(char *path)
                 if (get_sec(elf, i, &ehdr, &shname, &shdr, &data))
                         continue;
 
-                if (memcmp(shname, "events/", 7) == 0 ||
+                if (memcmp(shname, "kprobe/", 7) == 0 ||
+                    memcmp(shname, "kretprobe/", 10) == 0 ||
                     memcmp(shname, "socket", 6) == 0)
                         load_and_attach(shname, data->d_buf, data->d_size);
         }
@@ -201,3 +290,23 @@ int load_bpf_file(char *path)
         close(fd);
         return 0;
 }
+
+void read_trace_pipe(void)
+{
+        int trace_fd;
+
+        trace_fd = open(DEBUGFS "trace_pipe", O_RDONLY, 0);
+        if (trace_fd < 0)
+                return;
+
+        while (1) {
+                static char buf[4096];
+                ssize_t sz;
+
+                sz = read(trace_fd, buf, sizeof(buf));
+                if (sz > 0) {
+                        buf[sz] = 0;
+                        puts(buf);
+                }
+        }
+}
diff --git a/samples/bpf/bpf_load.h b/samples/bpf/bpf_load.h
index 27789a34f5e6..cbd7c2b532b9 100644
--- a/samples/bpf/bpf_load.h
+++ b/samples/bpf/bpf_load.h
@@ -6,6 +6,7 @@
 
 extern int map_fd[MAX_MAPS];
 extern int prog_fd[MAX_PROGS];
+extern int event_fd[MAX_PROGS];
 
 /* parses elf file compiled by llvm .c->.o
  * . parses 'maps' section and creates maps via BPF syscall
@@ -21,4 +22,6 @@ extern int prog_fd[MAX_PROGS];
  */
 int load_bpf_file(char *path);
 
+void read_trace_pipe(void);
+
 #endif
diff --git a/samples/bpf/libbpf.c b/samples/bpf/libbpf.c
index 46d50b7ddf79..7e1efa7e2ed7 100644
--- a/samples/bpf/libbpf.c
+++ b/samples/bpf/libbpf.c
@@ -81,7 +81,7 @@ char bpf_log_buf[LOG_BUF_SIZE];
 
 int bpf_prog_load(enum bpf_prog_type prog_type,
                   const struct bpf_insn *insns, int prog_len,
-                  const char *license)
+                  const char *license, int kern_version)
 {
         union bpf_attr attr = {
                 .prog_type = prog_type,
@@ -93,6 +93,11 @@ int bpf_prog_load(enum bpf_prog_type prog_type,
                 .log_level = 1,
         };
 
+        /* assign one field outside of struct init to make sure any
+         * padding is zero initialized
+         */
+        attr.kern_version = kern_version;
+
         bpf_log_buf[0] = 0;
 
         return syscall(__NR_bpf, BPF_PROG_LOAD, &attr, sizeof(attr));
@@ -121,3 +126,10 @@ int open_raw_sock(const char *name)
 
         return sock;
 }
+
+int perf_event_open(struct perf_event_attr *attr, int pid, int cpu,
+                    int group_fd, unsigned long flags)
+{
+        return syscall(__NR_perf_event_open, attr, pid, cpu,
+                       group_fd, flags);
+}
diff --git a/samples/bpf/libbpf.h b/samples/bpf/libbpf.h
index 58c5fe1bdba1..ac7b09672b46 100644
--- a/samples/bpf/libbpf.h
+++ b/samples/bpf/libbpf.h
@@ -13,7 +13,7 @@ int bpf_get_next_key(int fd, void *key, void *next_key);
 
 int bpf_prog_load(enum bpf_prog_type prog_type,
                   const struct bpf_insn *insns, int insn_len,
-                  const char *license);
+                  const char *license, int kern_version);
 
 #define LOG_BUF_SIZE 65536
 extern char bpf_log_buf[LOG_BUF_SIZE];
@@ -182,4 +182,7 @@ extern char bpf_log_buf[LOG_BUF_SIZE];
 /* create RAW socket and bind to interface 'name' */
 int open_raw_sock(const char *name);
 
+struct perf_event_attr;
+int perf_event_open(struct perf_event_attr *attr, int pid, int cpu,
+                    int group_fd, unsigned long flags);
 #endif
diff --git a/samples/bpf/sock_example.c b/samples/bpf/sock_example.c
index c8ad0404416f..a0ce251c5390 100644
--- a/samples/bpf/sock_example.c
+++ b/samples/bpf/sock_example.c
@@ -56,7 +56,7 @@ static int test_sock(void)
         };
 
         prog_fd = bpf_prog_load(BPF_PROG_TYPE_SOCKET_FILTER, prog, sizeof(prog),
-                                "GPL");
+                                "GPL", 0);
         if (prog_fd < 0) {
                 printf("failed to load prog '%s'\n", strerror(errno));
                 goto cleanup;
diff --git a/samples/bpf/test_verifier.c b/samples/bpf/test_verifier.c
index b96175e90363..740ce97cda5e 100644
--- a/samples/bpf/test_verifier.c
+++ b/samples/bpf/test_verifier.c
@@ -689,7 +689,7 @@ static int test(void)
 
                 prog_fd = bpf_prog_load(BPF_PROG_TYPE_UNSPEC, prog,
                                         prog_len * sizeof(struct bpf_insn),
-                                        "GPL");
+                                        "GPL", 0);
 
                 if (tests[i].result == ACCEPT) {
                         if (prog_fd < 0) {
diff --git a/samples/bpf/tracex1_kern.c b/samples/bpf/tracex1_kern.c
new file mode 100644
index 000000000000..31620463701a
--- /dev/null
+++ b/samples/bpf/tracex1_kern.c
@@ -0,0 +1,50 @@
+/* Copyright (c) 2013-2015 PLUMgrid, http://plumgrid.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ */
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <uapi/linux/bpf.h>
+#include <linux/version.h>
+#include "bpf_helpers.h"
+
+#define _(P) ({typeof(P) val = 0; bpf_probe_read(&val, sizeof(val), &P); val;})
+
+/* kprobe is NOT a stable ABI
+ * kernel functions can be removed, renamed or completely change semantics.
+ * Number of arguments and their positions can change, etc.
+ * In such case this bpf+kprobe example will no longer be meaningful
+ */
+SEC("kprobe/__netif_receive_skb_core")
+int bpf_prog1(struct pt_regs *ctx)
+{
+        /* attaches to kprobe netif_receive_skb,
+         * looks for packets on loobpack device and prints them
+         */
+        char devname[IFNAMSIZ] = {};
+        struct net_device *dev;
+        struct sk_buff *skb;
+        int len;
+
+        /* non-portable! works for the given kernel only */
+        skb = (struct sk_buff *) ctx->di;
+
+        dev = _(skb->dev);
+
+        len = _(skb->len);
+
+        bpf_probe_read(devname, sizeof(devname), dev->name);
+
+        if (devname[0] == 'l' && devname[1] == 'o') {
+                char fmt[] = "skb %p len %d\n";
+                /* using bpf_trace_printk() for DEBUG ONLY */
+                bpf_trace_printk(fmt, sizeof(fmt), skb, len);
+        }
+
+        return 0;
+}
+
+char _license[] SEC("license") = "GPL";
+u32 _version SEC("version") = LINUX_VERSION_CODE;
diff --git a/samples/bpf/tracex1_user.c b/samples/bpf/tracex1_user.c
new file mode 100644
index 000000000000..31a48183beea
--- /dev/null
+++ b/samples/bpf/tracex1_user.c
@@ -0,0 +1,25 @@
+#include <stdio.h>
+#include <linux/bpf.h>
+#include <unistd.h>
+#include "libbpf.h"
+#include "bpf_load.h"
+
+int main(int ac, char **argv)
+{
+        FILE *f;
+        char filename[256];
+
+        snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
+
+        if (load_bpf_file(filename)) {
+                printf("%s", bpf_log_buf);
+                return 1;
+        }
+
+        f = popen("taskset 1 ping -c5 localhost", "r");
+        (void) f;
+
+        read_trace_pipe();
+
+        return 0;
+}
diff --git a/samples/bpf/tracex2_kern.c b/samples/bpf/tracex2_kern.c
new file mode 100644
index 000000000000..19ec1cfc45db
--- /dev/null
+++ b/samples/bpf/tracex2_kern.c
@@ -0,0 +1,86 @@
+/* Copyright (c) 2013-2015 PLUMgrid, http://plumgrid.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ */
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <linux/version.h>
+#include <uapi/linux/bpf.h>
+#include "bpf_helpers.h"
+
+struct bpf_map_def SEC("maps") my_map = {
+        .type = BPF_MAP_TYPE_HASH,
+        .key_size = sizeof(long),
+        .value_size = sizeof(long),
+        .max_entries = 1024,
+};
+
+/* kprobe is NOT a stable ABI. If kernel internals change this bpf+kprobe
+ * example will no longer be meaningful
+ */
+SEC("kprobe/kfree_skb")
+int bpf_prog2(struct pt_regs *ctx)
+{
+        long loc = 0;
+        long init_val = 1;
+        long *value;
+
+        /* x64 specific: read ip of kfree_skb caller.
+         * non-portable version of __builtin_return_address(0)
+         */
+        bpf_probe_read(&loc, sizeof(loc), (void *)ctx->sp);
+
+        value = bpf_map_lookup_elem(&my_map, &loc);
+        if (value)
+                *value += 1;
+        else
+                bpf_map_update_elem(&my_map, &loc, &init_val, BPF_ANY);
+        return 0;
+}
+
+static unsigned int log2(unsigned int v)
+{
+        unsigned int r;
+        unsigned int shift;
+
+        r = (v > 0xFFFF) << 4; v >>= r;
+        shift = (v > 0xFF) << 3; v >>= shift; r |= shift;
+        shift = (v > 0xF) << 2; v >>= shift; r |= shift;
+        shift = (v > 0x3) << 1; v >>= shift; r |= shift;
+        r |= (v >> 1);
+        return r;
+}
+
+static unsigned int log2l(unsigned long v)
+{
+        unsigned int hi = v >> 32;
+        if (hi)
+                return log2(hi) + 32;
+        else
+                return log2(v);
+}
+
+struct bpf_map_def SEC("maps") my_hist_map = {
+        .type = BPF_MAP_TYPE_ARRAY,
+        .key_size = sizeof(u32),
+        .value_size = sizeof(long),
+        .max_entries = 64,
+};
+
+SEC("kprobe/sys_write")
+int bpf_prog3(struct pt_regs *ctx)
+{
+        long write_size = ctx->dx; /* arg3 */
+        long init_val = 1;
+        long *value;
+        u32 index = log2l(write_size);
+
+        value = bpf_map_lookup_elem(&my_hist_map, &index);
+        if (value)
+                __sync_fetch_and_add(value, 1);
+        return 0;
+}
+char _license[] SEC("license") = "GPL";
+u32 _version SEC("version") = LINUX_VERSION_CODE;
diff --git a/samples/bpf/tracex2_user.c b/samples/bpf/tracex2_user.c
new file mode 100644
index 000000000000..91b8d0896fbb
--- /dev/null
+++ b/samples/bpf/tracex2_user.c
@@ -0,0 +1,95 @@
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <linux/bpf.h>
+#include "libbpf.h"
+#include "bpf_load.h"
+
+#define MAX_INDEX       64
+#define MAX_STARS       38
+
+static void stars(char *str, long val, long max, int width)
+{
+        int i;
+
+        for (i = 0; i < (width * val / max) - 1 && i < width - 1; i++)
+                str[i] = '*';
+        if (val > max)
+                str[i - 1] = '+';
+        str[i] = '\0';
+}
+
+static void print_hist(int fd)
+{
+        int key;
+        long value;
+        long data[MAX_INDEX] = {};
+        char starstr[MAX_STARS];
+        int i;
+        int max_ind = -1;
+        long max_value = 0;
+
+        for (key = 0; key < MAX_INDEX; key++) {
+                bpf_lookup_elem(fd, &key, &value);
+                data[key] = value;
+                if (value && key > max_ind)
+                        max_ind = key;
+                if (value > max_value)
+                        max_value = value;
+        }
+
+        printf("           syscall write() stats\n");
+        printf("     byte_size       : count     distribution\n");
+        for (i = 1; i <= max_ind + 1; i++) {
+                stars(starstr, data[i - 1], max_value, MAX_STARS);
+                printf("%8ld -> %-8ld : %-8ld |%-*s|\n",
+                       (1l << i) >> 1, (1l << i) - 1, data[i - 1],
+                       MAX_STARS, starstr);
+        }
+}
+static void int_exit(int sig)
+{
+        print_hist(map_fd[1]);
+        exit(0);
+}
+
+int main(int ac, char **argv)
+{
+        char filename[256];
+        long key, next_key, value;
+        FILE *f;
+        int i;
+
+        snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
+
+        signal(SIGINT, int_exit);
+
+        /* start 'ping' in the background to have some kfree_skb events */
+        f = popen("ping -c5 localhost", "r");
+        (void) f;
+
+        /* start 'dd' in the background to have plenty of 'write' syscalls */
+        f = popen("dd if=/dev/zero of=/dev/null count=5000000", "r");
+        (void) f;
+
+        if (load_bpf_file(filename)) {
+                printf("%s", bpf_log_buf);
+                return 1;
+        }
+
+        for (i = 0; i < 5; i++) {
+                key = 0;
+                while (bpf_get_next_key(map_fd[0], &key, &next_key) == 0) {
+                        bpf_lookup_elem(map_fd[0], &next_key, &value);
+                        printf("location 0x%lx count %ld\n", next_key, value);
+                        key = next_key;
+                }
+                if (key)
+                        printf("\n");
+                sleep(1);
+        }
+        print_hist(map_fd[1]);
+
+        return 0;
+}
diff --git a/samples/bpf/tracex3_kern.c b/samples/bpf/tracex3_kern.c
new file mode 100644
index 000000000000..255ff2792366
--- /dev/null
+++ b/samples/bpf/tracex3_kern.c
@@ -0,0 +1,89 @@
+/* Copyright (c) 2013-2015 PLUMgrid, http://plumgrid.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ */
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <linux/version.h>
+#include <uapi/linux/bpf.h>
+#include "bpf_helpers.h"
+
+struct bpf_map_def SEC("maps") my_map = {
+        .type = BPF_MAP_TYPE_HASH,
+        .key_size = sizeof(long),
+        .value_size = sizeof(u64),
+        .max_entries = 4096,
+};
+
+/* kprobe is NOT a stable ABI. If kernel internals change this bpf+kprobe
+ * example will no longer be meaningful
+ */
+SEC("kprobe/blk_mq_start_request")
+int bpf_prog1(struct pt_regs *ctx)
+{
+        long rq = ctx->di;
+        u64 val = bpf_ktime_get_ns();
+
+        bpf_map_update_elem(&my_map, &rq, &val, BPF_ANY);
+        return 0;
+}
+
+static unsigned int log2l(unsigned long long n)
+{
+#define S(k) if (n >= (1ull << k)) { i += k; n >>= k; }
+        int i = -(n == 0);
+        S(32); S(16); S(8); S(4); S(2); S(1);
+        return i;
+#undef S
+}
+
+#define SLOTS 100
+
+struct bpf_map_def SEC("maps") lat_map = {
+        .type = BPF_MAP_TYPE_ARRAY,
+        .key_size = sizeof(u32),
+        .value_size = sizeof(u64),
+        .max_entries = SLOTS,
+};
+
+SEC("kprobe/blk_update_request")
+int bpf_prog2(struct pt_regs *ctx)
+{
+        long rq = ctx->di;
+        u64 *value, l, base;
+        u32 index;
+
+        value = bpf_map_lookup_elem(&my_map, &rq);
+        if (!value)
+                return 0;
+
+        u64 cur_time = bpf_ktime_get_ns();
+        u64 delta = cur_time - *value;
+
+        bpf_map_delete_elem(&my_map, &rq);
+
+        /* the lines below are computing index = log10(delta)*10
+         * using integer arithmetic
+         * index = 29 ~ 1 usec
+         * index = 59 ~ 1 msec
+         * index = 89 ~ 1 sec
+         * index = 99 ~ 10sec or more
+         * log10(x)*10 = log2(x)*10/log2(10) = log2(x)*3
+         */
+        l = log2l(delta);
+        base = 1ll << l;
+        index = (l * 64 + (delta - base) * 64 / base) * 3 / 64;
+
+        if (index >= SLOTS)
+                index = SLOTS - 1;
+
+        value = bpf_map_lookup_elem(&lat_map, &index);
+        if (value)
+                __sync_fetch_and_add((long *)value, 1);
+
+        return 0;
+}
+char _license[] SEC("license") = "GPL";
+u32 _version SEC("version") = LINUX_VERSION_CODE;
diff --git a/samples/bpf/tracex3_user.c b/samples/bpf/tracex3_user.c
new file mode 100644
index 000000000000..0aaa933ab938
--- /dev/null
+++ b/samples/bpf/tracex3_user.c
@@ -0,0 +1,150 @@
+/* Copyright (c) 2013-2015 PLUMgrid, http://plumgrid.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <unistd.h>
+#include <stdbool.h>
+#include <string.h>
+#include <linux/bpf.h>
+#include "libbpf.h"
+#include "bpf_load.h"
+
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
+
+#define SLOTS 100
+
+static void clear_stats(int fd)
+{
+        __u32 key;
+        __u64 value = 0;
+
+        for (key = 0; key < SLOTS; key++)
+                bpf_update_elem(fd, &key, &value, BPF_ANY);
+}
+
+const char *color[] = {
+        "\033[48;5;255m",
+        "\033[48;5;252m",
+        "\033[48;5;250m",
+        "\033[48;5;248m",
+        "\033[48;5;246m",
+        "\033[48;5;244m",
+        "\033[48;5;242m",
+        "\033[48;5;240m",
+        "\033[48;5;238m",
+        "\033[48;5;236m",
+        "\033[48;5;234m",
+        "\033[48;5;232m",
+};
+const int num_colors = ARRAY_SIZE(color);
+
+const char nocolor[] = "\033[00m";
+
+const char *sym[] = {
+        " ",
+        " ",
+        ".",
+        ".",
+        "*",
+        "*",
+        "o",
+        "o",
+        "O",
+        "O",
+        "#",
+        "#",
+};
+
+bool full_range = false;
+bool text_only = false;
+
+static void print_banner(void)
+{
+        if (full_range)
+                printf("|1ns     |10ns     |100ns    |1us      |10us     |100us"
+                       "    |1ms      |10ms     |100ms    |1s       |10s\n");
+        else
+                printf("|1us      |10us     |100us    |1ms      |10ms     "
+                       "|100ms    |1s       |10s\n");
+}
+
+static void print_hist(int fd)
+{
+        __u32 key;
+        __u64 value;
+        __u64 cnt[SLOTS];
+        __u64 max_cnt = 0;
+        __u64 total_events = 0;
+
+        for (key = 0; key < SLOTS; key++) {
+                value = 0;
+                bpf_lookup_elem(fd, &key, &value);
+                cnt[key] = value;
+                total_events += value;
+                if (value > max_cnt)
+                        max_cnt = value;
+        }
+        clear_stats(fd);
+        for (key = full_range ? 0 : 29; key < SLOTS; key++) {
+                int c = num_colors * cnt[key] / (max_cnt + 1);
+
+                if (text_only)
+                        printf("%s", sym[c]);
+                else
+                        printf("%s %s", color[c], nocolor);
+        }
+        printf(" # %lld\n", total_events);
+}
+
+int main(int ac, char **argv)
+{
+        char filename[256];
+        int i;
+
+        snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
+
+        if (load_bpf_file(filename)) {
+                printf("%s", bpf_log_buf);
+                return 1;
+        }
+
+        for (i = 1; i < ac; i++) {
+                if (strcmp(argv[i], "-a") == 0) {
+                        full_range = true;
+                } else if (strcmp(argv[i], "-t") == 0) {
+                        text_only = true;
+                } else if (strcmp(argv[i], "-h") == 0) {
+                        printf("Usage:\n"
+                               "  -a display wider latency range\n"
+                               "  -t text only\n");
+                        return 1;
+                }
+        }
+
+        printf("  heatmap of IO latency\n");
+        if (text_only)
+                printf("  %s", sym[num_colors - 1]);
+        else
+                printf("  %s %s", color[num_colors - 1], nocolor);
+        printf(" - many events with this latency\n");
+
+        if (text_only)
+                printf("  %s", sym[0]);
+        else
+                printf("  %s %s", color[0], nocolor);
+        printf(" - few events\n");
+
+        for (i = 0; ; i++) {
+                if (i % 20 == 0)
+                        print_banner();
+                print_hist(map_fd[1]);
+                sleep(2);
+        }
+
+        return 0;
+}
diff --git a/samples/bpf/tracex4_kern.c b/samples/bpf/tracex4_kern.c
new file mode 100644
index 000000000000..126b80512228
--- /dev/null
+++ b/samples/bpf/tracex4_kern.c
@@ -0,0 +1,54 @@
+/* Copyright (c) 2015 PLUMgrid, http://plumgrid.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ */
+#include <linux/ptrace.h>
+#include <linux/version.h>
+#include <uapi/linux/bpf.h>
+#include "bpf_helpers.h"
+
+struct pair {
+        u64 val;
+        u64 ip;
+};
+
+struct bpf_map_def SEC("maps") my_map = {
+        .type = BPF_MAP_TYPE_HASH,
+        .key_size = sizeof(long),
+        .value_size = sizeof(struct pair),
+        .max_entries = 1000000,
+};
+
+/* kprobe is NOT a stable ABI. If kernel internals change this bpf+kprobe
+ * example will no longer be meaningful
+ */
+SEC("kprobe/kmem_cache_free")
+int bpf_prog1(struct pt_regs *ctx)
+{
+        long ptr = ctx->si;
+
+        bpf_map_delete_elem(&my_map, &ptr);
+        return 0;
+}
+
+SEC("kretprobe/kmem_cache_alloc_node")
+int bpf_prog2(struct pt_regs *ctx)
+{
+        long ptr = ctx->ax;
+        long ip = 0;
+
+        /* get ip address of kmem_cache_alloc_node() caller */
+        bpf_probe_read(&ip, sizeof(ip), (void *)(ctx->bp + sizeof(ip)));
+
+        struct pair v = {
+                .val = bpf_ktime_get_ns(),
+                .ip = ip,
+        };
+
+        bpf_map_update_elem(&my_map, &ptr, &v, BPF_ANY);
+        return 0;
+}
+char _license[] SEC("license") = "GPL";
+u32 _version SEC("version") = LINUX_VERSION_CODE;
diff --git a/samples/bpf/tracex4_user.c b/samples/bpf/tracex4_user.c
new file mode 100644
index 000000000000..bc4a3bdea6ed
--- /dev/null
+++ b/samples/bpf/tracex4_user.c
@@ -0,0 +1,69 @@
+/* Copyright (c) 2015 PLUMgrid, http://plumgrid.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <unistd.h>
+#include <stdbool.h>
+#include <string.h>
+#include <time.h>
+#include <linux/bpf.h>
+#include "libbpf.h"
+#include "bpf_load.h"
+
+struct pair {
+        long long val;
+        __u64 ip;
+};
+
+static __u64 time_get_ns(void)
+{
+        struct timespec ts;
+
+        clock_gettime(CLOCK_MONOTONIC, &ts);
+        return ts.tv_sec * 1000000000ull + ts.tv_nsec;
+}
+
+static void print_old_objects(int fd)
+{
+        long long val = time_get_ns();
+        __u64 key, next_key;
+        struct pair v;
+
+        key = write(1, "\e[1;1H\e[2J", 12); /* clear screen */
+
+        key = -1;
+        while (bpf_get_next_key(map_fd[0], &key, &next_key) == 0) {
+                bpf_lookup_elem(map_fd[0], &next_key, &v);
+                key = next_key;
+                if (val - v.val < 1000000000ll)
+                        /* object was allocated more then 1 sec ago */
+                        continue;
+                printf("obj 0x%llx is %2lldsec old was allocated at ip %llx\n",
+                       next_key, (val - v.val) / 1000000000ll, v.ip);
+        }
+}
+
+int main(int ac, char **argv)
+{
+        char filename[256];
+        int i;
+
+        snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
+
+        if (load_bpf_file(filename)) {
+                printf("%s", bpf_log_buf);
+                return 1;
+        }
+
+        for (i = 0; ; i++) {
+                print_old_objects(map_fd[1]);
+                sleep(1);
+        }
+
+        return 0;
+}