Merge tag 'v3.15' into next

Linux 3.15

234 files changed, 4393 insertions, 1686 deletions

diff --git a/tools/Makefile b/tools/Makefile
index feec3ad5fd09..9a617adc6675 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -7,6 +7,7 @@ help:
         @echo '  cgroup     - cgroup tools'
         @echo '  cpupower   - a tool for all things x86 CPU power'
         @echo '  firewire   - the userspace part of nosy, an IEEE-1394 traffic sniffer'
+        @echo '  hv         - tools used when in Hyper-V clients'
         @echo '  lguest     - a minimal 32-bit x86 hypervisor'
         @echo '  perf       - Linux performance measurement and analysis tool'
         @echo '  selftests  - various kernel selftests'
@@ -40,9 +41,12 @@ acpi: FORCE
 cpupower: FORCE
         $(call descend,power/$@)
 
-cgroup firewire guest usb virtio vm net: FORCE
+cgroup firewire hv guest usb virtio vm net: FORCE
         $(call descend,$@)
 
+liblockdep: FORCE
+        $(call descend,lib/lockdep)
+
 libapikfs: FORCE
         $(call descend,lib/api)
 
@@ -64,7 +68,7 @@ acpi_install:
 cpupower_install:
         $(call descend,power/$(@:_install=),install)
 
-cgroup_install firewire_install lguest_install perf_install usb_install virtio_install vm_install net_install:
+cgroup_install firewire_install hv_install lguest_install perf_install usb_install virtio_install vm_install net_install:
         $(call descend,$(@:_install=),install)
 
 selftests_install:
@@ -76,7 +80,7 @@ turbostat_install x86_energy_perf_policy_install:
 tmon_install:
         $(call descend,thermal/$(@:_install=),install)
 
-install: acpi_install cgroup_install cpupower_install firewire_install lguest_install \
+install: acpi_install cgroup_install cpupower_install hv_install firewire_install lguest_install \
                 perf_install selftests_install turbostat_install usb_install \
                 virtio_install vm_install net_install x86_energy_perf_policy_install \
         tmon
@@ -87,9 +91,12 @@ acpi_clean:
 cpupower_clean:
         $(call descend,power/cpupower,clean)
 
-cgroup_clean firewire_clean lguest_clean usb_clean virtio_clean vm_clean net_clean:
+cgroup_clean hv_clean firewire_clean lguest_clean usb_clean virtio_clean vm_clean net_clean:
         $(call descend,$(@:_clean=),clean)
 
+liblockdep_clean:
+        $(call descend,lib/lockdep,clean)
+
 libapikfs_clean:
         $(call descend,lib/api,clean)
 
@@ -105,7 +112,7 @@ turbostat_clean x86_energy_perf_policy_clean:
 tmon_clean:
         $(call descend,thermal/tmon,clean)
 
-clean: acpi_clean cgroup_clean cpupower_clean firewire_clean lguest_clean \
+clean: acpi_clean cgroup_clean cpupower_clean hv_clean firewire_clean lguest_clean \
                 perf_clean selftests_clean turbostat_clean usb_clean virtio_clean \
                 vm_clean net_clean x86_energy_perf_policy_clean tmon_clean
 
diff --git a/tools/hv/Makefile b/tools/hv/Makefile
new file mode 100644
index 000000000000..bd22f786a60c
--- /dev/null
+++ b/tools/hv/Makefile
@@ -0,0 +1,13 @@
+# Makefile for Hyper-V tools
+
+CC = $(CROSS_COMPILE)gcc
+PTHREAD_LIBS = -lpthread
+WARNINGS = -Wall -Wextra
+CFLAGS = $(WARNINGS) -g $(PTHREAD_LIBS)
+
+all: hv_kvp_daemon hv_vss_daemon
+%: %.c
+        $(CC) $(CFLAGS) -o $@ $^
+
+clean:
+        $(RM) hv_kvp_daemon hv_vss_daemon
diff --git a/tools/hv/hv_fcopy_daemon.c b/tools/hv/hv_fcopy_daemon.c
new file mode 100644
index 000000000000..fba1c75aa484
--- /dev/null
+++ b/tools/hv/hv_fcopy_daemon.c
@@ -0,0 +1,197 @@
+/*
+ * An implementation of host to guest copy functionality for Linux.
+ *
+ * Copyright (C) 2014, Microsoft, Inc.
+ *
+ * Author : K. Y. Srinivasan <kys@microsoft.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
+ * NON INFRINGEMENT.  See the GNU General Public License for more
+ * details.
+ */
+
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/poll.h>
+#include <linux/types.h>
+#include <linux/kdev_t.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <linux/hyperv.h>
+#include <syslog.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <dirent.h>
+
+static int target_fd;
+static char target_fname[W_MAX_PATH];
+
+static int hv_start_fcopy(struct hv_start_fcopy *smsg)
+{
+        int error = HV_E_FAIL;
+        char *q, *p;
+
+        /*
+         * If possile append a path seperator to the path.
+         */
+        if (strlen((char *)smsg->path_name) < (W_MAX_PATH - 2))
+                strcat((char *)smsg->path_name, "/");
+
+        p = (char *)smsg->path_name;
+        snprintf(target_fname, sizeof(target_fname), "%s/%s",
+                (char *)smsg->path_name, smsg->file_name);
+
+        syslog(LOG_INFO, "Target file name: %s", target_fname);
+        /*
+         * Check to see if the path is already in place; if not,
+         * create if required.
+         */
+        while ((q = strchr(p, '/')) != NULL) {
+                if (q == p) {
+                        p++;
+                        continue;
+                }
+                *q = '\0';
+                if (access((char *)smsg->path_name, F_OK)) {
+                        if (smsg->copy_flags & CREATE_PATH) {
+                                if (mkdir((char *)smsg->path_name, 0755)) {
+                                        syslog(LOG_ERR, "Failed to create %s",
+                                                (char *)smsg->path_name);
+                                        goto done;
+                                }
+                        } else {
+                                syslog(LOG_ERR, "Invalid path: %s",
+                                        (char *)smsg->path_name);
+                                goto done;
+                        }
+                }
+                p = q + 1;
+                *q = '/';
+        }
+
+        if (!access(target_fname, F_OK)) {
+                syslog(LOG_INFO, "File: %s exists", target_fname);
+                if (!(smsg->copy_flags & OVER_WRITE)) {
+                        error = HV_ERROR_ALREADY_EXISTS;
+                        goto done;
+                }
+        }
+
+        target_fd = open(target_fname, O_RDWR | O_CREAT | O_CLOEXEC, 0744);
+        if (target_fd == -1) {
+                syslog(LOG_INFO, "Open Failed: %s", strerror(errno));
+                goto done;
+        }
+
+        error = 0;
+done:
+        return error;
+}
+
+static int hv_copy_data(struct hv_do_fcopy *cpmsg)
+{
+        ssize_t bytes_written;
+
+        bytes_written = pwrite(target_fd, cpmsg->data, cpmsg->size,
+                                cpmsg->offset);
+
+        if (bytes_written != cpmsg->size)
+                return HV_E_FAIL;
+
+        return 0;
+}
+
+static int hv_copy_finished(void)
+{
+        close(target_fd);
+        return 0;
+}
+static int hv_copy_cancel(void)
+{
+        close(target_fd);
+        unlink(target_fname);
+        return 0;
+
+}
+
+int main(void)
+{
+        int fd, fcopy_fd, len;
+        int error;
+        int version = FCOPY_CURRENT_VERSION;
+        char *buffer[4096 * 2];
+        struct hv_fcopy_hdr *in_msg;
+
+        if (daemon(1, 0)) {
+                syslog(LOG_ERR, "daemon() failed; error: %s", strerror(errno));
+                exit(EXIT_FAILURE);
+        }
+
+        openlog("HV_FCOPY", 0, LOG_USER);
+        syslog(LOG_INFO, "HV_FCOPY starting; pid is:%d", getpid());
+
+        fcopy_fd = open("/dev/vmbus/hv_fcopy", O_RDWR);
+
+        if (fcopy_fd < 0) {
+                syslog(LOG_ERR, "open /dev/vmbus/hv_fcopy failed; error: %d %s",
+                        errno, strerror(errno));
+                exit(EXIT_FAILURE);
+        }
+
+        /*
+         * Register with the kernel.
+         */
+        if ((write(fcopy_fd, &version, sizeof(int))) != sizeof(int)) {
+                syslog(LOG_ERR, "Registration failed: %s", strerror(errno));
+                exit(EXIT_FAILURE);
+        }
+
+        while (1) {
+                /*
+                 * In this loop we process fcopy messages after the
+                 * handshake is complete.
+                 */
+                len = pread(fcopy_fd, buffer, (4096 * 2), 0);
+                if (len < 0) {
+                        syslog(LOG_ERR, "pread failed: %s", strerror(errno));
+                        exit(EXIT_FAILURE);
+                }
+                in_msg = (struct hv_fcopy_hdr *)buffer;
+
+                switch (in_msg->operation) {
+                case START_FILE_COPY:
+                        error = hv_start_fcopy((struct hv_start_fcopy *)in_msg);
+                        break;
+                case WRITE_TO_FILE:
+                        error = hv_copy_data((struct hv_do_fcopy *)in_msg);
+                        break;
+                case COMPLETE_FCOPY:
+                        error = hv_copy_finished();
+                        break;
+                case CANCEL_FCOPY:
+                        error = hv_copy_cancel();
+                        break;
+
+                default:
+                        syslog(LOG_ERR, "Unknown operation: %d",
+                                in_msg->operation);
+
+                }
+
+                if (pwrite(fcopy_fd, &error, sizeof(int), 0) != sizeof(int)) {
+                        syslog(LOG_ERR, "pwrite failed: %s", strerror(errno));
+                        exit(EXIT_FAILURE);
+                }
+        }
+}
diff --git a/tools/hv/hv_vss_daemon.c b/tools/hv/hv_vss_daemon.c
index 520de3304571..6a213b8cd7b9 100644
--- a/tools/hv/hv_vss_daemon.c
+++ b/tools/hv/hv_vss_daemon.c
@@ -87,6 +87,8 @@ static int vss_operate(int operation)
                         continue;
                 if (strcmp(ent->mnt_type, "iso9660") == 0)
                         continue;
+                if (strcmp(ent->mnt_type, "vfat") == 0)
+                        continue;
                 if (strcmp(ent->mnt_dir, "/") == 0) {
                         root_seen = 1;
                         continue;
diff --git a/tools/include/linux/hash.h b/tools/include/linux/hash.h
new file mode 100644
index 000000000000..d026c6573018
--- /dev/null
+++ b/tools/include/linux/hash.h
@@ -0,0 +1,5 @@
+#include "../../../include/linux/hash.h"
+
+#ifndef _TOOLS_LINUX_HASH_H
+#define _TOOLS_LINUX_HASH_H
+#endif
diff --git a/tools/lib/api/Makefile b/tools/lib/api/Makefile
index ed2f51e11b80..ce00f7ee6455 100644
--- a/tools/lib/api/Makefile
+++ b/tools/lib/api/Makefile
@@ -9,8 +9,10 @@ LIB_H=
 LIB_OBJS=
 
 LIB_H += fs/debugfs.h
+LIB_H += fs/fs.h
 
 LIB_OBJS += $(OUTPUT)fs/debugfs.o
+LIB_OBJS += $(OUTPUT)fs/fs.o
 
 LIBFILE = libapikfs.a
 
diff --git a/tools/lib/api/fs/debugfs.c b/tools/lib/api/fs/debugfs.c
index 7c4347962353..a74fba6d7743 100644
--- a/tools/lib/api/fs/debugfs.c
+++ b/tools/lib/api/fs/debugfs.c
@@ -12,8 +12,8 @@
 char debugfs_mountpoint[PATH_MAX + 1] = "/sys/kernel/debug";
 
 static const char * const debugfs_known_mountpoints[] = {
-        "/sys/kernel/debug/",
-        "/debug/",
+        "/sys/kernel/debug",
+        "/debug",
         0,
 };
 
diff --git a/tools/perf/util/fs.c b/tools/lib/api/fs/fs.c
index f5be1f26e724..5b5eb788996e 100644
--- a/tools/perf/util/fs.c
+++ b/tools/lib/api/fs/fs.c
@@ -1,8 +1,13 @@
+/* TODO merge/factor in debugfs.c here */
 
-/* TODO merge/factor into tools/lib/lk/debugfs.c */
+#include <errno.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/vfs.h>
 
-#include "util.h"
-#include "util/fs.h"
+#include "debugfs.h"
+#include "fs.h"
 
 static const char * const sysfs__fs_known_mountpoints[] = {
         "/sys",
diff --git a/tools/perf/util/include/linux/magic.h b/tools/lib/api/fs/fs.h
index 07d63cf3e0f6..cb7049551f33 100644
--- a/tools/perf/util/include/linux/magic.h
+++ b/tools/lib/api/fs/fs.h
@@ -1,9 +1,5 @@
-#ifndef _PERF_LINUX_MAGIC_H_
-#define _PERF_LINUX_MAGIC_H_
-
-#ifndef DEBUGFS_MAGIC
-#define DEBUGFS_MAGIC          0x64626720
-#endif
+#ifndef __API_FS__
+#define __API_FS__
 
 #ifndef SYSFS_MAGIC
 #define SYSFS_MAGIC            0x62656572
@@ -13,4 +9,6 @@
 #define PROC_SUPER_MAGIC       0x9fa0
 #endif
 
-#endif
+const char *sysfs__mountpoint(void);
+const char *procfs__mountpoint(void);
+#endif /* __API_FS__ */
diff --git a/tools/lib/lockdep/Makefile b/tools/lib/lockdep/Makefile
index 07b0b7542511..bba2f5253b6e 100644
--- a/tools/lib/lockdep/Makefile
+++ b/tools/lib/lockdep/Makefile
@@ -1,13 +1,7 @@
-# liblockdep version
-LL_VERSION = 0
-LL_PATCHLEVEL = 0
-LL_EXTRAVERSION = 1
-
 # file format version
 FILE_VERSION = 1
 
-MAKEFLAGS += --no-print-directory
-
+LIBLOCKDEP_VERSION=$(shell make --no-print-directory -sC ../../.. kernelversion)
 
 # Makefiles suck: This macro sets a default value of $(2) for the
 # variable named by $(1), unless the variable has been set by
@@ -98,7 +92,7 @@ export prefix libdir bindir src obj
 libdir_SQ = $(subst ','\'',$(libdir))
 bindir_SQ = $(subst ','\'',$(bindir))
 
-LIB_FILE = liblockdep.a liblockdep.so
+LIB_FILE = liblockdep.a liblockdep.so.$(LIBLOCKDEP_VERSION)
 BIN_FILE = lockdep
 
 CONFIG_INCLUDES =
@@ -110,8 +104,6 @@ N		=
 
 export Q VERBOSE
 
-LIBLOCKDEP_VERSION = $(LL_VERSION).$(LL_PATCHLEVEL).$(LL_EXTRAVERSION)
-
 INCLUDES = -I. -I/usr/local/include -I./uinclude -I./include $(CONFIG_INCLUDES)
 
 # Set compile option CFLAGS if not set elsewhere
@@ -146,7 +138,7 @@ do_app_build =						\
 
 do_compile_shared_library =                     \
         ($(print_shared_lib_compile)            \
-        $(CC) --shared $^ -o $@ -lpthread -ldl)
+        $(CC) --shared $^ -o $@ -lpthread -ldl -Wl,-soname='"$@"';$(shell ln -s $@ liblockdep.so))
 
 do_build_static_lib =                           \
         ($(print_static_lib_build)              \
@@ -177,7 +169,7 @@ all: all_cmd
 
 all_cmd: $(CMD_TARGETS)
 
-liblockdep.so: $(PEVENT_LIB_OBJS)
+liblockdep.so.$(LIBLOCKDEP_VERSION): $(PEVENT_LIB_OBJS)
         $(Q)$(do_compile_shared_library)
 
 liblockdep.a: $(PEVENT_LIB_OBJS)
@@ -238,7 +230,7 @@ install_lib: all_cmd
 install: install_lib
 
 clean:
-        $(RM) *.o *~ $(TARGETS) *.a *.so $(VERSION_FILES) .*.d
+        $(RM) *.o *~ $(TARGETS) *.a *liblockdep*.so* $(VERSION_FILES) .*.d
         $(RM) tags TAGS
 
 endif # skip-makefile
diff --git a/tools/lib/lockdep/uinclude/linux/lockdep.h b/tools/lib/lockdep/uinclude/linux/lockdep.h
index d0f5d6e50214..c1552c28507e 100644
--- a/tools/lib/lockdep/uinclude/linux/lockdep.h
+++ b/tools/lib/lockdep/uinclude/linux/lockdep.h
@@ -10,6 +10,9 @@
 
 #define MAX_LOCK_DEPTH 2000UL
 
+#define asmlinkage
+#define __visible
+
 #include "../../../include/linux/lockdep.h"
 
 struct task_struct {
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index 1587ea392ad6..b83184f2d484 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -50,6 +50,18 @@ static int show_warning = 1;
                         warning(fmt, ##__VA_ARGS__);    \
         } while (0)
 
+#define do_warning_event(event, fmt, ...)                       \
+        do {                                                    \
+                if (!show_warning)                              \
+                        continue;                               \
+                                                                \
+                if (event)                                      \
+                        warning("[%s:%s] " fmt, event->system,  \
+                                event->name, ##__VA_ARGS__);    \
+                else                                            \
+                        warning(fmt, ##__VA_ARGS__);            \
+        } while (0)
+
 static void init_input_buf(const char *buf, unsigned long long size)
 {
         input_buf = buf;
@@ -1355,7 +1367,7 @@ static int event_read_fields(struct event_format *event, struct format_field **f
                 }
 
                 if (!field->type) {
-                        do_warning("%s: no type found", __func__);
+                        do_warning_event(event, "%s: no type found", __func__);
                         goto fail;
                 }
                 field->name = last_token;
@@ -1402,7 +1414,7 @@ static int event_read_fields(struct event_format *event, struct format_field **f
                                 free_token(token);
                                 type = read_token(&token);
                                 if (type == EVENT_NONE) {
-                                        do_warning("failed to find token");
+                                        do_warning_event(event, "failed to find token");
                                         goto fail;
                                 }
                         }
@@ -1636,7 +1648,7 @@ process_cond(struct event_format *event, struct print_arg *top, char **tok)
         right = alloc_arg();
 
         if (!arg || !left || !right) {
-                do_warning("%s: not enough memory!", __func__);
+                do_warning_event(event, "%s: not enough memory!", __func__);
                 /* arg will be freed at out_free */
                 free_arg(left);
                 free_arg(right);
@@ -1686,7 +1698,7 @@ process_array(struct event_format *event, struct print_arg *top, char **tok)
 
         arg = alloc_arg();
         if (!arg) {
-                do_warning("%s: not enough memory!", __func__);
+                do_warning_event(event, "%s: not enough memory!", __func__);
                 /* '*tok' is set to top->op.op.  No need to free. */
                 *tok = NULL;
                 return EVENT_ERROR;
@@ -1792,7 +1804,7 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)
         if (arg->type == PRINT_OP && !arg->op.left) {
                 /* handle single op */
                 if (token[1]) {
-                        do_warning("bad op token %s", token);
+                        do_warning_event(event, "bad op token %s", token);
                         goto out_free;
                 }
                 switch (token[0]) {
@@ -1802,7 +1814,7 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)
                 case '-':
                         break;
                 default:
-                        do_warning("bad op token %s", token);
+                        do_warning_event(event, "bad op token %s", token);
                         goto out_free;
 
                 }
@@ -1888,7 +1900,7 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)
                         char *new_atom;
 
                         if (left->type != PRINT_ATOM) {
-                                do_warning("bad pointer type");
+                                do_warning_event(event, "bad pointer type");
                                 goto out_free;
                         }
                         new_atom = realloc(left->atom.atom,
@@ -1930,7 +1942,7 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)
                 type = process_array(event, arg, tok);
 
         } else {
-                do_warning("unknown op '%s'", token);
+                do_warning_event(event, "unknown op '%s'", token);
                 event->flags |= EVENT_FL_FAILED;
                 /* the arg is now the left side */
                 goto out_free;
@@ -1951,7 +1963,7 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)
         return type;
 
 out_warn_free:
-        do_warning("%s: not enough memory!", __func__);
+        do_warning_event(event, "%s: not enough memory!", __func__);
 out_free:
         free_token(token);
         *tok = NULL;
@@ -2385,7 +2397,7 @@ process_flags(struct event_format *event, struct print_arg *arg, char **tok)
 
         field = alloc_arg();
         if (!field) {
-                do_warning("%s: not enough memory!", __func__);
+                do_warning_event(event, "%s: not enough memory!", __func__);
                 goto out_free;
         }
 
@@ -2438,7 +2450,7 @@ process_symbols(struct event_format *event, struct print_arg *arg, char **tok)
 
         field = alloc_arg();
         if (!field) {
-                do_warning("%s: not enough memory!", __func__);
+                do_warning_event(event, "%s: not enough memory!", __func__);
                 goto out_free;
         }
 
@@ -2477,7 +2489,7 @@ process_hex(struct event_format *event, struct print_arg *arg, char **tok)
 
         field = alloc_arg();
         if (!field) {
-                do_warning("%s: not enough memory!", __func__);
+                do_warning_event(event, "%s: not enough memory!", __func__);
                 goto out_free;
         }
 
@@ -2492,7 +2504,7 @@ process_hex(struct event_format *event, struct print_arg *arg, char **tok)
 
         field = alloc_arg();
         if (!field) {
-                do_warning("%s: not enough memory!", __func__);
+                do_warning_event(event, "%s: not enough memory!", __func__);
                 *tok = NULL;
                 return EVENT_ERROR;
         }
@@ -2555,7 +2567,7 @@ process_dynamic_array(struct event_format *event, struct print_arg *arg, char **
         free_token(token);
         arg = alloc_arg();
         if (!arg) {
-                do_warning("%s: not enough memory!", __func__);
+                do_warning_event(event, "%s: not enough memory!", __func__);
                 *tok = NULL;
                 return EVENT_ERROR;
         }
@@ -2614,13 +2626,14 @@ process_paren(struct event_format *event, struct print_arg *arg, char **tok)
 
                 /* prevous must be an atom */
                 if (arg->type != PRINT_ATOM) {
-                        do_warning("previous needed to be PRINT_ATOM");
+                        do_warning_event(event, "previous needed to be PRINT_ATOM");
                         goto out_free;
                 }
 
                 item_arg = alloc_arg();
                 if (!item_arg) {
-                        do_warning("%s: not enough memory!", __func__);
+                        do_warning_event(event, "%s: not enough memory!",
+                                         __func__);
                         goto out_free;
                 }
 
@@ -2721,21 +2734,24 @@ process_func_handler(struct event_format *event, struct pevent_function_handler
         for (i = 0; i < func->nr_args; i++) {
                 farg = alloc_arg();
                 if (!farg) {
-                        do_warning("%s: not enough memory!", __func__);
+                        do_warning_event(event, "%s: not enough memory!",
+                                         __func__);
                         return EVENT_ERROR;
                 }
 
                 type = process_arg(event, farg, &token);
                 if (i < (func->nr_args - 1)) {
                         if (type != EVENT_DELIM || strcmp(token, ",") != 0) {
-                                warning("Error: function '%s()' expects %d arguments but event %s only uses %d",
+                                do_warning_event(event,
+                                        "Error: function '%s()' expects %d arguments but event %s only uses %d",
                                         func->name, func->nr_args,
                                         event->name, i + 1);
                                 goto err;
                         }
                 } else {
                         if (type != EVENT_DELIM || strcmp(token, ")") != 0) {
-                                warning("Error: function '%s()' only expects %d arguments but event %s has more",
+                                do_warning_event(event,
+                                        "Error: function '%s()' only expects %d arguments but event %s has more",
                                         func->name, func->nr_args, event->name);
                                 goto err;
                         }
@@ -2792,7 +2808,7 @@ process_function(struct event_format *event, struct print_arg *arg,
                 return process_func_handler(event, func, arg, tok);
         }
 
-        do_warning("function %s not defined", token);
+        do_warning_event(event, "function %s not defined", token);
         free_token(token);
         return EVENT_ERROR;
 }
@@ -2878,7 +2894,7 @@ process_arg_token(struct event_format *event, struct print_arg *arg,
 
         case EVENT_ERROR ... EVENT_NEWLINE:
         default:
-                do_warning("unexpected type %d", type);
+                do_warning_event(event, "unexpected type %d", type);
                 return EVENT_ERROR;
         }
         *tok = token;
@@ -2901,7 +2917,8 @@ static int event_read_print_args(struct event_format *event, struct print_arg **
 
                 arg = alloc_arg();
                 if (!arg) {
-                        do_warning("%s: not enough memory!", __func__);
+                        do_warning_event(event, "%s: not enough memory!",
+                                         __func__);
                         return -1;
                 }
 
@@ -3481,11 +3498,12 @@ eval_num_arg(void *data, int size, struct event_format *event, struct print_arg
         return val;
 
 out_warning_op:
-        do_warning("%s: unknown op '%s'", __func__, arg->op.op);
+        do_warning_event(event, "%s: unknown op '%s'", __func__, arg->op.op);
         return 0;
 
 out_warning_field:
-        do_warning("%s: field %s not found", __func__, arg->field.name);
+        do_warning_event(event, "%s: field %s not found",
+                         __func__, arg->field.name);
         return 0;
 }
 
@@ -3591,7 +3609,8 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,
                 }
                 str = malloc(len + 1);
                 if (!str) {
-                        do_warning("%s: not enough memory!", __func__);
+                        do_warning_event(event, "%s: not enough memory!",
+                                         __func__);
                         return;
                 }
                 memcpy(str, data + field->offset, len);
@@ -3697,7 +3716,8 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,
         return;
 
 out_warning_field:
-        do_warning("%s: field %s not found", __func__, arg->field.name);
+        do_warning_event(event, "%s: field %s not found",
+                         __func__, arg->field.name);
 }
 
 static unsigned long long
@@ -3742,14 +3762,16 @@ process_defined_func(struct trace_seq *s, void *data, int size,
                         trace_seq_terminate(&str);
                         string = malloc(sizeof(*string));
                         if (!string) {
-                                do_warning("%s(%d): malloc str", __func__, __LINE__);
+                                do_warning_event(event, "%s(%d): malloc str",
+                                                 __func__, __LINE__);
                                 goto out_free;
                         }
                         string->next = strings;
                         string->str = strdup(str.buffer);
                         if (!string->str) {
                                 free(string);
-                                do_warning("%s(%d): malloc str", __func__, __LINE__);
+                                do_warning_event(event, "%s(%d): malloc str",
+                                                 __func__, __LINE__);
                                 goto out_free;
                         }
                         args[i] = (uintptr_t)string->str;
@@ -3761,7 +3783,7 @@ process_defined_func(struct trace_seq *s, void *data, int size,
                          * Something went totally wrong, this is not
                          * an input error, something in this code broke.
                          */
-                        do_warning("Unexpected end of arguments\n");
+                        do_warning_event(event, "Unexpected end of arguments\n");
                         goto out_free;
                 }
                 farg = farg->next;
@@ -3811,12 +3833,12 @@ static struct print_arg *make_bprint_args(char *fmt, void *data, int size, struc
         if (!field) {
                 field = pevent_find_field(event, "buf");
                 if (!field) {
-                        do_warning("can't find buffer field for binary printk");
+                        do_warning_event(event, "can't find buffer field for binary printk");
                         return NULL;
                 }
                 ip_field = pevent_find_field(event, "ip");
                 if (!ip_field) {
-                        do_warning("can't find ip field for binary printk");
+                        do_warning_event(event, "can't find ip field for binary printk");
                         return NULL;
                 }
                 pevent->bprint_buf_field = field;
@@ -3830,7 +3852,8 @@ static struct print_arg *make_bprint_args(char *fmt, void *data, int size, struc
          */
         args = alloc_arg();
         if (!args) {
-                do_warning("%s(%d): not enough memory!", __func__, __LINE__);
+                do_warning_event(event, "%s(%d): not enough memory!",
+                                 __func__, __LINE__);
                 return NULL;
         }
         arg = args;
@@ -3896,7 +3919,7 @@ static struct print_arg *make_bprint_args(char *fmt, void *data, int size, struc
                                 bptr += vsize;
                                 arg = alloc_arg();
                                 if (!arg) {
-                                        do_warning("%s(%d): not enough memory!",
+                                        do_warning_event(event, "%s(%d): not enough memory!",
                                                    __func__, __LINE__);
                                         goto out_free;
                                 }
@@ -3919,7 +3942,7 @@ static struct print_arg *make_bprint_args(char *fmt, void *data, int size, struc
                         case 's':
                                 arg = alloc_arg();
                                 if (!arg) {
-                                        do_warning("%s(%d): not enough memory!",
+                                        do_warning_event(event, "%s(%d): not enough memory!",
                                                    __func__, __LINE__);
                                         goto out_free;
                                 }
@@ -3959,7 +3982,7 @@ get_bprint_format(void *data, int size __maybe_unused,
         if (!field) {
                 field = pevent_find_field(event, "fmt");
                 if (!field) {
-                        do_warning("can't find format field for binary printk");
+                        do_warning_event(event, "can't find format field for binary printk");
                         return NULL;
                 }
                 pevent->bprint_fmt_field = field;
@@ -4003,8 +4026,8 @@ static void print_mac_arg(struct trace_seq *s, int mac, void *data, int size,
                 arg->field.field =
                         pevent_find_any_field(event, arg->field.name);
                 if (!arg->field.field) {
-                        do_warning("%s: field %s not found",
-                                   __func__, arg->field.name);
+                        do_warning_event(event, "%s: field %s not found",
+                                         __func__, arg->field.name);
                         return;
                 }
         }
@@ -4176,7 +4199,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event
                         case '*':
                                 /* The argument is the length. */
                                 if (!arg) {
-                                        do_warning("no argument match");
+                                        do_warning_event(event, "no argument match");
                                         event->flags |= EVENT_FL_FAILED;
                                         goto out_failed;
                                 }
@@ -4213,7 +4236,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event
                         case 'X':
                         case 'u':
                                 if (!arg) {
-                                        do_warning("no argument match");
+                                        do_warning_event(event, "no argument match");
                                         event->flags |= EVENT_FL_FAILED;
                                         goto out_failed;
                                 }
@@ -4223,7 +4246,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event
 
                                 /* should never happen */
                                 if (len > 31) {
-                                        do_warning("bad format!");
+                                        do_warning_event(event, "bad format!");
                                         event->flags |= EVENT_FL_FAILED;
                                         len = 31;
                                 }
@@ -4290,13 +4313,13 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event
                                                 trace_seq_printf(s, format, (long long)val);
                                         break;
                                 default:
-                                        do_warning("bad count (%d)", ls);
+                                        do_warning_event(event, "bad count (%d)", ls);
                                         event->flags |= EVENT_FL_FAILED;
                                 }
                                 break;
                         case 's':
                                 if (!arg) {
-                                        do_warning("no matching argument");
+                                        do_warning_event(event, "no matching argument");
                                         event->flags |= EVENT_FL_FAILED;
                                         goto out_failed;
                                 }
@@ -4306,7 +4329,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event
 
                                 /* should never happen */
                                 if (len > 31) {
-                                        do_warning("bad format!");
+                                        do_warning_event(event, "bad format!");
                                         event->flags |= EVENT_FL_FAILED;
                                         len = 31;
                                 }
@@ -4321,6 +4344,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event
                                               format, len_arg, arg);
                                 trace_seq_terminate(&p);
                                 trace_seq_puts(s, p.buffer);
+                                trace_seq_destroy(&p);
                                 arg = arg->next;
                                 break;
                         default:
diff --git a/tools/lib/traceevent/event-parse.h b/tools/lib/traceevent/event-parse.h
index 791c539374c7..feab94281634 100644
--- a/tools/lib/traceevent/event-parse.h
+++ b/tools/lib/traceevent/event-parse.h
@@ -876,8 +876,8 @@ struct event_filter {
 struct event_filter *pevent_filter_alloc(struct pevent *pevent);
 
 /* for backward compatibility */
-#define FILTER_NONE             PEVENT_ERRNO__FILTER_NOT_FOUND
-#define FILTER_NOEXIST          PEVENT_ERRNO__NO_FILTER
+#define FILTER_NONE             PEVENT_ERRNO__NO_FILTER
+#define FILTER_NOEXIST          PEVENT_ERRNO__FILTER_NOT_FOUND
 #define FILTER_MISS             PEVENT_ERRNO__FILTER_MISS
 #define FILTER_MATCH            PEVENT_ERRNO__FILTER_MATCH
 
diff --git a/tools/net/bpf_dbg.c b/tools/net/bpf_dbg.c
index 65dc757f7f7b..9a287bec695a 100644
--- a/tools/net/bpf_dbg.c
+++ b/tools/net/bpf_dbg.c
@@ -87,9 +87,6 @@
         __attribute__ ((format (printf, (pos_fmtstr), (pos_fmtargs))))
 #endif
 
-#define CMD(_name, _func) { .name = _name, .func = _func, }
-#define OP(_op, _name)      [_op] = _name
-
 enum {
         CMD_OK,
         CMD_ERR,
@@ -145,32 +142,32 @@ static size_t pcap_map_size = 0;
 static char *pcap_ptr_va_start, *pcap_ptr_va_curr;
 
 static const char * const op_table[] = {
-        OP(BPF_ST, "st"),
-        OP(BPF_STX, "stx"),
-        OP(BPF_LD_B, "ldb"),
-        OP(BPF_LD_H, "ldh"),
-        OP(BPF_LD_W, "ld"),
-        OP(BPF_LDX, "ldx"),
-        OP(BPF_LDX_B, "ldxb"),
-        OP(BPF_JMP_JA, "ja"),
-        OP(BPF_JMP_JEQ, "jeq"),
-        OP(BPF_JMP_JGT, "jgt"),
-        OP(BPF_JMP_JGE, "jge"),
-        OP(BPF_JMP_JSET, "jset"),
-        OP(BPF_ALU_ADD, "add"),
-        OP(BPF_ALU_SUB, "sub"),
-        OP(BPF_ALU_MUL, "mul"),
-        OP(BPF_ALU_DIV, "div"),
-        OP(BPF_ALU_MOD, "mod"),
-        OP(BPF_ALU_NEG, "neg"),
-        OP(BPF_ALU_AND, "and"),
-        OP(BPF_ALU_OR, "or"),
-        OP(BPF_ALU_XOR, "xor"),
-        OP(BPF_ALU_LSH, "lsh"),
-        OP(BPF_ALU_RSH, "rsh"),
-        OP(BPF_MISC_TAX, "tax"),
-        OP(BPF_MISC_TXA, "txa"),
-        OP(BPF_RET, "ret"),
+        [BPF_ST]        = "st",
+        [BPF_STX]       = "stx",
+        [BPF_LD_B]      = "ldb",
+        [BPF_LD_H]      = "ldh",
+        [BPF_LD_W]      = "ld",
+        [BPF_LDX]       = "ldx",
+        [BPF_LDX_B]     = "ldxb",
+        [BPF_JMP_JA]    = "ja",
+        [BPF_JMP_JEQ]   = "jeq",
+        [BPF_JMP_JGT]   = "jgt",
+        [BPF_JMP_JGE]   = "jge",
+        [BPF_JMP_JSET]  = "jset",
+        [BPF_ALU_ADD]   = "add",
+        [BPF_ALU_SUB]   = "sub",
+        [BPF_ALU_MUL]   = "mul",
+        [BPF_ALU_DIV]   = "div",
+        [BPF_ALU_MOD]   = "mod",
+        [BPF_ALU_NEG]   = "neg",
+        [BPF_ALU_AND]   = "and",
+        [BPF_ALU_OR]    = "or",
+        [BPF_ALU_XOR]   = "xor",
+        [BPF_ALU_LSH]   = "lsh",
+        [BPF_ALU_RSH]   = "rsh",
+        [BPF_MISC_TAX]  = "tax",
+        [BPF_MISC_TXA]  = "txa",
+        [BPF_RET]       = "ret",
 };
 
 static __check_format_printf(1, 2) int rl_printf(const char *fmt, ...)
@@ -823,7 +820,7 @@ do_div:
                 r->A &= r->X;
                 break;
         case BPF_ALU_AND | BPF_K:
-                r->A &= r->X;
+                r->A &= K;
                 break;
         case BPF_ALU_OR | BPF_X:
                 r->A |= r->X;
@@ -1127,7 +1124,6 @@ static int cmd_step(char *num)
 static int cmd_select(char *num)
 {
         unsigned int which, i;
-        struct pcap_pkthdr *hdr;
         bool have_next = true;
 
         if (!pcap_loaded() || strlen(num) == 0)
@@ -1144,7 +1140,7 @@ static int cmd_select(char *num)
 
         for (i = 0; i < which && (have_next = pcap_next_pkt()); i++)
                 /* noop */;
-        if (!have_next || (hdr = pcap_curr_pkt()) == NULL) {
+        if (!have_next || pcap_curr_pkt() == NULL) {
                 rl_printf("no packet #%u available!\n", which);
                 pcap_reset_pkt();
                 return CMD_ERR;
@@ -1177,9 +1173,8 @@ static int cmd_breakpoint(char *subcmd)
 static int cmd_run(char *num)
 {
         static uint32_t pass = 0, fail = 0;
-        struct pcap_pkthdr *hdr;
         bool has_limit = true;
-        int ret, pkts = 0, i = 0;
+        int pkts = 0, i = 0;
 
         if (!bpf_prog_loaded() || !pcap_loaded())
                 return CMD_ERR;
@@ -1189,10 +1184,10 @@ static int cmd_run(char *num)
                 has_limit = false;
 
         do {
-                hdr = pcap_curr_pkt();
-                ret = bpf_run_all(bpf_image, bpf_prog_len,
-                                  (uint8_t *) hdr + sizeof(*hdr),
-                                  hdr->caplen, hdr->len);
+                struct pcap_pkthdr *hdr = pcap_curr_pkt();
+                int ret = bpf_run_all(bpf_image, bpf_prog_len,
+                                      (uint8_t *) hdr + sizeof(*hdr),
+                                      hdr->caplen, hdr->len);
                 if (ret > 0)
                         pass++;
                 else if (ret == 0)
@@ -1245,14 +1240,14 @@ static int cmd_quit(char *dontcare)
 }
 
 static const struct shell_cmd cmds[] = {
-        CMD("load",             cmd_load),
-        CMD("select",           cmd_select),
-        CMD("step",             cmd_step),
-        CMD("run",              cmd_run),
-        CMD("breakpoint",       cmd_breakpoint),
-        CMD("disassemble",      cmd_disassemble),
-        CMD("dump",             cmd_dump),
-        CMD("quit",             cmd_quit),
+        { .name = "load", .func = cmd_load },
+        { .name = "select", .func = cmd_select },
+        { .name = "step", .func = cmd_step },
+        { .name = "run", .func = cmd_run },
+        { .name = "breakpoint", .func = cmd_breakpoint },
+        { .name = "disassemble", .func = cmd_disassemble },
+        { .name = "dump", .func = cmd_dump },
+        { .name = "quit", .func = cmd_quit },
 };
 
 static int execf(char *arg)
@@ -1280,7 +1275,6 @@ out:
 static char *shell_comp_gen(const char *buf, int state)
 {
         static int list_index, len;
-        const char *name;
 
         if (!state) {
                 list_index = 0;
@@ -1288,9 +1282,9 @@ static char *shell_comp_gen(const char *buf, int state)
         }
 
         for (; list_index < array_size(cmds); ) {
-                name = cmds[list_index].name;
-                list_index++;
+                const char *name = cmds[list_index].name;
 
+                list_index++;
                 if (strncmp(name, buf, len) == 0)
                         return strdup(name);
         }
@@ -1322,16 +1316,9 @@ static void init_shell(FILE *fin, FILE *fout)
 {
         char file[128];
 
-        memset(file, 0, sizeof(file));
-        snprintf(file, sizeof(file) - 1,
-                 "%s/.bpf_dbg_history", getenv("HOME"));
-
+        snprintf(file, sizeof(file), "%s/.bpf_dbg_history", getenv("HOME"));
         read_history(file);
 
-        memset(file, 0, sizeof(file));
-        snprintf(file, sizeof(file) - 1,
-                 "%s/.bpf_dbg_init", getenv("HOME"));
-
         rl_instream = fin;
         rl_outstream = fout;
 
@@ -1348,37 +1335,41 @@ static void init_shell(FILE *fin, FILE *fout)
         rl_bind_key_in_map('\t', rl_complete, emacs_meta_keymap);
         rl_bind_key_in_map('\033', rl_complete, emacs_meta_keymap);
 
+        snprintf(file, sizeof(file), "%s/.bpf_dbg_init", getenv("HOME"));
         rl_read_init_file(file);
+
         rl_prep_terminal(0);
         rl_set_signals();
 
         signal(SIGINT, intr_shell);
 }
 
-static void exit_shell(void)
+static void exit_shell(FILE *fin, FILE *fout)
 {
         char file[128];
 
-        memset(file, 0, sizeof(file));
-        snprintf(file, sizeof(file) - 1,
-                 "%s/.bpf_dbg_history", getenv("HOME"));
-
+        snprintf(file, sizeof(file), "%s/.bpf_dbg_history", getenv("HOME"));
         write_history(file);
+
         clear_history();
         rl_deprep_terminal();
 
         try_close_pcap();
+
+        if (fin != stdin)
+                fclose(fin);
+        if (fout != stdout)
+                fclose(fout);
 }
 
 static int run_shell_loop(FILE *fin, FILE *fout)
 {
         char *buf;
-        int ret;
 
         init_shell(fin, fout);
 
         while ((buf = readline("> ")) != NULL) {
-                ret = execf(buf);
+                int ret = execf(buf);
                 if (ret == CMD_EX)
                         break;
                 if (ret == CMD_OK && strlen(buf) > 0)
@@ -1387,7 +1378,7 @@ static int run_shell_loop(FILE *fin, FILE *fout)
                 free(buf);
         }
 
-        exit_shell();
+        exit_shell(fin, fout);
         return 0;
 }
 
diff --git a/tools/perf/Documentation/perf-bench.txt b/tools/perf/Documentation/perf-bench.txt
index 7065cd6fbdfc..4464ad770d51 100644
--- a/tools/perf/Documentation/perf-bench.txt
+++ b/tools/perf/Documentation/perf-bench.txt
@@ -48,6 +48,12 @@ SUBSYSTEM
 'mem'::
         Memory access performance.
 
+'numa'::
+        NUMA scheduling and MM benchmarks.
+
+'futex'::
+        Futex stressing benchmarks.
+
 'all'::
         All benchmark subsystems.
 
@@ -187,6 +193,22 @@ Show only the result with page faults before memset.
 --no-prefault::
 Show only the result without page faults before memset.
 
+SUITES FOR 'numa'
+~~~~~~~~~~~~~~~~~
+*mem*::
+Suite for evaluating NUMA workloads.
+
+SUITES FOR 'futex'
+~~~~~~~~~~~~~~~~~~
+*hash*::
+Suite for evaluating hash tables.
+
+*wake*::
+Suite for evaluating wake calls.
+
+*requeue*::
+Suite for evaluating requeue calls.
+
 SEE ALSO
 --------
 linkperf:perf[1]
diff --git a/tools/perf/Documentation/perf-mem.txt b/tools/perf/Documentation/perf-mem.txt
index 888d51137fbe..1d78a4064da4 100644
--- a/tools/perf/Documentation/perf-mem.txt
+++ b/tools/perf/Documentation/perf-mem.txt
@@ -18,6 +18,10 @@ from it, into perf.data. Perf record options are accepted and are passed through
 "perf mem -t <TYPE> report" displays the result. It invokes perf report with the
 right set of options to display a memory access profile.
 
+Note that on Intel systems the memory latency reported is the use-latency,
+not the pure load (or store latency). Use latency includes any pipeline
+queueing delays in addition to the memory subsystem latency.
+
 OPTIONS
 -------
 <command>...::
diff --git a/tools/perf/Documentation/perf-probe.txt b/tools/perf/Documentation/perf-probe.txt
index b715cb71592b..1513935c399b 100644
--- a/tools/perf/Documentation/perf-probe.txt
+++ b/tools/perf/Documentation/perf-probe.txt
@@ -136,6 +136,8 @@ Each probe argument follows below syntax.
 'NAME' specifies the name of this argument (optional). You can use the name of local variable, local data structure member (e.g. var->field, var.field2), local array with fixed index (e.g. array[1], var->array[0], var->pointer[2]), or kprobe-tracer argument format (e.g. $retval, %ax, etc). Note that the name of this argument will be set as the last member name if you specify a local data structure member (e.g. field2 for 'var->field1.field2'.)
 'TYPE' casts the type of this argument (optional). If omitted, perf probe automatically set the type based on debuginfo. You can specify 'string' type only for the local variable or structure member which is an array of or a pointer to 'char' or 'unsigned char' type.
 
+On x86 systems %REG is always the short form of the register: for example %AX. %RAX or %EAX is not valid.
+
 LINE SYNTAX
 -----------
 Line range is described by following syntax.
diff --git a/tools/perf/Documentation/perf-top.txt b/tools/perf/Documentation/perf-top.txt
index cdd8d4946dba..976b00c6cdb1 100644
--- a/tools/perf/Documentation/perf-top.txt
+++ b/tools/perf/Documentation/perf-top.txt
@@ -87,7 +87,6 @@ Default is to monitor all CPUS.
 --realtime=<priority>::
         Collect data with this RT SCHED_FIFO priority.
 
--s <symbol>::
 --sym-annotate=<symbol>::
         Annotate this symbol.
 
diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST
index f41572d0dd76..c0c87c87b60f 100644
--- a/tools/perf/MANIFEST
+++ b/tools/perf/MANIFEST
@@ -6,6 +6,7 @@ tools/lib/symbol/kallsyms.c
 tools/lib/symbol/kallsyms.h
 tools/include/asm/bug.h
 tools/include/linux/compiler.h
+tools/include/linux/hash.h
 include/linux/const.h
 include/linux/perf_event.h
 include/linux/rbtree.h
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 7257e7e9e38a..895edd32930c 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -7,6 +7,8 @@ include config/utilities.mak
 
 # Define V to have a more verbose compile.
 #
+# Define VF to have a more verbose feature check output.
+#
 # Define O to save output files in a separate directory.
 #
 # Define ARCH as name of target architecture if you want cross-builds.
@@ -55,6 +57,9 @@ include config/utilities.mak
 # Define NO_LIBAUDIT if you do not want libaudit support
 #
 # Define NO_LIBBIONIC if you do not want bionic support
+#
+# Define NO_LIBDW_DWARF_UNWIND if you do not want libdw support
+# for dwarf backtrace post unwind.
 
 ifeq ($(srctree),)
 srctree := $(patsubst %/,%,$(dir $(shell pwd)))
@@ -187,13 +192,13 @@ endif
 export PERL_PATH
 
 $(OUTPUT)util/parse-events-flex.c: util/parse-events.l $(OUTPUT)util/parse-events-bison.c
-        $(QUIET_FLEX)$(FLEX) --header-file=$(OUTPUT)util/parse-events-flex.h $(PARSER_DEBUG_FLEX) -t util/parse-events.l > $(OUTPUT)util/parse-events-flex.c
+        $(QUIET_FLEX)$(FLEX) -o $@ --header-file=$(OUTPUT)util/parse-events-flex.h $(PARSER_DEBUG_FLEX) util/parse-events.l
 
 $(OUTPUT)util/parse-events-bison.c: util/parse-events.y
         $(QUIET_BISON)$(BISON) -v util/parse-events.y -d $(PARSER_DEBUG_BISON) -o $(OUTPUT)util/parse-events-bison.c -p parse_events_
 
 $(OUTPUT)util/pmu-flex.c: util/pmu.l $(OUTPUT)util/pmu-bison.c
-        $(QUIET_FLEX)$(FLEX) --header-file=$(OUTPUT)util/pmu-flex.h -t util/pmu.l > $(OUTPUT)util/pmu-flex.c
+        $(QUIET_FLEX)$(FLEX) -o $@ --header-file=$(OUTPUT)util/pmu-flex.h util/pmu.l
 
 $(OUTPUT)util/pmu-bison.c: util/pmu.y
         $(QUIET_BISON)$(BISON) -v util/pmu.y -d -o $(OUTPUT)util/pmu-bison.c -p perf_pmu_
@@ -208,7 +213,7 @@ LIB_H += ../../include/uapi/linux/perf_event.h
 LIB_H += ../../include/linux/rbtree.h
 LIB_H += ../../include/linux/list.h
 LIB_H += ../../include/uapi/linux/const.h
-LIB_H += ../../include/linux/hash.h
+LIB_H += ../include/linux/hash.h
 LIB_H += ../../include/linux/stringify.h
 LIB_H += util/include/linux/bitmap.h
 LIB_H += util/include/linux/bitops.h
@@ -218,9 +223,7 @@ LIB_H += util/include/linux/ctype.h
 LIB_H += util/include/linux/kernel.h
 LIB_H += util/include/linux/list.h
 LIB_H += util/include/linux/export.h
-LIB_H += util/include/linux/magic.h
 LIB_H += util/include/linux/poison.h
-LIB_H += util/include/linux/prefetch.h
 LIB_H += util/include/linux/rbtree.h
 LIB_H += util/include/linux/rbtree_augmented.h
 LIB_H += util/include/linux/string.h
@@ -244,7 +247,6 @@ LIB_H += util/cache.h
 LIB_H += util/callchain.h
 LIB_H += util/build-id.h
 LIB_H += util/debug.h
-LIB_H += util/fs.h
 LIB_H += util/pmu.h
 LIB_H += util/event.h
 LIB_H += util/evsel.h
@@ -306,7 +308,6 @@ LIB_OBJS += $(OUTPUT)util/annotate.o
 LIB_OBJS += $(OUTPUT)util/build-id.o
 LIB_OBJS += $(OUTPUT)util/config.o
 LIB_OBJS += $(OUTPUT)util/ctype.o
-LIB_OBJS += $(OUTPUT)util/fs.o
 LIB_OBJS += $(OUTPUT)util/pmu.o
 LIB_OBJS += $(OUTPUT)util/environment.o
 LIB_OBJS += $(OUTPUT)util/event.o
@@ -408,6 +409,11 @@ endif
 LIB_OBJS += $(OUTPUT)tests/code-reading.o
 LIB_OBJS += $(OUTPUT)tests/sample-parsing.o
 LIB_OBJS += $(OUTPUT)tests/parse-no-sample-id-all.o
+ifndef NO_DWARF_UNWIND
+ifeq ($(ARCH),x86)
+LIB_OBJS += $(OUTPUT)tests/dwarf-unwind.o
+endif
+endif
 
 BUILTIN_OBJS += $(OUTPUT)builtin-annotate.o
 BUILTIN_OBJS += $(OUTPUT)builtin-bench.o
@@ -420,6 +426,9 @@ BUILTIN_OBJS += $(OUTPUT)bench/mem-memset-x86-64-asm.o
 endif
 BUILTIN_OBJS += $(OUTPUT)bench/mem-memcpy.o
 BUILTIN_OBJS += $(OUTPUT)bench/mem-memset.o
+BUILTIN_OBJS += $(OUTPUT)bench/futex-hash.o
+BUILTIN_OBJS += $(OUTPUT)bench/futex-wake.o
+BUILTIN_OBJS += $(OUTPUT)bench/futex-requeue.o
 
 BUILTIN_OBJS += $(OUTPUT)builtin-diff.o
 BUILTIN_OBJS += $(OUTPUT)builtin-evlist.o
@@ -475,8 +484,13 @@ ifndef NO_DWARF
 endif # NO_DWARF
 endif # NO_LIBELF
 
+ifndef NO_LIBDW_DWARF_UNWIND
+  LIB_OBJS += $(OUTPUT)util/unwind-libdw.o
+  LIB_H += util/unwind-libdw.h
+endif
+
 ifndef NO_LIBUNWIND
-  LIB_OBJS += $(OUTPUT)util/unwind.o
+  LIB_OBJS += $(OUTPUT)util/unwind-libunwind.o
 endif
 LIB_OBJS += $(OUTPUT)tests/keep-tracking.o
 
@@ -533,6 +547,7 @@ ifeq ($(NO_PERF_REGS),0)
   ifeq ($(ARCH),x86)
     LIB_H += arch/x86/include/perf_regs.h
   endif
+  LIB_OBJS += $(OUTPUT)util/perf_regs.o
 endif
 
 ifndef NO_LIBNUMA
@@ -574,7 +589,7 @@ $(GTK_OBJS): $(OUTPUT)%.o: %.c $(LIB_H)
         $(QUIET_CC)$(CC) -o $@ -c -fPIC $(CFLAGS) $(GTK_CFLAGS) $<
 
 $(OUTPUT)libperf-gtk.so: $(GTK_OBJS) $(PERFLIBS)
-        $(QUIET_LINK)$(CC) -o $@ -shared $(ALL_LDFLAGS) $(filter %.o,$^) $(GTK_LIBS)
+        $(QUIET_LINK)$(CC) -o $@ -shared $(LDFLAGS) $(filter %.o,$^) $(GTK_LIBS)
 
 $(OUTPUT)builtin-help.o: builtin-help.c $(OUTPUT)common-cmds.h $(OUTPUT)PERF-CFLAGS
         $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) \
@@ -655,6 +670,9 @@ $(OUTPUT)tests/python-use.o: tests/python-use.c $(OUTPUT)PERF-CFLAGS
                 -DPYTHON='"$(PYTHON_WORD)"' \
                 $<
 
+$(OUTPUT)tests/dwarf-unwind.o: tests/dwarf-unwind.c
+        $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) -fno-optimize-sibling-calls $<
+
 $(OUTPUT)util/config.o: util/config.c $(OUTPUT)PERF-CFLAGS
         $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<
 
@@ -707,9 +725,15 @@ $(patsubst perf-%,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h)
 # we depend the various files onto their directories.
 DIRECTORY_DEPS = $(LIB_OBJS) $(BUILTIN_OBJS) $(GTK_OBJS)
 DIRECTORY_DEPS += $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h
-$(DIRECTORY_DEPS): | $(sort $(dir $(DIRECTORY_DEPS)))
+# no need to add flex objects, because they depend on bison ones
+DIRECTORY_DEPS += $(OUTPUT)util/parse-events-bison.c
+DIRECTORY_DEPS += $(OUTPUT)util/pmu-bison.c
+
+OUTPUT_DIRECTORIES := $(sort $(dir $(DIRECTORY_DEPS)))
+
+$(DIRECTORY_DEPS): | $(OUTPUT_DIRECTORIES)
 # In the second step, we make a rule to actually create these directories
-$(sort $(dir $(DIRECTORY_DEPS))):
+$(OUTPUT_DIRECTORIES):
         $(QUIET_MKDIR)$(MKDIR) -p $@ 2>/dev/null
 
 $(LIB_FILE): $(LIB_OBJS)
@@ -886,7 +910,7 @@ config-clean:
 clean: $(LIBTRACEEVENT)-clean $(LIBAPIKFS)-clean config-clean
         $(call QUIET_CLEAN, core-objs)  $(RM) $(LIB_OBJS) $(BUILTIN_OBJS) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf.o $(LANG_BINDINGS) $(GTK_OBJS)
         $(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf
-        $(call QUIET_CLEAN, core-gen)   $(RM)  *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)PERF-CFLAGS $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex*
+        $(call QUIET_CLEAN, core-gen)   $(RM)  *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)PERF-CFLAGS $(OUTPUT)PERF-FEATURES $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex*
         $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean
         $(python-clean)
 
diff --git a/tools/perf/arch/arm/Makefile b/tools/perf/arch/arm/Makefile
index fe9b61e322a5..67e9b3d38e89 100644
--- a/tools/perf/arch/arm/Makefile
+++ b/tools/perf/arch/arm/Makefile
@@ -3,5 +3,5 @@ PERF_HAVE_DWARF_REGS := 1
 LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o
 endif
 ifndef NO_LIBUNWIND
-LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/unwind.o
+LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/unwind-libunwind.o
 endif
diff --git a/tools/perf/arch/arm/util/unwind.c b/tools/perf/arch/arm/util/unwind-libunwind.c
index da3dc950550c..729ed69a6664 100644
--- a/tools/perf/arch/arm/util/unwind.c
+++ b/tools/perf/arch/arm/util/unwind-libunwind.c
@@ -4,7 +4,7 @@
 #include "perf_regs.h"
 #include "../../util/unwind.h"
 
-int unwind__arch_reg_id(int regnum)
+int libunwind__arch_reg_id(int regnum)
 {
         switch (regnum) {
         case UNW_ARM_R0:
diff --git a/tools/perf/arch/x86/Makefile b/tools/perf/arch/x86/Makefile
index 8801fe02f206..1641542e3636 100644
--- a/tools/perf/arch/x86/Makefile
+++ b/tools/perf/arch/x86/Makefile
@@ -3,7 +3,14 @@ PERF_HAVE_DWARF_REGS := 1
 LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o
 endif
 ifndef NO_LIBUNWIND
-LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/unwind.o
+LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/unwind-libunwind.o
+endif
+ifndef NO_LIBDW_DWARF_UNWIND
+LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/unwind-libdw.o
+endif
+ifndef NO_DWARF_UNWIND
+LIB_OBJS += $(OUTPUT)arch/$(ARCH)/tests/regs_load.o
+LIB_OBJS += $(OUTPUT)arch/$(ARCH)/tests/dwarf-unwind.o
 endif
 LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/header.o
 LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/tsc.o
diff --git a/tools/perf/arch/x86/include/perf_regs.h b/tools/perf/arch/x86/include/perf_regs.h
index e84ca76aae77..fc819ca34a7e 100644
--- a/tools/perf/arch/x86/include/perf_regs.h
+++ b/tools/perf/arch/x86/include/perf_regs.h
@@ -5,14 +5,20 @@
 #include "../../util/types.h"
 #include <asm/perf_regs.h>
 
+void perf_regs_load(u64 *regs);
+
 #ifndef HAVE_ARCH_X86_64_SUPPORT
 #define PERF_REGS_MASK ((1ULL << PERF_REG_X86_32_MAX) - 1)
+#define PERF_REGS_MAX PERF_REG_X86_32_MAX
+#define PERF_SAMPLE_REGS_ABI PERF_SAMPLE_REGS_ABI_32
 #else
 #define REG_NOSUPPORT ((1ULL << PERF_REG_X86_DS) | \
                        (1ULL << PERF_REG_X86_ES) | \
                        (1ULL << PERF_REG_X86_FS) | \
                        (1ULL << PERF_REG_X86_GS))
 #define PERF_REGS_MASK (((1ULL << PERF_REG_X86_64_MAX) - 1) & ~REG_NOSUPPORT)
+#define PERF_REGS_MAX PERF_REG_X86_64_MAX
+#define PERF_SAMPLE_REGS_ABI PERF_SAMPLE_REGS_ABI_64
 #endif
 #define PERF_REG_IP PERF_REG_X86_IP
 #define PERF_REG_SP PERF_REG_X86_SP
diff --git a/tools/perf/arch/x86/tests/dwarf-unwind.c b/tools/perf/arch/x86/tests/dwarf-unwind.c
new file mode 100644
index 000000000000..83bc2385e6d3
--- /dev/null
+++ b/tools/perf/arch/x86/tests/dwarf-unwind.c
@@ -0,0 +1,60 @@
+#include <string.h>
+#include "perf_regs.h"
+#include "thread.h"
+#include "map.h"
+#include "event.h"
+#include "tests/tests.h"
+
+#define STACK_SIZE 8192
+
+static int sample_ustack(struct perf_sample *sample,
+                         struct thread *thread, u64 *regs)
+{
+        struct stack_dump *stack = &sample->user_stack;
+        struct map *map;
+        unsigned long sp;
+        u64 stack_size, *buf;
+
+        buf = malloc(STACK_SIZE);
+        if (!buf) {
+                pr_debug("failed to allocate sample uregs data\n");
+                return -1;
+        }
+
+        sp = (unsigned long) regs[PERF_REG_X86_SP];
+
+        map = map_groups__find(&thread->mg, MAP__VARIABLE, (u64) sp);
+        if (!map) {
+                pr_debug("failed to get stack map\n");
+                free(buf);
+                return -1;
+        }
+
+        stack_size = map->end - sp;
+        stack_size = stack_size > STACK_SIZE ? STACK_SIZE : stack_size;
+
+        memcpy(buf, (void *) sp, stack_size);
+        stack->data = (char *) buf;
+        stack->size = stack_size;
+        return 0;
+}
+
+int test__arch_unwind_sample(struct perf_sample *sample,
+                             struct thread *thread)
+{
+        struct regs_dump *regs = &sample->user_regs;
+        u64 *buf;
+
+        buf = malloc(sizeof(u64) * PERF_REGS_MAX);
+        if (!buf) {
+                pr_debug("failed to allocate sample uregs data\n");
+                return -1;
+        }
+
+        perf_regs_load(buf);
+        regs->abi  = PERF_SAMPLE_REGS_ABI;
+        regs->regs = buf;
+        regs->mask = PERF_REGS_MASK;
+
+        return sample_ustack(sample, thread, buf);
+}
diff --git a/tools/perf/arch/x86/tests/regs_load.S b/tools/perf/arch/x86/tests/regs_load.S
new file mode 100644
index 000000000000..60875d5c556c
--- /dev/null
+++ b/tools/perf/arch/x86/tests/regs_load.S
@@ -0,0 +1,98 @@
+#include <linux/linkage.h>
+
+#define AX       0
+#define BX       1 * 8
+#define CX       2 * 8
+#define DX       3 * 8
+#define SI       4 * 8
+#define DI       5 * 8
+#define BP       6 * 8
+#define SP       7 * 8
+#define IP       8 * 8
+#define FLAGS    9 * 8
+#define CS      10 * 8
+#define SS      11 * 8
+#define DS      12 * 8
+#define ES      13 * 8
+#define FS      14 * 8
+#define GS      15 * 8
+#define R8      16 * 8
+#define R9      17 * 8
+#define R10     18 * 8
+#define R11     19 * 8
+#define R12     20 * 8
+#define R13     21 * 8
+#define R14     22 * 8
+#define R15     23 * 8
+
+.text
+#ifdef HAVE_ARCH_X86_64_SUPPORT
+ENTRY(perf_regs_load)
+        movq %rax, AX(%rdi)
+        movq %rbx, BX(%rdi)
+        movq %rcx, CX(%rdi)
+        movq %rdx, DX(%rdi)
+        movq %rsi, SI(%rdi)
+        movq %rdi, DI(%rdi)
+        movq %rbp, BP(%rdi)
+
+        leaq 8(%rsp), %rax /* exclude this call.  */
+        movq %rax, SP(%rdi)
+
+        movq 0(%rsp), %rax
+        movq %rax, IP(%rdi)
+
+        movq $0, FLAGS(%rdi)
+        movq $0, CS(%rdi)
+        movq $0, SS(%rdi)
+        movq $0, DS(%rdi)
+        movq $0, ES(%rdi)
+        movq $0, FS(%rdi)
+        movq $0, GS(%rdi)
+
+        movq %r8,  R8(%rdi)
+        movq %r9,  R9(%rdi)
+        movq %r10, R10(%rdi)
+        movq %r11, R11(%rdi)
+        movq %r12, R12(%rdi)
+        movq %r13, R13(%rdi)
+        movq %r14, R14(%rdi)
+        movq %r15, R15(%rdi)
+        ret
+ENDPROC(perf_regs_load)
+#else
+ENTRY(perf_regs_load)
+        push %edi
+        movl 8(%esp), %edi
+        movl %eax, AX(%edi)
+        movl %ebx, BX(%edi)
+        movl %ecx, CX(%edi)
+        movl %edx, DX(%edi)
+        movl %esi, SI(%edi)
+        pop %eax
+        movl %eax, DI(%edi)
+        movl %ebp, BP(%edi)
+
+        leal 4(%esp), %eax /* exclude this call.  */
+        movl %eax, SP(%edi)
+
+        movl 0(%esp), %eax
+        movl %eax, IP(%edi)
+
+        movl $0, FLAGS(%edi)
+        movl $0, CS(%edi)
+        movl $0, SS(%edi)
+        movl $0, DS(%edi)
+        movl $0, ES(%edi)
+        movl $0, FS(%edi)
+        movl $0, GS(%edi)
+        ret
+ENDPROC(perf_regs_load)
+#endif
+
+/*
+ * We need to provide note.GNU-stack section, saying that we want
+ * NOT executable stack. Otherwise the final linking will assume that
+ * the ELF stack should not be restricted at all and set it RWX.
+ */
+.section .note.GNU-stack,"",@progbits
diff --git a/tools/perf/arch/x86/util/unwind-libdw.c b/tools/perf/arch/x86/util/unwind-libdw.c
new file mode 100644
index 000000000000..c4b72176ca83
--- /dev/null
+++ b/tools/perf/arch/x86/util/unwind-libdw.c
@@ -0,0 +1,51 @@
+#include <elfutils/libdwfl.h>
+#include "../../util/unwind-libdw.h"
+#include "../../util/perf_regs.h"
+
+bool libdw__arch_set_initial_registers(Dwfl_Thread *thread, void *arg)
+{
+        struct unwind_info *ui = arg;
+        struct regs_dump *user_regs = &ui->sample->user_regs;
+        Dwarf_Word dwarf_regs[17];
+        unsigned nregs;
+
+#define REG(r) ({                                               \
+        Dwarf_Word val = 0;                                     \
+        perf_reg_value(&val, user_regs, PERF_REG_X86_##r);      \
+        val;                                                    \
+})
+
+        if (user_regs->abi == PERF_SAMPLE_REGS_ABI_32) {
+                dwarf_regs[0] = REG(AX);
+                dwarf_regs[1] = REG(CX);
+                dwarf_regs[2] = REG(DX);
+                dwarf_regs[3] = REG(BX);
+                dwarf_regs[4] = REG(SP);
+                dwarf_regs[5] = REG(BP);
+                dwarf_regs[6] = REG(SI);
+                dwarf_regs[7] = REG(DI);
+                dwarf_regs[8] = REG(IP);
+                nregs = 9;
+        } else {
+                dwarf_regs[0]  = REG(AX);
+                dwarf_regs[1]  = REG(DX);
+                dwarf_regs[2]  = REG(CX);
+                dwarf_regs[3]  = REG(BX);
+                dwarf_regs[4]  = REG(SI);
+                dwarf_regs[5]  = REG(DI);
+                dwarf_regs[6]  = REG(BP);
+                dwarf_regs[7]  = REG(SP);
+                dwarf_regs[8]  = REG(R8);
+                dwarf_regs[9]  = REG(R9);
+                dwarf_regs[10] = REG(R10);
+                dwarf_regs[11] = REG(R11);
+                dwarf_regs[12] = REG(R12);
+                dwarf_regs[13] = REG(R13);
+                dwarf_regs[14] = REG(R14);
+                dwarf_regs[15] = REG(R15);
+                dwarf_regs[16] = REG(IP);
+                nregs = 17;
+        }
+
+        return dwfl_thread_state_registers(thread, 0, nregs, dwarf_regs);
+}
diff --git a/tools/perf/arch/x86/util/unwind.c b/tools/perf/arch/x86/util/unwind-libunwind.c
index 456a88cf5b37..3261f68c6a7c 100644
--- a/tools/perf/arch/x86/util/unwind.c
+++ b/tools/perf/arch/x86/util/unwind-libunwind.c
@@ -5,7 +5,7 @@
 #include "../../util/unwind.h"
 
 #ifdef HAVE_ARCH_X86_64_SUPPORT
-int unwind__arch_reg_id(int regnum)
+int libunwind__arch_reg_id(int regnum)
 {
         int id;
 
@@ -69,7 +69,7 @@ int unwind__arch_reg_id(int regnum)
         return id;
 }
 #else
-int unwind__arch_reg_id(int regnum)
+int libunwind__arch_reg_id(int regnum)
 {
         int id;
 
diff --git a/tools/perf/bench/bench.h b/tools/perf/bench/bench.h
index 0fdc85269c4d..eba46709b279 100644
--- a/tools/perf/bench/bench.h
+++ b/tools/perf/bench/bench.h
@@ -31,6 +31,9 @@ extern int bench_sched_pipe(int argc, const char **argv, const char *prefix);
 extern int bench_mem_memcpy(int argc, const char **argv,
                             const char *prefix __maybe_unused);
 extern int bench_mem_memset(int argc, const char **argv, const char *prefix);
+extern int bench_futex_hash(int argc, const char **argv, const char *prefix);
+extern int bench_futex_wake(int argc, const char **argv, const char *prefix);
+extern int bench_futex_requeue(int argc, const char **argv, const char *prefix);
 
 #define BENCH_FORMAT_DEFAULT_STR        "default"
 #define BENCH_FORMAT_DEFAULT            0
diff --git a/tools/perf/bench/futex-hash.c b/tools/perf/bench/futex-hash.c
new file mode 100644
index 000000000000..a84206e9c4aa
--- /dev/null
+++ b/tools/perf/bench/futex-hash.c
@@ -0,0 +1,212 @@
+/*
+ * Copyright (C) 2013  Davidlohr Bueso <davidlohr@hp.com>
+ *
+ * futex-hash: Stress the hell out of the Linux kernel futex uaddr hashing.
+ *
+ * This program is particularly useful for measuring the kernel's futex hash
+ * table/function implementation. In order for it to make sense, use with as
+ * many threads and futexes as possible.
+ */
+
+#include "../perf.h"
+#include "../util/util.h"
+#include "../util/stat.h"
+#include "../util/parse-options.h"
+#include "../util/header.h"
+#include "bench.h"
+#include "futex.h"
+
+#include <err.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <pthread.h>
+
+static unsigned int nthreads = 0;
+static unsigned int nsecs    = 10;
+/* amount of futexes per thread */
+static unsigned int nfutexes = 1024;
+static bool fshared = false, done = false, silent = false;
+
+struct timeval start, end, runtime;
+static pthread_mutex_t thread_lock;
+static unsigned int threads_starting;
+static struct stats throughput_stats;
+static pthread_cond_t thread_parent, thread_worker;
+
+struct worker {
+        int tid;
+        u_int32_t *futex;
+        pthread_t thread;
+        unsigned long ops;
+};
+
+static const struct option options[] = {
+        OPT_UINTEGER('t', "threads", &nthreads, "Specify amount of threads"),
+        OPT_UINTEGER('r', "runtime", &nsecs,    "Specify runtime (in seconds)"),
+        OPT_UINTEGER('f', "futexes", &nfutexes, "Specify amount of futexes per threads"),
+        OPT_BOOLEAN( 's', "silent",  &silent,   "Silent mode: do not display data/details"),
+        OPT_BOOLEAN( 'S', "shared",  &fshared,  "Use shared futexes instead of private ones"),
+        OPT_END()
+};
+
+static const char * const bench_futex_hash_usage[] = {
+        "perf bench futex hash <options>",
+        NULL
+};
+
+static void *workerfn(void *arg)
+{
+        int ret;
+        unsigned int i;
+        struct worker *w = (struct worker *) arg;
+
+        pthread_mutex_lock(&thread_lock);
+        threads_starting--;
+        if (!threads_starting)
+                pthread_cond_signal(&thread_parent);
+        pthread_cond_wait(&thread_worker, &thread_lock);
+        pthread_mutex_unlock(&thread_lock);
+
+        do {
+                for (i = 0; i < nfutexes; i++, w->ops++) {
+                        /*
+                         * We want the futex calls to fail in order to stress
+                         * the hashing of uaddr and not measure other steps,
+                         * such as internal waitqueue handling, thus enlarging
+                         * the critical region protected by hb->lock.
+                         */
+                        ret = futex_wait(&w->futex[i], 1234, NULL,
+                                         fshared ? 0 : FUTEX_PRIVATE_FLAG);
+                        if (!silent &&
+                            (!ret || errno != EAGAIN || errno != EWOULDBLOCK))
+                                warn("Non-expected futex return call");
+                }
+        }  while (!done);
+
+        return NULL;
+}
+
+static void toggle_done(int sig __maybe_unused,
+                        siginfo_t *info __maybe_unused,
+                        void *uc __maybe_unused)
+{
+        /* inform all threads that we're done for the day */
+        done = true;
+        gettimeofday(&end, NULL);
+        timersub(&end, &start, &runtime);
+}
+
+static void print_summary(void)
+{
+        unsigned long avg = avg_stats(&throughput_stats);
+        double stddev = stddev_stats(&throughput_stats);
+
+        printf("%sAveraged %ld operations/sec (+- %.2f%%), total secs = %d\n",
+               !silent ? "\n" : "", avg, rel_stddev_stats(stddev, avg),
+               (int) runtime.tv_sec);
+}
+
+int bench_futex_hash(int argc, const char **argv,
+                     const char *prefix __maybe_unused)
+{
+        int ret = 0;
+        cpu_set_t cpu;
+        struct sigaction act;
+        unsigned int i, ncpus;
+        pthread_attr_t thread_attr;
+        struct worker *worker = NULL;
+
+        argc = parse_options(argc, argv, options, bench_futex_hash_usage, 0);
+        if (argc) {
+                usage_with_options(bench_futex_hash_usage, options);
+                exit(EXIT_FAILURE);
+        }
+
+        ncpus = sysconf(_SC_NPROCESSORS_ONLN);
+
+        sigfillset(&act.sa_mask);
+        act.sa_sigaction = toggle_done;
+        sigaction(SIGINT, &act, NULL);
+
+        if (!nthreads) /* default to the number of CPUs */
+                nthreads = ncpus;
+
+        worker = calloc(nthreads, sizeof(*worker));
+        if (!worker)
+                goto errmem;
+
+        printf("Run summary [PID %d]: %d threads, each operating on %d [%s] futexes for %d secs.\n\n",
+               getpid(), nthreads, nfutexes, fshared ? "shared":"private", nsecs);
+
+        init_stats(&throughput_stats);
+        pthread_mutex_init(&thread_lock, NULL);
+        pthread_cond_init(&thread_parent, NULL);
+        pthread_cond_init(&thread_worker, NULL);
+
+        threads_starting = nthreads;
+        pthread_attr_init(&thread_attr);
+        gettimeofday(&start, NULL);
+        for (i = 0; i < nthreads; i++) {
+                worker[i].tid = i;
+                worker[i].futex = calloc(nfutexes, sizeof(*worker[i].futex));
+                if (!worker[i].futex)
+                        goto errmem;
+
+                CPU_ZERO(&cpu);
+                CPU_SET(i % ncpus, &cpu);
+
+                ret = pthread_attr_setaffinity_np(&thread_attr, sizeof(cpu_set_t), &cpu);
+                if (ret)
+                        err(EXIT_FAILURE, "pthread_attr_setaffinity_np");
+
+                ret = pthread_create(&worker[i].thread, &thread_attr, workerfn,
+                                     (void *)(struct worker *) &worker[i]);
+                if (ret)
+                        err(EXIT_FAILURE, "pthread_create");
+
+        }
+        pthread_attr_destroy(&thread_attr);
+
+        pthread_mutex_lock(&thread_lock);
+        while (threads_starting)
+                pthread_cond_wait(&thread_parent, &thread_lock);
+        pthread_cond_broadcast(&thread_worker);
+        pthread_mutex_unlock(&thread_lock);
+
+        sleep(nsecs);
+        toggle_done(0, NULL, NULL);
+
+        for (i = 0; i < nthreads; i++) {
+                ret = pthread_join(worker[i].thread, NULL);
+                if (ret)
+                        err(EXIT_FAILURE, "pthread_join");
+        }
+
+        /* cleanup & report results */
+        pthread_cond_destroy(&thread_parent);
+        pthread_cond_destroy(&thread_worker);
+        pthread_mutex_destroy(&thread_lock);
+
+        for (i = 0; i < nthreads; i++) {
+                unsigned long t = worker[i].ops/runtime.tv_sec;
+                update_stats(&throughput_stats, t);
+                if (!silent) {
+                        if (nfutexes == 1)
+                                printf("[thread %2d] futex: %p [ %ld ops/sec ]\n",
+                                       worker[i].tid, &worker[i].futex[0], t);
+                        else
+                                printf("[thread %2d] futexes: %p ... %p [ %ld ops/sec ]\n",
+                                       worker[i].tid, &worker[i].futex[0],
+                                       &worker[i].futex[nfutexes-1], t);
+                }
+
+                free(worker[i].futex);
+        }
+
+        print_summary();
+
+        free(worker);
+        return ret;
+errmem:
+        err(EXIT_FAILURE, "calloc");
+}
diff --git a/tools/perf/bench/futex-requeue.c b/tools/perf/bench/futex-requeue.c
new file mode 100644
index 000000000000..a16255876f1d
--- /dev/null
+++ b/tools/perf/bench/futex-requeue.c
@@ -0,0 +1,211 @@
+/*
+ * Copyright (C) 2013  Davidlohr Bueso <davidlohr@hp.com>
+ *
+ * futex-requeue: Block a bunch of threads on futex1 and requeue them
+ *                on futex2, N at a time.
+ *
+ * This program is particularly useful to measure the latency of nthread
+ * requeues without waking up any tasks -- thus mimicking a regular futex_wait.
+ */
+
+#include "../perf.h"
+#include "../util/util.h"
+#include "../util/stat.h"
+#include "../util/parse-options.h"
+#include "../util/header.h"
+#include "bench.h"
+#include "futex.h"
+
+#include <err.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <pthread.h>
+
+static u_int32_t futex1 = 0, futex2 = 0;
+
+/*
+ * How many tasks to requeue at a time.
+ * Default to 1 in order to make the kernel work more.
+ */
+static unsigned int nrequeue = 1;
+
+/*
+ * There can be significant variance from run to run,
+ * the more repeats, the more exact the overall avg and
+ * the better idea of the futex latency.
+ */
+static unsigned int repeat = 10;
+
+static pthread_t *worker;
+static bool done = 0, silent = 0;
+static pthread_mutex_t thread_lock;
+static pthread_cond_t thread_parent, thread_worker;
+static struct stats requeuetime_stats, requeued_stats;
+static unsigned int ncpus, threads_starting, nthreads = 0;
+
+static const struct option options[] = {
+        OPT_UINTEGER('t', "threads",  &nthreads, "Specify amount of threads"),
+        OPT_UINTEGER('q', "nrequeue", &nrequeue, "Specify amount of threads to requeue at once"),
+        OPT_UINTEGER('r', "repeat",   &repeat,   "Specify amount of times to repeat the run"),
+        OPT_BOOLEAN( 's', "silent",   &silent,   "Silent mode: do not display data/details"),
+        OPT_END()
+};
+
+static const char * const bench_futex_requeue_usage[] = {
+        "perf bench futex requeue <options>",
+        NULL
+};
+
+static void print_summary(void)
+{
+        double requeuetime_avg = avg_stats(&requeuetime_stats);
+        double requeuetime_stddev = stddev_stats(&requeuetime_stats);
+        unsigned int requeued_avg = avg_stats(&requeued_stats);
+
+        printf("Requeued %d of %d threads in %.4f ms (+-%.2f%%)\n",
+               requeued_avg,
+               nthreads,
+               requeuetime_avg/1e3,
+               rel_stddev_stats(requeuetime_stddev, requeuetime_avg));
+}
+
+static void *workerfn(void *arg __maybe_unused)
+{
+        pthread_mutex_lock(&thread_lock);
+        threads_starting--;
+        if (!threads_starting)
+                pthread_cond_signal(&thread_parent);
+        pthread_cond_wait(&thread_worker, &thread_lock);
+        pthread_mutex_unlock(&thread_lock);
+
+        futex_wait(&futex1, 0, NULL, FUTEX_PRIVATE_FLAG);
+        return NULL;
+}
+
+static void block_threads(pthread_t *w,
+                          pthread_attr_t thread_attr)
+{
+        cpu_set_t cpu;
+        unsigned int i;
+
+        threads_starting = nthreads;
+
+        /* create and block all threads */
+        for (i = 0; i < nthreads; i++) {
+                CPU_ZERO(&cpu);
+                CPU_SET(i % ncpus, &cpu);
+
+                if (pthread_attr_setaffinity_np(&thread_attr, sizeof(cpu_set_t), &cpu))
+                        err(EXIT_FAILURE, "pthread_attr_setaffinity_np");
+
+                if (pthread_create(&w[i], &thread_attr, workerfn, NULL))
+                        err(EXIT_FAILURE, "pthread_create");
+        }
+}
+
+static void toggle_done(int sig __maybe_unused,
+                        siginfo_t *info __maybe_unused,
+                        void *uc __maybe_unused)
+{
+        done = true;
+}
+
+int bench_futex_requeue(int argc, const char **argv,
+                        const char *prefix __maybe_unused)
+{
+        int ret = 0;
+        unsigned int i, j;
+        struct sigaction act;
+        pthread_attr_t thread_attr;
+
+        argc = parse_options(argc, argv, options, bench_futex_requeue_usage, 0);
+        if (argc)
+                goto err;
+
+        ncpus = sysconf(_SC_NPROCESSORS_ONLN);
+
+        sigfillset(&act.sa_mask);
+        act.sa_sigaction = toggle_done;
+        sigaction(SIGINT, &act, NULL);
+
+        if (!nthreads)
+                nthreads = ncpus;
+
+        worker = calloc(nthreads, sizeof(*worker));
+        if (!worker)
+                err(EXIT_FAILURE, "calloc");
+
+        printf("Run summary [PID %d]: Requeuing %d threads (from %p to %p), "
+               "%d at a time.\n\n",
+               getpid(), nthreads, &futex1, &futex2, nrequeue);
+
+        init_stats(&requeued_stats);
+        init_stats(&requeuetime_stats);
+        pthread_attr_init(&thread_attr);
+        pthread_mutex_init(&thread_lock, NULL);
+        pthread_cond_init(&thread_parent, NULL);
+        pthread_cond_init(&thread_worker, NULL);
+
+        for (j = 0; j < repeat && !done; j++) {
+                unsigned int nrequeued = 0;
+                struct timeval start, end, runtime;
+
+                /* create, launch & block all threads */
+                block_threads(worker, thread_attr);
+
+                /* make sure all threads are already blocked */
+                pthread_mutex_lock(&thread_lock);
+                while (threads_starting)
+                        pthread_cond_wait(&thread_parent, &thread_lock);
+                pthread_cond_broadcast(&thread_worker);
+                pthread_mutex_unlock(&thread_lock);
+
+                usleep(100000);
+
+                /* Ok, all threads are patiently blocked, start requeueing */
+                gettimeofday(&start, NULL);
+                for (nrequeued = 0; nrequeued < nthreads; nrequeued += nrequeue)
+                        /*
+                         * Do not wakeup any tasks blocked on futex1, allowing
+                         * us to really measure futex_wait functionality.
+                         */
+                        futex_cmp_requeue(&futex1, 0, &futex2, 0, nrequeue,
+                                          FUTEX_PRIVATE_FLAG);
+                gettimeofday(&end, NULL);
+                timersub(&end, &start, &runtime);
+
+                update_stats(&requeued_stats, nrequeued);
+                update_stats(&requeuetime_stats, runtime.tv_usec);
+
+                if (!silent) {
+                        printf("[Run %d]: Requeued %d of %d threads in %.4f ms\n",
+                               j + 1, nrequeued, nthreads, runtime.tv_usec/1e3);
+                }
+
+                /* everybody should be blocked on futex2, wake'em up */
+                nrequeued = futex_wake(&futex2, nthreads, FUTEX_PRIVATE_FLAG);
+                if (nthreads != nrequeued)
+                        warnx("couldn't wakeup all tasks (%d/%d)", nrequeued, nthreads);
+
+                for (i = 0; i < nthreads; i++) {
+                        ret = pthread_join(worker[i], NULL);
+                        if (ret)
+                                err(EXIT_FAILURE, "pthread_join");
+                }
+
+        }
+
+        /* cleanup & report results */
+        pthread_cond_destroy(&thread_parent);
+        pthread_cond_destroy(&thread_worker);
+        pthread_mutex_destroy(&thread_lock);
+        pthread_attr_destroy(&thread_attr);
+
+        print_summary();
+
+        free(worker);
+        return ret;
+err:
+        usage_with_options(bench_futex_requeue_usage, options);
+        exit(EXIT_FAILURE);
+}
diff --git a/tools/perf/bench/futex-wake.c b/tools/perf/bench/futex-wake.c
new file mode 100644
index 000000000000..d096169b161e
--- /dev/null
+++ b/tools/perf/bench/futex-wake.c
@@ -0,0 +1,201 @@
+/*
+ * Copyright (C) 2013  Davidlohr Bueso <davidlohr@hp.com>
+ *
+ * futex-wake: Block a bunch of threads on a futex and wake'em up, N at a time.
+ *
+ * This program is particularly useful to measure the latency of nthread wakeups
+ * in non-error situations:  all waiters are queued and all wake calls wakeup
+ * one or more tasks, and thus the waitqueue is never empty.
+ */
+
+#include "../perf.h"
+#include "../util/util.h"
+#include "../util/stat.h"
+#include "../util/parse-options.h"
+#include "../util/header.h"
+#include "bench.h"
+#include "futex.h"
+
+#include <err.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <pthread.h>
+
+/* all threads will block on the same futex */
+static u_int32_t futex1 = 0;
+
+/*
+ * How many wakeups to do at a time.
+ * Default to 1 in order to make the kernel work more.
+ */
+static unsigned int nwakes = 1;
+
+/*
+ * There can be significant variance from run to run,
+ * the more repeats, the more exact the overall avg and
+ * the better idea of the futex latency.
+ */
+static unsigned int repeat = 10;
+
+pthread_t *worker;
+static bool done = 0, silent = 0;
+static pthread_mutex_t thread_lock;
+static pthread_cond_t thread_parent, thread_worker;
+static struct stats waketime_stats, wakeup_stats;
+static unsigned int ncpus, threads_starting, nthreads = 0;
+
+static const struct option options[] = {
+        OPT_UINTEGER('t', "threads", &nthreads, "Specify amount of threads"),
+        OPT_UINTEGER('w', "nwakes",  &nwakes,   "Specify amount of threads to wake at once"),
+        OPT_UINTEGER('r', "repeat",  &repeat,   "Specify amount of times to repeat the run"),
+        OPT_BOOLEAN( 's', "silent",  &silent,   "Silent mode: do not display data/details"),
+        OPT_END()
+};
+
+static const char * const bench_futex_wake_usage[] = {
+        "perf bench futex wake <options>",
+        NULL
+};
+
+static void *workerfn(void *arg __maybe_unused)
+{
+        pthread_mutex_lock(&thread_lock);
+        threads_starting--;
+        if (!threads_starting)
+                pthread_cond_signal(&thread_parent);
+        pthread_cond_wait(&thread_worker, &thread_lock);
+        pthread_mutex_unlock(&thread_lock);
+
+        futex_wait(&futex1, 0, NULL, FUTEX_PRIVATE_FLAG);
+        return NULL;
+}
+
+static void print_summary(void)
+{
+        double waketime_avg = avg_stats(&waketime_stats);
+        double waketime_stddev = stddev_stats(&waketime_stats);
+        unsigned int wakeup_avg = avg_stats(&wakeup_stats);
+
+        printf("Wokeup %d of %d threads in %.4f ms (+-%.2f%%)\n",
+               wakeup_avg,
+               nthreads,
+               waketime_avg/1e3,
+               rel_stddev_stats(waketime_stddev, waketime_avg));
+}
+
+static void block_threads(pthread_t *w,
+                          pthread_attr_t thread_attr)
+{
+        cpu_set_t cpu;
+        unsigned int i;
+
+        threads_starting = nthreads;
+
+        /* create and block all threads */
+        for (i = 0; i < nthreads; i++) {
+                CPU_ZERO(&cpu);
+                CPU_SET(i % ncpus, &cpu);
+
+                if (pthread_attr_setaffinity_np(&thread_attr, sizeof(cpu_set_t), &cpu))
+                        err(EXIT_FAILURE, "pthread_attr_setaffinity_np");
+
+                if (pthread_create(&w[i], &thread_attr, workerfn, NULL))
+                        err(EXIT_FAILURE, "pthread_create");
+        }
+}
+
+static void toggle_done(int sig __maybe_unused,
+                        siginfo_t *info __maybe_unused,
+                        void *uc __maybe_unused)
+{
+        done = true;
+}
+
+int bench_futex_wake(int argc, const char **argv,
+                     const char *prefix __maybe_unused)
+{
+        int ret = 0;
+        unsigned int i, j;
+        struct sigaction act;
+        pthread_attr_t thread_attr;
+
+        argc = parse_options(argc, argv, options, bench_futex_wake_usage, 0);
+        if (argc) {
+                usage_with_options(bench_futex_wake_usage, options);
+                exit(EXIT_FAILURE);
+        }
+
+        ncpus = sysconf(_SC_NPROCESSORS_ONLN);
+
+        sigfillset(&act.sa_mask);
+        act.sa_sigaction = toggle_done;
+        sigaction(SIGINT, &act, NULL);
+
+        if (!nthreads)
+                nthreads = ncpus;
+
+        worker = calloc(nthreads, sizeof(*worker));
+        if (!worker)
+                err(EXIT_FAILURE, "calloc");
+
+        printf("Run summary [PID %d]: blocking on %d threads (at futex %p), "
+               "waking up %d at a time.\n\n",
+               getpid(), nthreads, &futex1, nwakes);
+
+        init_stats(&wakeup_stats);
+        init_stats(&waketime_stats);
+        pthread_attr_init(&thread_attr);
+        pthread_mutex_init(&thread_lock, NULL);
+        pthread_cond_init(&thread_parent, NULL);
+        pthread_cond_init(&thread_worker, NULL);
+
+        for (j = 0; j < repeat && !done; j++) {
+                unsigned int nwoken = 0;
+                struct timeval start, end, runtime;
+
+                /* create, launch & block all threads */
+                block_threads(worker, thread_attr);
+
+                /* make sure all threads are already blocked */
+                pthread_mutex_lock(&thread_lock);
+                while (threads_starting)
+                        pthread_cond_wait(&thread_parent, &thread_lock);
+                pthread_cond_broadcast(&thread_worker);
+                pthread_mutex_unlock(&thread_lock);
+
+                usleep(100000);
+
+                /* Ok, all threads are patiently blocked, start waking folks up */
+                gettimeofday(&start, NULL);
+                while (nwoken != nthreads)
+                        nwoken += futex_wake(&futex1, nwakes, FUTEX_PRIVATE_FLAG);
+                gettimeofday(&end, NULL);
+                timersub(&end, &start, &runtime);
+
+                update_stats(&wakeup_stats, nwoken);
+                update_stats(&waketime_stats, runtime.tv_usec);
+
+                if (!silent) {
+                        printf("[Run %d]: Wokeup %d of %d threads in %.4f ms\n",
+                               j + 1, nwoken, nthreads, runtime.tv_usec/1e3);
+                }
+
+                for (i = 0; i < nthreads; i++) {
+                        ret = pthread_join(worker[i], NULL);
+                        if (ret)
+                                err(EXIT_FAILURE, "pthread_join");
+                }
+
+        }
+
+        /* cleanup & report results */
+        pthread_cond_destroy(&thread_parent);
+        pthread_cond_destroy(&thread_worker);
+        pthread_mutex_destroy(&thread_lock);
+        pthread_attr_destroy(&thread_attr);
+
+        print_summary();
+
+        free(worker);
+        return ret;
+}
diff --git a/tools/perf/bench/futex.h b/tools/perf/bench/futex.h
new file mode 100644
index 000000000000..71f2844cf97f
--- /dev/null
+++ b/tools/perf/bench/futex.h
@@ -0,0 +1,71 @@
+/*
+ * Glibc independent futex library for testing kernel functionality.
+ * Shamelessly stolen from Darren Hart <dvhltc@us.ibm.com>
+ *    http://git.kernel.org/cgit/linux/kernel/git/dvhart/futextest.git/
+ */
+
+#ifndef _FUTEX_H
+#define _FUTEX_H
+
+#include <unistd.h>
+#include <sys/syscall.h>
+#include <sys/types.h>
+#include <linux/futex.h>
+
+/**
+ * futex() - SYS_futex syscall wrapper
+ * @uaddr:      address of first futex
+ * @op:         futex op code
+ * @val:        typically expected value of uaddr, but varies by op
+ * @timeout:    typically an absolute struct timespec (except where noted
+ *              otherwise). Overloaded by some ops
+ * @uaddr2:     address of second futex for some ops\
+ * @val3:       varies by op
+ * @opflags:    flags to be bitwise OR'd with op, such as FUTEX_PRIVATE_FLAG
+ *
+ * futex() is used by all the following futex op wrappers. It can also be
+ * used for misuse and abuse testing. Generally, the specific op wrappers
+ * should be used instead. It is a macro instead of an static inline function as
+ * some of the types over overloaded (timeout is used for nr_requeue for
+ * example).
+ *
+ * These argument descriptions are the defaults for all
+ * like-named arguments in the following wrappers except where noted below.
+ */
+#define futex(uaddr, op, val, timeout, uaddr2, val3, opflags) \
+        syscall(SYS_futex, uaddr, op | opflags, val, timeout, uaddr2, val3)
+
+/**
+ * futex_wait() - block on uaddr with optional timeout
+ * @timeout:    relative timeout
+ */
+static inline int
+futex_wait(u_int32_t *uaddr, u_int32_t val, struct timespec *timeout, int opflags)
+{
+        return futex(uaddr, FUTEX_WAIT, val, timeout, NULL, 0, opflags);
+}
+
+/**
+ * futex_wake() - wake one or more tasks blocked on uaddr
+ * @nr_wake:    wake up to this many tasks
+ */
+static inline int
+futex_wake(u_int32_t *uaddr, int nr_wake, int opflags)
+{
+        return futex(uaddr, FUTEX_WAKE, nr_wake, NULL, NULL, 0, opflags);
+}
+
+/**
+* futex_cmp_requeue() - requeue tasks from uaddr to uaddr2
+* @nr_wake:        wake up to this many tasks
+* @nr_requeue:        requeue up to this many tasks
+*/
+static inline int
+futex_cmp_requeue(u_int32_t *uaddr, u_int32_t val, u_int32_t *uaddr2, int nr_wake,
+                 int nr_requeue, int opflags)
+{
+        return futex(uaddr, FUTEX_CMP_REQUEUE, nr_wake, nr_requeue, uaddr2,
+                 val, opflags);
+}
+
+#endif /* _FUTEX_H */
diff --git a/tools/perf/bench/numa.c b/tools/perf/bench/numa.c
index 97d86d828190..ebfa163b80b5 100644
--- a/tools/perf/bench/numa.c
+++ b/tools/perf/bench/numa.c
@@ -1593,6 +1593,10 @@ static void init_params(struct params *p, const char *name, int argc, const char
         p->data_rand_walk               = true;
         p->nr_loops                     = -1;
         p->init_random                  = true;
+        p->mb_global_str                = "1";
+        p->nr_proc                      = 1;
+        p->nr_threads                   = 1;
+        p->nr_secs                      = 5;
         p->run_all                      = argc == 1;
 }
 
diff --git a/tools/perf/builtin-bench.c b/tools/perf/builtin-bench.c
index 8a987d252780..1e6e77710545 100644
--- a/tools/perf/builtin-bench.c
+++ b/tools/perf/builtin-bench.c
@@ -12,6 +12,7 @@
  *  sched ... scheduler and IPC performance
  *  mem   ... memory access performance
  *  numa  ... NUMA scheduling and MM performance
+ *  futex ... Futex performance
  */
 #include "perf.h"
 #include "util/util.h"
@@ -54,6 +55,14 @@ static struct bench mem_benchmarks[] = {
         { NULL,         NULL,                                           NULL                    }
 };
 
+static struct bench futex_benchmarks[] = {
+        { "hash",       "Benchmark for futex hash table",               bench_futex_hash        },
+        { "wake",       "Benchmark for futex wake calls",               bench_futex_wake        },
+        { "requeue",    "Benchmark for futex requeue calls",            bench_futex_requeue     },
+        { "all",        "Test all futex benchmarks",                    NULL                    },
+        { NULL,         NULL,                                           NULL                    }
+};
+
 struct collection {
         const char      *name;
         const char      *summary;
@@ -61,11 +70,12 @@ struct collection {
 };
 
 static struct collection collections[] = {
-        { "sched",      "Scheduler and IPC benchmarks",         sched_benchmarks        },
+        { "sched",      "Scheduler and IPC benchmarks",                 sched_benchmarks        },
         { "mem",        "Memory access benchmarks",                     mem_benchmarks          },
 #ifdef HAVE_LIBNUMA_SUPPORT
         { "numa",       "NUMA scheduling and MM benchmarks",            numa_benchmarks         },
 #endif
+        {"futex",       "Futex stressing benchmarks",                   futex_benchmarks        },
         { "all",        "All benchmarks",                               NULL                    },
         { NULL,         NULL,                                           NULL                    }
 };
diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index a77e31246c00..204fffe22532 100644
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -952,8 +952,8 @@ static int hpp__entry_global(struct perf_hpp_fmt *_fmt, struct perf_hpp *hpp,
                                  dfmt->header_width, buf);
 }
 
-static int hpp__header(struct perf_hpp_fmt *fmt,
-                       struct perf_hpp *hpp)
+static int hpp__header(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
+                       struct perf_evsel *evsel __maybe_unused)
 {
         struct diff_hpp_fmt *dfmt =
                 container_of(fmt, struct diff_hpp_fmt, fmt);
@@ -963,7 +963,8 @@ static int hpp__header(struct perf_hpp_fmt *fmt,
 }
 
 static int hpp__width(struct perf_hpp_fmt *fmt,
-                      struct perf_hpp *hpp __maybe_unused)
+                      struct perf_hpp *hpp __maybe_unused,
+                      struct perf_evsel *evsel __maybe_unused)
 {
         struct diff_hpp_fmt *dfmt =
                 container_of(fmt, struct diff_hpp_fmt, fmt);
diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
index b3466018bbd7..3a7387551369 100644
--- a/tools/perf/builtin-inject.c
+++ b/tools/perf/builtin-inject.c
@@ -312,7 +312,6 @@ found:
         sample_sw.period = sample->period;
         sample_sw.time   = sample->time;
         perf_event__synthesize_sample(event_sw, evsel->attr.sample_type,
-                                      evsel->attr.sample_regs_user,
                                       evsel->attr.read_format, &sample_sw,
                                       false);
         build_id__mark_dso_hit(tool, event_sw, &sample_sw, evsel, machine);
diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
index a7350519c63f..0f1e5a2f6ad7 100644
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -404,6 +404,7 @@ static struct kvm_event *kvm_alloc_init_event(struct event_key *key)
         }
 
         event->key = *key;
+        init_stats(&event->total.stats);
         return event;
 }
 
@@ -1691,17 +1692,15 @@ int cmd_kvm(int argc, const char **argv, const char *prefix __maybe_unused)
                 OPT_END()
         };
 
-
-        const char * const kvm_usage[] = {
-                "perf kvm [<options>] {top|record|report|diff|buildid-list|stat}",
-                NULL
-        };
+        const char *const kvm_subcommands[] = { "top", "record", "report", "diff",
+                                                "buildid-list", "stat", NULL };
+        const char *kvm_usage[] = { NULL, NULL };
 
         perf_host  = 0;
         perf_guest = 1;
 
-        argc = parse_options(argc, argv, kvm_options, kvm_usage,
-                        PARSE_OPT_STOP_AT_NON_OPTION);
+        argc = parse_options_subcommand(argc, argv, kvm_options, kvm_subcommands, kvm_usage,
+                                        PARSE_OPT_STOP_AT_NON_OPTION);
         if (!argc)
                 usage_with_options(kvm_usage, kvm_options);
 
diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
index 78948882e3de..cdcd4eb3a57d 100644
--- a/tools/perf/builtin-probe.c
+++ b/tools/perf/builtin-probe.c
@@ -268,9 +268,9 @@ static int opt_set_filter(const struct option *opt __maybe_unused,
         return 0;
 }
 
-static void init_params(void)
+static int init_params(void)
 {
-        line_range__init(&params.line_range);
+        return line_range__init(&params.line_range);
 }
 
 static void cleanup_params(void)
@@ -515,9 +515,11 @@ int cmd_probe(int argc, const char **argv, const char *prefix)
 {
         int ret;
 
-        init_params();
-        ret = __cmd_probe(argc, argv, prefix);
-        cleanup_params();
+        ret = init_params();
+        if (!ret) {
+                ret = __cmd_probe(argc, argv, prefix);
+                cleanup_params();
+        }
 
         return ret;
 }
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index af47531b82ec..8ce62ef7f6c3 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -374,7 +374,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
 
         session = perf_session__new(file, false, NULL);
         if (session == NULL) {
-                pr_err("Not enough memory for reading perf file header\n");
+                pr_err("Perf session creation failed.\n");
                 return -1;
         }
 
@@ -649,7 +649,7 @@ error:
         return ret;
 }
 
-#ifdef HAVE_LIBUNWIND_SUPPORT
+#ifdef HAVE_DWARF_UNWIND_SUPPORT
 static int get_stack_size(char *str, unsigned long *_size)
 {
         char *endptr;
@@ -675,7 +675,7 @@ static int get_stack_size(char *str, unsigned long *_size)
                max_size, str);
         return -1;
 }
-#endif /* HAVE_LIBUNWIND_SUPPORT */
+#endif /* HAVE_DWARF_UNWIND_SUPPORT */
 
 int record_parse_callchain(const char *arg, struct record_opts *opts)
 {
@@ -704,7 +704,7 @@ int record_parse_callchain(const char *arg, struct record_opts *opts)
                                        "needed for -g fp\n");
                         break;
 
-#ifdef HAVE_LIBUNWIND_SUPPORT
+#ifdef HAVE_DWARF_UNWIND_SUPPORT
                 /* Dwarf style */
                 } else if (!strncmp(name, "dwarf", sizeof("dwarf"))) {
                         const unsigned long default_stack_dump_size = 8192;
@@ -720,7 +720,7 @@ int record_parse_callchain(const char *arg, struct record_opts *opts)
                                 ret = get_stack_size(tok, &size);
                                 opts->stack_dump_size = size;
                         }
-#endif /* HAVE_LIBUNWIND_SUPPORT */
+#endif /* HAVE_DWARF_UNWIND_SUPPORT */
                 } else {
                         pr_err("callchain: Unknown --call-graph option "
                                "value: %s\n", arg);
@@ -735,7 +735,9 @@ int record_parse_callchain(const char *arg, struct record_opts *opts)
 
 static void callchain_debug(struct record_opts *opts)
 {
-        pr_debug("callchain: type %d\n", opts->call_graph);
+        static const char *str[CALLCHAIN_MAX] = { "NONE", "FP", "DWARF" };
+
+        pr_debug("callchain: type %s\n", str[opts->call_graph]);
 
         if (opts->call_graph == CALLCHAIN_DWARF)
                 pr_debug("callchain: stack dump size %d\n",
@@ -749,6 +751,8 @@ int record_parse_callchain_opt(const struct option *opt,
         struct record_opts *opts = opt->value;
         int ret;
 
+        opts->call_graph_enabled = !unset;
+
         /* --no-call-graph */
         if (unset) {
                 opts->call_graph = CALLCHAIN_NONE;
@@ -769,6 +773,8 @@ int record_callchain_opt(const struct option *opt,
 {
         struct record_opts *opts = opt->value;
 
+        opts->call_graph_enabled = !unset;
+
         if (opts->call_graph == CALLCHAIN_NONE)
                 opts->call_graph = CALLCHAIN_FP;
 
@@ -776,6 +782,16 @@ int record_callchain_opt(const struct option *opt,
         return 0;
 }
 
+static int perf_record_config(const char *var, const char *value, void *cb)
+{
+        struct record *rec = cb;
+
+        if (!strcmp(var, "record.call-graph"))
+                return record_parse_callchain(value, &rec->opts);
+
+        return perf_default_config(var, value, cb);
+}
+
 static const char * const record_usage[] = {
         "perf record [<options>] [<command>]",
         "perf record [<options>] -- <command> [<options>]",
@@ -807,7 +823,7 @@ static struct record record = {
 
 #define CALLCHAIN_HELP "setup and enables call-graph (stack chain/backtrace) recording: "
 
-#ifdef HAVE_LIBUNWIND_SUPPORT
+#ifdef HAVE_DWARF_UNWIND_SUPPORT
 const char record_callchain_help[] = CALLCHAIN_HELP "fp dwarf";
 #else
 const char record_callchain_help[] = CALLCHAIN_HELP "fp";
@@ -907,6 +923,8 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused)
         if (rec->evlist == NULL)
                 return -ENOMEM;
 
+        perf_config(perf_record_config, rec);
+
         argc = parse_options(argc, argv, record_options, record_usage,
                             PARSE_OPT_STOP_AT_NON_OPTION);
         if (!argc && target__none(&rec->opts.target))
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 02f985f3a396..c8f21137dfd8 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -75,13 +75,10 @@ static int report__config(const char *var, const char *value, void *cb)
         return perf_default_config(var, value, cb);
 }
 
-static int report__add_mem_hist_entry(struct perf_tool *tool, struct addr_location *al,
-                                      struct perf_sample *sample, struct perf_evsel *evsel,
-                                      union perf_event *event)
+static int report__add_mem_hist_entry(struct report *rep, struct addr_location *al,
+                                      struct perf_sample *sample, struct perf_evsel *evsel)
 {
-        struct report *rep = container_of(tool, struct report, tool);
         struct symbol *parent = NULL;
-        u8 cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
         struct hist_entry *he;
         struct mem_info *mi, *mx;
         uint64_t cost;
@@ -90,7 +87,7 @@ static int report__add_mem_hist_entry(struct perf_tool *tool, struct addr_locati
         if (err)
                 return err;
 
-        mi = machine__resolve_mem(al->machine, al->thread, sample, cpumode);
+        mi = sample__resolve_mem(sample, al);
         if (!mi)
                 return -ENOMEM;
 
@@ -131,10 +128,9 @@ out:
         return err;
 }
 
-static int report__add_branch_hist_entry(struct perf_tool *tool, struct addr_location *al,
+static int report__add_branch_hist_entry(struct report *rep, struct addr_location *al,
                                          struct perf_sample *sample, struct perf_evsel *evsel)
 {
-        struct report *rep = container_of(tool, struct report, tool);
         struct symbol *parent = NULL;
         unsigned i;
         struct hist_entry *he;
@@ -144,8 +140,7 @@ static int report__add_branch_hist_entry(struct perf_tool *tool, struct addr_loc
         if (err)
                 return err;
 
-        bi = machine__resolve_bstack(al->machine, al->thread,
-                                     sample->branch_stack);
+        bi = sample__resolve_bstack(sample, al);
         if (!bi)
                 return -ENOMEM;
 
@@ -190,10 +185,9 @@ out:
         return err;
 }
 
-static int report__add_hist_entry(struct perf_tool *tool, struct perf_evsel *evsel,
+static int report__add_hist_entry(struct report *rep, struct perf_evsel *evsel,
                                   struct addr_location *al, struct perf_sample *sample)
 {
-        struct report *rep = container_of(tool, struct report, tool);
         struct symbol *parent = NULL;
         struct hist_entry *he;
         int err = sample__resolve_callchain(sample, &parent, evsel, al, rep->max_stack);
@@ -237,25 +231,25 @@ static int process_sample_event(struct perf_tool *tool,
                 return -1;
         }
 
-        if (al.filtered || (rep->hide_unresolved && al.sym == NULL))
+        if (rep->hide_unresolved && al.sym == NULL)
                 return 0;
 
         if (rep->cpu_list && !test_bit(sample->cpu, rep->cpu_bitmap))
                 return 0;
 
         if (sort__mode == SORT_MODE__BRANCH) {
-                ret = report__add_branch_hist_entry(tool, &al, sample, evsel);
+                ret = report__add_branch_hist_entry(rep, &al, sample, evsel);
                 if (ret < 0)
                         pr_debug("problem adding lbr entry, skipping event\n");
         } else if (rep->mem_mode == 1) {
-                ret = report__add_mem_hist_entry(tool, &al, sample, evsel, event);
+                ret = report__add_mem_hist_entry(rep, &al, sample, evsel);
                 if (ret < 0)
                         pr_debug("problem adding mem entry, skipping event\n");
         } else {
                 if (al.map != NULL)
                         al.map->dso->hit = 1;
 
-                ret = report__add_hist_entry(tool, evsel, &al, sample);
+                ret = report__add_hist_entry(rep, evsel, &al, sample);
                 if (ret < 0)
                         pr_debug("problem incrementing symbol period, skipping event\n");
         }
@@ -934,7 +928,7 @@ repeat:
          * so don't allocate extra space that won't be used in the stdio
          * implementation.
          */
-        if (use_browser == 1 && sort__has_sym) {
+        if (ui__has_annotation()) {
                 symbol_conf.priv_size = sizeof(struct annotation);
                 machines__set_symbol_filter(&session->machines,
                                             symbol__annotate_init);
diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index 6a76a07b6789..9ac0a495c954 100644
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -1124,7 +1124,7 @@ static void output_lat_thread(struct perf_sched *sched, struct work_atoms *work_
 
         avg = work_list->total_lat / work_list->nb_atoms;
 
-        printf("|%11.3f ms |%9" PRIu64 " | avg:%9.3f ms | max:%9.3f ms | max at: %9.6f s\n",
+        printf("|%11.3f ms |%9" PRIu64 " | avg:%9.3f ms | max:%9.3f ms | max at: %13.6f s\n",
               (double)work_list->total_runtime / 1e6,
                  work_list->nb_atoms, (double)avg / 1e6,
                  (double)work_list->max_lat / 1e6,
@@ -1527,9 +1527,9 @@ static int perf_sched__lat(struct perf_sched *sched)
 
         perf_sched__sort_lat(sched);
 
-        printf("\n ---------------------------------------------------------------------------------------------------------------\n");
-        printf("  Task                  |   Runtime ms  | Switches | Average delay ms | Maximum delay ms | Maximum delay at     |\n");
-        printf(" ---------------------------------------------------------------------------------------------------------------\n");
+        printf("\n -----------------------------------------------------------------------------------------------------------------\n");
+        printf("  Task                  |   Runtime ms  | Switches | Average delay ms | Maximum delay ms | Maximum delay at       |\n");
+        printf(" -----------------------------------------------------------------------------------------------------------------\n");
 
         next = rb_first(&sched->sorted_atom_root);
 
@@ -1541,7 +1541,7 @@ static int perf_sched__lat(struct perf_sched *sched)
                 next = rb_next(next);
         }
 
-        printf(" -----------------------------------------------------------------------------------------\n");
+        printf(" -----------------------------------------------------------------------------------------------------------------\n");
         printf("  TOTAL:                |%11.3f ms |%9" PRIu64 " |\n",
                 (double)sched->all_runtime / 1e6, sched->all_count);
 
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 8b0e1c9234d9..65a151e36067 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -174,13 +174,20 @@ static inline int perf_evsel__nr_cpus(struct perf_evsel *evsel)
 
 static void perf_evsel__reset_stat_priv(struct perf_evsel *evsel)
 {
-        memset(evsel->priv, 0, sizeof(struct perf_stat));
+        int i;
+        struct perf_stat *ps = evsel->priv;
+
+        for (i = 0; i < 3; i++)
+                init_stats(&ps->res_stats[i]);
 }
 
 static int perf_evsel__alloc_stat_priv(struct perf_evsel *evsel)
 {
         evsel->priv = zalloc(sizeof(struct perf_stat));
-        return evsel->priv == NULL ? -ENOMEM : 0;
+        if (evsel == NULL)
+                return -ENOMEM;
+        perf_evsel__reset_stat_priv(evsel);
+        return 0;
 }
 
 static void perf_evsel__free_stat_priv(struct perf_evsel *evsel)
diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c
index 25526d6eae59..74db2568b867 100644
--- a/tools/perf/builtin-timechart.c
+++ b/tools/perf/builtin-timechart.c
@@ -494,7 +494,7 @@ static const char *cat_backtrace(union perf_event *event,
                         continue;
                 }
 
-                tal.filtered = false;
+                tal.filtered = 0;
                 thread__find_addr_location(al.thread, machine, cpumode,
                                            MAP__FUNCTION, ip, &tal);
 
@@ -1238,7 +1238,7 @@ static int timechart__record(struct timechart *tchart, int argc, const char **ar
         for (i = 0; i < old_power_args_nr; i++)
                 *p++ = strdup(old_power_args[i]);
 
-        for (j = 1; j < (unsigned int)argc; j++)
+        for (j = 0; j < (unsigned int)argc; j++)
                 *p++ = argv[j];
 
         return cmd_record(rec_argc, rec_argv, NULL);
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 5f989a7d8bc2..65aaa5bbf7ec 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -993,6 +993,16 @@ parse_callchain_opt(const struct option *opt, const char *arg, int unset)
         return record_parse_callchain_opt(opt, arg, unset);
 }
 
+static int perf_top_config(const char *var, const char *value, void *cb)
+{
+        struct perf_top *top = cb;
+
+        if (!strcmp(var, "top.call-graph"))
+                return record_parse_callchain(value, &top->record_opts);
+
+        return perf_default_config(var, value, cb);
+}
+
 static int
 parse_percent_limit(const struct option *opt, const char *arg,
                     int unset __maybe_unused)
@@ -1117,6 +1127,8 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
         if (top.evlist == NULL)
                 return -ENOMEM;
 
+        perf_config(perf_top_config, &top);
+
         argc = parse_options(argc, argv, options, top_usage, 0);
         if (argc)
                 usage_with_options(top_usage, options);
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 0331ea2701a3..802cf544202b 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -34,6 +34,14 @@ ifeq ($(ARCH),arm)
   LIBUNWIND_LIBS = -lunwind -lunwind-arm
 endif
 
+# So far there's only x86 libdw unwind support merged in perf.
+# Disable it on all other architectures in case libdw unwind
+# support is detected in system. Add supported architectures
+# to the check.
+ifneq ($(ARCH),x86)
+  NO_LIBDW_DWARF_UNWIND := 1
+endif
+
 ifeq ($(LIBUNWIND_LIBS),)
   NO_LIBUNWIND := 1
 else
@@ -59,6 +67,17 @@ ifeq ($(NO_PERF_REGS),0)
   CFLAGS += -DHAVE_PERF_REGS_SUPPORT
 endif
 
+ifndef NO_LIBELF
+  # for linking with debug library, run like:
+  # make DEBUG=1 LIBDW_DIR=/opt/libdw/
+  ifdef LIBDW_DIR
+    LIBDW_CFLAGS  := -I$(LIBDW_DIR)/include
+    LIBDW_LDFLAGS := -L$(LIBDW_DIR)/lib
+  endif
+  FEATURE_CHECK_CFLAGS-libdw-dwarf-unwind := $(LIBDW_CFLAGS)
+  FEATURE_CHECK_LDFLAGS-libdw-dwarf-unwind := $(LIBDW_LDFLAGS) -ldw
+endif
+
 # include ARCH specific config
 -include $(src-perf)/arch/$(ARCH)/Makefile
 
@@ -98,6 +117,10 @@ CFLAGS += -Wall
 CFLAGS += -Wextra
 CFLAGS += -std=gnu99
 
+# Enforce a non-executable stack, as we may regress (again) in the future by
+# adding assembler files missing the .GNU-stack linker note.
+LDFLAGS += -Wl,-z,noexecstack
+
 EXTLIBS = -lelf -lpthread -lrt -lm -ldl
 
 ifneq ($(OUTPUT),)
@@ -147,7 +170,38 @@ CORE_FEATURE_TESTS =			\
         libunwind                       \
         on-exit                         \
         stackprotector-all              \
-        timerfd
+        timerfd                         \
+        libdw-dwarf-unwind
+
+LIB_FEATURE_TESTS =                     \
+        dwarf                           \
+        glibc                           \
+        gtk2                            \
+        libaudit                        \
+        libbfd                          \
+        libelf                          \
+        libnuma                         \
+        libperl                         \
+        libpython                       \
+        libslang                        \
+        libunwind                       \
+        libdw-dwarf-unwind
+
+VF_FEATURE_TESTS =                      \
+        backtrace                       \
+        fortify-source                  \
+        gtk2-infobar                    \
+        libelf-getphdrnum               \
+        libelf-mmap                     \
+        libpython-version               \
+        on-exit                         \
+        stackprotector-all              \
+        timerfd                         \
+        libunwind-debug-frame           \
+        bionic                          \
+        liberty                         \
+        liberty-z                       \
+        cplus-demangle
 
 # Set FEATURE_CHECK_(C|LD)FLAGS-all for all CORE_FEATURE_TESTS features.
 # If in the future we need per-feature checks/flags for features not
@@ -161,17 +215,6 @@ endef
 $(foreach feat,$(CORE_FEATURE_TESTS),$(call set_test_all_flags,$(feat)))
 
 #
-# So here we detect whether test-all was rebuilt, to be able
-# to skip the print-out of the long features list if the file
-# existed before and after it was built:
-#
-ifeq ($(wildcard $(OUTPUT)config/feature-checks/test-all.bin),)
-  test-all-failed := 1
-else
-  test-all-failed := 0
-endif
-
-#
 # Special fast-path for the 'all features are available' case:
 #
 $(call feature_check,all,$(MSG))
@@ -180,15 +223,6 @@ $(call feature_check,all,$(MSG))
 # Just in case the build freshly failed, make sure we print the
 # feature matrix:
 #
-ifeq ($(feature-all), 0)
-  test-all-failed := 1
-endif
-
-ifeq ($(test-all-failed),1)
-  $(info )
-  $(info Auto-detecting system features:)
-endif
-
 ifeq ($(feature-all), 1)
   #
   # test-all.c passed - just set all the core feature flags to 1:
@@ -199,27 +233,6 @@ else
   $(foreach feat,$(CORE_FEATURE_TESTS),$(call feature_check,$(feat)))
 endif
 
-#
-# Print the result of the feature test:
-#
-feature_print = $(eval $(feature_print_code)) $(info $(MSG))
-
-define feature_print_code
-  ifeq ($(feature-$(1)), 1)
-    MSG = $(shell printf '...%30s: [ \033[32mon\033[m  ]' $(1))
-  else
-    MSG = $(shell printf '...%30s: [ \033[31mOFF\033[m ]' $(1))
-  endif
-endef
-
-#
-# Only print out our features if we rebuilt the testcases or if a test failed:
-#
-ifeq ($(test-all-failed), 1)
-  $(foreach feat,$(CORE_FEATURE_TESTS),$(call feature_print,$(feat)))
-  $(info )
-endif
-
 ifeq ($(feature-stackprotector-all), 1)
   CFLAGS += -fstack-protector-all
 endif
@@ -264,6 +277,7 @@ ifdef NO_LIBELF
   NO_DWARF := 1
   NO_DEMANGLE := 1
   NO_LIBUNWIND := 1
+  NO_LIBDW_DWARF_UNWIND := 1
 else
   ifeq ($(feature-libelf), 0)
     ifeq ($(feature-glibc), 1)
@@ -278,17 +292,18 @@ else
       NO_LIBELF := 1
       NO_DWARF := 1
       NO_DEMANGLE := 1
+      NO_LIBUNWIND := 1
+      NO_LIBDW_DWARF_UNWIND := 1
     else
       msg := $(error No gnu/libc-version.h found, please install glibc-dev[el]/glibc-static);
     endif
   else
-    # for linking with debug library, run like:
-    # make DEBUG=1 LIBDW_DIR=/opt/libdw/
-    ifdef LIBDW_DIR
-      LIBDW_CFLAGS  := -I$(LIBDW_DIR)/include
-      LIBDW_LDFLAGS := -L$(LIBDW_DIR)/lib
+    ifndef NO_LIBDW_DWARF_UNWIND
+      ifneq ($(feature-libdw-dwarf-unwind),1)
+        NO_LIBDW_DWARF_UNWIND := 1
+        msg := $(warning No libdw DWARF unwind found, Please install elfutils-devel/libdw-dev >= 0.158 and/or set LIBDW_DIR);
+      endif
     endif
-
     ifneq ($(feature-dwarf), 1)
       msg := $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.138, disables dwarf support. Please install new elfutils-devel/libdw-dev);
       NO_DWARF := 1
@@ -324,25 +339,51 @@ endif # NO_LIBELF
 
 ifndef NO_LIBUNWIND
   ifneq ($(feature-libunwind), 1)
-    msg := $(warning No libunwind found, disabling post unwind support. Please install libunwind-dev[el] >= 1.1);
+    msg := $(warning No libunwind found. Please install libunwind-dev[el] >= 1.1 and/or set LIBUNWIND_DIR);
     NO_LIBUNWIND := 1
+  endif
+endif
+
+dwarf-post-unwind := 1
+dwarf-post-unwind-text := BUG
+
+# setup DWARF post unwinder
+ifdef NO_LIBUNWIND
+  ifdef NO_LIBDW_DWARF_UNWIND
+    msg := $(warning Disabling post unwind, no support found.);
+    dwarf-post-unwind := 0
   else
-    ifeq ($(ARCH),arm)
-      $(call feature_check,libunwind-debug-frame)
-      ifneq ($(feature-libunwind-debug-frame), 1)
-        msg := $(warning No debug_frame support found in libunwind);
-        CFLAGS += -DNO_LIBUNWIND_DEBUG_FRAME
-      endif
-    else
-      # non-ARM has no dwarf_find_debug_frame() function:
+    dwarf-post-unwind-text := libdw
+  endif
+else
+  dwarf-post-unwind-text := libunwind
+  # Enable libunwind support by default.
+  ifndef NO_LIBDW_DWARF_UNWIND
+    NO_LIBDW_DWARF_UNWIND := 1
+  endif
+endif
+
+ifeq ($(dwarf-post-unwind),1)
+  CFLAGS += -DHAVE_DWARF_UNWIND_SUPPORT
+else
+  NO_DWARF_UNWIND := 1
+endif
+
+ifndef NO_LIBUNWIND
+  ifeq ($(ARCH),arm)
+    $(call feature_check,libunwind-debug-frame)
+    ifneq ($(feature-libunwind-debug-frame), 1)
+      msg := $(warning No debug_frame support found in libunwind);
       CFLAGS += -DNO_LIBUNWIND_DEBUG_FRAME
     endif
-
-    CFLAGS += -DHAVE_LIBUNWIND_SUPPORT
-    EXTLIBS += $(LIBUNWIND_LIBS)
-    CFLAGS += $(LIBUNWIND_CFLAGS)
-    LDFLAGS += $(LIBUNWIND_LDFLAGS)
-  endif # ifneq ($(feature-libunwind), 1)
+  else
+    # non-ARM has no dwarf_find_debug_frame() function:
+    CFLAGS += -DNO_LIBUNWIND_DEBUG_FRAME
+  endif
+  CFLAGS  += -DHAVE_LIBUNWIND_SUPPORT
+  EXTLIBS += $(LIBUNWIND_LIBS)
+  CFLAGS  += $(LIBUNWIND_CFLAGS)
+  LDFLAGS += $(LIBUNWIND_LDFLAGS)
 endif
 
 ifndef NO_LIBAUDIT
@@ -478,7 +519,21 @@ else
 endif
 
 ifeq ($(feature-libbfd), 1)
-  EXTLIBS += -lbfd -lz -liberty
+  EXTLIBS += -lbfd
+
+  # call all detections now so we get correct
+  # status in VF output
+  $(call feature_check,liberty)
+  $(call feature_check,liberty-z)
+  $(call feature_check,cplus-demangle)
+
+  ifeq ($(feature-liberty), 1)
+    EXTLIBS += -liberty
+  else
+    ifeq ($(feature-liberty-z), 1)
+      EXTLIBS += -liberty -lz
+    endif
+  endif
 endif
 
 ifdef NO_DEMANGLE
@@ -489,15 +544,10 @@ else
     CFLAGS += -DHAVE_CPLUS_DEMANGLE_SUPPORT
   else
     ifneq ($(feature-libbfd), 1)
-      $(call feature_check,liberty)
-      ifeq ($(feature-liberty), 1)
-        EXTLIBS += -lbfd -liberty
-      else
-        $(call feature_check,liberty-z)
-        ifeq ($(feature-liberty-z), 1)
-          EXTLIBS += -lbfd -liberty -lz
-        else
-          $(call feature_check,cplus-demangle)
+      ifneq ($(feature-liberty), 1)
+        ifneq ($(feature-liberty-z), 1)
+          # we dont have neither HAVE_CPLUS_DEMANGLE_SUPPORT
+          # or any of 'bfd iberty z' trinity
           ifeq ($(feature-cplus-demangle), 1)
             EXTLIBS += -liberty
             CFLAGS += -DHAVE_CPLUS_DEMANGLE_SUPPORT
@@ -602,3 +652,84 @@ ifdef DESTDIR
 plugindir=$(libdir)/traceevent/plugins
 plugindir_SQ= $(subst ','\'',$(plugindir))
 endif
+
+#
+# Print the result of the feature test:
+#
+feature_print_status = $(eval $(feature_print_status_code)) $(info $(MSG))
+
+define feature_print_status_code
+  ifeq ($(feature-$(1)), 1)
+    MSG = $(shell printf '...%30s: [ \033[32mon\033[m  ]' $(1))
+  else
+    MSG = $(shell printf '...%30s: [ \033[31mOFF\033[m ]' $(1))
+  endif
+endef
+
+feature_print_var = $(eval $(feature_print_var_code)) $(info $(MSG))
+define feature_print_var_code
+    MSG = $(shell printf '...%30s: %s' $(1) $($(1)))
+endef
+
+feature_print_text = $(eval $(feature_print_text_code)) $(info $(MSG))
+define feature_print_text_code
+    MSG = $(shell printf '...%30s: %s' $(1) $(2))
+endef
+
+PERF_FEATURES := $(foreach feat,$(LIB_FEATURE_TESTS),feature-$(feat)($(feature-$(feat))))
+PERF_FEATURES_FILE := $(shell touch $(OUTPUT)PERF-FEATURES; cat $(OUTPUT)PERF-FEATURES)
+
+ifeq ($(dwarf-post-unwind),1)
+  PERF_FEATURES += dwarf-post-unwind($(dwarf-post-unwind-text))
+endif
+
+# The $(display_lib) controls the default detection message
+# output. It's set if:
+# - detected features differes from stored features from
+#   last build (in PERF-FEATURES file)
+# - one of the $(LIB_FEATURE_TESTS) is not detected
+# - VF is enabled
+
+ifneq ("$(PERF_FEATURES)","$(PERF_FEATURES_FILE)")
+  $(shell echo "$(PERF_FEATURES)" > $(OUTPUT)PERF-FEATURES)
+  display_lib := 1
+endif
+
+feature_check = $(eval $(feature_check_code))
+define feature_check_code
+  ifneq ($(feature-$(1)), 1)
+    display_lib := 1
+  endif
+endef
+
+$(foreach feat,$(LIB_FEATURE_TESTS),$(call feature_check,$(feat)))
+
+ifeq ($(VF),1)
+  display_lib := 1
+  display_vf := 1
+endif
+
+ifeq ($(display_lib),1)
+  $(info )
+  $(info Auto-detecting system features:)
+  $(foreach feat,$(LIB_FEATURE_TESTS),$(call feature_print_status,$(feat),))
+
+  ifeq ($(dwarf-post-unwind),1)
+    $(call feature_print_text,"DWARF post unwind library", $(dwarf-post-unwind-text))
+  endif
+endif
+
+ifeq ($(display_vf),1)
+  $(foreach feat,$(VF_FEATURE_TESTS),$(call feature_print_status,$(feat),))
+  $(info )
+  $(call feature_print_var,prefix)
+  $(call feature_print_var,bindir)
+  $(call feature_print_var,libdir)
+  $(call feature_print_var,sysconfdir)
+  $(call feature_print_var,LIBUNWIND_DIR)
+  $(call feature_print_var,LIBDW_DIR)
+endif
+
+ifeq ($(display_lib),1)
+  $(info )
+endif
diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch
index fef8ae922800..4b06719ee984 100644
--- a/tools/perf/config/Makefile.arch
+++ b/tools/perf/config/Makefile.arch
@@ -5,7 +5,8 @@ ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
                                   -e s/arm.*/arm/ -e s/sa110/arm/ \
                                   -e s/s390x/s390/ -e s/parisc64/parisc/ \
                                   -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
-                                  -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ )
+                                  -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ \
+                                  -e s/tile.*/tile/ )
 
 # Additional ARCH settings for x86
 ifeq ($(ARCH),i386)
diff --git a/tools/perf/config/feature-checks/Makefile b/tools/perf/config/feature-checks/Makefile
index 523b7bc10553..2da103c53f89 100644
--- a/tools/perf/config/feature-checks/Makefile
+++ b/tools/perf/config/feature-checks/Makefile
@@ -26,7 +26,8 @@ FILES=					\
         test-libunwind-debug-frame.bin  \
         test-on-exit.bin                \
         test-stackprotector-all.bin     \
-        test-timerfd.bin
+        test-timerfd.bin                \
+        test-libdw-dwarf-unwind.bin
 
 CC := $(CROSS_COMPILE)gcc -MD
 PKG_CONFIG := $(CROSS_COMPILE)pkg-config
@@ -141,6 +142,9 @@ test-backtrace.bin:
 test-timerfd.bin:
         $(BUILD)
 
+test-libdw-dwarf-unwind.bin:
+        $(BUILD)
+
 -include *.d
 
 ###############################
diff --git a/tools/perf/config/feature-checks/test-all.c b/tools/perf/config/feature-checks/test-all.c
index 9b8a544155bb..fc37eb3ca17b 100644
--- a/tools/perf/config/feature-checks/test-all.c
+++ b/tools/perf/config/feature-checks/test-all.c
@@ -89,6 +89,10 @@
 # include "test-stackprotector-all.c"
 #undef main
 
+#define main main_test_libdw_dwarf_unwind
+# include "test-libdw-dwarf-unwind.c"
+#undef main
+
 int main(int argc, char *argv[])
 {
         main_test_libpython();
@@ -111,6 +115,7 @@ int main(int argc, char *argv[])
         main_test_libnuma();
         main_test_timerfd();
         main_test_stackprotector_all();
+        main_test_libdw_dwarf_unwind();
 
         return 0;
 }
diff --git a/tools/perf/config/feature-checks/test-libdw-dwarf-unwind.c b/tools/perf/config/feature-checks/test-libdw-dwarf-unwind.c
new file mode 100644
index 000000000000..f676a3ff442a
--- /dev/null
+++ b/tools/perf/config/feature-checks/test-libdw-dwarf-unwind.c
@@ -0,0 +1,13 @@
+
+#include <elfutils/libdwfl.h>
+
+int main(void)
+{
+        /*
+         * This function is guarded via: __nonnull_attribute__ (1, 2).
+         * Passing '1' as arguments value. This code is never executed,
+         * only compiled.
+         */
+        dwfl_thread_getframes((void *) 1, (void *) 1, NULL);
+        return 0;
+}
diff --git a/tools/perf/design.txt b/tools/perf/design.txt
index 63a0e6f04a01..a28dca2582aa 100644
--- a/tools/perf/design.txt
+++ b/tools/perf/design.txt
@@ -18,7 +18,7 @@ underlying hardware counters.
 Performance counters are accessed via special file descriptors.
 There's one file descriptor per virtual counter used.
 
-The special file descriptor is opened via the perf_event_open()
+The special file descriptor is opened via the sys_perf_event_open()
 system call:
 
    int sys_perf_event_open(struct perf_event_attr *hw_event_uptr,
@@ -82,7 +82,7 @@ machine-specific.
 If 'raw_type' is 0, then the 'type' field says what kind of counter
 this is, with the following encoding:
 
-enum perf_event_types {
+enum perf_type_id {
         PERF_TYPE_HARDWARE              = 0,
         PERF_TYPE_SOFTWARE              = 1,
         PERF_TYPE_TRACEPOINT            = 2,
@@ -95,7 +95,7 @@ specified by 'event_id':
  * Generalized performance counter event types, used by the hw_event.event_id
  * parameter of the sys_perf_event_open() syscall:
  */
-enum hw_event_ids {
+enum perf_hw_id {
         /*
          * Common hardware events, generalized by the kernel:
          */
@@ -129,7 +129,7 @@ software events, selected by 'event_id':
  * physical and sw events of the kernel (and allow the profiling of them as
  * well):
  */
-enum sw_event_ids {
+enum perf_sw_ids {
         PERF_COUNT_SW_CPU_CLOCK         = 0,
         PERF_COUNT_SW_TASK_CLOCK        = 1,
         PERF_COUNT_SW_PAGE_FAULTS       = 2,
@@ -230,7 +230,7 @@ these events are recorded in the ring-buffer (see below).
 The 'comm' bit allows tracking of process comm data on process creation.
 This too is recorded in the ring-buffer (see below).
 
-The 'pid' parameter to the perf_event_open() system call allows the
+The 'pid' parameter to the sys_perf_event_open() system call allows the
 counter to be specific to a task:
 
  pid == 0: if the pid parameter is zero, the counter is attached to the
@@ -260,7 +260,7 @@ The 'flags' parameter is currently unused and must be zero.
 
 The 'group_fd' parameter allows counter "groups" to be set up.  A
 counter group has one counter which is the group "leader".  The leader
-is created first, with group_fd = -1 in the perf_event_open call
+is created first, with group_fd = -1 in the sys_perf_event_open call
 that creates it.  The rest of the group members are created
 subsequently, with group_fd giving the fd of the group leader.
 (A single counter on its own is created with group_fd = -1 and is
diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh
index 496e2abb5482..ae3a57694b6b 100644
--- a/tools/perf/perf-completion.sh
+++ b/tools/perf/perf-completion.sh
@@ -123,7 +123,7 @@ __perf_main ()
                 __perfcomp_colon "$evts" "$cur"
         # List subcommands for 'perf kvm'
         elif [[ $prev == "kvm" ]]; then
-                subcmds="top record report diff buildid-list stat"
+                subcmds=$($cmd $prev --list-cmds)
                 __perfcomp_colon "$subcmds" "$cur"
         # List long option names
         elif [[ $cur == --* ]];  then
diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index e84fa26bc1be..5c11ecad02a9 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -12,6 +12,9 @@
 #ifndef __NR_perf_event_open
 # define __NR_perf_event_open 336
 #endif
+#ifndef __NR_futex
+# define __NR_futex 240
+#endif
 #endif
 
 #if defined(__x86_64__)
@@ -23,6 +26,9 @@
 #ifndef __NR_perf_event_open
 # define __NR_perf_event_open 298
 #endif
+#ifndef __NR_futex
+# define __NR_futex 202
+#endif
 #endif
 
 #ifdef __powerpc__
@@ -139,6 +145,14 @@
 #define CPUINFO_PROC    "core ID"
 #endif
 
+#ifdef __tile__
+#define mb()            asm volatile ("mf" ::: "memory")
+#define wmb()           asm volatile ("mf" ::: "memory")
+#define rmb()           asm volatile ("mf" ::: "memory")
+#define cpu_relax()     asm volatile ("mfspr zero, PASS" ::: "memory")
+#define CPUINFO_PROC    "model name"
+#endif
+
 #define barrier() asm volatile ("" ::: "memory")
 
 #ifndef cpu_relax
@@ -251,12 +265,14 @@ void pthread__unblock_sigwinch(void);
 enum perf_call_graph_mode {
         CALLCHAIN_NONE,
         CALLCHAIN_FP,
-        CALLCHAIN_DWARF
+        CALLCHAIN_DWARF,
+        CALLCHAIN_MAX
 };
 
 struct record_opts {
         struct target target;
         int          call_graph;
+        bool         call_graph_enabled;
         bool         group;
         bool         inherit_stat;
         bool         no_buffering;
diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index 1e67437fb4ca..b11bf8a08430 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -115,6 +115,14 @@ static struct test {
                 .desc = "Test parsing with no sample_id_all bit set",
                 .func = test__parse_no_sample_id_all,
         },
+#if defined(__x86_64__) || defined(__i386__)
+#ifdef HAVE_DWARF_UNWIND_SUPPORT
+        {
+                .desc = "Test dwarf unwind",
+                .func = test__dwarf_unwind,
+        },
+#endif
+#endif
         {
                 .func = NULL,
         },
diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c
index 653a8fe2db95..bfb186900ac0 100644
--- a/tools/perf/tests/code-reading.c
+++ b/tools/perf/tests/code-reading.c
@@ -504,6 +504,7 @@ static int do_test_code_reading(bool try_kcore)
                 if (ret < 0) {
                         if (!excl_kernel) {
                                 excl_kernel = true;
+                                perf_evlist__set_maps(evlist, NULL, NULL);
                                 perf_evlist__delete(evlist);
                                 evlist = NULL;
                                 continue;
diff --git a/tools/perf/tests/dwarf-unwind.c b/tools/perf/tests/dwarf-unwind.c
new file mode 100644
index 000000000000..c059ee81c038
--- /dev/null
+++ b/tools/perf/tests/dwarf-unwind.c
@@ -0,0 +1,144 @@
+#include <linux/compiler.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include "tests.h"
+#include "debug.h"
+#include "machine.h"
+#include "event.h"
+#include "unwind.h"
+#include "perf_regs.h"
+#include "map.h"
+#include "thread.h"
+
+static int mmap_handler(struct perf_tool *tool __maybe_unused,
+                        union perf_event *event,
+                        struct perf_sample *sample __maybe_unused,
+                        struct machine *machine)
+{
+        return machine__process_mmap_event(machine, event, NULL);
+}
+
+static int init_live_machine(struct machine *machine)
+{
+        union perf_event event;
+        pid_t pid = getpid();
+
+        return perf_event__synthesize_mmap_events(NULL, &event, pid, pid,
+                                                  mmap_handler, machine, true);
+}
+
+#define MAX_STACK 6
+
+static int unwind_entry(struct unwind_entry *entry, void *arg)
+{
+        unsigned long *cnt = (unsigned long *) arg;
+        char *symbol = entry->sym ? entry->sym->name : NULL;
+        static const char *funcs[MAX_STACK] = {
+                "test__arch_unwind_sample",
+                "unwind_thread",
+                "krava_3",
+                "krava_2",
+                "krava_1",
+                "test__dwarf_unwind"
+        };
+
+        if (*cnt >= MAX_STACK) {
+                pr_debug("failed: crossed the max stack value %d\n", MAX_STACK);
+                return -1;
+        }
+
+        if (!symbol) {
+                pr_debug("failed: got unresolved address 0x%" PRIx64 "\n",
+                         entry->ip);
+                return -1;
+        }
+
+        pr_debug("got: %s 0x%" PRIx64 "\n", symbol, entry->ip);
+        return strcmp((const char *) symbol, funcs[(*cnt)++]);
+}
+
+__attribute__ ((noinline))
+static int unwind_thread(struct thread *thread, struct machine *machine)
+{
+        struct perf_sample sample;
+        unsigned long cnt = 0;
+        int err = -1;
+
+        memset(&sample, 0, sizeof(sample));
+
+        if (test__arch_unwind_sample(&sample, thread)) {
+                pr_debug("failed to get unwind sample\n");
+                goto out;
+        }
+
+        err = unwind__get_entries(unwind_entry, &cnt, machine, thread,
+                                  &sample, MAX_STACK);
+        if (err)
+                pr_debug("unwind failed\n");
+        else if (cnt != MAX_STACK) {
+                pr_debug("got wrong number of stack entries %lu != %d\n",
+                         cnt, MAX_STACK);
+                err = -1;
+        }
+
+ out:
+        free(sample.user_stack.data);
+        free(sample.user_regs.regs);
+        return err;
+}
+
+__attribute__ ((noinline))
+static int krava_3(struct thread *thread, struct machine *machine)
+{
+        return unwind_thread(thread, machine);
+}
+
+__attribute__ ((noinline))
+static int krava_2(struct thread *thread, struct machine *machine)
+{
+        return krava_3(thread, machine);
+}
+
+__attribute__ ((noinline))
+static int krava_1(struct thread *thread, struct machine *machine)
+{
+        return krava_2(thread, machine);
+}
+
+int test__dwarf_unwind(void)
+{
+        struct machines machines;
+        struct machine *machine;
+        struct thread *thread;
+        int err = -1;
+
+        machines__init(&machines);
+
+        machine = machines__find(&machines, HOST_KERNEL_ID);
+        if (!machine) {
+                pr_err("Could not get machine\n");
+                return -1;
+        }
+
+        if (init_live_machine(machine)) {
+                pr_err("Could not init machine\n");
+                goto out;
+        }
+
+        if (verbose > 1)
+                machine__fprintf(machine, stderr);
+
+        thread = machine__find_thread(machine, getpid(), getpid());
+        if (!thread) {
+                pr_err("Could not get thread\n");
+                goto out;
+        }
+
+        err = krava_1(thread, machine);
+
+ out:
+        machine__delete_threads(machine);
+        machine__exit(machine);
+        machines__exit(&machines);
+        return err;
+}
diff --git a/tools/perf/tests/hists_link.c b/tools/perf/tests/hists_link.c
index 2b6519e0e36f..7ccbc7b6ae77 100644
--- a/tools/perf/tests/hists_link.c
+++ b/tools/perf/tests/hists_link.c
@@ -101,6 +101,7 @@ static struct machine *setup_fake_machine(struct machines *machines)
                         .mmap = {
                                 .header = { .misc = PERF_RECORD_MISC_USER, },
                                 .pid = fake_mmap_info[i].pid,
+                                .tid = fake_mmap_info[i].pid,
                                 .start = fake_mmap_info[i].start,
                                 .len = 0x1000ULL,
                                 .pgoff = 0ULL,
diff --git a/tools/perf/tests/make b/tools/perf/tests/make
index 00544b8b644b..2f92d6e7ee00 100644
--- a/tools/perf/tests/make
+++ b/tools/perf/tests/make
@@ -27,6 +27,7 @@ make_no_ui          := NO_NEWT=1 NO_SLANG=1 NO_GTK2=1
 make_no_demangle    := NO_DEMANGLE=1
 make_no_libelf      := NO_LIBELF=1
 make_no_libunwind   := NO_LIBUNWIND=1
+make_no_libdw_dwarf_unwind := NO_LIBDW_DWARF_UNWIND=1
 make_no_backtrace   := NO_BACKTRACE=1
 make_no_libnuma     := NO_LIBNUMA=1
 make_no_libaudit    := NO_LIBAUDIT=1
@@ -35,8 +36,9 @@ make_tags           := tags
 make_cscope         := cscope
 make_help           := help
 make_doc            := doc
-make_perf_o         := perf.o
-make_util_map_o     := util/map.o
+make_perf_o           := perf.o
+make_util_map_o       := util/map.o
+make_util_pmu_bison_o := util/pmu-bison.o
 make_install        := install
 make_install_bin    := install-bin
 make_install_doc    := install-doc
@@ -44,11 +46,13 @@ make_install_man    := install-man
 make_install_html   := install-html
 make_install_info   := install-info
 make_install_pdf    := install-pdf
+make_static         := LDFLAGS=-static
 
 # all the NO_* variable combined
 make_minimal        := NO_LIBPERL=1 NO_LIBPYTHON=1 NO_NEWT=1 NO_GTK2=1
 make_minimal        += NO_DEMANGLE=1 NO_LIBELF=1 NO_LIBUNWIND=1 NO_BACKTRACE=1
 make_minimal        += NO_LIBNUMA=1 NO_LIBAUDIT=1 NO_LIBBIONIC=1
+make_minimal        += NO_LIBDW_DWARF_UNWIND=1
 
 # $(run) contains all available tests
 run := make_pure
@@ -65,6 +69,7 @@ run += make_no_ui
 run += make_no_demangle
 run += make_no_libelf
 run += make_no_libunwind
+run += make_no_libdw_dwarf_unwind
 run += make_no_backtrace
 run += make_no_libnuma
 run += make_no_libaudit
@@ -73,6 +78,7 @@ run += make_help
 run += make_doc
 run += make_perf_o
 run += make_util_map_o
+run += make_util_pmu_bison_o
 run += make_install
 run += make_install_bin
 # FIXME 'install-*' commented out till they're fixed
@@ -82,6 +88,7 @@ run += make_install_bin
 # run += make_install_info
 # run += make_install_pdf
 run += make_minimal
+run += make_static
 
 ifneq ($(call has,ctags),)
 run += make_tags
@@ -113,8 +120,9 @@ test_make_doc_O  := $(test_ok)
 
 test_make_python_perf_so := test -f $(PERF)/python/perf.so
 
-test_make_perf_o     := test -f $(PERF)/perf.o
-test_make_util_map_o := test -f $(PERF)/util/map.o
+test_make_perf_o           := test -f $(PERF)/perf.o
+test_make_util_map_o       := test -f $(PERF)/util/map.o
+test_make_util_pmu_bison_o := test -f $(PERF)/util/pmu-bison.o
 
 define test_dest_files
   for file in $(1); do                          \
@@ -167,13 +175,10 @@ test_make_install_info_O := $(test_ok)
 test_make_install_pdf    := $(test_ok)
 test_make_install_pdf_O  := $(test_ok)
 
-# Kbuild tests only
-#test_make_python_perf_so_O := test -f $$TMP/tools/perf/python/perf.so
-#test_make_perf_o_O         := test -f $$TMP/tools/perf/perf.o
-#test_make_util_map_o_O     := test -f $$TMP/tools/perf/util/map.o
-
-test_make_perf_o_O     := true
-test_make_util_map_o_O := true
+test_make_python_perf_so_O    := test -f $$TMP_O/python/perf.so
+test_make_perf_o_O            := test -f $$TMP_O/perf.o
+test_make_util_map_o_O        := test -f $$TMP_O/util/map.o
+test_make_util_pmu_bison_o_O := test -f $$TMP_O/util/pmu-bison.o
 
 test_default = test -x $(PERF)/perf
 test = $(if $(test_$1),$(test_$1),$(test_default))
diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
index 4db0ae617d70..8605ff5572ae 100644
--- a/tools/perf/tests/parse-events.c
+++ b/tools/perf/tests/parse-events.c
@@ -2,7 +2,7 @@
 #include "parse-events.h"
 #include "evsel.h"
 #include "evlist.h"
-#include "fs.h"
+#include <api/fs/fs.h>
 #include <api/fs/debugfs.h>
 #include "tests.h"
 #include <linux/hw_breakpoint.h>
diff --git a/tools/perf/tests/sample-parsing.c b/tools/perf/tests/sample-parsing.c
index 1b677202638d..0014d3c8c21c 100644
--- a/tools/perf/tests/sample-parsing.c
+++ b/tools/perf/tests/sample-parsing.c
@@ -22,8 +22,8 @@
 } while (0)
 
 static bool samples_same(const struct perf_sample *s1,
-                         const struct perf_sample *s2, u64 type, u64 regs_user,
-                         u64 read_format)
+                         const struct perf_sample *s2,
+                         u64 type, u64 read_format)
 {
         size_t i;
 
@@ -95,8 +95,9 @@ static bool samples_same(const struct perf_sample *s1,
         }
 
         if (type & PERF_SAMPLE_REGS_USER) {
-                size_t sz = hweight_long(regs_user) * sizeof(u64);
+                size_t sz = hweight_long(s1->user_regs.mask) * sizeof(u64);
 
+                COMP(user_regs.mask);
                 COMP(user_regs.abi);
                 if (s1->user_regs.abi &&
                     (!s1->user_regs.regs || !s2->user_regs.regs ||
@@ -174,6 +175,7 @@ static int do_test(u64 sample_type, u64 sample_regs_user, u64 read_format)
                 .branch_stack   = &branch_stack.branch_stack,
                 .user_regs      = {
                         .abi    = PERF_SAMPLE_REGS_ABI_64,
+                        .mask   = sample_regs_user,
                         .regs   = user_regs,
                 },
                 .user_stack     = {
@@ -201,8 +203,7 @@ static int do_test(u64 sample_type, u64 sample_regs_user, u64 read_format)
                 sample.read.one.id    = 99;
         }
 
-        sz = perf_event__sample_event_size(&sample, sample_type,
-                                           sample_regs_user, read_format);
+        sz = perf_event__sample_event_size(&sample, sample_type, read_format);
         bufsz = sz + 4096; /* Add a bit for overrun checking */
         event = malloc(bufsz);
         if (!event) {
@@ -215,8 +216,7 @@ static int do_test(u64 sample_type, u64 sample_regs_user, u64 read_format)
         event->header.misc = 0;
         event->header.size = sz;
 
-        err = perf_event__synthesize_sample(event, sample_type,
-                                            sample_regs_user, read_format,
+        err = perf_event__synthesize_sample(event, sample_type, read_format,
                                             &sample, false);
         if (err) {
                 pr_debug("%s failed for sample_type %#"PRIx64", error %d\n",
@@ -244,8 +244,7 @@ static int do_test(u64 sample_type, u64 sample_regs_user, u64 read_format)
                 goto out_free;
         }
 
-        if (!samples_same(&sample, &sample_out, sample_type,
-                          sample_regs_user, read_format)) {
+        if (!samples_same(&sample, &sample_out, sample_type, read_format)) {
                 pr_debug("parsing failed for sample_type %#"PRIx64"\n",
                          sample_type);
                 goto out_free;
diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h
index e0ac713857ba..a24795ca002d 100644
--- a/tools/perf/tests/tests.h
+++ b/tools/perf/tests/tests.h
@@ -40,5 +40,14 @@ int test__code_reading(void);
 int test__sample_parsing(void);
 int test__keep_tracking(void);
 int test__parse_no_sample_id_all(void);
+int test__dwarf_unwind(void);
 
+#if defined(__x86_64__) || defined(__i386__)
+#ifdef HAVE_DWARF_UNWIND_SUPPORT
+struct thread;
+struct perf_sample;
+int test__arch_unwind_sample(struct perf_sample *sample,
+                             struct thread *thread);
+#endif
+#endif
 #endif /* TESTS_H */
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index b720b92eba6e..7ec871af3f6f 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -587,95 +587,52 @@ struct hpp_arg {
         bool current_entry;
 };
 
-static int __hpp__color_callchain(struct hpp_arg *arg)
+static int __hpp__overhead_callback(struct perf_hpp *hpp, bool front)
 {
-        if (!symbol_conf.use_callchain)
-                return 0;
-
-        slsmg_printf("%c ", arg->folded_sign);
-        return 2;
-}
-
-static int __hpp__color_fmt(struct perf_hpp *hpp, struct hist_entry *he,
-                            u64 (*get_field)(struct hist_entry *),
-                            int (*callchain_cb)(struct hpp_arg *))
-{
-        int ret = 0;
-        double percent = 0.0;
-        struct hists *hists = he->hists;
         struct hpp_arg *arg = hpp->ptr;
 
-        if (hists->stats.total_period)
-                percent = 100.0 * get_field(he) / hists->stats.total_period;
-
-        ui_browser__set_percent_color(arg->b, percent, arg->current_entry);
-
-        if (callchain_cb)
-                ret += callchain_cb(arg);
-
-        ret += scnprintf(hpp->buf, hpp->size, "%6.2f%%", percent);
-        slsmg_printf("%s", hpp->buf);
-
-        if (symbol_conf.event_group) {
-                int prev_idx, idx_delta;
-                struct perf_evsel *evsel = hists_to_evsel(hists);
-                struct hist_entry *pair;
-                int nr_members = evsel->nr_members;
-
-                if (nr_members <= 1)
-                        goto out;
+        if (arg->current_entry && arg->b->navkeypressed)
+                ui_browser__set_color(arg->b, HE_COLORSET_SELECTED);
+        else
+                ui_browser__set_color(arg->b, HE_COLORSET_NORMAL);
 
-                prev_idx = perf_evsel__group_idx(evsel);
+        if (front) {
+                if (!symbol_conf.use_callchain)
+                        return 0;
 
-                list_for_each_entry(pair, &he->pairs.head, pairs.node) {
-                        u64 period = get_field(pair);
-                        u64 total = pair->hists->stats.total_period;
+                slsmg_printf("%c ", arg->folded_sign);
+                return 2;
+        }
 
-                        if (!total)
-                                continue;
+        return 0;
+}
 
-                        evsel = hists_to_evsel(pair->hists);
-                        idx_delta = perf_evsel__group_idx(evsel) - prev_idx - 1;
+static int __hpp__color_callback(struct perf_hpp *hpp, bool front __maybe_unused)
+{
+        struct hpp_arg *arg = hpp->ptr;
 
-                        while (idx_delta--) {
-                                /*
-                                 * zero-fill group members in the middle which
-                                 * have no sample
-                                 */
-                                ui_browser__set_percent_color(arg->b, 0.0,
-                                                        arg->current_entry);
-                                ret += scnprintf(hpp->buf, hpp->size,
-                                                 " %6.2f%%", 0.0);
-                                slsmg_printf("%s", hpp->buf);
-                        }
+        if (!arg->current_entry || !arg->b->navkeypressed)
+                ui_browser__set_color(arg->b, HE_COLORSET_NORMAL);
+        return 0;
+}
 
-                        percent = 100.0 * period / total;
-                        ui_browser__set_percent_color(arg->b, percent,
-                                                      arg->current_entry);
-                        ret += scnprintf(hpp->buf, hpp->size,
-                                         " %6.2f%%", percent);
-                        slsmg_printf("%s", hpp->buf);
+static int __hpp__slsmg_color_printf(struct perf_hpp *hpp, const char *fmt, ...)
+{
+        struct hpp_arg *arg = hpp->ptr;
+        int ret;
+        va_list args;
+        double percent;
 
-                        prev_idx = perf_evsel__group_idx(evsel);
-                }
+        va_start(args, fmt);
+        percent = va_arg(args, double);
+        va_end(args);
 
-                idx_delta = nr_members - prev_idx - 1;
+        ui_browser__set_percent_color(arg->b, percent, arg->current_entry);
 
-                while (idx_delta--) {
-                        /*
-                         * zero-fill group members at last which have no sample
-                         */
-                        ui_browser__set_percent_color(arg->b, 0.0,
-                                                      arg->current_entry);
-                        ret += scnprintf(hpp->buf, hpp->size,
-                                         " %6.2f%%", 0.0);
-                        slsmg_printf("%s", hpp->buf);
-                }
-        }
-out:
-        if (!arg->current_entry || !arg->b->navkeypressed)
-                ui_browser__set_color(arg->b, HE_COLORSET_NORMAL);
+        ret = scnprintf(hpp->buf, hpp->size, fmt, percent);
+        slsmg_printf("%s", hpp->buf);
 
+        advance_hpp(hpp, ret);
         return ret;
 }
 
@@ -690,14 +647,15 @@ hist_browser__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,\
                                 struct perf_hpp *hpp,                   \
                                 struct hist_entry *he)                  \
 {                                                                       \
-        return __hpp__color_fmt(hpp, he, __hpp_get_##_field, _cb);      \
+        return __hpp__fmt(hpp, he, __hpp_get_##_field, _cb, " %6.2f%%", \
+                          __hpp__slsmg_color_printf, true);             \
 }
 
-__HPP_COLOR_PERCENT_FN(overhead, period, __hpp__color_callchain)
-__HPP_COLOR_PERCENT_FN(overhead_sys, period_sys, NULL)
-__HPP_COLOR_PERCENT_FN(overhead_us, period_us, NULL)
-__HPP_COLOR_PERCENT_FN(overhead_guest_sys, period_guest_sys, NULL)
-__HPP_COLOR_PERCENT_FN(overhead_guest_us, period_guest_us, NULL)
+__HPP_COLOR_PERCENT_FN(overhead, period, __hpp__overhead_callback)
+__HPP_COLOR_PERCENT_FN(overhead_sys, period_sys, __hpp__color_callback)
+__HPP_COLOR_PERCENT_FN(overhead_us, period_us, __hpp__color_callback)
+__HPP_COLOR_PERCENT_FN(overhead_guest_sys, period_guest_sys, __hpp__color_callback)
+__HPP_COLOR_PERCENT_FN(overhead_guest_us, period_guest_us, __hpp__color_callback)
 
 #undef __HPP_COLOR_PERCENT_FN
 
diff --git a/tools/perf/ui/gtk/hists.c b/tools/perf/ui/gtk/hists.c
index 5b95c44f3435..e395ef9b0ae0 100644
--- a/tools/perf/ui/gtk/hists.c
+++ b/tools/perf/ui/gtk/hists.c
@@ -8,16 +8,24 @@
 
 #define MAX_COLUMNS                     32
 
-static int __percent_color_snprintf(char *buf, size_t size, double percent)
+static int __percent_color_snprintf(struct perf_hpp *hpp, const char *fmt, ...)
 {
         int ret = 0;
+        va_list args;
+        double percent;
         const char *markup;
+        char *buf = hpp->buf;
+        size_t size = hpp->size;
+
+        va_start(args, fmt);
+        percent = va_arg(args, double);
+        va_end(args);
 
         markup = perf_gtk__get_percent_color(percent);
         if (markup)
                 ret += scnprintf(buf, size, markup);
 
-        ret += scnprintf(buf + ret, size - ret, " %6.2f%%", percent);
+        ret += scnprintf(buf + ret, size - ret, fmt, percent);
 
         if (markup)
                 ret += scnprintf(buf + ret, size - ret, "</span>");
@@ -25,66 +33,6 @@ static int __percent_color_snprintf(char *buf, size_t size, double percent)
         return ret;
 }
 
-
-static int __hpp__color_fmt(struct perf_hpp *hpp, struct hist_entry *he,
-                            u64 (*get_field)(struct hist_entry *))
-{
-        int ret;
-        double percent = 0.0;
-        struct hists *hists = he->hists;
-        struct perf_evsel *evsel = hists_to_evsel(hists);
-
-        if (hists->stats.total_period)
-                percent = 100.0 * get_field(he) / hists->stats.total_period;
-
-        ret = __percent_color_snprintf(hpp->buf, hpp->size, percent);
-
-        if (perf_evsel__is_group_event(evsel)) {
-                int prev_idx, idx_delta;
-                struct hist_entry *pair;
-                int nr_members = evsel->nr_members;
-
-                prev_idx = perf_evsel__group_idx(evsel);
-
-                list_for_each_entry(pair, &he->pairs.head, pairs.node) {
-                        u64 period = get_field(pair);
-                        u64 total = pair->hists->stats.total_period;
-
-                        evsel = hists_to_evsel(pair->hists);
-                        idx_delta = perf_evsel__group_idx(evsel) - prev_idx - 1;
-
-                        while (idx_delta--) {
-                                /*
-                                 * zero-fill group members in the middle which
-                                 * have no sample
-                                 */
-                                ret += __percent_color_snprintf(hpp->buf + ret,
-                                                                hpp->size - ret,
-                                                                0.0);
-                        }
-
-                        percent = 100.0 * period / total;
-                        ret += __percent_color_snprintf(hpp->buf + ret,
-                                                        hpp->size - ret,
-                                                        percent);
-
-                        prev_idx = perf_evsel__group_idx(evsel);
-                }
-
-                idx_delta = nr_members - prev_idx - 1;
-
-                while (idx_delta--) {
-                        /*
-                         * zero-fill group members at last which have no sample
-                         */
-                        ret += __percent_color_snprintf(hpp->buf + ret,
-                                                        hpp->size - ret,
-                                                        0.0);
-                }
-        }
-        return ret;
-}
-
 #define __HPP_COLOR_PERCENT_FN(_type, _field)                                   \
 static u64 he_get_##_field(struct hist_entry *he)                               \
 {                                                                               \
@@ -95,7 +43,8 @@ static int perf_gtk__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,
                                        struct perf_hpp *hpp,                    \
                                        struct hist_entry *he)                   \
 {                                                                               \
-        return __hpp__color_fmt(hpp, he, he_get_##_field);                      \
+        return __hpp__fmt(hpp, he, he_get_##_field, NULL, " %6.2f%%",           \
+                          __percent_color_snprintf, true);                      \
 }
 
 __HPP_COLOR_PERCENT_FN(overhead, period)
@@ -216,7 +165,6 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists,
         struct perf_hpp hpp = {
                 .buf            = s,
                 .size           = sizeof(s),
-                .ptr            = hists_to_evsel(hists),
         };
 
         nr_cols = 0;
@@ -243,7 +191,7 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists,
         col_idx = 0;
 
         perf_hpp__for_each_format(fmt) {
-                fmt->header(fmt, &hpp);
+                fmt->header(fmt, &hpp, hists_to_evsel(hists));
 
                 gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view),
                                                             -1, ltrim(s),
diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index 78f4c92e9b73..0f403b83e9d1 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -8,16 +8,27 @@
 
 /* hist period print (hpp) functions */
 
-typedef int (*hpp_snprint_fn)(char *buf, size_t size, const char *fmt, ...);
-
-static int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,
-                      u64 (*get_field)(struct hist_entry *),
-                      const char *fmt, hpp_snprint_fn print_fn,
-                      bool fmt_percent)
+#define hpp__call_print_fn(hpp, fn, fmt, ...)                   \
+({                                                              \
+        int __ret = fn(hpp, fmt, ##__VA_ARGS__);                \
+        advance_hpp(hpp, __ret);                                \
+        __ret;                                                  \
+})
+
+int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,
+               hpp_field_fn get_field, hpp_callback_fn callback,
+               const char *fmt, hpp_snprint_fn print_fn, bool fmt_percent)
 {
-        int ret;
+        int ret = 0;
         struct hists *hists = he->hists;
         struct perf_evsel *evsel = hists_to_evsel(hists);
+        char *buf = hpp->buf;
+        size_t size = hpp->size;
+
+        if (callback) {
+                ret = callback(hpp, true);
+                advance_hpp(hpp, ret);
+        }
 
         if (fmt_percent) {
                 double percent = 0.0;
@@ -26,9 +37,9 @@ static int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,
                         percent = 100.0 * get_field(he) /
                                   hists->stats.total_period;
 
-                ret = print_fn(hpp->buf, hpp->size, fmt, percent);
+                ret += hpp__call_print_fn(hpp, print_fn, fmt, percent);
         } else
-                ret = print_fn(hpp->buf, hpp->size, fmt, get_field(he));
+                ret += hpp__call_print_fn(hpp, print_fn, fmt, get_field(he));
 
         if (perf_evsel__is_group_event(evsel)) {
                 int prev_idx, idx_delta;
@@ -52,16 +63,22 @@ static int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,
                                  * zero-fill group members in the middle which
                                  * have no sample
                                  */
-                                ret += print_fn(hpp->buf + ret, hpp->size - ret,
-                                                fmt, 0);
+                                if (fmt_percent) {
+                                        ret += hpp__call_print_fn(hpp, print_fn,
+                                                                  fmt, 0.0);
+                                } else {
+                                        ret += hpp__call_print_fn(hpp, print_fn,
+                                                                  fmt, 0ULL);
+                                }
                         }
 
-                        if (fmt_percent)
-                                ret += print_fn(hpp->buf + ret, hpp->size - ret,
-                                                fmt, 100.0 * period / total);
-                        else
-                                ret += print_fn(hpp->buf + ret, hpp->size - ret,
-                                                fmt, period);
+                        if (fmt_percent) {
+                                ret += hpp__call_print_fn(hpp, print_fn, fmt,
+                                                          100.0 * period / total);
+                        } else {
+                                ret += hpp__call_print_fn(hpp, print_fn, fmt,
+                                                          period);
+                        }
 
                         prev_idx = perf_evsel__group_idx(evsel);
                 }
@@ -72,41 +89,87 @@ static int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,
                         /*
                          * zero-fill group members at last which have no sample
                          */
-                        ret += print_fn(hpp->buf + ret, hpp->size - ret,
-                                        fmt, 0);
+                        if (fmt_percent) {
+                                ret += hpp__call_print_fn(hpp, print_fn,
+                                                          fmt, 0.0);
+                        } else {
+                                ret += hpp__call_print_fn(hpp, print_fn,
+                                                          fmt, 0ULL);
+                        }
                 }
         }
+
+        if (callback) {
+                int __ret = callback(hpp, false);
+
+                advance_hpp(hpp, __ret);
+                ret += __ret;
+        }
+
+        /*
+         * Restore original buf and size as it's where caller expects
+         * the result will be saved.
+         */
+        hpp->buf = buf;
+        hpp->size = size;
+
         return ret;
 }
 
 #define __HPP_HEADER_FN(_type, _str, _min_width, _unit_width)           \
 static int hpp__header_##_type(struct perf_hpp_fmt *fmt __maybe_unused, \
-                               struct perf_hpp *hpp)                    \
+                               struct perf_hpp *hpp,                    \
+                               struct perf_evsel *evsel)                \
 {                                                                       \
         int len = _min_width;                                           \
                                                                         \
-        if (symbol_conf.event_group) {                                  \
-                struct perf_evsel *evsel = hpp->ptr;                    \
-                                                                        \
+        if (symbol_conf.event_group)                                    \
                 len = max(len, evsel->nr_members * _unit_width);        \
-        }                                                               \
+                                                                        \
         return scnprintf(hpp->buf, hpp->size, "%*s", len, _str);        \
 }
 
 #define __HPP_WIDTH_FN(_type, _min_width, _unit_width)                  \
 static int hpp__width_##_type(struct perf_hpp_fmt *fmt __maybe_unused,  \
-                              struct perf_hpp *hpp __maybe_unused)      \
+                              struct perf_hpp *hpp __maybe_unused,      \
+                              struct perf_evsel *evsel)                 \
 {                                                                       \
         int len = _min_width;                                           \
                                                                         \
-        if (symbol_conf.event_group) {                                  \
-                struct perf_evsel *evsel = hpp->ptr;                    \
-                                                                        \
+        if (symbol_conf.event_group)                                    \
                 len = max(len, evsel->nr_members * _unit_width);        \
-        }                                                               \
+                                                                        \
         return len;                                                     \
 }
 
+static int hpp_color_scnprintf(struct perf_hpp *hpp, const char *fmt, ...)
+{
+        va_list args;
+        ssize_t ssize = hpp->size;
+        double percent;
+        int ret;
+
+        va_start(args, fmt);
+        percent = va_arg(args, double);
+        ret = value_color_snprintf(hpp->buf, hpp->size, fmt, percent);
+        va_end(args);
+
+        return (ret >= ssize) ? (ssize - 1) : ret;
+}
+
+static int hpp_entry_scnprintf(struct perf_hpp *hpp, const char *fmt, ...)
+{
+        va_list args;
+        ssize_t ssize = hpp->size;
+        int ret;
+
+        va_start(args, fmt);
+        ret = vsnprintf(hpp->buf, hpp->size, fmt, args);
+        va_end(args);
+
+        return (ret >= ssize) ? (ssize - 1) : ret;
+}
+
 #define __HPP_COLOR_PERCENT_FN(_type, _field)                                   \
 static u64 he_get_##_field(struct hist_entry *he)                               \
 {                                                                               \
@@ -116,8 +179,8 @@ static u64 he_get_##_field(struct hist_entry *he)				\
 static int hpp__color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,          \
                               struct perf_hpp *hpp, struct hist_entry *he)      \
 {                                                                               \
-        return __hpp__fmt(hpp, he, he_get_##_field, " %6.2f%%",                 \
-                          percent_color_snprintf, true);                        \
+        return __hpp__fmt(hpp, he, he_get_##_field, NULL, " %6.2f%%",           \
+                          hpp_color_scnprintf, true);                           \
 }
 
 #define __HPP_ENTRY_PERCENT_FN(_type, _field)                                   \
@@ -125,8 +188,8 @@ static int hpp__entry_##_type(struct perf_hpp_fmt *_fmt __maybe_unused,		\
                               struct perf_hpp *hpp, struct hist_entry *he)      \
 {                                                                               \
         const char *fmt = symbol_conf.field_sep ? " %.2f" : " %6.2f%%";         \
-        return __hpp__fmt(hpp, he, he_get_##_field, fmt,                        \
-                          scnprintf, true);                                     \
+        return __hpp__fmt(hpp, he, he_get_##_field, NULL, fmt,                  \
+                          hpp_entry_scnprintf, true);                           \
 }
 
 #define __HPP_ENTRY_RAW_FN(_type, _field)                                       \
@@ -139,7 +202,8 @@ static int hpp__entry_##_type(struct perf_hpp_fmt *_fmt __maybe_unused,		\
                               struct perf_hpp *hpp, struct hist_entry *he)      \
 {                                                                               \
         const char *fmt = symbol_conf.field_sep ? " %"PRIu64 : " %11"PRIu64;    \
-        return __hpp__fmt(hpp, he, he_get_raw_##_field, fmt, scnprintf, false); \
+        return __hpp__fmt(hpp, he, he_get_raw_##_field, NULL, fmt,              \
+                          hpp_entry_scnprintf, false);                          \
 }
 
 #define HPP_PERCENT_FNS(_type, _str, _field, _min_width, _unit_width)   \
@@ -263,15 +327,13 @@ unsigned int hists__sort_list_width(struct hists *hists)
         struct perf_hpp_fmt *fmt;
         struct sort_entry *se;
         int i = 0, ret = 0;
-        struct perf_hpp dummy_hpp = {
-                .ptr    = hists_to_evsel(hists),
-        };
+        struct perf_hpp dummy_hpp;
 
         perf_hpp__for_each_format(fmt) {
                 if (i)
                         ret += 2;
 
-                ret += fmt->width(fmt, &dummy_hpp);
+                ret += fmt->width(fmt, &dummy_hpp, hists_to_evsel(hists));
         }
 
         list_for_each_entry(se, &hist_entry__sort_list, list)
diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c
index 831fbb77d1ff..d59893edf031 100644
--- a/tools/perf/ui/stdio/hist.c
+++ b/tools/perf/ui/stdio/hist.c
@@ -306,12 +306,6 @@ static size_t hist_entry__callchain_fprintf(struct hist_entry *he,
         return hist_entry_callchain__fprintf(he, total_period, left_margin, fp);
 }
 
-static inline void advance_hpp(struct perf_hpp *hpp, int inc)
-{
-        hpp->buf  += inc;
-        hpp->size -= inc;
-}
-
 static int hist_entry__period_snprintf(struct perf_hpp *hpp,
                                        struct hist_entry *he)
 {
@@ -385,7 +379,6 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,
         struct perf_hpp dummy_hpp = {
                 .buf    = bf,
                 .size   = sizeof(bf),
-                .ptr    = hists_to_evsel(hists),
         };
         bool first = true;
         size_t linesz;
@@ -404,7 +397,7 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,
                 else
                         first = false;
 
-                fmt->header(fmt, &dummy_hpp);
+                fmt->header(fmt, &dummy_hpp, hists_to_evsel(hists));
                 fprintf(fp, "%s", bf);
         }
 
@@ -449,7 +442,7 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,
                 else
                         first = false;
 
-                width = fmt->width(fmt, &dummy_hpp);
+                width = fmt->width(fmt, &dummy_hpp, hists_to_evsel(hists));
                 for (i = 0; i < width; i++)
                         fprintf(fp, ".");
         }
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 3aa555ff9d89..809b4c50beae 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -1236,6 +1236,7 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map,
         struct dso *dso = map->dso;
         char *filename;
         const char *d_filename;
+        const char *evsel_name = perf_evsel__name(evsel);
         struct annotation *notes = symbol__annotation(sym);
         struct disasm_line *pos, *queue = NULL;
         u64 start = map__rip_2objdump(map, sym->start);
@@ -1243,7 +1244,7 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map,
         int more = 0;
         u64 len;
         int width = 8;
-        int namelen;
+        int namelen, evsel_name_len, graph_dotted_len;
 
         filename = strdup(dso->long_name);
         if (!filename)
@@ -1256,14 +1257,17 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map,
 
         len = symbol__size(sym);
         namelen = strlen(d_filename);
+        evsel_name_len = strlen(evsel_name);
 
         if (perf_evsel__is_group_event(evsel))
                 width *= evsel->nr_members;
 
-        printf(" %-*.*s|        Source code & Disassembly of %s\n",
-               width, width, "Percent", d_filename);
-        printf("-%-*.*s-------------------------------------\n",
-               width+namelen, width+namelen, graph_dotted_line);
+        printf(" %-*.*s|        Source code & Disassembly of %s for %s\n",
+               width, width, "Percent", d_filename, evsel_name);
+
+        graph_dotted_len = width + namelen + evsel_name_len;
+        printf("-%-*.*s-----------------------------------------\n",
+               graph_dotted_len, graph_dotted_len, graph_dotted_line);
 
         if (verbose)
                 symbol__annotate_hits(sym, evsel);
diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c
index a9b48c42e81e..7fe4994eeb63 100644
--- a/tools/perf/util/cpumap.c
+++ b/tools/perf/util/cpumap.c
@@ -1,5 +1,5 @@
 #include "util.h"
-#include "fs.h"
+#include <api/fs/fs.h>
 #include "../perf.h"
 #include "cpumap.h"
 #include <assert.h>
diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c
index 1fbcd8bdc11b..55de44ecebef 100644
--- a/tools/perf/util/data.c
+++ b/tools/perf/util/data.c
@@ -86,10 +86,17 @@ static int open_file_read(struct perf_data_file *file)
 
 static int open_file_write(struct perf_data_file *file)
 {
+        int fd;
+
         if (check_backup(file))
                 return -1;
 
-        return open(file->path, O_CREAT|O_RDWR|O_TRUNC, S_IRUSR|S_IWUSR);
+        fd = open(file->path, O_CREAT|O_RDWR|O_TRUNC, S_IRUSR|S_IWUSR);
+
+        if (fd < 0)
+                pr_err("failed to open %s : %s\n", file->path, strerror(errno));
+
+        return fd;
 }
 
 static int open_file(struct perf_data_file *file)
diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
index 4045d086d9d9..64453d63b971 100644
--- a/tools/perf/util/dso.c
+++ b/tools/perf/util/dso.c
@@ -45,8 +45,8 @@ int dso__read_binary_type_filename(const struct dso *dso,
                         debuglink--;
                 if (*debuglink == '/')
                         debuglink++;
-                filename__read_debuglink(dso->long_name, debuglink,
-                                         size - (debuglink - filename));
+                ret = filename__read_debuglink(dso->long_name, debuglink,
+                                               size - (debuglink - filename));
                 }
                 break;
         case DSO_BINARY_TYPE__BUILD_ID_CACHE:
diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h
index cd7d6f078cdd..ab06f1c03655 100644
--- a/tools/perf/util/dso.h
+++ b/tools/perf/util/dso.h
@@ -102,6 +102,16 @@ struct dso {
         char             name[0];
 };
 
+/* dso__for_each_symbol - iterate over the symbols of given type
+ *
+ * @dso: the 'struct dso *' in which symbols itereated
+ * @pos: the 'struct symbol *' to use as a loop cursor
+ * @n: the 'struct rb_node *' to use as a temporary storage
+ * @type: the 'enum map_type' type of symbols
+ */
+#define dso__for_each_symbol(dso, pos, n, type) \
+        symbols__for_each_entry(&(dso)->symbols[(type)], pos, n)
+
 static inline void dso__set_loaded(struct dso *dso, enum map_type type)
 {
         dso->loaded |= (1 << type);
diff --git a/tools/perf/util/dwarf-aux.c b/tools/perf/util/dwarf-aux.c
index 7defd77105d0..cc66c4049e09 100644
--- a/tools/perf/util/dwarf-aux.c
+++ b/tools/perf/util/dwarf-aux.c
@@ -747,14 +747,17 @@ struct __find_variable_param {
 static int __die_find_variable_cb(Dwarf_Die *die_mem, void *data)
 {
         struct __find_variable_param *fvp = data;
+        Dwarf_Attribute attr;
         int tag;
 
         tag = dwarf_tag(die_mem);
         if ((tag == DW_TAG_formal_parameter ||
              tag == DW_TAG_variable) &&
-            die_compare_name(die_mem, fvp->name))
+            die_compare_name(die_mem, fvp->name) &&
+        /* Does the DIE have location information or external instance? */
+            (dwarf_attr(die_mem, DW_AT_external, &attr) ||
+             dwarf_attr(die_mem, DW_AT_location, &attr)))
                 return DIE_FIND_CB_END;
-
         if (dwarf_haspc(die_mem, fvp->addr))
                 return DIE_FIND_CB_CONTINUE;
         else
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index b0f3ca850e9e..9d12aa6dd485 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -1,6 +1,7 @@
 #include <linux/types.h>
 #include "event.h"
 #include "debug.h"
+#include "hist.h"
 #include "machine.h"
 #include "sort.h"
 #include "string.h"
@@ -94,14 +95,10 @@ static pid_t perf_event__get_comm_tgid(pid_t pid, char *comm, size_t len)
 
 static pid_t perf_event__synthesize_comm(struct perf_tool *tool,
                                          union perf_event *event, pid_t pid,
-                                         int full,
                                          perf_event__handler_t process,
                                          struct machine *machine)
 {
-        char filename[PATH_MAX];
         size_t size;
-        DIR *tasks;
-        struct dirent dirent, *next;
         pid_t tgid;
 
         memset(&event->comm, 0, sizeof(event->comm));
@@ -124,55 +121,35 @@ static pid_t perf_event__synthesize_comm(struct perf_tool *tool,
         event->comm.header.size = (sizeof(event->comm) -
                                 (sizeof(event->comm.comm) - size) +
                                 machine->id_hdr_size);
-        if (!full) {
-                event->comm.tid = pid;
+        event->comm.tid = pid;
 
-                if (process(tool, event, &synth_sample, machine) != 0)
-                        return -1;
-
-                goto out;
-        }
-
-        if (machine__is_default_guest(machine))
-                return 0;
-
-        snprintf(filename, sizeof(filename), "%s/proc/%d/task",
-                 machine->root_dir, pid);
-
-        tasks = opendir(filename);
-        if (tasks == NULL) {
-                pr_debug("couldn't open %s\n", filename);
-                return 0;
-        }
+        if (process(tool, event, &synth_sample, machine) != 0)
+                return -1;
 
-        while (!readdir_r(tasks, &dirent, &next) && next) {
-                char *end;
-                pid = strtol(dirent.d_name, &end, 10);
-                if (*end)
-                        continue;
+out:
+        return tgid;
+}
 
-                /* already have tgid; jut want to update the comm */
-                (void) perf_event__get_comm_tgid(pid, event->comm.comm,
-                                         sizeof(event->comm.comm));
+static int perf_event__synthesize_fork(struct perf_tool *tool,
+                                       union perf_event *event, pid_t pid,
+                                       pid_t tgid, perf_event__handler_t process,
+                                       struct machine *machine)
+{
+        memset(&event->fork, 0, sizeof(event->fork) + machine->id_hdr_size);
 
-                size = strlen(event->comm.comm) + 1;
-                size = PERF_ALIGN(size, sizeof(u64));
-                memset(event->comm.comm + size, 0, machine->id_hdr_size);
-                event->comm.header.size = (sizeof(event->comm) -
-                                          (sizeof(event->comm.comm) - size) +
-                                          machine->id_hdr_size);
+        /* this is really a clone event but we use fork to synthesize it */
+        event->fork.ppid = tgid;
+        event->fork.ptid = tgid;
+        event->fork.pid  = tgid;
+        event->fork.tid  = pid;
+        event->fork.header.type = PERF_RECORD_FORK;
 
-                event->comm.tid = pid;
+        event->fork.header.size = (sizeof(event->fork) + machine->id_hdr_size);
 
-                if (process(tool, event, &synth_sample, machine) != 0) {
-                        tgid = -1;
-                        break;
-                }
-        }
+        if (process(tool, event, &synth_sample, machine) != 0)
+                return -1;
 
-        closedir(tasks);
-out:
-        return tgid;
+        return 0;
 }
 
 int perf_event__synthesize_mmap_events(struct perf_tool *tool,
@@ -324,17 +301,71 @@ int perf_event__synthesize_modules(struct perf_tool *tool,
 
 static int __event__synthesize_thread(union perf_event *comm_event,
                                       union perf_event *mmap_event,
+                                      union perf_event *fork_event,
                                       pid_t pid, int full,
                                           perf_event__handler_t process,
                                       struct perf_tool *tool,
                                       struct machine *machine, bool mmap_data)
 {
-        pid_t tgid = perf_event__synthesize_comm(tool, comm_event, pid, full,
+        char filename[PATH_MAX];
+        DIR *tasks;
+        struct dirent dirent, *next;
+        pid_t tgid;
+
+        /* special case: only send one comm event using passed in pid */
+        if (!full) {
+                tgid = perf_event__synthesize_comm(tool, comm_event, pid,
+                                                   process, machine);
+
+                if (tgid == -1)
+                        return -1;
+
+                return perf_event__synthesize_mmap_events(tool, mmap_event, pid, tgid,
+                                                          process, machine, mmap_data);
+        }
+
+        if (machine__is_default_guest(machine))
+                return 0;
+
+        snprintf(filename, sizeof(filename), "%s/proc/%d/task",
+                 machine->root_dir, pid);
+
+        tasks = opendir(filename);
+        if (tasks == NULL) {
+                pr_debug("couldn't open %s\n", filename);
+                return 0;
+        }
+
+        while (!readdir_r(tasks, &dirent, &next) && next) {
+                char *end;
+                int rc = 0;
+                pid_t _pid;
+
+                _pid = strtol(dirent.d_name, &end, 10);
+                if (*end)
+                        continue;
+
+                tgid = perf_event__synthesize_comm(tool, comm_event, _pid,
+                                                   process, machine);
+                if (tgid == -1)
+                        return -1;
+
+                if (_pid == pid) {
+                        /* process the parent's maps too */
+                        rc = perf_event__synthesize_mmap_events(tool, mmap_event, pid, tgid,
+                                                process, machine, mmap_data);
+                } else {
+                        /* only fork the tid's map, to save time */
+                        rc = perf_event__synthesize_fork(tool, fork_event, _pid, tgid,
                                                  process, machine);
-        if (tgid == -1)
-                return -1;
-        return perf_event__synthesize_mmap_events(tool, mmap_event, pid, tgid,
-                                                  process, machine, mmap_data);
+                }
+
+                if (rc)
+                        return rc;
+        }
+
+        closedir(tasks);
+        return 0;
 }
 
 int perf_event__synthesize_thread_map(struct perf_tool *tool,
@@ -343,7 +374,7 @@ int perf_event__synthesize_thread_map(struct perf_tool *tool,
                                       struct machine *machine,
                                       bool mmap_data)
 {
-        union perf_event *comm_event, *mmap_event;
+        union perf_event *comm_event, *mmap_event, *fork_event;
         int err = -1, thread, j;
 
         comm_event = malloc(sizeof(comm_event->comm) + machine->id_hdr_size);
@@ -354,9 +385,14 @@ int perf_event__synthesize_thread_map(struct perf_tool *tool,
         if (mmap_event == NULL)
                 goto out_free_comm;
 
+        fork_event = malloc(sizeof(fork_event->fork) + machine->id_hdr_size);
+        if (fork_event == NULL)
+                goto out_free_mmap;
+
         err = 0;
         for (thread = 0; thread < threads->nr; ++thread) {
                 if (__event__synthesize_thread(comm_event, mmap_event,
+                                               fork_event,
                                                threads->map[thread], 0,
                                                process, tool, machine,
                                                mmap_data)) {
@@ -382,6 +418,7 @@ int perf_event__synthesize_thread_map(struct perf_tool *tool,
                         /* if not, generate events for it */
                         if (need_leader &&
                             __event__synthesize_thread(comm_event, mmap_event,
+                                                       fork_event,
                                                        comm_event->comm.pid, 0,
                                                        process, tool, machine,
                                                        mmap_data)) {
@@ -390,6 +427,8 @@ int perf_event__synthesize_thread_map(struct perf_tool *tool,
                         }
                 }
         }
+        free(fork_event);
+out_free_mmap:
         free(mmap_event);
 out_free_comm:
         free(comm_event);
@@ -404,9 +443,12 @@ int perf_event__synthesize_threads(struct perf_tool *tool,
         DIR *proc;
         char proc_path[PATH_MAX];
         struct dirent dirent, *next;
-        union perf_event *comm_event, *mmap_event;
+        union perf_event *comm_event, *mmap_event, *fork_event;
         int err = -1;
 
+        if (machine__is_default_guest(machine))
+                return 0;
+
         comm_event = malloc(sizeof(comm_event->comm) + machine->id_hdr_size);
         if (comm_event == NULL)
                 goto out;
@@ -415,14 +457,15 @@ int perf_event__synthesize_threads(struct perf_tool *tool,
         if (mmap_event == NULL)
                 goto out_free_comm;
 
-        if (machine__is_default_guest(machine))
-                return 0;
+        fork_event = malloc(sizeof(fork_event->fork) + machine->id_hdr_size);
+        if (fork_event == NULL)
+                goto out_free_mmap;
 
         snprintf(proc_path, sizeof(proc_path), "%s/proc", machine->root_dir);
         proc = opendir(proc_path);
 
         if (proc == NULL)
-                goto out_free_mmap;
+                goto out_free_fork;
 
         while (!readdir_r(proc, &dirent, &next) && next) {
                 char *end;
@@ -434,12 +477,14 @@ int perf_event__synthesize_threads(struct perf_tool *tool,
                  * We may race with exiting thread, so don't stop just because
                  * one thread couldn't be synthesized.
                  */
-                __event__synthesize_thread(comm_event, mmap_event, pid, 1,
-                                           process, tool, machine, mmap_data);
+                __event__synthesize_thread(comm_event, mmap_event, fork_event, pid,
+                                           1, process, tool, machine, mmap_data);
         }
 
         err = 0;
         closedir(proc);
+out_free_fork:
+        free(fork_event);
 out_free_mmap:
         free(mmap_event);
 out_free_comm:
@@ -661,7 +706,7 @@ void thread__find_addr_map(struct thread *thread,
         al->thread = thread;
         al->addr = addr;
         al->cpumode = cpumode;
-        al->filtered = false;
+        al->filtered = 0;
 
         if (machine == NULL) {
                 al->map = NULL;
@@ -687,11 +732,11 @@ void thread__find_addr_map(struct thread *thread,
                 if ((cpumode == PERF_RECORD_MISC_GUEST_USER ||
                         cpumode == PERF_RECORD_MISC_GUEST_KERNEL) &&
                         !perf_guest)
-                        al->filtered = true;
+                        al->filtered |= (1 << HIST_FILTER__GUEST);
                 if ((cpumode == PERF_RECORD_MISC_USER ||
                         cpumode == PERF_RECORD_MISC_KERNEL) &&
                         !perf_host)
-                        al->filtered = true;
+                        al->filtered |= (1 << HIST_FILTER__HOST);
 
                 return;
         }
@@ -748,9 +793,6 @@ int perf_event__preprocess_sample(const union perf_event *event,
         if (thread == NULL)
                 return -1;
 
-        if (thread__is_filtered(thread))
-                goto out_filtered;
-
         dump_printf(" ... thread: %s:%d\n", thread__comm_str(thread), thread->tid);
         /*
          * Have we already created the kernel maps for this machine?
@@ -768,6 +810,10 @@ int perf_event__preprocess_sample(const union perf_event *event,
         dump_printf(" ...... dso: %s\n",
                     al->map ? al->map->dso->long_name :
                         al->level == 'H' ? "[hypervisor]" : "<not found>");
+
+        if (thread__is_filtered(thread))
+                al->filtered |= (1 << HIST_FILTER__THREAD);
+
         al->sym = NULL;
         al->cpu = sample->cpu;
 
@@ -779,8 +825,9 @@ int perf_event__preprocess_sample(const union perf_event *event,
                                                   dso->short_name) ||
                                (dso->short_name != dso->long_name &&
                                 strlist__has_entry(symbol_conf.dso_list,
-                                                   dso->long_name)))))
-                        goto out_filtered;
+                                                   dso->long_name))))) {
+                        al->filtered |= (1 << HIST_FILTER__DSO);
+                }
 
                 al->sym = map__find_symbol(al->map, al->addr,
                                            machine->symbol_filter);
@@ -788,12 +835,9 @@ int perf_event__preprocess_sample(const union perf_event *event,
 
         if (symbol_conf.sym_list &&
                 (!al->sym || !strlist__has_entry(symbol_conf.sym_list,
-                                                al->sym->name)))
-                goto out_filtered;
-
-        return 0;
+                                                al->sym->name))) {
+                al->filtered |= (1 << HIST_FILTER__SYMBOL);
+        }
 
-out_filtered:
-        al->filtered = true;
         return 0;
 }
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 851fa06f4a42..38457d447a13 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -85,6 +85,7 @@ struct sample_event {
 
 struct regs_dump {
         u64 abi;
+        u64 mask;
         u64 *regs;
 };
 
@@ -259,9 +260,9 @@ int perf_event__preprocess_sample(const union perf_event *event,
 const char *perf_event__name(unsigned int id);
 
 size_t perf_event__sample_event_size(const struct perf_sample *sample, u64 type,
-                                     u64 sample_regs_user, u64 read_format);
+                                     u64 read_format);
 int perf_event__synthesize_sample(union perf_event *event, u64 type,
-                                  u64 sample_regs_user, u64 read_format,
+                                  u64 read_format,
                                   const struct perf_sample *sample,
                                   bool swapped);
 
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 55407c594b87..5c28d82b76c4 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -500,6 +500,34 @@ int perf_evsel__group_desc(struct perf_evsel *evsel, char *buf, size_t size)
         return ret;
 }
 
+static void
+perf_evsel__config_callgraph(struct perf_evsel *evsel,
+                             struct record_opts *opts)
+{
+        bool function = perf_evsel__is_function_event(evsel);
+        struct perf_event_attr *attr = &evsel->attr;
+
+        perf_evsel__set_sample_bit(evsel, CALLCHAIN);
+
+        if (opts->call_graph == CALLCHAIN_DWARF) {
+                if (!function) {
+                        perf_evsel__set_sample_bit(evsel, REGS_USER);
+                        perf_evsel__set_sample_bit(evsel, STACK_USER);
+                        attr->sample_regs_user = PERF_REGS_MASK;
+                        attr->sample_stack_user = opts->stack_dump_size;
+                        attr->exclude_callchain_user = 1;
+                } else {
+                        pr_info("Cannot use DWARF unwind for function trace event,"
+                                " falling back to framepointers.\n");
+                }
+        }
+
+        if (function) {
+                pr_info("Disabling user space callchains for function trace event.\n");
+                attr->exclude_callchain_user = 1;
+        }
+}
+
 /*
  * The enable_on_exec/disabled value strategy:
  *
@@ -595,17 +623,8 @@ void perf_evsel__config(struct perf_evsel *evsel, struct record_opts *opts)
                 attr->mmap_data = track;
         }
 
-        if (opts->call_graph) {
-                perf_evsel__set_sample_bit(evsel, CALLCHAIN);
-
-                if (opts->call_graph == CALLCHAIN_DWARF) {
-                        perf_evsel__set_sample_bit(evsel, REGS_USER);
-                        perf_evsel__set_sample_bit(evsel, STACK_USER);
-                        attr->sample_regs_user = PERF_REGS_MASK;
-                        attr->sample_stack_user = opts->stack_dump_size;
-                        attr->exclude_callchain_user = 1;
-                }
-        }
+        if (opts->call_graph_enabled)
+                perf_evsel__config_callgraph(evsel, opts);
 
         if (target__has_cpu(&opts->target))
                 perf_evsel__set_sample_bit(evsel, CPU);
@@ -1004,7 +1023,7 @@ retry_sample_id:
 
                         group_fd = get_group_fd(evsel, cpu, thread);
 retry_open:
-                        pr_debug2("perf_event_open: pid %d  cpu %d  group_fd %d  flags %#lx\n",
+                        pr_debug2("sys_perf_event_open: pid %d  cpu %d  group_fd %d  flags %#lx\n",
                                   pid, cpus->map[cpu], group_fd, flags);
 
                         FD(evsel, cpu, thread) = sys_perf_event_open(&evsel->attr,
@@ -1013,7 +1032,7 @@ retry_open:
                                                                      group_fd, flags);
                         if (FD(evsel, cpu, thread) < 0) {
                                 err = -errno;
-                                pr_debug2("perf_event_open failed, error %d\n",
+                                pr_debug2("sys_perf_event_open failed, error %d\n",
                                           err);
                                 goto try_fallback;
                         }
@@ -1220,7 +1239,7 @@ int perf_evsel__parse_sample(struct perf_evsel *evsel, union perf_event *event,
         memset(data, 0, sizeof(*data));
         data->cpu = data->pid = data->tid = -1;
         data->stream_id = data->id = data->time = -1ULL;
-        data->period = 1;
+        data->period = evsel->attr.sample_period;
         data->weight = 0;
 
         if (event->header.type != PERF_RECORD_SAMPLE) {
@@ -1396,10 +1415,11 @@ int perf_evsel__parse_sample(struct perf_evsel *evsel, union perf_event *event,
                 array++;
 
                 if (data->user_regs.abi) {
-                        u64 regs_user = evsel->attr.sample_regs_user;
+                        u64 mask = evsel->attr.sample_regs_user;
 
-                        sz = hweight_long(regs_user) * sizeof(u64);
+                        sz = hweight_long(mask) * sizeof(u64);
                         OVERFLOW_CHECK(array, sz, max_size);
+                        data->user_regs.mask = mask;
                         data->user_regs.regs = (u64 *)array;
                         array = (void *)array + sz;
                 }
@@ -1451,7 +1471,7 @@ int perf_evsel__parse_sample(struct perf_evsel *evsel, union perf_event *event,
 }
 
 size_t perf_event__sample_event_size(const struct perf_sample *sample, u64 type,
-                                     u64 sample_regs_user, u64 read_format)
+                                     u64 read_format)
 {
         size_t sz, result = sizeof(struct sample_event);
 
@@ -1517,7 +1537,7 @@ size_t perf_event__sample_event_size(const struct perf_sample *sample, u64 type,
         if (type & PERF_SAMPLE_REGS_USER) {
                 if (sample->user_regs.abi) {
                         result += sizeof(u64);
-                        sz = hweight_long(sample_regs_user) * sizeof(u64);
+                        sz = hweight_long(sample->user_regs.mask) * sizeof(u64);
                         result += sz;
                 } else {
                         result += sizeof(u64);
@@ -1546,7 +1566,7 @@ size_t perf_event__sample_event_size(const struct perf_sample *sample, u64 type,
 }
 
 int perf_event__synthesize_sample(union perf_event *event, u64 type,
-                                  u64 sample_regs_user, u64 read_format,
+                                  u64 read_format,
                                   const struct perf_sample *sample,
                                   bool swapped)
 {
@@ -1687,7 +1707,7 @@ int perf_event__synthesize_sample(union perf_event *event, u64 type,
         if (type & PERF_SAMPLE_REGS_USER) {
                 if (sample->user_regs.abi) {
                         *array++ = sample->user_regs.abi;
-                        sz = hweight_long(sample_regs_user) * sizeof(u64);
+                        sz = hweight_long(sample->user_regs.mask) * sizeof(u64);
                         memcpy(array, sample->user_regs.regs, sz);
                         array = (void *)array + sz;
                 } else {
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index f1b325665aae..0c9926cfb292 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -315,6 +315,24 @@ static inline bool perf_evsel__is_group_event(struct perf_evsel *evsel)
         return perf_evsel__is_group_leader(evsel) && evsel->nr_members > 1;
 }
 
+/**
+ * perf_evsel__is_function_event - Return whether given evsel is a function
+ * trace event
+ *
+ * @evsel - evsel selector to be tested
+ *
+ * Return %true if event is function trace event
+ */
+static inline bool perf_evsel__is_function_event(struct perf_evsel *evsel)
+{
+#define FUNCTION_EVENT "ftrace:function"
+
+        return evsel->name &&
+               !strncmp(FUNCTION_EVENT, evsel->name, sizeof(FUNCTION_EVENT));
+
+#undef FUNCTION_EVENT
+}
+
 struct perf_attr_details {
         bool freq;
         bool verbose;
diff --git a/tools/perf/util/fs.h b/tools/perf/util/fs.h
deleted file mode 100644
index 5e09ce1bab0e..000000000000
--- a/tools/perf/util/fs.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __PERF_FS
-#define __PERF_FS
-
-const char *sysfs__mountpoint(void);
-const char *procfs__mountpoint(void);
-
-#endif /* __PERF_FS */
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index e4e6249b87d4..f38590d7561b 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -13,13 +13,6 @@ static bool hists__filter_entry_by_thread(struct hists *hists,
 static bool hists__filter_entry_by_symbol(struct hists *hists,
                                           struct hist_entry *he);
 
-enum hist_filter {
-        HIST_FILTER__DSO,
-        HIST_FILTER__THREAD,
-        HIST_FILTER__PARENT,
-        HIST_FILTER__SYMBOL,
-};
-
 struct callchain_param  callchain_param = {
         .mode   = CHAIN_GRAPH_REL,
         .min_percent = 0.5,
@@ -290,7 +283,7 @@ static struct hist_entry *hist_entry__new(struct hist_entry *template)
                 if (he->branch_info) {
                         /*
                          * This branch info is (a part of) allocated from
-                         * machine__resolve_bstack() and will be freed after
+                         * sample__resolve_bstack() and will be freed after
                          * adding new entries.  So we need to save a copy.
                          */
                         he->branch_info = malloc(sizeof(*he->branch_info));
@@ -369,7 +362,7 @@ static struct hist_entry *add_hist_entry(struct hists *hists,
                         he_stat__add_period(&he->stat, period, weight);
 
                         /*
-                         * This mem info was allocated from machine__resolve_mem
+                         * This mem info was allocated from sample__resolve_mem
                          * and will not be used anymore.
                          */
                         zfree(&entry->mem_info);
@@ -429,7 +422,7 @@ struct hist_entry *__hists__add_entry(struct hists *hists,
                         .weight = weight,
                 },
                 .parent = sym_parent,
-                .filtered = symbol__parent_filter(sym_parent),
+                .filtered = symbol__parent_filter(sym_parent) | al->filtered,
                 .hists  = hists,
                 .branch_info = bi,
                 .mem_info = mi,
diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index a59743fa3ef7..1f1f513dfe7f 100644
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -14,6 +14,15 @@ struct hist_entry;
 struct addr_location;
 struct symbol;
 
+enum hist_filter {
+        HIST_FILTER__DSO,
+        HIST_FILTER__THREAD,
+        HIST_FILTER__PARENT,
+        HIST_FILTER__SYMBOL,
+        HIST_FILTER__GUEST,
+        HIST_FILTER__HOST,
+};
+
 /*
  * The kernel collects the number of events it couldn't send in a stretch and
  * when possible sends this number in a PERF_RECORD_LOST event. The number of
@@ -132,8 +141,10 @@ struct perf_hpp {
 };
 
 struct perf_hpp_fmt {
-        int (*header)(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp);
-        int (*width)(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp);
+        int (*header)(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
+                      struct perf_evsel *evsel);
+        int (*width)(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
+                     struct perf_evsel *evsel);
         int (*color)(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
                      struct hist_entry *he);
         int (*entry)(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
@@ -166,6 +177,20 @@ void perf_hpp__init(void);
 void perf_hpp__column_register(struct perf_hpp_fmt *format);
 void perf_hpp__column_enable(unsigned col);
 
+typedef u64 (*hpp_field_fn)(struct hist_entry *he);
+typedef int (*hpp_callback_fn)(struct perf_hpp *hpp, bool front);
+typedef int (*hpp_snprint_fn)(struct perf_hpp *hpp, const char *fmt, ...);
+
+int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,
+               hpp_field_fn get_field, hpp_callback_fn callback,
+               const char *fmt, hpp_snprint_fn print_fn, bool fmt_percent);
+
+static inline void advance_hpp(struct perf_hpp *hpp, int inc)
+{
+        hpp->buf  += inc;
+        hpp->size -= inc;
+}
+
 static inline size_t perf_hpp__use_color(void)
 {
         return !symbol_conf.field_sep;
diff --git a/tools/perf/util/include/linux/hash.h b/tools/perf/util/include/linux/hash.h
deleted file mode 100644
index 201f57397997..000000000000
--- a/tools/perf/util/include/linux/hash.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "../../../../include/linux/hash.h"
-
-#ifndef PERF_HASH_H
-#define PERF_HASH_H
-#endif
diff --git a/tools/perf/util/include/linux/kernel.h b/tools/perf/util/include/linux/kernel.h
index d8c927c868ee..9844c31b7c2b 100644
--- a/tools/perf/util/include/linux/kernel.h
+++ b/tools/perf/util/include/linux/kernel.h
@@ -94,12 +94,6 @@ static inline int scnprintf(char * buf, size_t size, const char * fmt, ...)
         return (i >= ssize) ? (ssize - 1) : i;
 }
 
-static inline unsigned long
-simple_strtoul(const char *nptr, char **endptr, int base)
-{
-        return strtoul(nptr, endptr, base);
-}
-
 int eprintf(int level,
             const char *fmt, ...) __attribute__((format(printf, 2, 3)));
 
diff --git a/tools/perf/util/include/linux/list.h b/tools/perf/util/include/linux/list.h
index 1d928a0ce997..bfe0a2afd0d2 100644
--- a/tools/perf/util/include/linux/list.h
+++ b/tools/perf/util/include/linux/list.h
@@ -1,5 +1,4 @@
 #include <linux/kernel.h>
-#include <linux/prefetch.h>
 
 #include "../../../../include/linux/list.h"
 
diff --git a/tools/perf/util/include/linux/prefetch.h b/tools/perf/util/include/linux/prefetch.h
deleted file mode 100644
index 7841e485d8c3..000000000000
--- a/tools/perf/util/include/linux/prefetch.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef PERF_LINUX_PREFETCH_H
-#define PERF_LINUX_PREFETCH_H
-
-static inline void prefetch(void *a __attribute__((unused))) { }
-
-#endif
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 620a1983b76b..27c2a5efe450 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -327,9 +327,10 @@ struct thread *machine__findnew_thread(struct machine *machine, pid_t pid,
         return __machine__findnew_thread(machine, pid, tid, true);
 }
 
-struct thread *machine__find_thread(struct machine *machine, pid_t tid)
+struct thread *machine__find_thread(struct machine *machine, pid_t pid,
+                                    pid_t tid)
 {
-        return __machine__findnew_thread(machine, 0, tid, false);
+        return __machine__findnew_thread(machine, pid, tid, false);
 }
 
 int machine__process_comm_event(struct machine *machine, union perf_event *event,
@@ -716,7 +717,7 @@ static char *get_kernel_version(const char *root_dir)
 }
 
 static int map_groups__set_modules_path_dir(struct map_groups *mg,
-                                const char *dir_name)
+                                const char *dir_name, int depth)
 {
         struct dirent *dent;
         DIR *dir = opendir(dir_name);
@@ -741,7 +742,15 @@ static int map_groups__set_modules_path_dir(struct map_groups *mg,
                             !strcmp(dent->d_name, ".."))
                                 continue;
 
-                        ret = map_groups__set_modules_path_dir(mg, path);
+                        /* Do not follow top-level source and build symlinks */
+                        if (depth == 0) {
+                                if (!strcmp(dent->d_name, "source") ||
+                                    !strcmp(dent->d_name, "build"))
+                                        continue;
+                        }
+
+                        ret = map_groups__set_modules_path_dir(mg, path,
+                                                               depth + 1);
                         if (ret < 0)
                                 goto out;
                 } else {
@@ -785,11 +794,11 @@ static int machine__set_modules_path(struct machine *machine)
         if (!version)
                 return -1;
 
-        snprintf(modules_path, sizeof(modules_path), "%s/lib/modules/%s/kernel",
+        snprintf(modules_path, sizeof(modules_path), "%s/lib/modules/%s",
                  machine->root_dir, version);
         free(version);
 
-        return map_groups__set_modules_path_dir(&machine->kmaps, modules_path);
+        return map_groups__set_modules_path_dir(&machine->kmaps, modules_path, 0);
 }
 
 static int machine__create_module(void *arg, const char *name, u64 start)
@@ -1026,7 +1035,7 @@ int machine__process_mmap2_event(struct machine *machine,
         }
 
         thread = machine__findnew_thread(machine, event->mmap2.pid,
-                                        event->mmap2.pid);
+                                        event->mmap2.tid);
         if (thread == NULL)
                 goto out_problem;
 
@@ -1074,7 +1083,7 @@ int machine__process_mmap_event(struct machine *machine, union perf_event *event
         }
 
         thread = machine__findnew_thread(machine, event->mmap.pid,
-                                         event->mmap.pid);
+                                         event->mmap.tid);
         if (thread == NULL)
                 goto out_problem;
 
@@ -1114,7 +1123,9 @@ static void machine__remove_thread(struct machine *machine, struct thread *th)
 int machine__process_fork_event(struct machine *machine, union perf_event *event,
                                 struct perf_sample *sample)
 {
-        struct thread *thread = machine__find_thread(machine, event->fork.tid);
+        struct thread *thread = machine__find_thread(machine,
+                                                     event->fork.pid,
+                                                     event->fork.tid);
         struct thread *parent = machine__findnew_thread(machine,
                                                         event->fork.ppid,
                                                         event->fork.ptid);
@@ -1140,7 +1151,9 @@ int machine__process_fork_event(struct machine *machine, union perf_event *event
 int machine__process_exit_event(struct machine *machine, union perf_event *event,
                                 struct perf_sample *sample __maybe_unused)
 {
-        struct thread *thread = machine__find_thread(machine, event->fork.tid);
+        struct thread *thread = machine__find_thread(machine,
+                                                     event->fork.pid,
+                                                     event->fork.tid);
 
         if (dump_trace)
                 perf_event__fprintf_task(event, stdout);
@@ -1184,39 +1197,22 @@ static bool symbol__match_regex(struct symbol *sym, regex_t *regex)
         return 0;
 }
 
-static const u8 cpumodes[] = {
-        PERF_RECORD_MISC_USER,
-        PERF_RECORD_MISC_KERNEL,
-        PERF_RECORD_MISC_GUEST_USER,
-        PERF_RECORD_MISC_GUEST_KERNEL
-};
-#define NCPUMODES (sizeof(cpumodes)/sizeof(u8))
-
 static void ip__resolve_ams(struct machine *machine, struct thread *thread,
                             struct addr_map_symbol *ams,
                             u64 ip)
 {
         struct addr_location al;
-        size_t i;
-        u8 m;
 
         memset(&al, 0, sizeof(al));
+        /*
+         * We cannot use the header.misc hint to determine whether a
+         * branch stack address is user, kernel, guest, hypervisor.
+         * Branches may straddle the kernel/user/hypervisor boundaries.
+         * Thus, we have to try consecutively until we find a match
+         * or else, the symbol is unknown
+         */
+        thread__find_cpumode_addr_location(thread, machine, MAP__FUNCTION, ip, &al);
 
-        for (i = 0; i < NCPUMODES; i++) {
-                m = cpumodes[i];
-                /*
-                 * We cannot use the header.misc hint to determine whether a
-                 * branch stack address is user, kernel, guest, hypervisor.
-                 * Branches may straddle the kernel/user/hypervisor boundaries.
-                 * Thus, we have to try consecutively until we find a match
-                 * or else, the symbol is unknown
-                 */
-                thread__find_addr_location(thread, machine, m, MAP__FUNCTION,
-                                ip, &al);
-                if (al.map)
-                        goto found;
-        }
-found:
         ams->addr = ip;
         ams->al_addr = al.addr;
         ams->sym = al.sym;
@@ -1238,37 +1234,35 @@ static void ip__resolve_data(struct machine *machine, struct thread *thread,
         ams->map = al.map;
 }
 
-struct mem_info *machine__resolve_mem(struct machine *machine,
-                                      struct thread *thr,
-                                      struct perf_sample *sample,
-                                      u8 cpumode)
+struct mem_info *sample__resolve_mem(struct perf_sample *sample,
+                                     struct addr_location *al)
 {
         struct mem_info *mi = zalloc(sizeof(*mi));
 
         if (!mi)
                 return NULL;
 
-        ip__resolve_ams(machine, thr, &mi->iaddr, sample->ip);
-        ip__resolve_data(machine, thr, cpumode, &mi->daddr, sample->addr);
+        ip__resolve_ams(al->machine, al->thread, &mi->iaddr, sample->ip);
+        ip__resolve_data(al->machine, al->thread, al->cpumode,
+                         &mi->daddr, sample->addr);
         mi->data_src.val = sample->data_src;
 
         return mi;
 }
 
-struct branch_info *machine__resolve_bstack(struct machine *machine,
-                                            struct thread *thr,
-                                            struct branch_stack *bs)
+struct branch_info *sample__resolve_bstack(struct perf_sample *sample,
+                                           struct addr_location *al)
 {
-        struct branch_info *bi;
         unsigned int i;
+        const struct branch_stack *bs = sample->branch_stack;
+        struct branch_info *bi = calloc(bs->nr, sizeof(struct branch_info));
 
-        bi = calloc(bs->nr, sizeof(struct branch_info));
         if (!bi)
                 return NULL;
 
         for (i = 0; i < bs->nr; i++) {
-                ip__resolve_ams(machine, thr, &bi[i].to, bs->entries[i].to);
-                ip__resolve_ams(machine, thr, &bi[i].from, bs->entries[i].from);
+                ip__resolve_ams(al->machine, al->thread, &bi[i].to, bs->entries[i].to);
+                ip__resolve_ams(al->machine, al->thread, &bi[i].from, bs->entries[i].from);
                 bi[i].flags = bs->entries[i].flags;
         }
         return bi;
@@ -1326,7 +1320,7 @@ static int machine__resolve_callchain_sample(struct machine *machine,
                         continue;
                 }
 
-                al.filtered = false;
+                al.filtered = 0;
                 thread__find_addr_location(thread, machine, cpumode,
                                            MAP__FUNCTION, ip, &al);
                 if (al.sym != NULL) {
@@ -1385,8 +1379,7 @@ int machine__resolve_callchain(struct machine *machine,
                 return 0;
 
         return unwind__get_entries(unwind_entry, &callchain_cursor, machine,
-                                   thread, evsel->attr.sample_regs_user,
-                                   sample, max_stack);
+                                   thread, sample, max_stack);
 
 }
 
diff --git a/tools/perf/util/machine.h b/tools/perf/util/machine.h
index f77e91e483dc..c8c74a119398 100644
--- a/tools/perf/util/machine.h
+++ b/tools/perf/util/machine.h
@@ -41,7 +41,8 @@ struct map *machine__kernel_map(struct machine *machine, enum map_type type)
         return machine->vmlinux_maps[type];
 }
 
-struct thread *machine__find_thread(struct machine *machine, pid_t tid);
+struct thread *machine__find_thread(struct machine *machine, pid_t pid,
+                                    pid_t tid);
 
 int machine__process_comm_event(struct machine *machine, union perf_event *event,
                                 struct perf_sample *sample);
@@ -91,12 +92,10 @@ void machine__delete_dead_threads(struct machine *machine);
 void machine__delete_threads(struct machine *machine);
 void machine__delete(struct machine *machine);
 
-struct branch_info *machine__resolve_bstack(struct machine *machine,
-                                            struct thread *thread,
-                                            struct branch_stack *bs);
-struct mem_info *machine__resolve_mem(struct machine *machine,
-                                      struct thread *thread,
-                                      struct perf_sample *sample, u8 cpumode);
+struct branch_info *sample__resolve_bstack(struct perf_sample *sample,
+                                           struct addr_location *al);
+struct mem_info *sample__resolve_mem(struct perf_sample *sample,
+                                     struct addr_location *al);
 int machine__resolve_callchain(struct machine *machine,
                                struct perf_evsel *evsel,
                                struct thread *thread,
diff --git a/tools/perf/util/map.h b/tools/perf/util/map.h
index 257e513205ce..f00f058afb3b 100644
--- a/tools/perf/util/map.h
+++ b/tools/perf/util/map.h
@@ -90,6 +90,16 @@ u64 map__objdump_2mem(struct map *map, u64 ip);
 
 struct symbol;
 
+/* map__for_each_symbol - iterate over the symbols in the given map
+ *
+ * @map: the 'struct map *' in which symbols itereated
+ * @pos: the 'struct symbol *' to use as a loop cursor
+ * @n: the 'struct rb_node *' to use as a temporary storage
+ * Note: caller must ensure map->dso is not NULL (map is loaded).
+ */
+#define map__for_each_symbol(map, pos, n)       \
+        dso__for_each_symbol(map->dso, pos, n, map->type)
+
 typedef int (*symbol_filter_t)(struct map *map, struct symbol *sym);
 
 void map__init(struct map *map, enum map_type type,
diff --git a/tools/perf/util/parse-options.c b/tools/perf/util/parse-options.c
index d22e3f8017dc..bf48092983c6 100644
--- a/tools/perf/util/parse-options.c
+++ b/tools/perf/util/parse-options.c
@@ -407,7 +407,9 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
                 if (internal_help && !strcmp(arg + 2, "help"))
                         return usage_with_options_internal(usagestr, options, 0);
                 if (!strcmp(arg + 2, "list-opts"))
-                        return PARSE_OPT_LIST;
+                        return PARSE_OPT_LIST_OPTS;
+                if (!strcmp(arg + 2, "list-cmds"))
+                        return PARSE_OPT_LIST_SUBCMDS;
                 switch (parse_long_opt(ctx, arg + 2, options)) {
                 case -1:
                         return parse_options_usage(usagestr, options, arg + 2, 0);
@@ -433,25 +435,45 @@ int parse_options_end(struct parse_opt_ctx_t *ctx)
         return ctx->cpidx + ctx->argc;
 }
 
-int parse_options(int argc, const char **argv, const struct option *options,
-                  const char * const usagestr[], int flags)
+int parse_options_subcommand(int argc, const char **argv, const struct option *options,
+                        const char *const subcommands[], const char *usagestr[], int flags)
 {
         struct parse_opt_ctx_t ctx;
 
         perf_header__set_cmdline(argc, argv);
 
+        /* build usage string if it's not provided */
+        if (subcommands && !usagestr[0]) {
+                struct strbuf buf = STRBUF_INIT;
+
+                strbuf_addf(&buf, "perf %s [<options>] {", argv[0]);
+                for (int i = 0; subcommands[i]; i++) {
+                        if (i)
+                                strbuf_addstr(&buf, "|");
+                        strbuf_addstr(&buf, subcommands[i]);
+                }
+                strbuf_addstr(&buf, "}");
+
+                usagestr[0] = strdup(buf.buf);
+                strbuf_release(&buf);
+        }
+
         parse_options_start(&ctx, argc, argv, flags);
         switch (parse_options_step(&ctx, options, usagestr)) {
         case PARSE_OPT_HELP:
                 exit(129);
         case PARSE_OPT_DONE:
                 break;
-        case PARSE_OPT_LIST:
+        case PARSE_OPT_LIST_OPTS:
                 while (options->type != OPTION_END) {
                         printf("--%s ", options->long_name);
                         options++;
                 }
                 exit(130);
+        case PARSE_OPT_LIST_SUBCMDS:
+                for (int i = 0; subcommands[i]; i++)
+                        printf("%s ", subcommands[i]);
+                exit(130);
         default: /* PARSE_OPT_UNKNOWN */
                 if (ctx.argv[0][1] == '-') {
                         error("unknown option `%s'", ctx.argv[0] + 2);
@@ -464,6 +486,13 @@ int parse_options(int argc, const char **argv, const struct option *options,
         return parse_options_end(&ctx);
 }
 
+int parse_options(int argc, const char **argv, const struct option *options,
+                  const char * const usagestr[], int flags)
+{
+        return parse_options_subcommand(argc, argv, options, NULL,
+                                        (const char **) usagestr, flags);
+}
+
 #define USAGE_OPTS_WIDTH 24
 #define USAGE_GAP         2
 
diff --git a/tools/perf/util/parse-options.h b/tools/perf/util/parse-options.h
index cbf0149cf221..d8dac8ac5f37 100644
--- a/tools/perf/util/parse-options.h
+++ b/tools/perf/util/parse-options.h
@@ -140,6 +140,11 @@ extern int parse_options(int argc, const char **argv,
                          const struct option *options,
                          const char * const usagestr[], int flags);
 
+extern int parse_options_subcommand(int argc, const char **argv,
+                                const struct option *options,
+                                const char *const subcommands[],
+                                const char *usagestr[], int flags);
+
 extern NORETURN void usage_with_options(const char * const *usagestr,
                                         const struct option *options);
 
@@ -148,7 +153,8 @@ extern NORETURN void usage_with_options(const char * const *usagestr,
 enum {
         PARSE_OPT_HELP = -1,
         PARSE_OPT_DONE,
-        PARSE_OPT_LIST,
+        PARSE_OPT_LIST_OPTS,
+        PARSE_OPT_LIST_SUBCMDS,
         PARSE_OPT_UNKNOWN,
 };
 
diff --git a/tools/perf/util/perf_regs.c b/tools/perf/util/perf_regs.c
new file mode 100644
index 000000000000..a3539ef30b15
--- /dev/null
+++ b/tools/perf/util/perf_regs.c
@@ -0,0 +1,19 @@
+#include <errno.h>
+#include "perf_regs.h"
+
+int perf_reg_value(u64 *valp, struct regs_dump *regs, int id)
+{
+        int i, idx = 0;
+        u64 mask = regs->mask;
+
+        if (!(mask & (1 << id)))
+                return -EINVAL;
+
+        for (i = 0; i < id; i++) {
+                if (mask & (1 << i))
+                        idx++;
+        }
+
+        *valp = regs->regs[idx];
+        return 0;
+}
diff --git a/tools/perf/util/perf_regs.h b/tools/perf/util/perf_regs.h
index a3d42cd74919..d6e8b6a8d7f3 100644
--- a/tools/perf/util/perf_regs.h
+++ b/tools/perf/util/perf_regs.h
@@ -1,8 +1,14 @@
 #ifndef __PERF_REGS_H
 #define __PERF_REGS_H
 
+#include "types.h"
+#include "event.h"
+
 #ifdef HAVE_PERF_REGS_SUPPORT
 #include <perf_regs.h>
+
+int perf_reg_value(u64 *valp, struct regs_dump *regs, int id);
+
 #else
 #define PERF_REGS_MASK  0
 
@@ -10,5 +16,12 @@ static inline const char *perf_reg_name(int id __maybe_unused)
 {
         return NULL;
 }
+
+static inline int perf_reg_value(u64 *valp __maybe_unused,
+                                 struct regs_dump *regs __maybe_unused,
+                                 int id __maybe_unused)
+{
+        return 0;
+}
 #endif /* HAVE_PERF_REGS_SUPPORT */
 #endif /* __PERF_REGS_H */
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index b752ecb40d86..00a7dcb2f55c 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -3,7 +3,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <dirent.h>
-#include "fs.h"
+#include <api/fs/fs.h>
 #include <locale.h>
 #include "util.h"
 #include "pmu.h"
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index d8b048c20cde..0d1542f33d87 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -70,34 +70,32 @@ static int e_snprintf(char *str, size_t size, const char *format, ...)
 }
 
 static char *synthesize_perf_probe_point(struct perf_probe_point *pp);
-static int convert_name_to_addr(struct perf_probe_event *pev,
-                                const char *exec);
 static void clear_probe_trace_event(struct probe_trace_event *tev);
-static struct machine machine;
+static struct machine *host_machine;
 
 /* Initialize symbol maps and path of vmlinux/modules */
-static int init_vmlinux(void)
+static int init_symbol_maps(bool user_only)
 {
         int ret;
 
         symbol_conf.sort_by_name = true;
-        if (symbol_conf.vmlinux_name == NULL)
-                symbol_conf.try_vmlinux_path = true;
-        else
-                pr_debug("Use vmlinux: %s\n", symbol_conf.vmlinux_name);
         ret = symbol__init();
         if (ret < 0) {
                 pr_debug("Failed to init symbol map.\n");
                 goto out;
         }
 
-        ret = machine__init(&machine, "", HOST_KERNEL_ID);
-        if (ret < 0)
-                goto out;
+        if (host_machine || user_only)  /* already initialized */
+                return 0;
 
-        if (machine__create_kernel_maps(&machine) < 0) {
-                pr_debug("machine__create_kernel_maps() failed.\n");
-                goto out;
+        if (symbol_conf.vmlinux_name)
+                pr_debug("Use vmlinux: %s\n", symbol_conf.vmlinux_name);
+
+        host_machine = machine__new_host();
+        if (!host_machine) {
+                pr_debug("machine__new_host() failed.\n");
+                symbol__exit();
+                ret = -1;
         }
 out:
         if (ret < 0)
@@ -105,21 +103,66 @@ out:
         return ret;
 }
 
+static void exit_symbol_maps(void)
+{
+        if (host_machine) {
+                machine__delete(host_machine);
+                host_machine = NULL;
+        }
+        symbol__exit();
+}
+
 static struct symbol *__find_kernel_function_by_name(const char *name,
                                                      struct map **mapp)
 {
-        return machine__find_kernel_function_by_name(&machine, name, mapp,
+        return machine__find_kernel_function_by_name(host_machine, name, mapp,
                                                      NULL);
 }
 
+static struct symbol *__find_kernel_function(u64 addr, struct map **mapp)
+{
+        return machine__find_kernel_function(host_machine, addr, mapp, NULL);
+}
+
+static struct ref_reloc_sym *kernel_get_ref_reloc_sym(void)
+{
+        /* kmap->ref_reloc_sym should be set if host_machine is initialized */
+        struct kmap *kmap;
+
+        if (map__load(host_machine->vmlinux_maps[MAP__FUNCTION], NULL) < 0)
+                return NULL;
+
+        kmap = map__kmap(host_machine->vmlinux_maps[MAP__FUNCTION]);
+        return kmap->ref_reloc_sym;
+}
+
+static u64 kernel_get_symbol_address_by_name(const char *name, bool reloc)
+{
+        struct ref_reloc_sym *reloc_sym;
+        struct symbol *sym;
+        struct map *map;
+
+        /* ref_reloc_sym is just a label. Need a special fix*/
+        reloc_sym = kernel_get_ref_reloc_sym();
+        if (reloc_sym && strcmp(name, reloc_sym->name) == 0)
+                return (reloc) ? reloc_sym->addr : reloc_sym->unrelocated_addr;
+        else {
+                sym = __find_kernel_function_by_name(name, &map);
+                if (sym)
+                        return map->unmap_ip(map, sym->start) -
+                                (reloc) ? 0 : map->reloc;
+        }
+        return 0;
+}
+
 static struct map *kernel_get_module_map(const char *module)
 {
         struct rb_node *nd;
-        struct map_groups *grp = &machine.kmaps;
+        struct map_groups *grp = &host_machine->kmaps;
 
         /* A file path -- this is an offline module */
         if (module && strchr(module, '/'))
-                return machine__new_module(&machine, 0, module);
+                return machine__new_module(host_machine, 0, module);
 
         if (!module)
                 module = "kernel";
@@ -141,7 +184,7 @@ static struct dso *kernel_get_module_dso(const char *module)
         const char *vmlinux_name;
 
         if (module) {
-                list_for_each_entry(dso, &machine.kernel_dsos, node) {
+                list_for_each_entry(dso, &host_machine->kernel_dsos, node) {
                         if (strncmp(dso->short_name + 1, module,
                                     dso->short_name_len - 2) == 0)
                                 goto found;
@@ -150,7 +193,7 @@ static struct dso *kernel_get_module_dso(const char *module)
                 return NULL;
         }
 
-        map = machine.vmlinux_maps[MAP__FUNCTION];
+        map = host_machine->vmlinux_maps[MAP__FUNCTION];
         dso = map->dso;
 
         vmlinux_name = symbol_conf.vmlinux_name;
@@ -173,20 +216,6 @@ const char *kernel_get_module_path(const char *module)
         return (dso) ? dso->long_name : NULL;
 }
 
-static int init_user_exec(void)
-{
-        int ret = 0;
-
-        symbol_conf.try_vmlinux_path = false;
-        symbol_conf.sort_by_name = true;
-        ret = symbol__init();
-
-        if (ret < 0)
-                pr_debug("Failed to init symbol map.\n");
-
-        return ret;
-}
-
 static int convert_exec_to_group(const char *exec, char **result)
 {
         char *ptr1, *ptr2, *exec_copy;
@@ -218,32 +247,23 @@ out:
         return ret;
 }
 
-static int convert_to_perf_probe_point(struct probe_trace_point *tp,
-                                        struct perf_probe_point *pp)
+static void clear_probe_trace_events(struct probe_trace_event *tevs, int ntevs)
 {
-        pp->function = strdup(tp->symbol);
-
-        if (pp->function == NULL)
-                return -ENOMEM;
-
-        pp->offset = tp->offset;
-        pp->retprobe = tp->retprobe;
+        int i;
 
-        return 0;
+        for (i = 0; i < ntevs; i++)
+                clear_probe_trace_event(tevs + i);
 }
 
 #ifdef HAVE_DWARF_SUPPORT
+
 /* Open new debuginfo of given module */
 static struct debuginfo *open_debuginfo(const char *module)
 {
-        const char *path;
+        const char *path = module;
 
-        /* A file path -- this is an offline module */
-        if (module && strchr(module, '/'))
-                path = module;
-        else {
+        if (!module || !strchr(module, '/')) {
                 path = kernel_get_module_path(module);
-
                 if (!path) {
                         pr_err("Failed to find path of %s module.\n",
                                module ?: "kernel");
@@ -253,46 +273,6 @@ static struct debuginfo *open_debuginfo(const char *module)
         return debuginfo__new(path);
 }
 
-/*
- * Convert trace point to probe point with debuginfo
- * Currently only handles kprobes.
- */
-static int kprobe_convert_to_perf_probe(struct probe_trace_point *tp,
-                                        struct perf_probe_point *pp)
-{
-        struct symbol *sym;
-        struct map *map;
-        u64 addr;
-        int ret = -ENOENT;
-        struct debuginfo *dinfo;
-
-        sym = __find_kernel_function_by_name(tp->symbol, &map);
-        if (sym) {
-                addr = map->unmap_ip(map, sym->start + tp->offset);
-                pr_debug("try to find %s+%ld@%" PRIx64 "\n", tp->symbol,
-                         tp->offset, addr);
-
-                dinfo = debuginfo__new_online_kernel(addr);
-                if (dinfo) {
-                        ret = debuginfo__find_probe_point(dinfo,
-                                                 (unsigned long)addr, pp);
-                        debuginfo__delete(dinfo);
-                } else {
-                        pr_debug("Failed to open debuginfo at 0x%" PRIx64 "\n",
-                                 addr);
-                        ret = -ENOENT;
-                }
-        }
-        if (ret <= 0) {
-                pr_debug("Failed to find corresponding probes from "
-                         "debuginfo. Use kprobe event information.\n");
-                return convert_to_perf_probe_point(tp, pp);
-        }
-        pp->retprobe = tp->retprobe;
-
-        return 0;
-}
-
 static int get_text_start_address(const char *exec, unsigned long *address)
 {
         Elf *elf;
@@ -321,12 +301,62 @@ out:
         return ret;
 }
 
+/*
+ * Convert trace point to probe point with debuginfo
+ */
+static int find_perf_probe_point_from_dwarf(struct probe_trace_point *tp,
+                                            struct perf_probe_point *pp,
+                                            bool is_kprobe)
+{
+        struct debuginfo *dinfo = NULL;
+        unsigned long stext = 0;
+        u64 addr = tp->address;
+        int ret = -ENOENT;
+
+        /* convert the address to dwarf address */
+        if (!is_kprobe) {
+                if (!addr) {
+                        ret = -EINVAL;
+                        goto error;
+                }
+                ret = get_text_start_address(tp->module, &stext);
+                if (ret < 0)
+                        goto error;
+                addr += stext;
+        } else {
+                addr = kernel_get_symbol_address_by_name(tp->symbol, false);
+                if (addr == 0)
+                        goto error;
+                addr += tp->offset;
+        }
+
+        pr_debug("try to find information at %" PRIx64 " in %s\n", addr,
+                 tp->module ? : "kernel");
+
+        dinfo = open_debuginfo(tp->module);
+        if (dinfo) {
+                ret = debuginfo__find_probe_point(dinfo,
+                                                 (unsigned long)addr, pp);
+                debuginfo__delete(dinfo);
+        } else {
+                pr_debug("Failed to open debuginfo at 0x%" PRIx64 "\n", addr);
+                ret = -ENOENT;
+        }
+
+        if (ret > 0) {
+                pp->retprobe = tp->retprobe;
+                return 0;
+        }
+error:
+        pr_debug("Failed to find corresponding probes from debuginfo.\n");
+        return ret ? : -ENOENT;
+}
+
 static int add_exec_to_probe_trace_events(struct probe_trace_event *tevs,
                                           int ntevs, const char *exec)
 {
         int i, ret = 0;
-        unsigned long offset, stext = 0;
-        char buf[32];
+        unsigned long stext = 0;
 
         if (!exec)
                 return 0;
@@ -337,15 +367,9 @@ static int add_exec_to_probe_trace_events(struct probe_trace_event *tevs,
 
         for (i = 0; i < ntevs && ret >= 0; i++) {
                 /* point.address is the addres of point.symbol + point.offset */
-                offset = tevs[i].point.address - stext;
-                tevs[i].point.offset = 0;
-                zfree(&tevs[i].point.symbol);
-                ret = e_snprintf(buf, 32, "0x%lx", offset);
-                if (ret < 0)
-                        break;
+                tevs[i].point.address -= stext;
                 tevs[i].point.module = strdup(exec);
-                tevs[i].point.symbol = strdup(buf);
-                if (!tevs[i].point.symbol || !tevs[i].point.module) {
+                if (!tevs[i].point.module) {
                         ret = -ENOMEM;
                         break;
                 }
@@ -388,12 +412,40 @@ static int add_module_to_probe_trace_events(struct probe_trace_event *tevs,
         return ret;
 }
 
-static void clear_probe_trace_events(struct probe_trace_event *tevs, int ntevs)
+/* Post processing the probe events */
+static int post_process_probe_trace_events(struct probe_trace_event *tevs,
+                                           int ntevs, const char *module,
+                                           bool uprobe)
 {
+        struct ref_reloc_sym *reloc_sym;
+        char *tmp;
         int i;
 
-        for (i = 0; i < ntevs; i++)
-                clear_probe_trace_event(tevs + i);
+        if (uprobe)
+                return add_exec_to_probe_trace_events(tevs, ntevs, module);
+
+        /* Note that currently ref_reloc_sym based probe is not for drivers */
+        if (module)
+                return add_module_to_probe_trace_events(tevs, ntevs, module);
+
+        reloc_sym = kernel_get_ref_reloc_sym();
+        if (!reloc_sym) {
+                pr_warning("Relocated base symbol is not found!\n");
+                return -EINVAL;
+        }
+
+        for (i = 0; i < ntevs; i++) {
+                if (tevs[i].point.address) {
+                        tmp = strdup(reloc_sym->name);
+                        if (!tmp)
+                                return -ENOMEM;
+                        free(tevs[i].point.symbol);
+                        tevs[i].point.symbol = tmp;
+                        tevs[i].point.offset = tevs[i].point.address -
+                                               reloc_sym->unrelocated_addr;
+                }
+        }
+        return 0;
 }
 
 /* Try to find perf_probe_event with debuginfo */
@@ -416,21 +468,16 @@ static int try_to_find_probe_trace_events(struct perf_probe_event *pev,
                 return 0;
         }
 
+        pr_debug("Try to find probe point from debuginfo.\n");
         /* Searching trace events corresponding to a probe event */
         ntevs = debuginfo__find_trace_events(dinfo, pev, tevs, max_tevs);
 
         debuginfo__delete(dinfo);
 
         if (ntevs > 0) {        /* Succeeded to find trace events */
-                pr_debug("find %d probe_trace_events.\n", ntevs);
-                if (target) {
-                        if (pev->uprobes)
-                                ret = add_exec_to_probe_trace_events(*tevs,
-                                                 ntevs, target);
-                        else
-                                ret = add_module_to_probe_trace_events(*tevs,
-                                                 ntevs, target);
-                }
+                pr_debug("Found %d probe_trace_events.\n", ntevs);
+                ret = post_process_probe_trace_events(*tevs, ntevs,
+                                                        target, pev->uprobes);
                 if (ret < 0) {
                         clear_probe_trace_events(*tevs, ntevs);
                         zfree(tevs);
@@ -563,20 +610,16 @@ static int _show_one_line(FILE *fp, int l, bool skip, bool show_num)
  * Show line-range always requires debuginfo to find source file and
  * line number.
  */
-int show_line_range(struct line_range *lr, const char *module)
+static int __show_line_range(struct line_range *lr, const char *module)
 {
         int l = 1;
-        struct line_node *ln;
+        struct int_node *ln;
         struct debuginfo *dinfo;
         FILE *fp;
         int ret;
         char *tmp;
 
         /* Search a line range */
-        ret = init_vmlinux();
-        if (ret < 0)
-                return ret;
-
         dinfo = open_debuginfo(module);
         if (!dinfo) {
                 pr_warning("Failed to open debuginfo file.\n");
@@ -623,8 +666,8 @@ int show_line_range(struct line_range *lr, const char *module)
                         goto end;
         }
 
-        list_for_each_entry(ln, &lr->line_list, list) {
-                for (; ln->line > l; l++) {
+        intlist__for_each(ln, lr->line_list) {
+                for (; ln->i > l; l++) {
                         ret = show_one_line(fp, l - lr->offset);
                         if (ret < 0)
                                 goto end;
@@ -646,6 +689,19 @@ end:
         return ret;
 }
 
+int show_line_range(struct line_range *lr, const char *module)
+{
+        int ret;
+
+        ret = init_symbol_maps(false);
+        if (ret < 0)
+                return ret;
+        ret = __show_line_range(lr, module);
+        exit_symbol_maps();
+
+        return ret;
+}
+
 static int show_available_vars_at(struct debuginfo *dinfo,
                                   struct perf_probe_event *pev,
                                   int max_vls, struct strfilter *_filter,
@@ -707,14 +763,15 @@ int show_available_vars(struct perf_probe_event *pevs, int npevs,
         int i, ret = 0;
         struct debuginfo *dinfo;
 
-        ret = init_vmlinux();
+        ret = init_symbol_maps(false);
         if (ret < 0)
                 return ret;
 
         dinfo = open_debuginfo(module);
         if (!dinfo) {
                 pr_warning("Failed to open debuginfo file.\n");
-                return -ENOENT;
+                ret = -ENOENT;
+                goto out;
         }
 
         setup_pager();
@@ -724,23 +781,19 @@ int show_available_vars(struct perf_probe_event *pevs, int npevs,
                                              externs);
 
         debuginfo__delete(dinfo);
+out:
+        exit_symbol_maps();
         return ret;
 }
 
 #else   /* !HAVE_DWARF_SUPPORT */
 
-static int kprobe_convert_to_perf_probe(struct probe_trace_point *tp,
-                                        struct perf_probe_point *pp)
+static int
+find_perf_probe_point_from_dwarf(struct probe_trace_point *tp __maybe_unused,
+                                 struct perf_probe_point *pp __maybe_unused,
+                                 bool is_kprobe __maybe_unused)
 {
-        struct symbol *sym;
-
-        sym = __find_kernel_function_by_name(tp->symbol, NULL);
-        if (!sym) {
-                pr_err("Failed to find symbol %s in kernel.\n", tp->symbol);
-                return -ENOENT;
-        }
-
-        return convert_to_perf_probe_point(tp, pp);
+        return -ENOSYS;
 }
 
 static int try_to_find_probe_trace_events(struct perf_probe_event *pev,
@@ -776,24 +829,22 @@ int show_available_vars(struct perf_probe_event *pevs __maybe_unused,
 
 void line_range__clear(struct line_range *lr)
 {
-        struct line_node *ln;
-
         free(lr->function);
         free(lr->file);
         free(lr->path);
         free(lr->comp_dir);
-        while (!list_empty(&lr->line_list)) {
-                ln = list_first_entry(&lr->line_list, struct line_node, list);
-                list_del(&ln->list);
-                free(ln);
-        }
+        intlist__delete(lr->line_list);
         memset(lr, 0, sizeof(*lr));
 }
 
-void line_range__init(struct line_range *lr)
+int line_range__init(struct line_range *lr)
 {
         memset(lr, 0, sizeof(*lr));
-        INIT_LIST_HEAD(&lr->line_list);
+        lr->line_list = intlist__new(NULL);
+        if (!lr->line_list)
+                return -ENOMEM;
+        else
+                return 0;
 }
 
 static int parse_line_num(char **ptr, int *val, const char *what)
@@ -1267,16 +1318,21 @@ static int parse_probe_trace_command(const char *cmd,
         } else
                 p = argv[1];
         fmt1_str = strtok_r(p, "+", &fmt);
-        tp->symbol = strdup(fmt1_str);
-        if (tp->symbol == NULL) {
-                ret = -ENOMEM;
-                goto out;
+        if (fmt1_str[0] == '0') /* only the address started with 0x */
+                tp->address = strtoul(fmt1_str, NULL, 0);
+        else {
+                /* Only the symbol-based probe has offset */
+                tp->symbol = strdup(fmt1_str);
+                if (tp->symbol == NULL) {
+                        ret = -ENOMEM;
+                        goto out;
+                }
+                fmt2_str = strtok_r(NULL, "", &fmt);
+                if (fmt2_str == NULL)
+                        tp->offset = 0;
+                else
+                        tp->offset = strtoul(fmt2_str, NULL, 10);
         }
-        fmt2_str = strtok_r(NULL, "", &fmt);
-        if (fmt2_str == NULL)
-                tp->offset = 0;
-        else
-                tp->offset = strtoul(fmt2_str, NULL, 10);
 
         tev->nargs = argc - 2;
         tev->args = zalloc(sizeof(struct probe_trace_arg) * tev->nargs);
@@ -1518,20 +1574,27 @@ char *synthesize_probe_trace_command(struct probe_trace_event *tev)
         if (buf == NULL)
                 return NULL;
 
+        len = e_snprintf(buf, MAX_CMDLEN, "%c:%s/%s ", tp->retprobe ? 'r' : 'p',
+                         tev->group, tev->event);
+        if (len <= 0)
+                goto error;
+
+        /* Uprobes must have tp->address and tp->module */
+        if (tev->uprobes && (!tp->address || !tp->module))
+                goto error;
+
+        /* Use the tp->address for uprobes */
         if (tev->uprobes)
-                len = e_snprintf(buf, MAX_CMDLEN, "%c:%s/%s %s:%s",
-                                 tp->retprobe ? 'r' : 'p',
-                                 tev->group, tev->event,
-                                 tp->module, tp->symbol);
+                ret = e_snprintf(buf + len, MAX_CMDLEN - len, "%s:0x%lx",
+                                 tp->module, tp->address);
         else
-                len = e_snprintf(buf, MAX_CMDLEN, "%c:%s/%s %s%s%s+%lu",
-                                 tp->retprobe ? 'r' : 'p',
-                                 tev->group, tev->event,
+                ret = e_snprintf(buf + len, MAX_CMDLEN - len, "%s%s%s+%lu",
                                  tp->module ?: "", tp->module ? ":" : "",
                                  tp->symbol, tp->offset);
 
-        if (len <= 0)
+        if (ret <= 0)
                 goto error;
+        len += ret;
 
         for (i = 0; i < tev->nargs; i++) {
                 ret = synthesize_probe_trace_arg(&tev->args[i], buf + len,
@@ -1547,6 +1610,79 @@ error:
         return NULL;
 }
 
+static int find_perf_probe_point_from_map(struct probe_trace_point *tp,
+                                          struct perf_probe_point *pp,
+                                          bool is_kprobe)
+{
+        struct symbol *sym = NULL;
+        struct map *map;
+        u64 addr;
+        int ret = -ENOENT;
+
+        if (!is_kprobe) {
+                map = dso__new_map(tp->module);
+                if (!map)
+                        goto out;
+                addr = tp->address;
+                sym = map__find_symbol(map, addr, NULL);
+        } else {
+                addr = kernel_get_symbol_address_by_name(tp->symbol, true);
+                if (addr) {
+                        addr += tp->offset;
+                        sym = __find_kernel_function(addr, &map);
+                }
+        }
+        if (!sym)
+                goto out;
+
+        pp->retprobe = tp->retprobe;
+        pp->offset = addr - map->unmap_ip(map, sym->start);
+        pp->function = strdup(sym->name);
+        ret = pp->function ? 0 : -ENOMEM;
+
+out:
+        if (map && !is_kprobe) {
+                dso__delete(map->dso);
+                map__delete(map);
+        }
+
+        return ret;
+}
+
+static int convert_to_perf_probe_point(struct probe_trace_point *tp,
+                                        struct perf_probe_point *pp,
+                                        bool is_kprobe)
+{
+        char buf[128];
+        int ret;
+
+        ret = find_perf_probe_point_from_dwarf(tp, pp, is_kprobe);
+        if (!ret)
+                return 0;
+        ret = find_perf_probe_point_from_map(tp, pp, is_kprobe);
+        if (!ret)
+                return 0;
+
+        pr_debug("Failed to find probe point from both of dwarf and map.\n");
+
+        if (tp->symbol) {
+                pp->function = strdup(tp->symbol);
+                pp->offset = tp->offset;
+        } else if (!tp->module && !is_kprobe) {
+                ret = e_snprintf(buf, 128, "0x%" PRIx64, (u64)tp->address);
+                if (ret < 0)
+                        return ret;
+                pp->function = strdup(buf);
+                pp->offset = 0;
+        }
+        if (pp->function == NULL)
+                return -ENOMEM;
+
+        pp->retprobe = tp->retprobe;
+
+        return 0;
+}
+
 static int convert_to_perf_probe_event(struct probe_trace_event *tev,
                                struct perf_probe_event *pev, bool is_kprobe)
 {
@@ -1560,11 +1696,7 @@ static int convert_to_perf_probe_event(struct probe_trace_event *tev,
                 return -ENOMEM;
 
         /* Convert trace_point to probe_point */
-        if (is_kprobe)
-                ret = kprobe_convert_to_perf_probe(&tev->point, &pev->point);
-        else
-                ret = convert_to_perf_probe_point(&tev->point, &pev->point);
-
+        ret = convert_to_perf_probe_point(&tev->point, &pev->point, is_kprobe);
         if (ret < 0)
                 return ret;
 
@@ -1731,7 +1863,8 @@ static struct strlist *get_probe_trace_command_rawlist(int fd)
 }
 
 /* Show an event */
-static int show_perf_probe_event(struct perf_probe_event *pev)
+static int show_perf_probe_event(struct perf_probe_event *pev,
+                                 const char *module)
 {
         int i, ret;
         char buf[128];
@@ -1747,6 +1880,8 @@ static int show_perf_probe_event(struct perf_probe_event *pev)
                 return ret;
 
         printf("  %-20s (on %s", buf, place);
+        if (module)
+                printf(" in %s", module);
 
         if (pev->nargs > 0) {
                 printf(" with");
@@ -1784,7 +1919,8 @@ static int __show_perf_probe_events(int fd, bool is_kprobe)
                         ret = convert_to_perf_probe_event(&tev, &pev,
                                                                 is_kprobe);
                         if (ret >= 0)
-                                ret = show_perf_probe_event(&pev);
+                                ret = show_perf_probe_event(&pev,
+                                                            tev.point.module);
                 }
                 clear_perf_probe_event(&pev);
                 clear_probe_trace_event(&tev);
@@ -1807,7 +1943,7 @@ int show_perf_probe_events(void)
         if (fd < 0)
                 return fd;
 
-        ret = init_vmlinux();
+        ret = init_symbol_maps(false);
         if (ret < 0)
                 return ret;
 
@@ -1820,6 +1956,7 @@ int show_perf_probe_events(void)
                 close(fd);
         }
 
+        exit_symbol_maps();
         return ret;
 }
 
@@ -1982,7 +2119,7 @@ static int __add_probe_trace_events(struct perf_probe_event *pev,
                 group = pev->group;
                 pev->event = tev->event;
                 pev->group = tev->group;
-                show_perf_probe_event(pev);
+                show_perf_probe_event(pev, tev->point.module);
                 /* Trick here - restore current event/group */
                 pev->event = (char *)event;
                 pev->group = (char *)group;
@@ -2008,113 +2145,175 @@ static int __add_probe_trace_events(struct perf_probe_event *pev,
         return ret;
 }
 
-static int convert_to_probe_trace_events(struct perf_probe_event *pev,
-                                          struct probe_trace_event **tevs,
-                                          int max_tevs, const char *target)
+static char *looking_function_name;
+static int num_matched_functions;
+
+static int probe_function_filter(struct map *map __maybe_unused,
+                                      struct symbol *sym)
 {
+        if ((sym->binding == STB_GLOBAL || sym->binding == STB_LOCAL) &&
+            strcmp(looking_function_name, sym->name) == 0) {
+                num_matched_functions++;
+                return 0;
+        }
+        return 1;
+}
+
+#define strdup_or_goto(str, label)      \
+        ({ char *__p = strdup(str); if (!__p) goto label; __p; })
+
+/*
+ * Find probe function addresses from map.
+ * Return an error or the number of found probe_trace_event
+ */
+static int find_probe_trace_events_from_map(struct perf_probe_event *pev,
+                                            struct probe_trace_event **tevs,
+                                            int max_tevs, const char *target)
+{
+        struct map *map = NULL;
+        struct kmap *kmap = NULL;
+        struct ref_reloc_sym *reloc_sym = NULL;
         struct symbol *sym;
-        int ret, i;
+        struct rb_node *nd;
         struct probe_trace_event *tev;
+        struct perf_probe_point *pp = &pev->point;
+        struct probe_trace_point *tp;
+        int ret, i;
 
-        if (pev->uprobes && !pev->group) {
-                /* Replace group name if not given */
-                ret = convert_exec_to_group(target, &pev->group);
-                if (ret != 0) {
-                        pr_warning("Failed to make a group name.\n");
-                        return ret;
-                }
+        /* Init maps of given executable or kernel */
+        if (pev->uprobes)
+                map = dso__new_map(target);
+        else
+                map = kernel_get_module_map(target);
+        if (!map) {
+                ret = -EINVAL;
+                goto out;
         }
 
-        /* Convert perf_probe_event with debuginfo */
-        ret = try_to_find_probe_trace_events(pev, tevs, max_tevs, target);
-        if (ret != 0)
-                return ret;     /* Found in debuginfo or got an error */
-
-        if (pev->uprobes) {
-                ret = convert_name_to_addr(pev, target);
-                if (ret < 0)
-                        return ret;
+        /*
+         * Load matched symbols: Since the different local symbols may have
+         * same name but different addresses, this lists all the symbols.
+         */
+        num_matched_functions = 0;
+        looking_function_name = pp->function;
+        ret = map__load(map, probe_function_filter);
+        if (ret || num_matched_functions == 0) {
+                pr_err("Failed to find symbol %s in %s\n", pp->function,
+                        target ? : "kernel");
+                ret = -ENOENT;
+                goto out;
+        } else if (num_matched_functions > max_tevs) {
+                pr_err("Too many functions matched in %s\n",
+                        target ? : "kernel");
+                ret = -E2BIG;
+                goto out;
         }
 
-        /* Allocate trace event buffer */
-        tev = *tevs = zalloc(sizeof(struct probe_trace_event));
-        if (tev == NULL)
-                return -ENOMEM;
+        if (!pev->uprobes) {
+                kmap = map__kmap(map);
+                reloc_sym = kmap->ref_reloc_sym;
+                if (!reloc_sym) {
+                        pr_warning("Relocated base symbol is not found!\n");
+                        ret = -EINVAL;
+                        goto out;
+                }
+        }
 
-        /* Copy parameters */
-        tev->point.symbol = strdup(pev->point.function);
-        if (tev->point.symbol == NULL) {
+        /* Setup result trace-probe-events */
+        *tevs = zalloc(sizeof(*tev) * num_matched_functions);
+        if (!*tevs) {
                 ret = -ENOMEM;
-                goto error;
+                goto out;
         }
 
-        if (target) {
-                tev->point.module = strdup(target);
-                if (tev->point.module == NULL) {
-                        ret = -ENOMEM;
-                        goto error;
+        ret = 0;
+        map__for_each_symbol(map, sym, nd) {
+                tev = (*tevs) + ret;
+                tp = &tev->point;
+                if (ret == num_matched_functions) {
+                        pr_warning("Too many symbols are listed. Skip it.\n");
+                        break;
                 }
-        }
-
-        tev->point.offset = pev->point.offset;
-        tev->point.retprobe = pev->point.retprobe;
-        tev->nargs = pev->nargs;
-        tev->uprobes = pev->uprobes;
+                ret++;
 
-        if (tev->nargs) {
-                tev->args = zalloc(sizeof(struct probe_trace_arg)
-                                   * tev->nargs);
-                if (tev->args == NULL) {
-                        ret = -ENOMEM;
-                        goto error;
+                if (pp->offset > sym->end - sym->start) {
+                        pr_warning("Offset %ld is bigger than the size of %s\n",
+                                   pp->offset, sym->name);
+                        ret = -ENOENT;
+                        goto err_out;
+                }
+                /* Add one probe point */
+                tp->address = map->unmap_ip(map, sym->start) + pp->offset;
+                if (reloc_sym) {
+                        tp->symbol = strdup_or_goto(reloc_sym->name, nomem_out);
+                        tp->offset = tp->address - reloc_sym->addr;
+                } else {
+                        tp->symbol = strdup_or_goto(sym->name, nomem_out);
+                        tp->offset = pp->offset;
+                }
+                tp->retprobe = pp->retprobe;
+                if (target)
+                        tev->point.module = strdup_or_goto(target, nomem_out);
+                tev->uprobes = pev->uprobes;
+                tev->nargs = pev->nargs;
+                if (tev->nargs) {
+                        tev->args = zalloc(sizeof(struct probe_trace_arg) *
+                                           tev->nargs);
+                        if (tev->args == NULL)
+                                goto nomem_out;
                 }
                 for (i = 0; i < tev->nargs; i++) {
-                        if (pev->args[i].name) {
-                                tev->args[i].name = strdup(pev->args[i].name);
-                                if (tev->args[i].name == NULL) {
-                                        ret = -ENOMEM;
-                                        goto error;
-                                }
-                        }
-                        tev->args[i].value = strdup(pev->args[i].var);
-                        if (tev->args[i].value == NULL) {
-                                ret = -ENOMEM;
-                                goto error;
-                        }
-                        if (pev->args[i].type) {
-                                tev->args[i].type = strdup(pev->args[i].type);
-                                if (tev->args[i].type == NULL) {
-                                        ret = -ENOMEM;
-                                        goto error;
-                                }
-                        }
+                        if (pev->args[i].name)
+                                tev->args[i].name =
+                                        strdup_or_goto(pev->args[i].name,
+                                                        nomem_out);
+
+                        tev->args[i].value = strdup_or_goto(pev->args[i].var,
+                                                            nomem_out);
+                        if (pev->args[i].type)
+                                tev->args[i].type =
+                                        strdup_or_goto(pev->args[i].type,
+                                                        nomem_out);
                 }
         }
 
-        if (pev->uprobes)
-                return 1;
+out:
+        if (map && pev->uprobes) {
+                /* Only when using uprobe(exec) map needs to be released */
+                dso__delete(map->dso);
+                map__delete(map);
+        }
+        return ret;
 
-        /* Currently just checking function name from symbol map */
-        sym = __find_kernel_function_by_name(tev->point.symbol, NULL);
-        if (!sym) {
-                pr_warning("Kernel symbol \'%s\' not found.\n",
-                           tev->point.symbol);
-                ret = -ENOENT;
-                goto error;
-        } else if (tev->point.offset > sym->end - sym->start) {
-                pr_warning("Offset specified is greater than size of %s\n",
-                           tev->point.symbol);
-                ret = -ENOENT;
-                goto error;
+nomem_out:
+        ret = -ENOMEM;
+err_out:
+        clear_probe_trace_events(*tevs, num_matched_functions);
+        zfree(tevs);
+        goto out;
+}
+
+static int convert_to_probe_trace_events(struct perf_probe_event *pev,
+                                          struct probe_trace_event **tevs,
+                                          int max_tevs, const char *target)
+{
+        int ret;
 
+        if (pev->uprobes && !pev->group) {
+                /* Replace group name if not given */
+                ret = convert_exec_to_group(target, &pev->group);
+                if (ret != 0) {
+                        pr_warning("Failed to make a group name.\n");
+                        return ret;
+                }
         }
 
-        return 1;
-error:
-        clear_probe_trace_event(tev);
-        free(tev);
-        *tevs = NULL;
-        return ret;
+        /* Convert perf_probe_event with debuginfo */
+        ret = try_to_find_probe_trace_events(pev, tevs, max_tevs, target);
+        if (ret != 0)
+                return ret;     /* Found in debuginfo or got an error */
+
+        return find_probe_trace_events_from_map(pev, tevs, max_tevs, target);
 }
 
 struct __event_package {
@@ -2135,12 +2334,7 @@ int add_perf_probe_events(struct perf_probe_event *pevs, int npevs,
         if (pkgs == NULL)
                 return -ENOMEM;
 
-        if (!pevs->uprobes)
-                /* Init vmlinux path */
-                ret = init_vmlinux();
-        else
-                ret = init_user_exec();
-
+        ret = init_symbol_maps(pevs->uprobes);
         if (ret < 0) {
                 free(pkgs);
                 return ret;
@@ -2174,6 +2368,7 @@ end:
                 zfree(&pkgs[i].tevs);
         }
         free(pkgs);
+        exit_symbol_maps();
 
         return ret;
 }
@@ -2323,159 +2518,51 @@ static struct strfilter *available_func_filter;
 static int filter_available_functions(struct map *map __maybe_unused,
                                       struct symbol *sym)
 {
-        if (sym->binding == STB_GLOBAL &&
+        if ((sym->binding == STB_GLOBAL || sym->binding == STB_LOCAL) &&
             strfilter__compare(available_func_filter, sym->name))
                 return 0;
         return 1;
 }
 
-static int __show_available_funcs(struct map *map)
-{
-        if (map__load(map, filter_available_functions)) {
-                pr_err("Failed to load map.\n");
-                return -EINVAL;
-        }
-        if (!dso__sorted_by_name(map->dso, map->type))
-                dso__sort_by_name(map->dso, map->type);
-
-        dso__fprintf_symbols_by_name(map->dso, map->type, stdout);
-        return 0;
-}
-
-static int available_kernel_funcs(const char *module)
+int show_available_funcs(const char *target, struct strfilter *_filter,
+                                        bool user)
 {
         struct map *map;
         int ret;
 
-        ret = init_vmlinux();
+        ret = init_symbol_maps(user);
         if (ret < 0)
                 return ret;
 
-        map = kernel_get_module_map(module);
+        /* Get a symbol map */
+        if (user)
+                map = dso__new_map(target);
+        else
+                map = kernel_get_module_map(target);
         if (!map) {
-                pr_err("Failed to find %s map.\n", (module) ? : "kernel");
+                pr_err("Failed to get a map for %s\n", (target) ? : "kernel");
                 return -EINVAL;
         }
-        return __show_available_funcs(map);
-}
-
-static int available_user_funcs(const char *target)
-{
-        struct map *map;
-        int ret;
-
-        ret = init_user_exec();
-        if (ret < 0)
-                return ret;
-
-        map = dso__new_map(target);
-        ret = __show_available_funcs(map);
-        dso__delete(map->dso);
-        map__delete(map);
-        return ret;
-}
 
-int show_available_funcs(const char *target, struct strfilter *_filter,
-                                        bool user)
-{
-        setup_pager();
+        /* Load symbols with given filter */
         available_func_filter = _filter;
-
-        if (!user)
-                return available_kernel_funcs(target);
-
-        return available_user_funcs(target);
-}
-
-/*
- * uprobe_events only accepts address:
- * Convert function and any offset to address
- */
-static int convert_name_to_addr(struct perf_probe_event *pev, const char *exec)
-{
-        struct perf_probe_point *pp = &pev->point;
-        struct symbol *sym;
-        struct map *map = NULL;
-        char *function = NULL;
-        int ret = -EINVAL;
-        unsigned long long vaddr = 0;
-
-        if (!pp->function) {
-                pr_warning("No function specified for uprobes");
-                goto out;
-        }
-
-        function = strdup(pp->function);
-        if (!function) {
-                pr_warning("Failed to allocate memory by strdup.\n");
-                ret = -ENOMEM;
-                goto out;
-        }
-
-        map = dso__new_map(exec);
-        if (!map) {
-                pr_warning("Cannot find appropriate DSO for %s.\n", exec);
-                goto out;
-        }
-        available_func_filter = strfilter__new(function, NULL);
         if (map__load(map, filter_available_functions)) {
-                pr_err("Failed to load map.\n");
-                goto out;
-        }
-
-        sym = map__find_symbol_by_name(map, function, NULL);
-        if (!sym) {
-                pr_warning("Cannot find %s in DSO %s\n", function, exec);
-                goto out;
-        }
-
-        if (map->start > sym->start)
-                vaddr = map->start;
-        vaddr += sym->start + pp->offset + map->pgoff;
-        pp->offset = 0;
-
-        if (!pev->event) {
-                pev->event = function;
-                function = NULL;
-        }
-        if (!pev->group) {
-                char *ptr1, *ptr2, *exec_copy;
-
-                pev->group = zalloc(sizeof(char *) * 64);
-                exec_copy = strdup(exec);
-                if (!exec_copy) {
-                        ret = -ENOMEM;
-                        pr_warning("Failed to copy exec string.\n");
-                        goto out;
-                }
-
-                ptr1 = strdup(basename(exec_copy));
-                if (ptr1) {
-                        ptr2 = strpbrk(ptr1, "-._");
-                        if (ptr2)
-                                *ptr2 = '\0';
-                        e_snprintf(pev->group, 64, "%s_%s", PERFPROBE_GROUP,
-                                        ptr1);
-                        free(ptr1);
-                }
-                free(exec_copy);
-        }
-        free(pp->function);
-        pp->function = zalloc(sizeof(char *) * MAX_PROBE_ARGS);
-        if (!pp->function) {
-                ret = -ENOMEM;
-                pr_warning("Failed to allocate memory by zalloc.\n");
-                goto out;
+                pr_err("Failed to load symbols in %s\n", (target) ? : "kernel");
+                goto end;
         }
-        e_snprintf(pp->function, MAX_PROBE_ARGS, "0x%llx", vaddr);
-        ret = 0;
+        if (!dso__sorted_by_name(map->dso, map->type))
+                dso__sort_by_name(map->dso, map->type);
 
-out:
-        if (map) {
+        /* Show all (filtered) symbols */
+        setup_pager();
+        dso__fprintf_symbols_by_name(map->dso, map->type, stdout);
+end:
+        if (user) {
                 dso__delete(map->dso);
                 map__delete(map);
         }
-        if (function)
-                free(function);
+        exit_symbol_maps();
+
         return ret;
 }
+
diff --git a/tools/perf/util/probe-event.h b/tools/perf/util/probe-event.h
index fcaf7273e85a..776c9347a3b6 100644
--- a/tools/perf/util/probe-event.h
+++ b/tools/perf/util/probe-event.h
@@ -2,6 +2,7 @@
 #define _PROBE_EVENT_H
 
 #include <stdbool.h>
+#include "intlist.h"
 #include "strlist.h"
 #include "strfilter.h"
 
@@ -76,13 +77,6 @@ struct perf_probe_event {
         struct perf_probe_arg   *args;  /* Arguments */
 };
 
-
-/* Line number container */
-struct line_node {
-        struct list_head        list;
-        int                     line;
-};
-
 /* Line range */
 struct line_range {
         char                    *file;          /* File name */
@@ -92,7 +86,7 @@ struct line_range {
         int                     offset;         /* Start line offset */
         char                    *path;          /* Real path name */
         char                    *comp_dir;      /* Compile directory */
-        struct list_head        line_list;      /* Visible lines */
+        struct intlist          *line_list;     /* Visible lines */
 };
 
 /* List of variables */
@@ -124,7 +118,7 @@ extern int parse_line_range_desc(const char *cmd, struct line_range *lr);
 extern void line_range__clear(struct line_range *lr);
 
 /* Initialize line range */
-extern void line_range__init(struct line_range *lr);
+extern int line_range__init(struct line_range *lr);
 
 /* Internal use: Return kernel/module path */
 extern const char *kernel_get_module_path(const char *module);
diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c
index 061edb162b5b..9d8eb26f0533 100644
--- a/tools/perf/util/probe-finder.c
+++ b/tools/perf/util/probe-finder.c
@@ -34,7 +34,9 @@
 
 #include <linux/bitops.h>
 #include "event.h"
+#include "dso.h"
 #include "debug.h"
+#include "intlist.h"
 #include "util.h"
 #include "symbol.h"
 #include "probe-finder.h"
@@ -42,65 +44,6 @@
 /* Kprobe tracer basic type is up to u64 */
 #define MAX_BASIC_TYPE_BITS     64
 
-/* Line number list operations */
-
-/* Add a line to line number list */
-static int line_list__add_line(struct list_head *head, int line)
-{
-        struct line_node *ln;
-        struct list_head *p;
-
-        /* Reverse search, because new line will be the last one */
-        list_for_each_entry_reverse(ln, head, list) {
-                if (ln->line < line) {
-                        p = &ln->list;
-                        goto found;
-                } else if (ln->line == line)    /* Already exist */
-                        return 1;
-        }
-        /* List is empty, or the smallest entry */
-        p = head;
-found:
-        pr_debug("line list: add a line %u\n", line);
-        ln = zalloc(sizeof(struct line_node));
-        if (ln == NULL)
-                return -ENOMEM;
-        ln->line = line;
-        INIT_LIST_HEAD(&ln->list);
-        list_add(&ln->list, p);
-        return 0;
-}
-
-/* Check if the line in line number list */
-static int line_list__has_line(struct list_head *head, int line)
-{
-        struct line_node *ln;
-
-        /* Reverse search, because new line will be the last one */
-        list_for_each_entry(ln, head, list)
-                if (ln->line == line)
-                        return 1;
-
-        return 0;
-}
-
-/* Init line number list */
-static void line_list__init(struct list_head *head)
-{
-        INIT_LIST_HEAD(head);
-}
-
-/* Free line number list */
-static void line_list__free(struct list_head *head)
-{
-        struct line_node *ln;
-        while (!list_empty(head)) {
-                ln = list_first_entry(head, struct line_node, list);
-                list_del(&ln->list);
-                free(ln);
-        }
-}
-
 /* Dwarf FL wrappers */
 static char *debuginfo_path;    /* Currently dummy */
 
@@ -147,80 +90,7 @@ error:
         return -ENOENT;
 }
 
-#if _ELFUTILS_PREREQ(0, 148)
-/* This method is buggy if elfutils is older than 0.148 */
-static int __linux_kernel_find_elf(Dwfl_Module *mod,
-                                   void **userdata,
-                                   const char *module_name,
-                                   Dwarf_Addr base,
-                                   char **file_name, Elf **elfp)
-{
-        int fd;
-        const char *path = kernel_get_module_path(module_name);
-
-        pr_debug2("Use file %s for %s\n", path, module_name);
-        if (path) {
-                fd = open(path, O_RDONLY);
-                if (fd >= 0) {
-                        *file_name = strdup(path);
-                        return fd;
-                }
-        }
-        /* If failed, try to call standard method */
-        return dwfl_linux_kernel_find_elf(mod, userdata, module_name, base,
-                                          file_name, elfp);
-}
-
-static const Dwfl_Callbacks kernel_callbacks = {
-        .find_debuginfo = dwfl_standard_find_debuginfo,
-        .debuginfo_path = &debuginfo_path,
-
-        .find_elf = __linux_kernel_find_elf,
-        .section_address = dwfl_linux_kernel_module_section_address,
-};
-
-/* Get a Dwarf from live kernel image */
-static int debuginfo__init_online_kernel_dwarf(struct debuginfo *dbg,
-                                               Dwarf_Addr addr)
-{
-        dbg->dwfl = dwfl_begin(&kernel_callbacks);
-        if (!dbg->dwfl)
-                return -EINVAL;
-
-        /* Load the kernel dwarves: Don't care the result here */
-        dwfl_linux_kernel_report_kernel(dbg->dwfl);
-        dwfl_linux_kernel_report_modules(dbg->dwfl);
-
-        dbg->dbg = dwfl_addrdwarf(dbg->dwfl, addr, &dbg->bias);
-        /* Here, check whether we could get a real dwarf */
-        if (!dbg->dbg) {
-                pr_debug("Failed to find kernel dwarf at %lx\n",
-                         (unsigned long)addr);
-                dwfl_end(dbg->dwfl);
-                memset(dbg, 0, sizeof(*dbg));
-                return -ENOENT;
-        }
-
-        return 0;
-}
-#else
-/* With older elfutils, this just support kernel module... */
-static int debuginfo__init_online_kernel_dwarf(struct debuginfo *dbg,
-                                               Dwarf_Addr addr __maybe_unused)
-{
-        const char *path = kernel_get_module_path("kernel");
-
-        if (!path) {
-                pr_err("Failed to find vmlinux path\n");
-                return -ENOENT;
-        }
-
-        pr_debug2("Use file %s for debuginfo\n", path);
-        return debuginfo__init_offline_dwarf(dbg, path);
-}
-#endif
-
-struct debuginfo *debuginfo__new(const char *path)
+static struct debuginfo *__debuginfo__new(const char *path)
 {
         struct debuginfo *dbg = zalloc(sizeof(*dbg));
         if (!dbg)
@@ -228,21 +98,44 @@ struct debuginfo *debuginfo__new(const char *path)
 
         if (debuginfo__init_offline_dwarf(dbg, path) < 0)
                 zfree(&dbg);
-
+        if (dbg)
+                pr_debug("Open Debuginfo file: %s\n", path);
         return dbg;
 }
 
-struct debuginfo *debuginfo__new_online_kernel(unsigned long addr)
-{
-        struct debuginfo *dbg = zalloc(sizeof(*dbg));
+enum dso_binary_type distro_dwarf_types[] = {
+        DSO_BINARY_TYPE__FEDORA_DEBUGINFO,
+        DSO_BINARY_TYPE__UBUNTU_DEBUGINFO,
+        DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO,
+        DSO_BINARY_TYPE__BUILDID_DEBUGINFO,
+        DSO_BINARY_TYPE__NOT_FOUND,
+};
 
-        if (!dbg)
-                return NULL;
+struct debuginfo *debuginfo__new(const char *path)
+{
+        enum dso_binary_type *type;
+        char buf[PATH_MAX], nil = '\0';
+        struct dso *dso;
+        struct debuginfo *dinfo = NULL;
+
+        /* Try to open distro debuginfo files */
+        dso = dso__new(path);
+        if (!dso)
+                goto out;
 
-        if (debuginfo__init_online_kernel_dwarf(dbg, (Dwarf_Addr)addr) < 0)
-                zfree(&dbg);
+        for (type = distro_dwarf_types;
+             !dinfo && *type != DSO_BINARY_TYPE__NOT_FOUND;
+             type++) {
+                if (dso__read_binary_type_filename(dso, *type, &nil,
+                                                   buf, PATH_MAX) < 0)
+                        continue;
+                dinfo = __debuginfo__new(buf);
+        }
+        dso__delete(dso);
 
-        return dbg;
+out:
+        /* if failed to open all distro debuginfo, open given binary */
+        return dinfo ? : __debuginfo__new(path);
 }
 
 void debuginfo__delete(struct debuginfo *dbg)
@@ -618,12 +511,12 @@ static int convert_variable(Dwarf_Die *vr_die, struct probe_finder *pf)
 
         ret = convert_variable_location(vr_die, pf->addr, pf->fb_ops,
                                         &pf->sp_die, pf->tvar);
-        if (ret == -ENOENT)
+        if (ret == -ENOENT || ret == -EINVAL)
                 pr_err("Failed to find the location of %s at this address.\n"
                        " Perhaps, it has been optimized out.\n", pf->pvar->var);
         else if (ret == -ENOTSUP)
                 pr_err("Sorry, we don't support this variable location yet.\n");
-        else if (pf->pvar->field) {
+        else if (ret == 0 && pf->pvar->field) {
                 ret = convert_variable_fields(vr_die, pf->pvar->var,
                                               pf->pvar->field, &pf->tvar->ref,
                                               &die_mem);
@@ -880,7 +773,7 @@ static int find_probe_point_by_line(struct probe_finder *pf)
 }
 
 /* Find lines which match lazy pattern */
-static int find_lazy_match_lines(struct list_head *head,
+static int find_lazy_match_lines(struct intlist *list,
                                  const char *fname, const char *pat)
 {
         FILE *fp;
@@ -901,7 +794,7 @@ static int find_lazy_match_lines(struct list_head *head,
                         line[len - 1] = '\0';
 
                 if (strlazymatch(line, pat)) {
-                        line_list__add_line(head, linenum);
+                        intlist__add(list, linenum);
                         count++;
                 }
                 linenum++;
@@ -924,7 +817,7 @@ static int probe_point_lazy_walker(const char *fname, int lineno,
         Dwarf_Die *sc_die, die_mem;
         int ret;
 
-        if (!line_list__has_line(&pf->lcache, lineno) ||
+        if (!intlist__has_entry(pf->lcache, lineno) ||
             strtailcmp(fname, pf->fname) != 0)
                 return 0;
 
@@ -952,9 +845,9 @@ static int find_probe_point_lazy(Dwarf_Die *sp_die, struct probe_finder *pf)
 {
         int ret = 0;
 
-        if (list_empty(&pf->lcache)) {
+        if (intlist__empty(pf->lcache)) {
                 /* Matching lazy line pattern */
-                ret = find_lazy_match_lines(&pf->lcache, pf->fname,
+                ret = find_lazy_match_lines(pf->lcache, pf->fname,
                                             pf->pev->point.lazy_line);
                 if (ret <= 0)
                         return ret;
@@ -1092,11 +985,13 @@ static int debuginfo__find_probes(struct debuginfo *dbg,
 
 #if _ELFUTILS_PREREQ(0, 142)
         /* Get the call frame information from this dwarf */
-        pf->cfi = dwarf_getcfi(dbg->dbg);
+        pf->cfi = dwarf_getcfi_elf(dwarf_getelf(dbg->dbg));
 #endif
 
         off = 0;
-        line_list__init(&pf->lcache);
+        pf->lcache = intlist__new(NULL);
+        if (!pf->lcache)
+                return -ENOMEM;
 
         /* Fastpath: lookup by function name from .debug_pubnames section */
         if (pp->function) {
@@ -1149,7 +1044,8 @@ static int debuginfo__find_probes(struct debuginfo *dbg,
         }
 
 found:
-        line_list__free(&pf->lcache);
+        intlist__delete(pf->lcache);
+        pf->lcache = NULL;
 
         return ret;
 }
@@ -1537,7 +1433,7 @@ static int line_range_add_line(const char *src, unsigned int lineno,
                 if (lr->path == NULL)
                         return -ENOMEM;
         }
-        return line_list__add_line(&lr->line_list, lineno);
+        return intlist__add(lr->line_list, lineno);
 }
 
 static int line_range_walk_cb(const char *fname, int lineno,
@@ -1545,13 +1441,15 @@ static int line_range_walk_cb(const char *fname, int lineno,
                               void *data)
 {
         struct line_finder *lf = data;
+        int err;
 
         if ((strtailcmp(fname, lf->fname) != 0) ||
             (lf->lno_s > lineno || lf->lno_e < lineno))
                 return 0;
 
-        if (line_range_add_line(fname, lineno, lf->lr) < 0)
-                return -EINVAL;
+        err = line_range_add_line(fname, lineno, lf->lr);
+        if (err < 0 && err != -EEXIST)
+                return err;
 
         return 0;
 }
@@ -1565,7 +1463,7 @@ static int find_line_range_by_line(Dwarf_Die *sp_die, struct line_finder *lf)
 
         /* Update status */
         if (ret >= 0)
-                if (!list_empty(&lf->lr->line_list))
+                if (!intlist__empty(lf->lr->line_list))
                         ret = lf->found = 1;
                 else
                         ret = 0;        /* Lines are not found */
@@ -1577,14 +1475,15 @@ static int find_line_range_by_line(Dwarf_Die *sp_die, struct line_finder *lf)
 
 static int line_range_inline_cb(Dwarf_Die *in_die, void *data)
 {
-        find_line_range_by_line(in_die, data);
+        int ret = find_line_range_by_line(in_die, data);
 
         /*
          * We have to check all instances of inlined function, because
          * some execution paths can be optimized out depends on the
-         * function argument of instances
+         * function argument of instances. However, if an error occurs,
+         * it should be handled by the caller.
          */
-        return 0;
+        return ret < 0 ? ret : 0;
 }
 
 /* Search function definition from function name */
diff --git a/tools/perf/util/probe-finder.h b/tools/perf/util/probe-finder.h
index ffc33cdd25cc..92590b2c7e1c 100644
--- a/tools/perf/util/probe-finder.h
+++ b/tools/perf/util/probe-finder.h
@@ -3,6 +3,7 @@
 
 #include <stdbool.h>
 #include "util.h"
+#include "intlist.h"
 #include "probe-event.h"
 
 #define MAX_PROBE_BUFFER        1024
@@ -29,8 +30,8 @@ struct debuginfo {
         Dwarf_Addr      bias;
 };
 
+/* This also tries to open distro debuginfo */
 extern struct debuginfo *debuginfo__new(const char *path);
-extern struct debuginfo *debuginfo__new_online_kernel(unsigned long addr);
 extern void debuginfo__delete(struct debuginfo *dbg);
 
 /* Find probe_trace_events specified by perf_probe_event from debuginfo */
@@ -66,7 +67,7 @@ struct probe_finder {
         const char              *fname;         /* Real file name */
         Dwarf_Die               cu_die;         /* Current CU */
         Dwarf_Die               sp_die;
-        struct list_head        lcache;         /* Line cache for lazy match */
+        struct intlist          *lcache;        /* Line cache for lazy match */
 
         /* For variable searching */
 #if _ELFUTILS_PREREQ(0, 142)
diff --git a/tools/perf/util/python-ext-sources b/tools/perf/util/python-ext-sources
index 595bfc73d2ed..16a475a7d492 100644
--- a/tools/perf/util/python-ext-sources
+++ b/tools/perf/util/python-ext-sources
@@ -17,6 +17,6 @@ util/xyarray.c
 util/cgroup.c
 util/rblist.c
 util/strlist.c
-util/fs.c
+../lib/api/fs/fs.c
 util/trace-event.c
 ../../lib/rbtree.c
diff --git a/tools/perf/util/record.c b/tools/perf/util/record.c
index 373762501dad..049e0a09ccd3 100644
--- a/tools/perf/util/record.c
+++ b/tools/perf/util/record.c
@@ -2,7 +2,7 @@
 #include "evsel.h"
 #include "cpumap.h"
 #include "parse-events.h"
-#include "fs.h"
+#include <api/fs/fs.h>
 #include "util.h"
 
 typedef void (*setup_probe_fn_t)(struct perf_evsel *evsel);
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 5da6ce74c676..55960f22233c 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -702,11 +702,12 @@ static void regs_dump__printf(u64 mask, u64 *regs)
         }
 }
 
-static void regs_user__printf(struct perf_sample *sample, u64 mask)
+static void regs_user__printf(struct perf_sample *sample)
 {
         struct regs_dump *user_regs = &sample->user_regs;
 
         if (user_regs->regs) {
+                u64 mask = user_regs->mask;
                 printf("... user regs: mask 0x%" PRIx64 "\n", mask);
                 regs_dump__printf(mask, user_regs->regs);
         }
@@ -793,7 +794,7 @@ static void dump_sample(struct perf_evsel *evsel, union perf_event *event,
         if (!dump_trace)
                 return;
 
-        printf("(IP, %d): %d/%d: %#" PRIx64 " period: %" PRIu64 " addr: %#" PRIx64 "\n",
+        printf("(IP, 0x%x): %d/%d: %#" PRIx64 " period: %" PRIu64 " addr: %#" PRIx64 "\n",
                event->header.misc, sample->pid, sample->tid, sample->ip,
                sample->period, sample->addr);
 
@@ -806,7 +807,7 @@ static void dump_sample(struct perf_evsel *evsel, union perf_event *event,
                 branch_stack__printf(sample);
 
         if (sample_type & PERF_SAMPLE_REGS_USER)
-                regs_user__printf(sample, evsel->attr.sample_regs_user);
+                regs_user__printf(sample);
 
         if (sample_type & PERF_SAMPLE_STACK_USER)
                 stack_user__printf(&sample->user_stack);
diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
index 516d19fb999b..6864661a79dd 100644
--- a/tools/perf/util/symbol-elf.c
+++ b/tools/perf/util/symbol-elf.c
@@ -6,6 +6,7 @@
 #include <inttypes.h>
 
 #include "symbol.h"
+#include "vdso.h"
 #include <symbol/kallsyms.h>
 #include "debug.h"
 
@@ -506,6 +507,8 @@ int filename__read_debuglink(const char *filename, char *debuglink,
         /* the start of this section is a zero-terminated string */
         strncpy(debuglink, data->d_buf, size);
 
+        err = 0;
+
 out_elf_end:
         elf_end(elf);
 out_close:
@@ -616,6 +619,7 @@ int symsrc__init(struct symsrc *ss, struct dso *dso, const char *name,
                 GElf_Shdr shdr;
                 ss->adjust_symbols = (ehdr.e_type == ET_EXEC ||
                                 ehdr.e_type == ET_REL ||
+                                is_vdso_map(dso->short_name) ||
                                 elf_section_by_name(elf, &ehdr, &shdr,
                                                      ".gnu.prelink_undo",
                                                      NULL) != NULL);
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index e89afc097d8a..95e249779931 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -410,7 +410,7 @@ struct symbol *dso__find_symbol(struct dso *dso,
         return symbols__find(&dso->symbols[type], addr);
 }
 
-struct symbol *dso__first_symbol(struct dso *dso, enum map_type type)
+static struct symbol *dso__first_symbol(struct dso *dso, enum map_type type)
 {
         return symbols__first(&dso->symbols[type]);
 }
@@ -1251,6 +1251,46 @@ out_failure:
         return -1;
 }
 
+static bool dso__is_compatible_symtab_type(struct dso *dso, bool kmod,
+                                           enum dso_binary_type type)
+{
+        switch (type) {
+        case DSO_BINARY_TYPE__JAVA_JIT:
+        case DSO_BINARY_TYPE__DEBUGLINK:
+        case DSO_BINARY_TYPE__SYSTEM_PATH_DSO:
+        case DSO_BINARY_TYPE__FEDORA_DEBUGINFO:
+        case DSO_BINARY_TYPE__UBUNTU_DEBUGINFO:
+        case DSO_BINARY_TYPE__BUILDID_DEBUGINFO:
+        case DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO:
+                return !kmod && dso->kernel == DSO_TYPE_USER;
+
+        case DSO_BINARY_TYPE__KALLSYMS:
+        case DSO_BINARY_TYPE__VMLINUX:
+        case DSO_BINARY_TYPE__KCORE:
+                return dso->kernel == DSO_TYPE_KERNEL;
+
+        case DSO_BINARY_TYPE__GUEST_KALLSYMS:
+        case DSO_BINARY_TYPE__GUEST_VMLINUX:
+        case DSO_BINARY_TYPE__GUEST_KCORE:
+                return dso->kernel == DSO_TYPE_GUEST_KERNEL;
+
+        case DSO_BINARY_TYPE__GUEST_KMODULE:
+        case DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE:
+                /*
+                 * kernel modules know their symtab type - it's set when
+                 * creating a module dso in machine__new_module().
+                 */
+                return kmod && dso->symtab_type == type;
+
+        case DSO_BINARY_TYPE__BUILD_ID_CACHE:
+                return true;
+
+        case DSO_BINARY_TYPE__NOT_FOUND:
+        default:
+                return false;
+        }
+}
+
 int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)
 {
         char *name;
@@ -1261,6 +1301,7 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)
         int ss_pos = 0;
         struct symsrc ss_[2];
         struct symsrc *syms_ss = NULL, *runtime_ss = NULL;
+        bool kmod;
 
         dso__set_loaded(dso, map->type);
 
@@ -1301,7 +1342,11 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)
         if (!name)
                 return -1;
 
-        /* Iterate over candidate debug images.
+        kmod = dso->symtab_type == DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE ||
+                dso->symtab_type == DSO_BINARY_TYPE__GUEST_KMODULE;
+
+        /*
+         * Iterate over candidate debug images.
          * Keep track of "interesting" ones (those which have a symtab, dynsym,
          * and/or opd section) for processing.
          */
@@ -1311,6 +1356,9 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)
 
                 enum dso_binary_type symtab_type = binary_type_symtab[i];
 
+                if (!dso__is_compatible_symtab_type(dso, kmod, symtab_type))
+                        continue;
+
                 if (dso__read_binary_type_filename(dso, symtab_type,
                                                    root_dir, name, PATH_MAX))
                         continue;
@@ -1353,15 +1401,10 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)
         if (!runtime_ss && syms_ss)
                 runtime_ss = syms_ss;
 
-        if (syms_ss) {
-                int km;
-
-                km = dso->symtab_type == DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE ||
-                     dso->symtab_type == DSO_BINARY_TYPE__GUEST_KMODULE;
-                ret = dso__load_sym(dso, map, syms_ss, runtime_ss, filter, km);
-        } else {
+        if (syms_ss)
+                ret = dso__load_sym(dso, map, syms_ss, runtime_ss, filter, kmod);
+        else
                 ret = -1;
-        }
 
         if (ret > 0) {
                 int nr_plt;
diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index fffe2888a1c7..501e4e722e8e 100644
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -79,6 +79,17 @@ struct symbol {
 void symbol__delete(struct symbol *sym);
 void symbols__delete(struct rb_root *symbols);
 
+/* symbols__for_each_entry - iterate over symbols (rb_root)
+ *
+ * @symbols: the rb_root of symbols
+ * @pos: the 'struct symbol *' to use as a loop cursor
+ * @nd: the 'struct rb_node *' to use as a temporary storage
+ */
+#define symbols__for_each_entry(symbols, pos, nd)                       \
+        for (nd = rb_first(symbols);                                    \
+             nd && (pos = rb_entry(nd, struct symbol, rb_node));        \
+             nd = rb_next(nd))
+
 static inline size_t symbol__size(const struct symbol *sym)
 {
         return sym->end - sym->start + 1;
@@ -175,7 +186,7 @@ struct addr_location {
         struct symbol *sym;
         u64           addr;
         char          level;
-        bool          filtered;
+        u8            filtered;
         u8            cpumode;
         s32           cpu;
 };
@@ -223,7 +234,6 @@ struct symbol *dso__find_symbol(struct dso *dso, enum map_type type,
                                 u64 addr);
 struct symbol *dso__find_symbol_by_name(struct dso *dso, enum map_type type,
                                         const char *name);
-struct symbol *dso__first_symbol(struct dso *dso, enum map_type type);
 
 int filename__read_build_id(const char *filename, void *bf, size_t size);
 int sysfs__read_build_id(const char *filename, void *bf, size_t size);
diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c
index 0358882c8910..3ce0498bdae6 100644
--- a/tools/perf/util/thread.c
+++ b/tools/perf/util/thread.c
@@ -142,3 +142,24 @@ int thread__fork(struct thread *thread, struct thread *parent, u64 timestamp)
 
         return 0;
 }
+
+void thread__find_cpumode_addr_location(struct thread *thread,
+                                        struct machine *machine,
+                                        enum map_type type, u64 addr,
+                                        struct addr_location *al)
+{
+        size_t i;
+        const u8 const cpumodes[] = {
+                PERF_RECORD_MISC_USER,
+                PERF_RECORD_MISC_KERNEL,
+                PERF_RECORD_MISC_GUEST_USER,
+                PERF_RECORD_MISC_GUEST_KERNEL
+        };
+
+        for (i = 0; i < ARRAY_SIZE(cpumodes); i++) {
+                thread__find_addr_location(thread, machine, cpumodes[i], type,
+                                           addr, al);
+                if (al->map)
+                        break;
+        }
+}
diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h
index 5b856bf942e1..9b29f085aede 100644
--- a/tools/perf/util/thread.h
+++ b/tools/perf/util/thread.h
@@ -44,12 +44,6 @@ void thread__insert_map(struct thread *thread, struct map *map);
 int thread__fork(struct thread *thread, struct thread *parent, u64 timestamp);
 size_t thread__fprintf(struct thread *thread, FILE *fp);
 
-static inline struct map *thread__find_map(struct thread *thread,
-                                           enum map_type type, u64 addr)
-{
-        return thread ? map_groups__find(&thread->mg, type, addr) : NULL;
-}
-
 void thread__find_addr_map(struct thread *thread, struct machine *machine,
                            u8 cpumode, enum map_type type, u64 addr,
                            struct addr_location *al);
@@ -58,6 +52,11 @@ void thread__find_addr_location(struct thread *thread, struct machine *machine,
                                 u8 cpumode, enum map_type type, u64 addr,
                                 struct addr_location *al);
 
+void thread__find_cpumode_addr_location(struct thread *thread,
+                                        struct machine *machine,
+                                        enum map_type type, u64 addr,
+                                        struct addr_location *al);
+
 static inline void *thread__priv(struct thread *thread)
 {
         return thread->priv;
diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index e0d6d07f6848..c36636fd825b 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -126,6 +126,7 @@ void event_format__print(struct event_format *event,
         trace_seq_init(&s);
         pevent_event_info(&s, event, &record);
         trace_seq_do_printf(&s);
+        trace_seq_destroy(&s);
 }
 
 void parse_proc_kallsyms(struct pevent *pevent,
diff --git a/tools/perf/util/unwind-libdw.c b/tools/perf/util/unwind-libdw.c
new file mode 100644
index 000000000000..67db73ec3dab
--- /dev/null
+++ b/tools/perf/util/unwind-libdw.c
@@ -0,0 +1,210 @@
+#include <linux/compiler.h>
+#include <elfutils/libdw.h>
+#include <elfutils/libdwfl.h>
+#include <inttypes.h>
+#include <errno.h>
+#include "unwind.h"
+#include "unwind-libdw.h"
+#include "machine.h"
+#include "thread.h"
+#include "types.h"
+#include "event.h"
+#include "perf_regs.h"
+
+static char *debuginfo_path;
+
+static const Dwfl_Callbacks offline_callbacks = {
+        .find_debuginfo         = dwfl_standard_find_debuginfo,
+        .debuginfo_path         = &debuginfo_path,
+        .section_address        = dwfl_offline_section_address,
+};
+
+static int __report_module(struct addr_location *al, u64 ip,
+                            struct unwind_info *ui)
+{
+        Dwfl_Module *mod;
+        struct dso *dso = NULL;
+
+        thread__find_addr_location(ui->thread, ui->machine,
+                                   PERF_RECORD_MISC_USER,
+                                   MAP__FUNCTION, ip, al);
+
+        if (al->map)
+                dso = al->map->dso;
+
+        if (!dso)
+                return 0;
+
+        mod = dwfl_addrmodule(ui->dwfl, ip);
+        if (!mod)
+                mod = dwfl_report_elf(ui->dwfl, dso->short_name,
+                                      dso->long_name, -1, al->map->start,
+                                      false);
+
+        return mod && dwfl_addrmodule(ui->dwfl, ip) == mod ? 0 : -1;
+}
+
+static int report_module(u64 ip, struct unwind_info *ui)
+{
+        struct addr_location al;
+
+        return __report_module(&al, ip, ui);
+}
+
+static int entry(u64 ip, struct unwind_info *ui)
+
+{
+        struct unwind_entry e;
+        struct addr_location al;
+
+        if (__report_module(&al, ip, ui))
+                return -1;
+
+        e.ip  = ip;
+        e.map = al.map;
+        e.sym = al.sym;
+
+        pr_debug("unwind: %s:ip = 0x%" PRIx64 " (0x%" PRIx64 ")\n",
+                 al.sym ? al.sym->name : "''",
+                 ip,
+                 al.map ? al.map->map_ip(al.map, ip) : (u64) 0);
+
+        return ui->cb(&e, ui->arg);
+}
+
+static pid_t next_thread(Dwfl *dwfl, void *arg, void **thread_argp)
+{
+        /* We want only single thread to be processed. */
+        if (*thread_argp != NULL)
+                return 0;
+
+        *thread_argp = arg;
+        return dwfl_pid(dwfl);
+}
+
+static int access_dso_mem(struct unwind_info *ui, Dwarf_Addr addr,
+                          Dwarf_Word *data)
+{
+        struct addr_location al;
+        ssize_t size;
+
+        thread__find_addr_map(ui->thread, ui->machine, PERF_RECORD_MISC_USER,
+                              MAP__FUNCTION, addr, &al);
+        if (!al.map) {
+                pr_debug("unwind: no map for %lx\n", (unsigned long)addr);
+                return -1;
+        }
+
+        if (!al.map->dso)
+                return -1;
+
+        size = dso__data_read_addr(al.map->dso, al.map, ui->machine,
+                                   addr, (u8 *) data, sizeof(*data));
+
+        return !(size == sizeof(*data));
+}
+
+static bool memory_read(Dwfl *dwfl __maybe_unused, Dwarf_Addr addr, Dwarf_Word *result,
+                        void *arg)
+{
+        struct unwind_info *ui = arg;
+        struct stack_dump *stack = &ui->sample->user_stack;
+        u64 start, end;
+        int offset;
+        int ret;
+
+        ret = perf_reg_value(&start, &ui->sample->user_regs, PERF_REG_SP);
+        if (ret)
+                return false;
+
+        end = start + stack->size;
+
+        /* Check overflow. */
+        if (addr + sizeof(Dwarf_Word) < addr)
+                return false;
+
+        if (addr < start || addr + sizeof(Dwarf_Word) > end) {
+                ret = access_dso_mem(ui, addr, result);
+                if (ret) {
+                        pr_debug("unwind: access_mem 0x%" PRIx64 " not inside range"
+                                 " 0x%" PRIx64 "-0x%" PRIx64 "\n",
+                                addr, start, end);
+                        return false;
+                }
+                return true;
+        }
+
+        offset  = addr - start;
+        *result = *(Dwarf_Word *)&stack->data[offset];
+        pr_debug("unwind: access_mem addr 0x%" PRIx64 ", val %lx, offset %d\n",
+                 addr, (unsigned long)*result, offset);
+        return true;
+}
+
+static const Dwfl_Thread_Callbacks callbacks = {
+        .next_thread            = next_thread,
+        .memory_read            = memory_read,
+        .set_initial_registers  = libdw__arch_set_initial_registers,
+};
+
+static int
+frame_callback(Dwfl_Frame *state, void *arg)
+{
+        struct unwind_info *ui = arg;
+        Dwarf_Addr pc;
+
+        if (!dwfl_frame_pc(state, &pc, NULL)) {
+                pr_err("%s", dwfl_errmsg(-1));
+                return DWARF_CB_ABORT;
+        }
+
+        return entry(pc, ui) || !(--ui->max_stack) ?
+               DWARF_CB_ABORT : DWARF_CB_OK;
+}
+
+int unwind__get_entries(unwind_entry_cb_t cb, void *arg,
+                        struct machine *machine, struct thread *thread,
+                        struct perf_sample *data,
+                        int max_stack)
+{
+        struct unwind_info ui = {
+                .sample         = data,
+                .thread         = thread,
+                .machine        = machine,
+                .cb             = cb,
+                .arg            = arg,
+                .max_stack      = max_stack,
+        };
+        Dwarf_Word ip;
+        int err = -EINVAL;
+
+        if (!data->user_regs.regs)
+                return -EINVAL;
+
+        ui.dwfl = dwfl_begin(&offline_callbacks);
+        if (!ui.dwfl)
+                goto out;
+
+        err = perf_reg_value(&ip, &data->user_regs, PERF_REG_IP);
+        if (err)
+                goto out;
+
+        err = report_module(ip, &ui);
+        if (err)
+                goto out;
+
+        if (!dwfl_attach_state(ui.dwfl, EM_NONE, thread->tid, &callbacks, &ui))
+                goto out;
+
+        err = dwfl_getthread_frames(ui.dwfl, thread->tid, frame_callback, &ui);
+
+        if (err && !ui.max_stack)
+                err = 0;
+
+ out:
+        if (err)
+                pr_debug("unwind: failed with '%s'\n", dwfl_errmsg(-1));
+
+        dwfl_end(ui.dwfl);
+        return 0;
+}
diff --git a/tools/perf/util/unwind-libdw.h b/tools/perf/util/unwind-libdw.h
new file mode 100644
index 000000000000..417a1426f3ad
--- /dev/null
+++ b/tools/perf/util/unwind-libdw.h
@@ -0,0 +1,21 @@
+#ifndef __PERF_UNWIND_LIBDW_H
+#define __PERF_UNWIND_LIBDW_H
+
+#include <elfutils/libdwfl.h>
+#include "event.h"
+#include "thread.h"
+#include "unwind.h"
+
+bool libdw__arch_set_initial_registers(Dwfl_Thread *thread, void *arg);
+
+struct unwind_info {
+        Dwfl                    *dwfl;
+        struct perf_sample      *sample;
+        struct machine          *machine;
+        struct thread           *thread;
+        unwind_entry_cb_t       cb;
+        void                    *arg;
+        int                     max_stack;
+};
+
+#endif /* __PERF_UNWIND_LIBDW_H */
diff --git a/tools/perf/util/unwind.c b/tools/perf/util/unwind-libunwind.c
index 742f23bf35ff..bd5768d74f01 100644
--- a/tools/perf/util/unwind.c
+++ b/tools/perf/util/unwind-libunwind.c
@@ -86,7 +86,6 @@ struct unwind_info {
         struct perf_sample      *sample;
         struct machine          *machine;
         struct thread           *thread;
-        u64                     sample_uregs;
 };
 
 #define dw_read(ptr, type, end) ({      \
@@ -391,30 +390,13 @@ static int access_dso_mem(struct unwind_info *ui, unw_word_t addr,
         return !(size == sizeof(*data));
 }
 
-static int reg_value(unw_word_t *valp, struct regs_dump *regs, int id,
-                     u64 sample_regs)
-{
-        int i, idx = 0;
-
-        if (!(sample_regs & (1 << id)))
-                return -EINVAL;
-
-        for (i = 0; i < id; i++) {
-                if (sample_regs & (1 << i))
-                        idx++;
-        }
-
-        *valp = regs->regs[idx];
-        return 0;
-}
-
 static int access_mem(unw_addr_space_t __maybe_unused as,
                       unw_word_t addr, unw_word_t *valp,
                       int __write, void *arg)
 {
         struct unwind_info *ui = arg;
         struct stack_dump *stack = &ui->sample->user_stack;
-        unw_word_t start, end;
+        u64 start, end;
         int offset;
         int ret;
 
@@ -424,8 +406,7 @@ static int access_mem(unw_addr_space_t __maybe_unused as,
                 return 0;
         }
 
-        ret = reg_value(&start, &ui->sample->user_regs, PERF_REG_SP,
-                        ui->sample_uregs);
+        ret = perf_reg_value(&start, &ui->sample->user_regs, PERF_REG_SP);
         if (ret)
                 return ret;
 
@@ -438,8 +419,9 @@ static int access_mem(unw_addr_space_t __maybe_unused as,
         if (addr < start || addr + sizeof(unw_word_t) >= end) {
                 ret = access_dso_mem(ui, addr, valp);
                 if (ret) {
-                        pr_debug("unwind: access_mem %p not inside range %p-%p\n",
-                                (void *)addr, (void *)start, (void *)end);
+                        pr_debug("unwind: access_mem %p not inside range"
+                                 " 0x%" PRIx64 "-0x%" PRIx64 "\n",
+                                 (void *) addr, start, end);
                         *valp = 0;
                         return ret;
                 }
@@ -448,8 +430,8 @@ static int access_mem(unw_addr_space_t __maybe_unused as,
 
         offset = addr - start;
         *valp  = *(unw_word_t *)&stack->data[offset];
-        pr_debug("unwind: access_mem addr %p, val %lx, offset %d\n",
-                 (void *)addr, (unsigned long)*valp, offset);
+        pr_debug("unwind: access_mem addr %p val %lx, offset %d\n",
+                 (void *) addr, (unsigned long)*valp, offset);
         return 0;
 }
 
@@ -459,6 +441,7 @@ static int access_reg(unw_addr_space_t __maybe_unused as,
 {
         struct unwind_info *ui = arg;
         int id, ret;
+        u64 val;
 
         /* Don't support write, I suspect we don't need it. */
         if (__write) {
@@ -471,16 +454,17 @@ static int access_reg(unw_addr_space_t __maybe_unused as,
                 return 0;
         }
 
-        id = unwind__arch_reg_id(regnum);
+        id = libunwind__arch_reg_id(regnum);
         if (id < 0)
                 return -EINVAL;
 
-        ret = reg_value(valp, &ui->sample->user_regs, id, ui->sample_uregs);
+        ret = perf_reg_value(&val, &ui->sample->user_regs, id);
         if (ret) {
                 pr_err("unwind: can't read reg %d\n", regnum);
                 return ret;
         }
 
+        *valp = (unw_word_t) val;
         pr_debug("unwind: reg %d, val %lx\n", regnum, (unsigned long)*valp);
         return 0;
 }
@@ -563,7 +547,7 @@ static int get_entries(struct unwind_info *ui, unwind_entry_cb_t cb,
                 unw_word_t ip;
 
                 unw_get_reg(&c, UNW_REG_IP, &ip);
-                ret = entry(ip, ui->thread, ui->machine, cb, arg);
+                ret = ip ? entry(ip, ui->thread, ui->machine, cb, arg) : 0;
         }
 
         unw_destroy_addr_space(addr_space);
@@ -572,13 +556,11 @@ static int get_entries(struct unwind_info *ui, unwind_entry_cb_t cb,
 
 int unwind__get_entries(unwind_entry_cb_t cb, void *arg,
                         struct machine *machine, struct thread *thread,
-                        u64 sample_uregs, struct perf_sample *data,
-                        int max_stack)
+                        struct perf_sample *data, int max_stack)
 {
-        unw_word_t ip;
+        u64 ip;
         struct unwind_info ui = {
                 .sample       = data,
-                .sample_uregs = sample_uregs,
                 .thread       = thread,
                 .machine      = machine,
         };
@@ -587,7 +569,7 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg,
         if (!data->user_regs.regs)
                 return -EINVAL;
 
-        ret = reg_value(&ip, &data->user_regs, PERF_REG_IP, sample_uregs);
+        ret = perf_reg_value(&ip, &data->user_regs, PERF_REG_IP);
         if (ret)
                 return ret;
 
@@ -595,5 +577,5 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg,
         if (ret)
                 return -ENOMEM;
 
-        return get_entries(&ui, cb, arg, max_stack);
+        return --max_stack > 0 ? get_entries(&ui, cb, arg, max_stack) : 0;
 }
diff --git a/tools/perf/util/unwind.h b/tools/perf/util/unwind.h
index d5966f49e22c..b031316f221a 100644
--- a/tools/perf/util/unwind.h
+++ b/tools/perf/util/unwind.h
@@ -13,24 +13,25 @@ struct unwind_entry {
 
 typedef int (*unwind_entry_cb_t)(struct unwind_entry *entry, void *arg);
 
-#ifdef HAVE_LIBUNWIND_SUPPORT
+#ifdef HAVE_DWARF_UNWIND_SUPPORT
 int unwind__get_entries(unwind_entry_cb_t cb, void *arg,
                         struct machine *machine,
                         struct thread *thread,
-                        u64 sample_uregs,
                         struct perf_sample *data, int max_stack);
-int unwind__arch_reg_id(int regnum);
+/* libunwind specific */
+#ifdef HAVE_LIBUNWIND_SUPPORT
+int libunwind__arch_reg_id(int regnum);
+#endif
 #else
 static inline int
 unwind__get_entries(unwind_entry_cb_t cb __maybe_unused,
                     void *arg __maybe_unused,
                     struct machine *machine __maybe_unused,
                     struct thread *thread __maybe_unused,
-                    u64 sample_uregs __maybe_unused,
                     struct perf_sample *data __maybe_unused,
                     int max_stack __maybe_unused)
 {
         return 0;
 }
-#endif /* HAVE_LIBUNWIND_SUPPORT */
+#endif /* HAVE_DWARF_UNWIND_SUPPORT */
 #endif /* __UNWIND_H */
diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
index 42ad667bb317..9f66549562bd 100644
--- a/tools/perf/util/util.c
+++ b/tools/perf/util/util.c
@@ -1,6 +1,6 @@
 #include "../perf.h"
 #include "util.h"
-#include "fs.h"
+#include <api/fs/fs.h>
 #include <sys/mman.h>
 #ifdef HAVE_BACKTRACE_SUPPORT
 #include <execinfo.h>
diff --git a/tools/power/acpi/Makefile b/tools/power/acpi/Makefile
index d9186a2fdf06..c2c0f20067a5 100644
--- a/tools/power/acpi/Makefile
+++ b/tools/power/acpi/Makefile
@@ -89,15 +89,6 @@ else
         STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
 endif
 
-# if DEBUG is enabled, then we do not strip or optimize
-ifeq ($(strip $(DEBUG)),true)
-        CFLAGS += -O1 -g -DDEBUG
-        STRIPCMD = /bin/true -Since_we_are_debugging
-else
-        CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer
-        STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
-endif
-
 # --- ACPIDUMP BEGIN ---
 
 vpath %.c \
@@ -128,7 +119,7 @@ clean:
         -rm -f $(OUTPUT)acpidump
 
 install-tools:
-        $(INSTALL) -d $(DESTDIR)${bindir}
+        $(INSTALL) -d $(DESTDIR)${sbindir}
         $(INSTALL_PROGRAM) $(OUTPUT)acpidump $(DESTDIR)${sbindir}
 
 install-man:
diff --git a/tools/power/x86/turbostat/turbostat.8 b/tools/power/x86/turbostat/turbostat.8
index b4ddb748356c..56bfb523c5bb 100644
--- a/tools/power/x86/turbostat/turbostat.8
+++ b/tools/power/x86/turbostat/turbostat.8
@@ -47,21 +47,22 @@ displays the statistics gathered since it was forked.
 .PP
 .SH FIELD DESCRIPTIONS
 .nf
-\fBpk\fP processor package number.
-\fBcor\fP processor core number.
+\fBPackage\fP processor package number.
+\fBCore\fP processor core number.
 \fBCPU\fP Linux CPU (logical processor) number.
 Note that multiple CPUs per core indicate support for Intel(R) Hyper-Threading Technology.
-\fB%c0\fP percent of the interval that the CPU retired instructions.
-\fBGHz\fP average clock rate while the CPU was in c0 state.
-\fBTSC\fP average GHz that the TSC ran during the entire interval.
-\fB%c1, %c3, %c6, %c7\fP show the percentage residency in hardware core idle states.
-\fBCTMP\fP Degrees Celsius reported by the per-core Digital Thermal Sensor.
-\fBPTMP\fP Degrees Celsius reported by the per-package Package Thermal Monitor.
-\fB%pc2, %pc3, %pc6, %pc7\fP percentage residency in hardware package idle states.
-\fBPkg_W\fP Watts consumed by the whole package.
-\fBCor_W\fP Watts consumed by the core part of the package.
-\fBGFX_W\fP Watts consumed by the Graphics part of the package -- available only on client processors.
-\fBRAM_W\fP Watts consumed by the DRAM DIMMS -- available only on server processors.
+\fBAVG_MHz\fP number of cycles executed divided by time elapsed.
+\fB%Buzy\fP percent of the interval that the CPU retired instructions, aka. % of time in "C0" state.
+\fBBzy_MHz\fP average clock rate while the CPU was busy (in "c0" state).
+\fBTSC_MHz\fP average MHz that the TSC ran during the entire interval.
+\fBCPU%c1, CPU%c3, CPU%c6, CPU%c7\fP show the percentage residency in hardware core idle states.
+\fBCoreTmp\fP Degrees Celsius reported by the per-core Digital Thermal Sensor.
+\fBPkgTtmp\fP Degrees Celsius reported by the per-package Package Thermal Monitor.
+\fBPkg%pc2, Pkg%pc3, Pkg%pc6, Pkg%pc7\fP percentage residency in hardware package idle states.
+\fBPkgWatt\fP Watts consumed by the whole package.
+\fBCorWatt\fP Watts consumed by the core part of the package.
+\fBGFXWatt\fP Watts consumed by the Graphics part of the package -- available only on client processors.
+\fBRAMWatt\fP Watts consumed by the DRAM DIMMS -- available only on server processors.
 \fBPKG_%\fP percent of the interval that RAPL throttling was active on the Package.
 \fBRAM_%\fP percent of the interval that RAPL throttling was active on DRAM.
 .fi
@@ -78,29 +79,17 @@ For Watts columns, the summary is a system total.
 Subsequent rows show per-CPU statistics.
 
 .nf
-[root@sandy]# ./turbostat
-cor CPU    %c0  GHz  TSC    %c1    %c3    %c6    %c7 CTMP PTMP   %pc2   %pc3   %pc6   %pc7  Pkg_W  Cor_W GFX_W
-          0.06 0.80 2.29   0.11   0.00   0.00  99.83   47   40   0.26   0.01   0.44  98.78   3.49   0.12  0.14
-  0   0   0.07 0.80 2.29   0.07   0.00   0.00  99.86   40   40   0.26   0.01   0.44  98.78   3.49   0.12  0.14
-  0   4   0.03 0.80 2.29   0.12
-  1   1   0.04 0.80 2.29   0.25   0.01   0.00  99.71   40
-  1   5   0.16 0.80 2.29   0.13
-  2   2   0.05 0.80 2.29   0.06   0.01   0.00  99.88   40
-  2   6   0.03 0.80 2.29   0.08
-  3   3   0.05 0.80 2.29   0.08   0.00   0.00  99.87   47
-  3   7   0.04 0.84 2.29   0.09
-.fi
-.SH SUMMARY EXAMPLE
-The "-s" option prints the column headers just once,
-and then the one line system summary for each sample interval.
-
-.nf
-[root@wsm]# turbostat -S
-   %c0  GHz  TSC    %c1    %c3    %c6 CTMP   %pc3   %pc6
-  1.40 2.81 3.38  10.78  43.47  44.35   42  13.67   2.09
-  1.34 2.90 3.38  11.48  58.96  28.23   41  19.89   0.15
-  1.55 2.72 3.38  26.73  37.66  34.07   42   2.53   2.80
-  1.37 2.83 3.38  16.95  60.05  21.63   42   5.76   0.20
+[root@ivy]# ./turbostat
+    Core     CPU Avg_MHz   %Busy Bzy_MHz TSC_MHz     SMI  CPU%c1  CPU%c3  CPU%c6  CPU%c7 CoreTmp  PkgTmp Pkg%pc2 Pkg%pc3 Pkg%pc6 Pkg%pc7 PkgWatt CorWatt GFXWatt 
+       -       -       6    0.36    1596    3492       0    0.59    0.01   99.04    0.00      23      24   23.82    0.01   72.47    0.00    6.40    1.01    0.00
+       0       0       9    0.58    1596    3492       0    0.28    0.01   99.13    0.00      23      24   23.82    0.01   72.47    0.00    6.40    1.01    0.00
+       0       4       1    0.07    1596    3492       0    0.79
+       1       1      10    0.65    1596    3492       0    0.59    0.00   98.76    0.00      23
+       1       5       5    0.28    1596    3492       0    0.95
+       2       2      10    0.66    1596    3492       0    0.41    0.01   98.92    0.00      23
+       2       6       2    0.10    1597    3492       0    0.97
+       3       3       3    0.20    1596    3492       0    0.44    0.00   99.37    0.00      23
+       3       7       5    0.31    1596    3492       0    0.33
 .fi
 .SH VERBOSE EXAMPLE
 The "-v" option adds verbosity to the output:
@@ -154,55 +143,35 @@ eg. Here a cycle soaker is run on 1 CPU (see %c0) for a few seconds
 until ^C while the other CPUs are mostly idle:
 
 .nf
-[root@x980 lenb]# ./turbostat cat /dev/zero > /dev/null
+root@ivy: turbostat cat /dev/zero > /dev/null
 ^C
-cor CPU    %c0  GHz  TSC    %c1    %c3    %c6   %pc3   %pc6
-          8.86 3.61 3.38  15.06  31.19  44.89   0.00   0.00
-  0   0   1.46 3.22 3.38  16.84  29.48  52.22   0.00   0.00
-  0   6   0.21 3.06 3.38  18.09
-  1   2   0.53 3.33 3.38   2.80  46.40  50.27
-  1   8   0.89 3.47 3.38   2.44
-  2   4   1.36 3.43 3.38   9.04  23.71  65.89
-  2  10   0.18 2.86 3.38  10.22
-  8   1   0.04 2.87 3.38  99.96   0.01   0.00
-  8   7  99.72 3.63 3.38   0.27
-  9   3   0.31 3.21 3.38   7.64  56.55  35.50
-  9   9   0.08 2.95 3.38   7.88
- 10   5   1.42 3.43 3.38   2.14  30.99  65.44
- 10  11   0.16 2.88 3.38   3.40
+    Core     CPU Avg_MHz   %Busy Bzy_MHz TSC_MHz     SMI  CPU%c1  CPU%c3  CPU%c6  CPU%c7 CoreTmp  PkgTmp Pkg%pc2 Pkg%pc3 Pkg%pc6 Pkg%pc7 PkgWatt CorWatt GFXWatt 
+       -       -     496   12.75    3886    3492       0   13.16    0.04   74.04    0.00      36      36    0.00    0.00    0.00    0.00   23.15   17.65    0.00
+       0       0      22    0.57    3830    3492       0    0.83    0.02   98.59    0.00      27      36    0.00    0.00    0.00    0.00   23.15   17.65    0.00
+       0       4       9    0.24    3829    3492       0    1.15
+       1       1       4    0.09    3783    3492       0   99.91    0.00    0.00    0.00      36
+       1       5    3880   99.82    3888    3492       0    0.18
+       2       2      17    0.44    3813    3492       0    0.77    0.04   98.75    0.00      28
+       2       6      12    0.32    3823    3492       0    0.89
+       3       3      16    0.43    3844    3492       0    0.63    0.11   98.84    0.00      30
+       3       7       4    0.11    3827    3492       0    0.94
+30.372243 sec
+
 .fi
-Above the cycle soaker drives cpu7 up its 3.6 GHz turbo limit
+Above the cycle soaker drives cpu5 up its 3.8 GHz turbo limit
 while the other processors are generally in various states of idle.
 
-Note that cpu1 and cpu7 are HT siblings within core8.
-As cpu7 is very busy, it prevents its sibling, cpu1,
+Note that cpu1 and cpu5 are HT siblings within core1.
+As cpu5 is very busy, it prevents its sibling, cpu1,
 from entering a c-state deeper than c1.
 
-Note that turbostat reports average GHz of 3.63, while
-the arithmetic average of the GHz column above is lower.
-This is a weighted average, where the weight is %c0.  ie. it is the total number of
-un-halted cycles elapsed per time divided by the number of CPUs.
-.SH SMI COUNTING EXAMPLE
-On Intel Nehalem and newer processors, MSR 0x34 is a System Management Mode Interrupt (SMI) counter.
-This counter is shown by default under the "SMI" column.
-.nf
-[root@x980 ~]# turbostat
-cor CPU    %c0  GHz  TSC SMI    %c1    %c3    %c6 CTMP   %pc3   %pc6
-          0.11 1.91 3.38   0   1.84   0.26  97.79   29   0.82  83.87
-  0   0   0.40 1.63 3.38   0  10.27   0.12  89.20   20   0.82  83.88
-  0   6   0.06 1.63 3.38   0  10.61
-  1   2   0.37 2.63 3.38   0   0.02   0.10  99.51   22
-  1   8   0.01 1.62 3.38   0   0.39
-  2   4   0.07 1.62 3.38   0   0.04   0.07  99.82   23
-  2  10   0.02 1.62 3.38   0   0.09
-  8   1   0.23 1.64 3.38   0   0.10   1.07  98.60   24
-  8   7   0.02 1.64 3.38   0   0.31
-  9   3   0.03 1.62 3.38   0   0.03   0.05  99.89   29
-  9   9   0.02 1.62 3.38   0   0.05
- 10   5   0.07 1.62 3.38   0   0.08   0.12  99.73   27
- 10  11   0.03 1.62 3.38   0   0.13
-^C
-.fi
+Note that the Avg_MHz column reflects the total number of cycles executed
+divided by the measurement interval.  If the %Busy column is 100%,
+then the processor was running at that speed the entire interval.
+The Avg_MHz multiplied by the %Busy results in the Bzy_MHz --
+which is the average frequency while the processor was executing --
+not including any non-busy idle time.
+
 .SH NOTES
 
 .B "turbostat "
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 77eb130168da..7c9d8e71eb9e 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -56,7 +56,7 @@ unsigned int do_slm_cstates;
 unsigned int use_c1_residency_msr;
 unsigned int has_aperf;
 unsigned int has_epb;
-unsigned int units = 1000000000;        /* Ghz etc */
+unsigned int units = 1000000;   /* MHz etc */
 unsigned int genuine_intel;
 unsigned int has_invariant_tsc;
 unsigned int do_nehalem_platform_info;
@@ -264,88 +264,93 @@ int get_msr(int cpu, off_t offset, unsigned long long *msr)
         return 0;
 }
 
+/*
+ * Example Format w/ field column widths:
+ *
+ * Package    Core     CPU Avg_MHz Bzy_MHz TSC_MHz     SMI   %Busy CPU_%c1 CPU_%c3 CPU_%c6 CPU_%c7 CoreTmp  PkgTmp Pkg%pc2 Pkg%pc3 Pkg%pc6 Pkg%pc7 PkgWatt CorWatt GFXWatt
+ * 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567
+ */
+
 void print_header(void)
 {
         if (show_pkg)
-                outp += sprintf(outp, "pk");
-        if (show_pkg)
-                outp += sprintf(outp, " ");
+                outp += sprintf(outp, "Package ");
         if (show_core)
-                outp += sprintf(outp, "cor");
+                outp += sprintf(outp, "    Core ");
         if (show_cpu)
-                outp += sprintf(outp, " CPU");
-        if (show_pkg || show_core || show_cpu)
-                outp += sprintf(outp, " ");
+                outp += sprintf(outp, "    CPU ");
+        if (has_aperf)
+                outp += sprintf(outp, "Avg_MHz ");
         if (do_nhm_cstates)
-                outp += sprintf(outp, "   %%c0");
+                outp += sprintf(outp, "  %%Busy ");
         if (has_aperf)
-                outp += sprintf(outp, "  GHz");
-        outp += sprintf(outp, "  TSC");
+                outp += sprintf(outp, "Bzy_MHz ");
+        outp += sprintf(outp, "TSC_MHz ");
         if (do_smi)
-                outp += sprintf(outp, " SMI");
+                outp += sprintf(outp, "    SMI ");
         if (extra_delta_offset32)
-                outp += sprintf(outp, "  count 0x%03X", extra_delta_offset32);
+                outp += sprintf(outp, " count 0x%03X ", extra_delta_offset32);
         if (extra_delta_offset64)
-                outp += sprintf(outp, "  COUNT 0x%03X", extra_delta_offset64);
+                outp += sprintf(outp, " COUNT 0x%03X ", extra_delta_offset64);
         if (extra_msr_offset32)
-                outp += sprintf(outp, "   MSR 0x%03X", extra_msr_offset32);
+                outp += sprintf(outp, "  MSR 0x%03X ", extra_msr_offset32);
         if (extra_msr_offset64)
-                outp += sprintf(outp, "           MSR 0x%03X", extra_msr_offset64);
+                outp += sprintf(outp, "          MSR 0x%03X ", extra_msr_offset64);
         if (do_nhm_cstates)
-                outp += sprintf(outp, "    %%c1");
+                outp += sprintf(outp, " CPU%%c1 ");
         if (do_nhm_cstates && !do_slm_cstates)
-                outp += sprintf(outp, "    %%c3");
+                outp += sprintf(outp, " CPU%%c3 ");
         if (do_nhm_cstates)
-                outp += sprintf(outp, "    %%c6");
+                outp += sprintf(outp, " CPU%%c6 ");
         if (do_snb_cstates)
-                outp += sprintf(outp, "    %%c7");
+                outp += sprintf(outp, " CPU%%c7 ");
 
         if (do_dts)
-                outp += sprintf(outp, " CTMP");
+                outp += sprintf(outp, "CoreTmp ");
         if (do_ptm)
-                outp += sprintf(outp, " PTMP");
+                outp += sprintf(outp, " PkgTmp ");
 
         if (do_snb_cstates)
-                outp += sprintf(outp, "   %%pc2");
+                outp += sprintf(outp, "Pkg%%pc2 ");
         if (do_nhm_cstates && !do_slm_cstates)
-                outp += sprintf(outp, "   %%pc3");
+                outp += sprintf(outp, "Pkg%%pc3 ");
         if (do_nhm_cstates && !do_slm_cstates)
-                outp += sprintf(outp, "   %%pc6");
+                outp += sprintf(outp, "Pkg%%pc6 ");
         if (do_snb_cstates)
-                outp += sprintf(outp, "   %%pc7");
+                outp += sprintf(outp, "Pkg%%pc7 ");
         if (do_c8_c9_c10) {
-                outp += sprintf(outp, "   %%pc8");
-                outp += sprintf(outp, "   %%pc9");
-                outp += sprintf(outp, "  %%pc10");
+                outp += sprintf(outp, "Pkg%%pc8 ");
+                outp += sprintf(outp, "Pkg%%pc9 ");
+                outp += sprintf(outp, "Pk%%pc10 ");
         }
 
         if (do_rapl && !rapl_joules) {
                 if (do_rapl & RAPL_PKG)
-                        outp += sprintf(outp, "  Pkg_W");
+                        outp += sprintf(outp, "PkgWatt ");
                 if (do_rapl & RAPL_CORES)
-                        outp += sprintf(outp, "  Cor_W");
+                        outp += sprintf(outp, "CorWatt ");
                 if (do_rapl & RAPL_GFX)
-                        outp += sprintf(outp, " GFX_W");
+                        outp += sprintf(outp, "GFXWatt ");
                 if (do_rapl & RAPL_DRAM)
-                        outp += sprintf(outp, " RAM_W");
+                        outp += sprintf(outp, "RAMWatt ");
                 if (do_rapl & RAPL_PKG_PERF_STATUS)
-                        outp += sprintf(outp, " PKG_%%");
+                        outp += sprintf(outp, "  PKG_%% ");
                 if (do_rapl & RAPL_DRAM_PERF_STATUS)
-                        outp += sprintf(outp, " RAM_%%");
+                        outp += sprintf(outp, "  RAM_%% ");
         } else {
                 if (do_rapl & RAPL_PKG)
-                        outp += sprintf(outp, "  Pkg_J");
+                        outp += sprintf(outp, "  Pkg_J ");
                 if (do_rapl & RAPL_CORES)
-                        outp += sprintf(outp, "  Cor_J");
+                        outp += sprintf(outp, "  Cor_J ");
                 if (do_rapl & RAPL_GFX)
-                        outp += sprintf(outp, " GFX_J");
+                        outp += sprintf(outp, "  GFX_J ");
                 if (do_rapl & RAPL_DRAM)
-                        outp += sprintf(outp, " RAM_W");
+                        outp += sprintf(outp, "  RAM_W ");
                 if (do_rapl & RAPL_PKG_PERF_STATUS)
-                        outp += sprintf(outp, " PKG_%%");
+                        outp += sprintf(outp, "  PKG_%% ");
                 if (do_rapl & RAPL_DRAM_PERF_STATUS)
-                        outp += sprintf(outp, " RAM_%%");
-                outp += sprintf(outp, " time");
+                        outp += sprintf(outp, "  RAM_%% ");
+                outp += sprintf(outp, "  time ");
 
         }
         outp += sprintf(outp, "\n");
@@ -410,25 +415,12 @@ int dump_counters(struct thread_data *t, struct core_data *c,
 
 /*
  * column formatting convention & formats
- * package: "pk" 2 columns %2d
- * core: "cor" 3 columns %3d
- * CPU: "CPU" 3 columns %3d
- * Pkg_W: %6.2
- * Cor_W: %6.2
- * GFX_W: %5.2
- * RAM_W: %5.2
- * GHz: "GHz" 3 columns %3.2
- * TSC: "TSC" 3 columns %3.2
- * SMI: "SMI" 4 columns %4d
- * percentage " %pc3" %6.2
- * Perf Status percentage: %5.2
- * "CTMP" 4 columns %4d
  */
 int format_counters(struct thread_data *t, struct core_data *c,
         struct pkg_data *p)
 {
         double interval_float;
-        char *fmt5, *fmt6;
+        char *fmt8;
 
          /* if showing only 1st thread in core and this isn't one, bail out */
         if (show_core_only && !(t->flags & CPU_IS_FIRST_THREAD_IN_CORE))
@@ -443,65 +435,52 @@ int format_counters(struct thread_data *t, struct core_data *c,
         /* topo columns, print blanks on 1st (average) line */
         if (t == &average.threads) {
                 if (show_pkg)
-                        outp += sprintf(outp, "  ");
-                if (show_pkg && show_core)
-                        outp += sprintf(outp, " ");
+                        outp += sprintf(outp, "       -");
                 if (show_core)
-                        outp += sprintf(outp, "   ");
+                        outp += sprintf(outp, "       -");
                 if (show_cpu)
-                        outp += sprintf(outp, " " "   ");
+                        outp += sprintf(outp, "       -");
         } else {
                 if (show_pkg) {
                         if (p)
-                                outp += sprintf(outp, "%2d", p->package_id);
+                                outp += sprintf(outp, "%8d", p->package_id);
                         else
-                                outp += sprintf(outp, "  ");
+                                outp += sprintf(outp, "       -");
                 }
-                if (show_pkg && show_core)
-                        outp += sprintf(outp, " ");
                 if (show_core) {
                         if (c)
-                                outp += sprintf(outp, "%3d", c->core_id);
+                                outp += sprintf(outp, "%8d", c->core_id);
                         else
-                                outp += sprintf(outp, "   ");
+                                outp += sprintf(outp, "       -");
                 }
                 if (show_cpu)
-                        outp += sprintf(outp, " %3d", t->cpu_id);
+                        outp += sprintf(outp, "%8d", t->cpu_id);
         }
+
+        /* AvgMHz */
+        if (has_aperf)
+                outp += sprintf(outp, "%8.0f",
+                        1.0 / units * t->aperf / interval_float);
+
         /* %c0 */
         if (do_nhm_cstates) {
-                if (show_pkg || show_core || show_cpu)
-                        outp += sprintf(outp, " ");
                 if (!skip_c0)
-                        outp += sprintf(outp, "%6.2f", 100.0 * t->mperf/t->tsc);
+                        outp += sprintf(outp, "%8.2f", 100.0 * t->mperf/t->tsc);
                 else
-                        outp += sprintf(outp, "  ****");
+                        outp += sprintf(outp, "********");
         }
 
-        /* GHz */
-        if (has_aperf) {
-                if (!aperf_mperf_unstable) {
-                        outp += sprintf(outp, " %3.2f",
-                                1.0 * t->tsc / units * t->aperf /
-                                t->mperf / interval_float);
-                } else {
-                        if (t->aperf > t->tsc || t->mperf > t->tsc) {
-                                outp += sprintf(outp, " ***");
-                        } else {
-                                outp += sprintf(outp, "%3.1f*",
-                                        1.0 * t->tsc /
-                                        units * t->aperf /
-                                        t->mperf / interval_float);
-                        }
-                }
-        }
+        /* BzyMHz */
+        if (has_aperf)
+                outp += sprintf(outp, "%8.0f",
+                        1.0 * t->tsc / units * t->aperf / t->mperf / interval_float);
 
         /* TSC */
-        outp += sprintf(outp, "%5.2f", 1.0 * t->tsc/units/interval_float);
+        outp += sprintf(outp, "%8.0f", 1.0 * t->tsc/units/interval_float);
 
         /* SMI */
         if (do_smi)
-                outp += sprintf(outp, "%4d", t->smi_count);
+                outp += sprintf(outp, "%8d", t->smi_count);
 
         /* delta */
         if (extra_delta_offset32)
@@ -520,9 +499,9 @@ int format_counters(struct thread_data *t, struct core_data *c,
 
         if (do_nhm_cstates) {
                 if (!skip_c1)
-                        outp += sprintf(outp, " %6.2f", 100.0 * t->c1/t->tsc);
+                        outp += sprintf(outp, "%8.2f", 100.0 * t->c1/t->tsc);
                 else
-                        outp += sprintf(outp, "  ****");
+                        outp += sprintf(outp, "********");
         }
 
         /* print per-core data only for 1st thread in core */
@@ -530,79 +509,76 @@ int format_counters(struct thread_data *t, struct core_data *c,
                 goto done;
 
         if (do_nhm_cstates && !do_slm_cstates)
-                outp += sprintf(outp, " %6.2f", 100.0 * c->c3/t->tsc);
+                outp += sprintf(outp, "%8.2f", 100.0 * c->c3/t->tsc);
         if (do_nhm_cstates)
-                outp += sprintf(outp, " %6.2f", 100.0 * c->c6/t->tsc);
+                outp += sprintf(outp, "%8.2f", 100.0 * c->c6/t->tsc);
         if (do_snb_cstates)
-                outp += sprintf(outp, " %6.2f", 100.0 * c->c7/t->tsc);
+                outp += sprintf(outp, "%8.2f", 100.0 * c->c7/t->tsc);
 
         if (do_dts)
-                outp += sprintf(outp, " %4d", c->core_temp_c);
+                outp += sprintf(outp, "%8d", c->core_temp_c);
 
         /* print per-package data only for 1st core in package */
         if (!(t->flags & CPU_IS_FIRST_CORE_IN_PACKAGE))
                 goto done;
 
         if (do_ptm)
-                outp += sprintf(outp, " %4d", p->pkg_temp_c);
+                outp += sprintf(outp, "%8d", p->pkg_temp_c);
 
         if (do_snb_cstates)
-                outp += sprintf(outp, " %6.2f", 100.0 * p->pc2/t->tsc);
+                outp += sprintf(outp, "%8.2f", 100.0 * p->pc2/t->tsc);
         if (do_nhm_cstates && !do_slm_cstates)
-                outp += sprintf(outp, " %6.2f", 100.0 * p->pc3/t->tsc);
+                outp += sprintf(outp, "%8.2f", 100.0 * p->pc3/t->tsc);
         if (do_nhm_cstates && !do_slm_cstates)
-                outp += sprintf(outp, " %6.2f", 100.0 * p->pc6/t->tsc);
+                outp += sprintf(outp, "%8.2f", 100.0 * p->pc6/t->tsc);
         if (do_snb_cstates)
-                outp += sprintf(outp, " %6.2f", 100.0 * p->pc7/t->tsc);
+                outp += sprintf(outp, "%8.2f", 100.0 * p->pc7/t->tsc);
         if (do_c8_c9_c10) {
-                outp += sprintf(outp, " %6.2f", 100.0 * p->pc8/t->tsc);
-                outp += sprintf(outp, " %6.2f", 100.0 * p->pc9/t->tsc);
-                outp += sprintf(outp, " %6.2f", 100.0 * p->pc10/t->tsc);
+                outp += sprintf(outp, "%8.2f", 100.0 * p->pc8/t->tsc);
+                outp += sprintf(outp, "%8.2f", 100.0 * p->pc9/t->tsc);
+                outp += sprintf(outp, "%8.2f", 100.0 * p->pc10/t->tsc);
         }
 
         /*
          * If measurement interval exceeds minimum RAPL Joule Counter range,
          * indicate that results are suspect by printing "**" in fraction place.
          */
-        if (interval_float < rapl_joule_counter_range) {
-                fmt5 = " %5.2f";
-                fmt6 = " %6.2f";
-        } else {
-                fmt5 = " %3.0f**";
-                fmt6 = " %4.0f**";
-        }
+        if (interval_float < rapl_joule_counter_range)
+                fmt8 = "%8.2f";
+        else
+                fmt8 = " %6.0f**";
 
         if (do_rapl && !rapl_joules) {
                 if (do_rapl & RAPL_PKG)
-                        outp += sprintf(outp, fmt6, p->energy_pkg * rapl_energy_units / interval_float);
+                        outp += sprintf(outp, fmt8, p->energy_pkg * rapl_energy_units / interval_float);
                 if (do_rapl & RAPL_CORES)
-                        outp += sprintf(outp, fmt6, p->energy_cores * rapl_energy_units / interval_float);
+                        outp += sprintf(outp, fmt8, p->energy_cores * rapl_energy_units / interval_float);
                 if (do_rapl & RAPL_GFX)
-                        outp += sprintf(outp, fmt5, p->energy_gfx * rapl_energy_units / interval_float);
+                        outp += sprintf(outp, fmt8, p->energy_gfx * rapl_energy_units / interval_float);
                 if (do_rapl & RAPL_DRAM)
-                        outp += sprintf(outp, fmt5, p->energy_dram * rapl_energy_units / interval_float);
+                        outp += sprintf(outp, fmt8, p->energy_dram * rapl_energy_units / interval_float);
                 if (do_rapl & RAPL_PKG_PERF_STATUS)
-                        outp += sprintf(outp, fmt5, 100.0 * p->rapl_pkg_perf_status * rapl_time_units / interval_float);
+                        outp += sprintf(outp, fmt8, 100.0 * p->rapl_pkg_perf_status * rapl_time_units / interval_float);
                 if (do_rapl & RAPL_DRAM_PERF_STATUS)
-                        outp += sprintf(outp, fmt5, 100.0 * p->rapl_dram_perf_status * rapl_time_units / interval_float);
+                        outp += sprintf(outp, fmt8, 100.0 * p->rapl_dram_perf_status * rapl_time_units / interval_float);
         } else {
                 if (do_rapl & RAPL_PKG)
-                        outp += sprintf(outp, fmt6,
+                        outp += sprintf(outp, fmt8,
                                         p->energy_pkg * rapl_energy_units);
                 if (do_rapl & RAPL_CORES)
-                        outp += sprintf(outp, fmt6,
+                        outp += sprintf(outp, fmt8,
                                         p->energy_cores * rapl_energy_units);
                 if (do_rapl & RAPL_GFX)
-                        outp += sprintf(outp, fmt5,
+                        outp += sprintf(outp, fmt8,
                                         p->energy_gfx * rapl_energy_units);
                 if (do_rapl & RAPL_DRAM)
-                        outp += sprintf(outp, fmt5,
+                        outp += sprintf(outp, fmt8,
                                         p->energy_dram * rapl_energy_units);
                 if (do_rapl & RAPL_PKG_PERF_STATUS)
-                        outp += sprintf(outp, fmt5, 100.0 * p->rapl_pkg_perf_status * rapl_time_units / interval_float);
+                        outp += sprintf(outp, fmt8, 100.0 * p->rapl_pkg_perf_status * rapl_time_units / interval_float);
                 if (do_rapl & RAPL_DRAM_PERF_STATUS)
-                        outp += sprintf(outp, fmt5, 100.0 * p->rapl_dram_perf_status * rapl_time_units / interval_float);
-        outp += sprintf(outp, fmt5, interval_float);
+                        outp += sprintf(outp, fmt8, 100.0 * p->rapl_dram_perf_status * rapl_time_units / interval_float);
+        outp += sprintf(outp, fmt8, interval_float);
 
         }
 done:
@@ -1516,6 +1492,9 @@ int has_nehalem_turbo_ratio_limit(unsigned int family, unsigned int model)
         case 0x46:      /* HSW */
         case 0x37:      /* BYT */
         case 0x4D:      /* AVN */
+        case 0x3D:      /* BDW */
+        case 0x4F:      /* BDX */
+        case 0x56:      /* BDX-DE */
                 return 1;
         case 0x2E:      /* Nehalem-EX Xeon - Beckton */
         case 0x2F:      /* Westmere-EX Xeon - Eagleton */
@@ -1629,9 +1608,12 @@ void rapl_probe(unsigned int family, unsigned int model)
         case 0x3C:      /* HSW */
         case 0x45:      /* HSW */
         case 0x46:      /* HSW */
+        case 0x3D:      /* BDW */
                 do_rapl = RAPL_PKG | RAPL_CORES | RAPL_CORE_POLICY | RAPL_GFX | RAPL_PKG_POWER_INFO;
                 break;
         case 0x3F:      /* HSX */
+        case 0x4F:      /* BDX */
+        case 0x56:      /* BDX-DE */
                 do_rapl = RAPL_PKG | RAPL_DRAM | RAPL_DRAM_PERF_STATUS | RAPL_PKG_PERF_STATUS | RAPL_PKG_POWER_INFO;
                 break;
         case 0x2D:
@@ -1875,6 +1857,9 @@ int is_snb(unsigned int family, unsigned int model)
         case 0x3F:      /* HSW */
         case 0x45:      /* HSW */
         case 0x46:      /* HSW */
+        case 0x3D:      /* BDW */
+        case 0x4F:      /* BDX */
+        case 0x56:      /* BDX-DE */
                 return 1;
         }
         return 0;
@@ -1886,7 +1871,8 @@ int has_c8_c9_c10(unsigned int family, unsigned int model)
                 return 0;
 
         switch (model) {
-        case 0x45:
+        case 0x45:      /* HSW */
+        case 0x3D:      /* BDW */
                 return 1;
         }
         return 0;
@@ -2455,7 +2441,7 @@ int main(int argc, char **argv)
         cmdline(argc, argv);
 
         if (verbose)
-                fprintf(stderr, "turbostat v3.6 Dec 2, 2013"
+                fprintf(stderr, "turbostat v3.7 Feb 6, 2014"
                         " - Len Brown <lenb@kernel.org>\n");
 
         turbostat_init();
diff --git a/tools/testing/ktest/examples/kvm.conf b/tools/testing/ktest/examples/kvm.conf
index 831c7c5395f1..fbc134f9ac6e 100644
--- a/tools/testing/ktest/examples/kvm.conf
+++ b/tools/testing/ktest/examples/kvm.conf
@@ -10,6 +10,10 @@ MACHINE = Guest
 # Use virsh to read the serial console of the guest
 CONSOLE =  virsh console ${MACHINE}
 
+# Use SIGKILL to terminate virsh console. We can't kill virsh console
+# by the default signal, SIGINT.
+CLOSE_CONSOLE_SIGNAL = KILL
+
 #*************************************#
 # This part is the same as test.conf  #
 #*************************************#
diff --git a/tools/testing/selftests/powerpc/Makefile b/tools/testing/selftests/powerpc/Makefile
index bd24ae5aaeab..316194f26ff4 100644
--- a/tools/testing/selftests/powerpc/Makefile
+++ b/tools/testing/selftests/powerpc/Makefile
@@ -13,7 +13,7 @@ CFLAGS := -Wall -O2 -flto -Wall -Werror -DGIT_VERSION='"$(GIT_VERSION)"' -I$(CUR
 
 export CC CFLAGS
 
-TARGETS = pmu
+TARGETS = pmu copyloops
 
 endif
 
diff --git a/tools/testing/selftests/powerpc/copyloops/Makefile b/tools/testing/selftests/powerpc/copyloops/Makefile
new file mode 100644
index 000000000000..6f2d3be227f9
--- /dev/null
+++ b/tools/testing/selftests/powerpc/copyloops/Makefile
@@ -0,0 +1,29 @@
+# The loops are all 64-bit code
+CFLAGS += -m64
+CFLAGS += -I$(CURDIR)
+CFLAGS += -D SELFTEST
+
+# Use our CFLAGS for the implicit .S rule
+ASFLAGS = $(CFLAGS)
+
+PROGS := copyuser_64 copyuser_power7 memcpy_64 memcpy_power7
+EXTRA_SOURCES := validate.c ../harness.c
+
+all: $(PROGS)
+
+copyuser_64:     CPPFLAGS += -D COPY_LOOP=test___copy_tofrom_user_base
+copyuser_power7: CPPFLAGS += -D COPY_LOOP=test___copy_tofrom_user_power7
+memcpy_64:       CPPFLAGS += -D COPY_LOOP=test_memcpy
+memcpy_power7:   CPPFLAGS += -D COPY_LOOP=test_memcpy_power7
+
+$(PROGS): $(EXTRA_SOURCES)
+
+run_tests: all
+        @-for PROG in $(PROGS); do \
+                ./$$PROG; \
+        done;
+
+clean:
+        rm -f $(PROGS) *.o
+
+.PHONY: all run_tests clean
diff --git a/tools/testing/selftests/powerpc/copyloops/asm/ppc_asm.h b/tools/testing/selftests/powerpc/copyloops/asm/ppc_asm.h
new file mode 100644
index 000000000000..ccd9c84c4e3f
--- /dev/null
+++ b/tools/testing/selftests/powerpc/copyloops/asm/ppc_asm.h
@@ -0,0 +1,86 @@
+#include <ppc-asm.h>
+
+#define CONFIG_ALTIVEC
+
+#define r1      1
+
+#define vr0     0
+#define vr1     1
+#define vr2     2
+#define vr3     3
+#define vr4     4
+#define vr5     5
+#define vr6     6
+#define vr7     7
+#define vr8     8
+#define vr9     9
+#define vr10    10
+#define vr11    11
+#define vr12    12
+#define vr13    13
+#define vr14    14
+#define vr15    15
+#define vr16    16
+#define vr17    17
+#define vr18    18
+#define vr19    19
+#define vr20    20
+#define vr21    21
+#define vr22    22
+#define vr23    23
+#define vr24    24
+#define vr25    25
+#define vr26    26
+#define vr27    27
+#define vr28    28
+#define vr29    29
+#define vr30    30
+#define vr31    31
+
+#define R14 r14
+#define R15 r15
+#define R16 r16
+#define R17 r17
+#define R18 r18
+#define R19 r19
+#define R20 r20
+#define R21 r21
+#define R22 r22
+
+#define STACKFRAMESIZE  256
+#define STK_PARAM(i)    (48 + ((i)-3)*8)
+#define STK_REG(i)      (112 + ((i)-14)*8)
+
+#define _GLOBAL(A) FUNC_START(test_ ## A)
+
+#define PPC_MTOCRF(A, B)        mtocrf A, B
+
+FUNC_START(enter_vmx_usercopy)
+        li      r3,1
+        blr
+
+FUNC_START(exit_vmx_usercopy)
+        li      r3,0
+        blr
+
+FUNC_START(enter_vmx_copy)
+        li      r3,1
+        blr
+
+FUNC_START(exit_vmx_copy)
+        blr
+
+FUNC_START(memcpy_power7)
+        blr
+
+FUNC_START(__copy_tofrom_user_power7)
+        blr
+
+FUNC_START(__copy_tofrom_user_base)
+        blr
+
+#define BEGIN_FTR_SECTION
+#define FTR_SECTION_ELSE
+#define ALT_FTR_SECTION_END_IFCLR(x)
+#define ALT_FTR_SECTION_END(x, y)
+#define END_FTR_SECTION_IFCLR(x)
diff --git a/tools/testing/selftests/powerpc/copyloops/asm/processor.h b/tools/testing/selftests/powerpc/copyloops/asm/processor.h
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/tools/testing/selftests/powerpc/copyloops/asm/processor.h
diff --git a/tools/testing/selftests/powerpc/copyloops/copyuser_64.S b/tools/testing/selftests/powerpc/copyloops/copyuser_64.S
new file mode 120000
index 000000000000..f1c418a2521a
--- /dev/null
+++ b/tools/testing/selftests/powerpc/copyloops/copyuser_64.S
@@ -0,0 +1 @@
+../../../../../arch/powerpc/lib/copyuser_64.S
\ No newline at end of file
diff --git a/tools/testing/selftests/powerpc/copyloops/copyuser_power7.S b/tools/testing/selftests/powerpc/copyloops/copyuser_power7.S
new file mode 120000
index 000000000000..478689598298
--- /dev/null
+++ b/tools/testing/selftests/powerpc/copyloops/copyuser_power7.S
@@ -0,0 +1 @@
+../../../../../arch/powerpc/lib/copyuser_power7.S
\ No newline at end of file
diff --git a/tools/testing/selftests/powerpc/copyloops/memcpy_64.S b/tools/testing/selftests/powerpc/copyloops/memcpy_64.S
new file mode 120000
index 000000000000..cce33fb6f9d8
--- /dev/null
+++ b/tools/testing/selftests/powerpc/copyloops/memcpy_64.S
@@ -0,0 +1 @@
+../../../../../arch/powerpc/lib/memcpy_64.S
\ No newline at end of file
diff --git a/tools/testing/selftests/powerpc/copyloops/memcpy_power7.S b/tools/testing/selftests/powerpc/copyloops/memcpy_power7.S
new file mode 120000
index 000000000000..0d6fbfaf3d59
--- /dev/null
+++ b/tools/testing/selftests/powerpc/copyloops/memcpy_power7.S
@@ -0,0 +1 @@
+../../../../../arch/powerpc/lib/memcpy_power7.S
\ No newline at end of file
diff --git a/tools/testing/selftests/powerpc/copyloops/validate.c b/tools/testing/selftests/powerpc/copyloops/validate.c
new file mode 100644
index 000000000000..1750ff57ee58
--- /dev/null
+++ b/tools/testing/selftests/powerpc/copyloops/validate.c
@@ -0,0 +1,99 @@
+#include <malloc.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdbool.h>
+
+#include "../utils.h"
+
+#define MAX_LEN 8192
+#define MAX_OFFSET 16
+#define MIN_REDZONE 128
+#define BUFLEN (MAX_LEN+MAX_OFFSET+2*MIN_REDZONE)
+#define POISON 0xa5
+
+unsigned long COPY_LOOP(void *to, const void *from, unsigned long size);
+
+static void do_one(char *src, char *dst, unsigned long src_off,
+                   unsigned long dst_off, unsigned long len, void *redzone,
+                   void *fill)
+{
+        char *srcp, *dstp;
+        unsigned long ret;
+        unsigned long i;
+
+        srcp = src + MIN_REDZONE + src_off;
+        dstp = dst + MIN_REDZONE + dst_off;
+
+        memset(src, POISON, BUFLEN);
+        memset(dst, POISON, BUFLEN);
+        memcpy(srcp, fill, len);
+
+        ret = COPY_LOOP(dstp, srcp, len);
+        if (ret && ret != (unsigned long)dstp) {
+                printf("(%p,%p,%ld) returned %ld\n", dstp, srcp, len, ret);
+                abort();
+        }
+
+        if (memcmp(dstp, srcp, len)) {
+                printf("(%p,%p,%ld) miscompare\n", dstp, srcp, len);
+                printf("src: ");
+                for (i = 0; i < len; i++)
+                        printf("%02x ", srcp[i]);
+                printf("\ndst: ");
+                for (i = 0; i < len; i++)
+                        printf("%02x ", dstp[i]);
+                printf("\n");
+                abort();
+        }
+
+        if (memcmp(dst, redzone, dstp - dst)) {
+                printf("(%p,%p,%ld) redzone before corrupted\n",
+                       dstp, srcp, len);
+                abort();
+        }
+
+        if (memcmp(dstp+len, redzone, dst+BUFLEN-(dstp+len))) {
+                printf("(%p,%p,%ld) redzone after corrupted\n",
+                       dstp, srcp, len);
+                abort();
+        }
+}
+
+int test_copy_loop(void)
+{
+        char *src, *dst, *redzone, *fill;
+        unsigned long len, src_off, dst_off;
+        unsigned long i;
+
+        src = memalign(BUFLEN, BUFLEN);
+        dst = memalign(BUFLEN, BUFLEN);
+        redzone = malloc(BUFLEN);
+        fill = malloc(BUFLEN);
+
+        if (!src || !dst || !redzone || !fill) {
+                fprintf(stderr, "malloc failed\n");
+                exit(1);
+        }
+
+        memset(redzone, POISON, BUFLEN);
+
+        /* Fill with sequential bytes */
+        for (i = 0; i < BUFLEN; i++)
+                fill[i] = i & 0xff;
+
+        for (len = 1; len < MAX_LEN; len++) {
+                for (src_off = 0; src_off < MAX_OFFSET; src_off++) {
+                        for (dst_off = 0; dst_off < MAX_OFFSET; dst_off++) {
+                                do_one(src, dst, src_off, dst_off, len,
+                                       redzone, fill);
+                        }
+                }
+        }
+
+        return 0;
+}
+
+int main(void)
+{
+        return test_harness(test_copy_loop, str(COPY_LOOP));
+}
diff --git a/tools/testing/selftests/powerpc/utils.h b/tools/testing/selftests/powerpc/utils.h
index 5851c4b0f553..0de064406dab 100644
--- a/tools/testing/selftests/powerpc/utils.h
+++ b/tools/testing/selftests/powerpc/utils.h
@@ -31,4 +31,7 @@ do {								\
         }                                                       \
 } while (0)
 
+#define _str(s) #s
+#define str(s) _str(s)
+
 #endif /* _SELFTESTS_POWERPC_UTILS_H */
diff --git a/tools/testing/selftests/rcutorture/bin/functions.sh b/tools/testing/selftests/rcutorture/bin/functions.sh
index 587561d7c035..9b17e810ddc3 100644
--- a/tools/testing/selftests/rcutorture/bin/functions.sh
+++ b/tools/testing/selftests/rcutorture/bin/functions.sh
@@ -96,6 +96,7 @@ identify_qemu () {
                 echo qemu-system-ppc64
         else
                 echo Cannot figure out what qemu command to use! 1>&2
+                echo file $1 output: $u
                 # Usually this will be one of /usr/bin/qemu-system-*
                 # Use RCU_QEMU_CMD environment variable or appropriate
                 # argument to top-level script.
diff --git a/tools/testing/selftests/rcutorture/bin/kvm-recheck-lock.sh b/tools/testing/selftests/rcutorture/bin/kvm-recheck-lock.sh
new file mode 100755
index 000000000000..829186e19eb1
--- /dev/null
+++ b/tools/testing/selftests/rcutorture/bin/kvm-recheck-lock.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+#
+# Analyze a given results directory for locktorture progress.
+#
+# Usage: sh kvm-recheck-lock.sh resdir
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, you can access it online at
+# http://www.gnu.org/licenses/gpl-2.0.html.
+#
+# Copyright (C) IBM Corporation, 2014
+#
+# Authors: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
+
+i="$1"
+if test -d $i
+then
+        :
+else
+        echo Unreadable results directory: $i
+        exit 1
+fi
+
+configfile=`echo $i | sed -e 's/^.*\///'`
+ncs=`grep "Writes:  Total:" $i/console.log 2> /dev/null | tail -1 | sed -e 's/^.* Total: //' -e 's/ .*$//'`
+if test -z "$ncs"
+then
+        echo $configfile
+else
+        title="$configfile ------- $ncs acquisitions/releases"
+        dur=`sed -e 's/^.* locktorture.shutdown_secs=//' -e 's/ .*$//' < $i/qemu-cmd 2> /dev/null`
+        if test -z "$dur"
+        then
+                :
+        else
+                ncsps=`awk -v ncs=$ncs -v dur=$dur '
+                        BEGIN { print ncs / dur }' < /dev/null`
+                title="$title ($ncsps per second)"
+        fi
+        echo $title
+fi
diff --git a/tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh b/tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh
new file mode 100755
index 000000000000..d75b1dc5ae53
--- /dev/null
+++ b/tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+#
+# Analyze a given results directory for rcutorture progress.
+#
+# Usage: sh kvm-recheck-rcu.sh resdir
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, you can access it online at
+# http://www.gnu.org/licenses/gpl-2.0.html.
+#
+# Copyright (C) IBM Corporation, 2014
+#
+# Authors: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
+
+i="$1"
+if test -d $i
+then
+        :
+else
+        echo Unreadable results directory: $i
+        exit 1
+fi
+
+configfile=`echo $i | sed -e 's/^.*\///'`
+ngps=`grep ver: $i/console.log 2> /dev/null | tail -1 | sed -e 's/^.* ver: //' -e 's/ .*$//'`
+if test -z "$ngps"
+then
+        echo $configfile
+else
+        title="$configfile ------- $ngps grace periods"
+        dur=`sed -e 's/^.* rcutorture.shutdown_secs=//' -e 's/ .*$//' < $i/qemu-cmd 2> /dev/null`
+        if test -z "$dur"
+        then
+                :
+        else
+                ngpsps=`awk -v ngps=$ngps -v dur=$dur '
+                        BEGIN { print ngps / dur }' < /dev/null`
+                title="$title ($ngpsps per second)"
+        fi
+        echo $title
+fi
diff --git a/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh b/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh
index baef09f3469b..a44daaa259a9 100755
--- a/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Given the results directories for previous KVM runs of rcutorture,
+# Given the results directories for previous KVM-based torture runs,
 # check the build and console output for errors.  Given a directory
 # containing results directories, this recursively checks them all.
 #
@@ -27,11 +27,18 @@
 PATH=`pwd`/tools/testing/selftests/rcutorture/bin:$PATH; export PATH
 for rd in "$@"
 do
+        firsttime=1
         dirs=`find $rd -name Make.defconfig.out -print | sort | sed -e 's,/[^/]*$,,' | sort -u`
         for i in $dirs
         do
-                configfile=`echo $i | sed -e 's/^.*\///'`
-                echo $configfile
+                if test -n "$firsttime"
+                then
+                        firsttime=""
+                        resdir=`echo $i | sed -e 's,/$,,' -e 's,/[^/]*$,,'`
+                        head -1 $resdir/log
+                fi
+                TORTURE_SUITE="`cat $i/../TORTURE_SUITE`"
+                kvm-recheck-${TORTURE_SUITE}.sh $i
                 configcheck.sh $i/.config $i/ConfigFragment
                 parse-build.sh $i/Make.out $configfile
                 parse-rcutorture.sh $i/console.log $configfile
diff --git a/tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
index 151b23788935..94b28bb37d36 100755
--- a/tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
@@ -6,15 +6,15 @@
 # Execute this in the source tree.  Do not run it as a background task
 # because qemu does not seem to like that much.
 #
-# Usage: sh kvm-test-1-rcu.sh config builddir resdir minutes qemu-args bootargs
+# Usage: sh kvm-test-1-run.sh config builddir resdir minutes qemu-args boot_args
 #
-# qemu-args defaults to "" -- you will want "-nographic" if running headless.
-# bootargs defaults to  "root=/dev/sda noapic selinux=0 console=ttyS0"
-#                       "initcall_debug debug rcutorture.stat_interval=15"
-#                       "rcutorture.shutdown_secs=$((minutes * 60))"
-#                       "rcutorture.rcutorture_runnable=1"
+# qemu-args defaults to "-nographic", along with arguments specifying the
+#                       number of CPUs and other options generated from
+#                       the underlying CPU architecture.
+# boot_args defaults to value returned by the per_version_boot_params
+#                       shell function.
 #
-# Anything you specify for either qemu-args or bootargs is appended to
+# Anything you specify for either qemu-args or boot_args is appended to
 # the default values.  The "-smp" value is deduced from the contents of
 # the config fragment.
 #
@@ -40,32 +40,34 @@
 
 grace=120
 
-T=/tmp/kvm-test-1-rcu.sh.$$
+T=/tmp/kvm-test-1-run.sh.$$
 trap 'rm -rf $T' 0
 
 . $KVM/bin/functions.sh
 . $KVPATH/ver_functions.sh
 
 config_template=${1}
+config_dir=`echo $config_template | sed -e 's,/[^/]*$,,'`
 title=`echo $config_template | sed -e 's/^.*\///'`
 builddir=${2}
 if test -z "$builddir" -o ! -d "$builddir" -o ! -w "$builddir"
 then
-        echo "kvm-test-1-rcu.sh :$builddir: Not a writable directory, cannot build into it"
+        echo "kvm-test-1-run.sh :$builddir: Not a writable directory, cannot build into it"
         exit 1
 fi
 resdir=${3}
 if test -z "$resdir" -o ! -d "$resdir" -o ! -w "$resdir"
 then
-        echo "kvm-test-1-rcu.sh :$resdir: Not a writable directory, cannot build into it"
+        echo "kvm-test-1-run.sh :$resdir: Not a writable directory, cannot store results into it"
         exit 1
 fi
 cp $config_template $resdir/ConfigFragment
 echo ' ---' `date`: Starting build
 echo ' ---' Kconfig fragment at: $config_template >> $resdir/log
-cat << '___EOF___' >> $T
-CONFIG_RCU_TORTURE_TEST=y
-___EOF___
+if test -r "$config_dir/CFcommon"
+then
+        cat < $config_dir/CFcommon >> $T
+fi
 # Optimizations below this point
 # CONFIG_USB=n
 # CONFIG_SECURITY=n
@@ -96,11 +98,23 @@ then
         cp $builddir/.config $resdir
         cp $builddir/arch/x86/boot/bzImage $resdir
         parse-build.sh $resdir/Make.out $title
+        if test -f $builddir.wait
+        then
+                mv $builddir.wait $builddir.ready
+        fi
 else
         cp $builddir/Make*.out $resdir
         echo Build failed, not running KVM, see $resdir.
+        if test -f $builddir.wait
+        then
+                mv $builddir.wait $builddir.ready
+        fi
         exit 1
 fi
+while test -f $builddir.ready
+do
+        sleep 1
+done
 minutes=$4
 seconds=$(($minutes * 60))
 qemu_args=$5
@@ -111,9 +125,10 @@ kstarttime=`awk 'BEGIN { print systime() }' < /dev/null`
 echo ' ---' `date`: Starting kernel
 
 # Determine the appropriate flavor of qemu command.
-QEMU="`identify_qemu $builddir/vmlinux.o`"
+QEMU="`identify_qemu $builddir/vmlinux`"
 
 # Generate -smp qemu argument.
+qemu_args="-nographic $qemu_args"
 cpu_count=`configNR_CPUS.sh $config_template`
 vcpus=`identify_qemu_vcpus`
 if test $cpu_count -gt $vcpus
@@ -133,12 +148,8 @@ qemu_append="`identify_qemu_append "$QEMU"`"
 
 # Pull in Kconfig-fragment boot parameters
 boot_args="`configfrag_boot_params "$boot_args" "$config_template"`"
-# Generate CPU-hotplug boot parameters
-boot_args="`rcutorture_param_onoff "$boot_args" $builddir/.config`"
-# Generate rcu_barrier() boot parameter
-boot_args="`rcutorture_param_n_barrier_cbs "$boot_args"`"
-# Pull in standard rcutorture boot arguments
-boot_args="$boot_args rcutorture.stat_interval=15 rcutorture.shutdown_secs=$seconds rcutorture.rcutorture_runnable=1"
+# Generate kernel-version-specific boot parameters
+boot_args="`per_version_boot_params "$boot_args" $builddir/.config $seconds`"
 
 echo $QEMU $qemu_args -m 512 -kernel $builddir/arch/x86/boot/bzImage -append \"$qemu_append $boot_args\" > $resdir/qemu-cmd
 if test -n "$RCU_BUILDONLY"
@@ -188,5 +199,5 @@ then
 fi
 
 cp $builddir/console.log $resdir
-parse-rcutorture.sh $resdir/console.log $title
+parse-${TORTURE_SUITE}torture.sh $resdir/console.log $title
 parse-console.sh $resdir/console.log $title
diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh b/tools/testing/selftests/rcutorture/bin/kvm.sh
index 1b7923bf6a70..5a78cbf55f06 100644
--- a/tools/testing/selftests/rcutorture/bin/kvm.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm.sh
@@ -30,14 +30,21 @@
 scriptname=$0
 args="$*"
 
+T=/tmp/kvm.sh.$$
+trap 'rm -rf $T' 0
+mkdir $T
+
 dur=30
+dryrun=""
 KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM
 PATH=${KVM}/bin:$PATH; export PATH
 builddir="${KVM}/b1"
 RCU_INITRD="$KVM/initrd"; export RCU_INITRD
 RCU_KMAKE_ARG=""; export RCU_KMAKE_ARG
+TORTURE_SUITE=rcu
 resdir=""
 configs=""
+cpus=0
 ds=`date +%Y.%m.%d-%H:%M:%S`
 kversion=""
 
@@ -49,7 +56,9 @@ usage () {
         echo "       --builddir absolute-pathname"
         echo "       --buildonly"
         echo "       --configs \"config-file list\""
+        echo "       --cpus N"
         echo "       --datestamp string"
+        echo "       --dryrun sched|script"
         echo "       --duration minutes"
         echo "       --interactive"
         echo "       --kmake-arg kernel-make-arguments"
@@ -58,8 +67,9 @@ usage () {
         echo "       --no-initrd"
         echo "       --qemu-args qemu-system-..."
         echo "       --qemu-cmd qemu-system-..."
-        echo "       --results absolute-pathname"
         echo "       --relbuilddir relative-pathname"
+        echo "       --results absolute-pathname"
+        echo "       --torture rcu"
         exit 1
 }
 
@@ -85,11 +95,21 @@ do
                 configs="$2"
                 shift
                 ;;
+        --cpus)
+                checkarg --cpus "(number)" "$#" "$2" '^[0-9]*$' '^--'
+                cpus=$2
+                shift
+                ;;
         --datestamp)
                 checkarg --datestamp "(relative pathname)" "$#" "$2" '^[^/]*$' '^--'
                 ds=$2
                 shift
                 ;;
+        --dryrun)
+                checkarg --dryrun "sched|script" $# "$2" 'sched\|script' '^--'
+                dryrun=$2
+                shift
+                ;;
         --duration)
                 checkarg --duration "(minutes)" $# "$2" '^[0-9]*$' '^error'
                 dur=$2
@@ -138,6 +158,11 @@ do
                 resdir=$2
                 shift
                 ;;
+        --torture)
+                checkarg --torture "(suite name)" "$#" "$2" '^\(lock\|rcu\)$' '^--'
+                TORTURE_SUITE=$2
+                shift
+                ;;
         *)
                 echo Unknown argument $1
                 usage
@@ -146,7 +171,7 @@ do
         shift
 done
 
-CONFIGFRAG=${KVM}/configs; export CONFIGFRAG
+CONFIGFRAG=${KVM}/configs/${TORTURE_SUITE}; export CONFIGFRAG
 KVPATH=${CONFIGFRAG}/$kversion; export KVPATH
 
 if test -z "$configs"
@@ -157,54 +182,231 @@ fi
 if test -z "$resdir"
 then
         resdir=$KVM/res
-        if ! test -e $resdir
-        then
-                mkdir $resdir || :
-        fi
-else
+fi
+
+if test "$dryrun" = ""
+then
         if ! test -e $resdir
         then
                 mkdir -p "$resdir" || :
         fi
-fi
-mkdir $resdir/$ds
-touch $resdir/$ds/log
-echo $scriptname $args >> $resdir/$ds/log
+        mkdir $resdir/$ds
 
-pwd > $resdir/$ds/testid.txt
-if test -d .git
-then
-        git status >> $resdir/$ds/testid.txt
-        git rev-parse HEAD >> $resdir/$ds/testid.txt
-fi
-builddir=$KVM/b1
-if ! test -e $builddir
-then
-        mkdir $builddir || :
+        # Be noisy only if running the script.
+        echo Results directory: $resdir/$ds
+        echo $scriptname $args
+
+        touch $resdir/$ds/log
+        echo $scriptname $args >> $resdir/$ds/log
+        echo ${TORTURE_SUITE} > $resdir/$ds/TORTURE_SUITE
+
+        pwd > $resdir/$ds/testid.txt
+        if test -d .git
+        then
+                git status >> $resdir/$ds/testid.txt
+                git rev-parse HEAD >> $resdir/$ds/testid.txt
+        fi
 fi
 
+# Create a file of test-name/#cpus pairs, sorted by decreasing #cpus.
+touch $T/cfgcpu
 for CF in $configs
 do
-        # Running TREE01 multiple times creates TREE01, TREE01.2, TREE01.3, ...
-        rd=$resdir/$ds/$CF
-        if test -d "${rd}"
+        if test -f "$CONFIGFRAG/$kversion/$CF"
         then
-                n="`ls -d "${rd}"* | grep '\.[0-9]\+$' |
-                        sed -e 's/^.*\.\([0-9]\+\)/\1/' |
-                        sort -k1n | tail -1`"
-                if test -z "$n"
-                then
-                        rd="${rd}.2"
-                else
-                        n="`expr $n + 1`"
-                        rd="${rd}.${n}"
-                fi
+                echo $CF `configNR_CPUS.sh $CONFIGFRAG/$kversion/$CF` >> $T/cfgcpu
+        else
+                echo "The --configs file $CF does not exist, terminating."
+                exit 1
         fi
-        mkdir "${rd}"
-        echo Results directory: $rd
-        kvm-test-1-rcu.sh $CONFIGFRAG/$kversion/$CF $builddir $rd $dur "-nographic $RCU_QEMU_ARG" "rcutorture.test_no_idle_hz=1 rcutorture.verbose=1 $RCU_BOOTARGS"
 done
+sort -k2nr $T/cfgcpu > $T/cfgcpu.sort
+
+# Use a greedy bin-packing algorithm, sorting the list accordingly.
+awk < $T/cfgcpu.sort > $T/cfgcpu.pack -v ncpus=$cpus '
+BEGIN {
+        njobs = 0;
+}
+
+{
+        # Read file of tests and corresponding required numbers of CPUs.
+        cf[njobs] = $1;
+        cpus[njobs] = $2;
+        njobs++;
+}
+
+END {
+        alldone = 0;
+        batch = 0;
+        nc = -1;
+
+        # Each pass through the following loop creates on test batch
+        # that can be executed concurrently given ncpus.  Note that a
+        # given test that requires more than the available CPUs will run in
+        # their own batch.  Such tests just have to make do with what
+        # is available.
+        while (nc != ncpus) {
+                batch++;
+                nc = ncpus;
+
+                # Each pass through the following loop considers one
+                # test for inclusion in the current batch.
+                for (i = 0; i < njobs; i++) {
+                        if (done[i])
+                                continue; # Already part of a batch.
+                        if (nc >= cpus[i] || nc == ncpus) {
+
+                                # This test fits into the current batch.
+                                done[i] = batch;
+                                nc -= cpus[i];
+                                if (nc <= 0)
+                                        break; # Too-big test in its own batch.
+                        }
+                }
+        }
+
+        # Dump out the tests in batch order.
+        for (b = 1; b <= batch; b++)
+                for (i = 0; i < njobs; i++)
+                        if (done[i] == b)
+                                print cf[i], cpus[i];
+}'
+
+# Generate a script to execute the tests in appropriate batches.
+cat << ___EOF___ > $T/script
+TORTURE_SUITE="$TORTURE_SUITE"; export TORTURE_SUITE
+___EOF___
+awk < $T/cfgcpu.pack \
+        -v CONFIGDIR="$CONFIGFRAG/$kversion/" \
+        -v KVM="$KVM" \
+        -v ncpus=$cpus \
+        -v rd=$resdir/$ds/ \
+        -v dur=$dur \
+        -v RCU_QEMU_ARG=$RCU_QEMU_ARG \
+        -v RCU_BOOTARGS=$RCU_BOOTARGS \
+'BEGIN {
+        i = 0;
+}
+
+{
+        cf[i] = $1;
+        cpus[i] = $2;
+        i++;
+}
+
+# Dump out the scripting required to run one test batch.
+function dump(first, pastlast)
+{
+        print "echo ----Start batch: `date`";
+        print "echo ----Start batch: `date` >> " rd "/log";
+        jn=1
+        for (j = first; j < pastlast; j++) {
+                builddir=KVM "/b" jn
+                cpusr[jn] = cpus[j];
+                if (cfrep[cf[j]] == "") {
+                        cfr[jn] = cf[j];
+                        cfrep[cf[j]] = 1;
+                } else {
+                        cfrep[cf[j]]++;
+                        cfr[jn] = cf[j] "." cfrep[cf[j]];
+                }
+                if (cpusr[jn] > ncpus && ncpus != 0)
+                        ovf = "(!)";
+                else
+                        ovf = "";
+                print "echo ", cfr[jn], cpusr[jn] ovf ": Starting build. `date`";
+                print "echo ", cfr[jn], cpusr[jn] ovf ": Starting build. `date` >> " rd "/log";
+                print "rm -f " builddir ".*";
+                print "touch " builddir ".wait";
+                print "mkdir " builddir " > /dev/null 2>&1 || :";
+                print "mkdir " rd cfr[jn] " || :";
+                print "kvm-test-1-run.sh " CONFIGDIR cf[j], builddir, rd cfr[jn], dur " \"" RCU_QEMU_ARG "\" \"" RCU_BOOTARGS "\" > " rd cfr[jn]  "/kvm-test-1-run.sh.out 2>&1 &"
+                print "echo ", cfr[jn], cpusr[jn] ovf ": Waiting for build to complete. `date`";
+                print "echo ", cfr[jn], cpusr[jn] ovf ": Waiting for build to complete. `date` >> " rd "/log";
+                print "while test -f " builddir ".wait"
+                print "do"
+                print "\tsleep 1"
+                print "done"
+                print "echo ", cfr[jn], cpusr[jn] ovf ": Build complete. `date`";
+                print "echo ", cfr[jn], cpusr[jn] ovf ": Build complete. `date` >> " rd "/log";
+                jn++;
+        }
+        for (j = 1; j < jn; j++) {
+                builddir=KVM "/b" j
+                print "rm -f " builddir ".ready"
+                print "echo ----", cfr[j], cpusr[j] ovf ": Starting kernel. `date`";
+                print "echo ----", cfr[j], cpusr[j] ovf ": Starting kernel. `date` >> " rd "/log";
+        }
+        print "wait"
+        print "echo ---- All kernel runs complete. `date`";
+        print "echo ---- All kernel runs complete. `date` >> " rd "/log";
+        for (j = 1; j < jn; j++) {
+                builddir=KVM "/b" j
+                print "echo ----", cfr[j], cpusr[j] ovf ": Build/run results:";
+                print "echo ----", cfr[j], cpusr[j] ovf ": Build/run results: >> " rd "/log";
+                print "cat " rd cfr[j]  "/kvm-test-1-run.sh.out";
+                print "cat " rd cfr[j]  "/kvm-test-1-run.sh.out >> " rd "/log";
+        }
+}
+
+END {
+        njobs = i;
+        nc = ncpus;
+        first = 0;
+
+        # Each pass through the following loop considers one test.
+        for (i = 0; i < njobs; i++) {
+                if (ncpus == 0) {
+                        # Sequential test specified, each test its own batch.
+                        dump(i, i + 1);
+                        first = i;
+                } else if (nc < cpus[i] && i != 0) {
+                        # Out of CPUs, dump out a batch.
+                        dump(first, i);
+                        first = i;
+                        nc = ncpus;
+                }
+                # Account for the CPUs needed by the current test.
+                nc -= cpus[i];
+        }
+        # Dump the last batch.
+        if (ncpus != 0)
+                dump(first, i);
+}' >> $T/script
+
+if test "$dryrun" = script
+then
+        # Dump out the script, but define the environment variables that
+        # it needs to run standalone.
+        echo CONFIGFRAG="$CONFIGFRAG; export CONFIGFRAG"
+        echo KVM="$KVM; export KVM"
+        echo KVPATH="$KVPATH; export KVPATH"
+        echo PATH="$PATH; export PATH"
+        echo RCU_BUILDONLY="$RCU_BUILDONLY; export RCU_BUILDONLY"
+        echo RCU_INITRD="$RCU_INITRD; export RCU_INITRD"
+        echo RCU_KMAKE_ARG="$RCU_KMAKE_ARG; export RCU_KMAKE_ARG"
+        echo RCU_QEMU_CMD="$RCU_QEMU_CMD; export RCU_QEMU_CMD"
+        echo RCU_QEMU_INTERACTIVE="$RCU_QEMU_INTERACTIVE; export RCU_QEMU_INTERACTIVE"
+        echo RCU_QEMU_MAC="$RCU_QEMU_MAC; export RCU_QEMU_MAC"
+        echo "mkdir -p "$resdir" || :"
+        echo "mkdir $resdir/$ds"
+        cat $T/script
+        exit 0
+elif test "$dryrun" = sched
+then
+        # Extract the test run schedule from the script.
+        egrep 'start batch|Starting build\.' $T/script |
+                sed -e 's/:.*$//' -e 's/^echo //'
+        exit 0
+else
+        # Not a dryru, so run the script.
+        sh $T/script
+fi
+
 # Tracing: trace_event=rcu:rcu_grace_period,rcu:rcu_future_grace_period,rcu:rcu_grace_period_init,rcu:rcu_nocb_wake,rcu:rcu_preempt_task,rcu:rcu_unlock_preempted_task,rcu:rcu_quiescent_state_report,rcu:rcu_fqs,rcu:rcu_callback,rcu:rcu_kfree_callback,rcu:rcu_batch_start,rcu:rcu_invoke_callback,rcu:rcu_invoke_kfree_callback,rcu:rcu_batch_end,rcu:rcu_torture_read,rcu:rcu_barrier
 
+echo
+echo
 echo " --- `date` Test summary:"
+echo Results directory: $resdir/$ds
 kvm-recheck.sh $resdir/$ds
diff --git a/tools/testing/selftests/rcutorture/configs/lock/BUSTED b/tools/testing/selftests/rcutorture/configs/lock/BUSTED
new file mode 100644
index 000000000000..1d1da1477fc3
--- /dev/null
+++ b/tools/testing/selftests/rcutorture/configs/lock/BUSTED
@@ -0,0 +1,6 @@
+CONFIG_SMP=y
+CONFIG_NR_CPUS=4
+CONFIG_HOTPLUG_CPU=y
+CONFIG_PREEMPT_NONE=n
+CONFIG_PREEMPT_VOLUNTARY=n
+CONFIG_PREEMPT=y
diff --git a/tools/testing/selftests/rcutorture/configs/lock/BUSTED.boot b/tools/testing/selftests/rcutorture/configs/lock/BUSTED.boot
new file mode 100644
index 000000000000..6386c15e9770
--- /dev/null
+++ b/tools/testing/selftests/rcutorture/configs/lock/BUSTED.boot
@@ -0,0 +1 @@
+locktorture.torture_type=lock_busted
diff --git a/tools/testing/selftests/rcutorture/configs/lock/CFLIST b/tools/testing/selftests/rcutorture/configs/lock/CFLIST
new file mode 100644
index 000000000000..a061b22d1892
--- /dev/null
+++ b/tools/testing/selftests/rcutorture/configs/lock/CFLIST
@@ -0,0 +1 @@
+LOCK01
diff --git a/tools/testing/selftests/rcutorture/configs/lock/CFcommon b/tools/testing/selftests/rcutorture/configs/lock/CFcommon
new file mode 100644
index 000000000000..e372dc269254
--- /dev/null
+++ b/tools/testing/selftests/rcutorture/configs/lock/CFcommon
@@ -0,0 +1,2 @@
+CONFIG_LOCK_TORTURE_TEST=y
+CONFIG_PRINTK_TIME=y
diff --git a/tools/testing/selftests/rcutorture/configs/lock/LOCK01 b/tools/testing/selftests/rcutorture/configs/lock/LOCK01
new file mode 100644
index 000000000000..a9625e3d6cd9
--- /dev/null
+++ b/tools/testing/selftests/rcutorture/configs/lock/LOCK01
@@ -0,0 +1,6 @@
+CONFIG_SMP=y
+CONFIG_NR_CPUS=8
+CONFIG_HOTPLUG_CPU=y
+CONFIG_PREEMPT_NONE=n
+CONFIG_PREEMPT_VOLUNTARY=n
+CONFIG_PREEMPT=y
diff --git a/tools/testing/selftests/rcutorture/configs/lock/ver_functions.sh b/tools/testing/selftests/rcutorture/configs/lock/ver_functions.sh
new file mode 100644
index 000000000000..9746ea1cd6c7
--- /dev/null
+++ b/tools/testing/selftests/rcutorture/configs/lock/ver_functions.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+#
+# Kernel-version-dependent shell functions for the rest of the scripts.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, you can access it online at
+# http://www.gnu.org/licenses/gpl-2.0.html.
+#
+# Copyright (C) IBM Corporation, 2014
+#
+# Authors: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
+
+# locktorture_param_onoff bootparam-string config-file
+#
+# Adds onoff locktorture module parameters to kernels having it.
+locktorture_param_onoff () {
+        if ! bootparam_hotplug_cpu "$1" && configfrag_hotplug_cpu "$2"
+        then
+                echo CPU-hotplug kernel, adding locktorture onoff. 1>&2
+                echo locktorture.onoff_interval=3 locktorture.onoff_holdoff=30
+        fi
+}
+
+# per_version_boot_params bootparam-string config-file seconds
+#
+# Adds per-version torture-module parameters to kernels supporting them.
+per_version_boot_params () {
+        echo $1 `locktorture_param_onoff "$1" "$2"` \
+                locktorture.stat_interval=15 \
+                locktorture.shutdown_secs=$3 \
+                locktorture.locktorture_runnable=1 \
+                locktorture.verbose=1
+}
diff --git a/tools/testing/selftests/rcutorture/configs/rcu/BUSTED b/tools/testing/selftests/rcutorture/configs/rcu/BUSTED
new file mode 100644
index 000000000000..48d8a245c7fa
--- /dev/null
+++ b/tools/testing/selftests/rcutorture/configs/rcu/BUSTED
@@ -0,0 +1,7 @@
+CONFIG_RCU_TRACE=n
+CONFIG_SMP=y
+CONFIG_NR_CPUS=4
+CONFIG_HOTPLUG_CPU=y
+CONFIG_PREEMPT_NONE=n
+CONFIG_PREEMPT_VOLUNTARY=n
+CONFIG_PREEMPT=y
diff --git a/tools/testing/selftests/rcutorture/configs/rcu/BUSTED.boot b/tools/testing/selftests/rcutorture/configs/rcu/BUSTED.boot
new file mode 100644
index 000000000000..6804f9dcfc1b
--- /dev/null
+++ b/tools/testing/selftests/rcutorture/configs/rcu/BUSTED.boot
@@ -0,0 +1 @@
+rcutorture.torture_type=rcu_busted
diff --git a/tools/testing/selftests/rcutorture/configs/CFLIST b/tools/testing/selftests/rcutorture/configs/rcu/CFLIST
index cd3d29cb0a47..cd3d29cb0a47 100644
--- a/tools/testing/selftests/rcutorture/configs/CFLIST
+++ b/tools/testing/selftests/rcutorture/configs/rcu/CFLIST
diff --git a/tools/testing/selftests/rcutorture/configs/rcu/CFcommon b/tools/testing/selftests/rcutorture/configs/rcu/CFcommon
new file mode 100644
index 000000000000..d2d2a86139db
--- /dev/null
+++ b/tools/testing/selftests/rcutorture/configs/rcu/CFcommon
@@ -0,0 +1,2 @@
+CONFIG_RCU_TORTURE_TEST=y
+CONFIG_PRINTK_TIME=y
diff --git a/tools/testing/selftests/rcutorture/configs/SRCU-N b/tools/testing/selftests/rcutorture/configs/rcu/SRCU-N
index 10a0e27f4c75..9fbb41b9b314 100644
--- a/tools/testing/selftests/rcutorture/configs/SRCU-N
+++ b/tools/testing/selftests/rcutorture/configs/rcu/SRCU-N
@@ -1,8 +1,7 @@
 CONFIG_RCU_TRACE=n
 CONFIG_SMP=y
-CONFIG_NR_CPUS=8
+CONFIG_NR_CPUS=4
 CONFIG_HOTPLUG_CPU=y
 CONFIG_PREEMPT_NONE=y
 CONFIG_PREEMPT_VOLUNTARY=n
 CONFIG_PREEMPT=n
-CONFIG_PRINTK_TIME=y
diff --git a/tools/testing/selftests/rcutorture/configs/SRCU-N.boot b/tools/testing/selftests/rcutorture/configs/rcu/SRCU-N.boot
index 238bfe3bd0cc..238bfe3bd0cc 100644
--- a/tools/testing/selftests/rcutorture/configs/SRCU-N.boot
+++ b/tools/testing/selftests/rcutorture/configs/rcu/SRCU-N.boot
diff --git a/tools/testing/selftests/rcutorture/configs/SRCU-P b/tools/testing/selftests/rcutorture/configs/rcu/SRCU-P
index 6650e00c6d91..4b6f272dba27 100644
--- a/tools/testing/selftests/rcutorture/configs/SRCU-P
+++ b/tools/testing/selftests/rcutorture/configs/rcu/SRCU-P
@@ -5,4 +5,3 @@ CONFIG_HOTPLUG_CPU=y
 CONFIG_PREEMPT_NONE=n
 CONFIG_PREEMPT_VOLUNTARY=n
 CONFIG_PREEMPT=y
-CONFIG_PRINTK_TIME=y
diff --git a/tools/testing/selftests/rcutorture/configs/SRCU-P.boot b/tools/testing/selftests/rcutorture/configs/rcu/SRCU-P.boot
index 238bfe3bd0cc..238bfe3bd0cc 100644
--- a/tools/testing/selftests/rcutorture/configs/SRCU-P.boot
+++ b/tools/testing/selftests/rcutorture/configs/rcu/SRCU-P.boot
diff --git a/tools/testing/selftests/rcutorture/configs/TINY01 b/tools/testing/selftests/rcutorture/configs/rcu/TINY01
index 0c2823f21712..0a63e073a00c 100644
--- a/tools/testing/selftests/rcutorture/configs/TINY01
+++ b/tools/testing/selftests/rcutorture/configs/rcu/TINY01
@@ -10,4 +10,3 @@ CONFIG_RCU_TRACE=n
 CONFIG_DEBUG_LOCK_ALLOC=n
 CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
 CONFIG_PREEMPT_COUNT=n
-CONFIG_PRINTK_TIME=y
diff --git a/tools/testing/selftests/rcutorture/configs/TINY02 b/tools/testing/selftests/rcutorture/configs/rcu/TINY02
index e5072d7528b6..f4feaee40776 100644
--- a/tools/testing/selftests/rcutorture/configs/TINY02
+++ b/tools/testing/selftests/rcutorture/configs/rcu/TINY02
@@ -10,4 +10,3 @@ CONFIG_RCU_TRACE=y
 CONFIG_DEBUG_LOCK_ALLOC=y
 CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
 CONFIG_PREEMPT_COUNT=y
-CONFIG_PRINTK_TIME=y
diff --git a/tools/testing/selftests/rcutorture/configs/TREE01 b/tools/testing/selftests/rcutorture/configs/rcu/TREE01
index 141119a00044..9c827ec59a97 100644
--- a/tools/testing/selftests/rcutorture/configs/TREE01
+++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE01
@@ -20,4 +20,3 @@ CONFIG_RCU_CPU_STALL_INFO=n
 CONFIG_RCU_CPU_STALL_VERBOSE=n
 CONFIG_RCU_BOOST=n
 CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
-CONFIG_PRINTK_TIME=y
diff --git a/tools/testing/selftests/rcutorture/configs/TREE01.boot b/tools/testing/selftests/rcutorture/configs/rcu/TREE01.boot
index 0fc8a3428938..0fc8a3428938 100644
--- a/tools/testing/selftests/rcutorture/configs/TREE01.boot
+++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE01.boot
diff --git a/tools/testing/selftests/rcutorture/configs/TREE02 b/tools/testing/selftests/rcutorture/configs/rcu/TREE02
index 2d4d09608528..1a777b5f68b5 100644
--- a/tools/testing/selftests/rcutorture/configs/TREE02
+++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE02
@@ -7,7 +7,7 @@ CONFIG_PREEMPT=y
 CONFIG_HZ_PERIODIC=n
 CONFIG_NO_HZ_IDLE=y
 CONFIG_NO_HZ_FULL=n
-CONFIG_RCU_FAST_NO_HZ=n 
+CONFIG_RCU_FAST_NO_HZ=n
 CONFIG_RCU_TRACE=n
 CONFIG_HOTPLUG_CPU=n
 CONFIG_SUSPEND=n
@@ -23,4 +23,3 @@ CONFIG_RCU_CPU_STALL_INFO=n
 CONFIG_RCU_CPU_STALL_VERBOSE=y
 CONFIG_RCU_BOOST=n
 CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
-CONFIG_PRINTK_TIME=y
diff --git a/tools/testing/selftests/rcutorture/configs/TREE03 b/tools/testing/selftests/rcutorture/configs/rcu/TREE03
index a47de5be8a04..c1f111c1561b 100644
--- a/tools/testing/selftests/rcutorture/configs/TREE03
+++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE03
@@ -20,4 +20,3 @@ CONFIG_RCU_CPU_STALL_VERBOSE=n
 CONFIG_RCU_BOOST=y
 CONFIG_RCU_BOOST_PRIO=2
 CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
-CONFIG_PRINTK_TIME=y
diff --git a/tools/testing/selftests/rcutorture/configs/TREE04 b/tools/testing/selftests/rcutorture/configs/rcu/TREE04
index 8d839b86a1d5..7dbd27ce17a4 100644
--- a/tools/testing/selftests/rcutorture/configs/TREE04
+++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE04
@@ -22,4 +22,3 @@ CONFIG_PROVE_RCU_DELAY=n
 CONFIG_RCU_CPU_STALL_INFO=y
 CONFIG_RCU_CPU_STALL_VERBOSE=y
 CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
-CONFIG_PRINTK_TIME=y
diff --git a/tools/testing/selftests/rcutorture/configs/TREE04.boot b/tools/testing/selftests/rcutorture/configs/rcu/TREE04.boot
index 0fc8a3428938..0fc8a3428938 100644
--- a/tools/testing/selftests/rcutorture/configs/TREE04.boot
+++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE04.boot
diff --git a/tools/testing/selftests/rcutorture/configs/TREE05 b/tools/testing/selftests/rcutorture/configs/rcu/TREE05
index b5ba72ea25cb..d0f32e574743 100644
--- a/tools/testing/selftests/rcutorture/configs/TREE05
+++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE05
@@ -22,4 +22,3 @@ CONFIG_PROVE_RCU_DELAY=y
 CONFIG_RCU_CPU_STALL_INFO=n
 CONFIG_RCU_CPU_STALL_VERBOSE=n
 CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
-CONFIG_PRINTK_TIME=y
diff --git a/tools/testing/selftests/rcutorture/configs/TREE05.boot b/tools/testing/selftests/rcutorture/configs/rcu/TREE05.boot
index 3b42b8b033cd..3b42b8b033cd 100644
--- a/tools/testing/selftests/rcutorture/configs/TREE05.boot
+++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE05.boot
diff --git a/tools/testing/selftests/rcutorture/configs/TREE06 b/tools/testing/selftests/rcutorture/configs/rcu/TREE06
index 7c95ab48d29f..2e477dfb9c57 100644
--- a/tools/testing/selftests/rcutorture/configs/TREE06
+++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE06
@@ -23,4 +23,3 @@ CONFIG_PROVE_RCU_DELAY=n
 CONFIG_RCU_CPU_STALL_INFO=n
 CONFIG_RCU_CPU_STALL_VERBOSE=n
 CONFIG_DEBUG_OBJECTS_RCU_HEAD=y
-CONFIG_PRINTK_TIME=y
diff --git a/tools/testing/selftests/rcutorture/configs/TREE07 b/tools/testing/selftests/rcutorture/configs/rcu/TREE07
index 1467404bdec1..042f86ef362a 100644
--- a/tools/testing/selftests/rcutorture/configs/TREE07
+++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE07
@@ -21,4 +21,3 @@ CONFIG_PROVE_RCU_DELAY=n
 CONFIG_RCU_CPU_STALL_INFO=y
 CONFIG_RCU_CPU_STALL_VERBOSE=n
 CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
-CONFIG_PRINTK_TIME=y
diff --git a/tools/testing/selftests/rcutorture/configs/TREE08 b/tools/testing/selftests/rcutorture/configs/rcu/TREE08
index 7d097a61ac2a..3438cee1e3c5 100644
--- a/tools/testing/selftests/rcutorture/configs/TREE08
+++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE08
@@ -23,4 +23,3 @@ CONFIG_RCU_CPU_STALL_INFO=n
 CONFIG_RCU_CPU_STALL_VERBOSE=n
 CONFIG_RCU_BOOST=n
 CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
-CONFIG_PRINTK_TIME=y
diff --git a/tools/testing/selftests/rcutorture/configs/TREE08-T b/tools/testing/selftests/rcutorture/configs/rcu/TREE08-T
index 442c4e450ab3..bf4523d3e44c 100644
--- a/tools/testing/selftests/rcutorture/configs/TREE08-T
+++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE08-T
@@ -23,4 +23,3 @@ CONFIG_RCU_CPU_STALL_INFO=n
 CONFIG_RCU_CPU_STALL_VERBOSE=n
 CONFIG_RCU_BOOST=n
 CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
-CONFIG_PRINTK_TIME=y
diff --git a/tools/testing/selftests/rcutorture/configs/TREE09 b/tools/testing/selftests/rcutorture/configs/rcu/TREE09
index 0d1ec0d3dfee..81e4f7c0bf0b 100644
--- a/tools/testing/selftests/rcutorture/configs/TREE09
+++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE09
@@ -18,4 +18,3 @@ CONFIG_RCU_CPU_STALL_INFO=n
 CONFIG_RCU_CPU_STALL_VERBOSE=n
 CONFIG_RCU_BOOST=n
 CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
-CONFIG_PRINTK_TIME=y
diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/CFLIST b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/CFLIST
index 18223947bbcb..18223947bbcb 100644
--- a/tools/testing/selftests/rcutorture/configs/v0.0/CFLIST
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/CFLIST
diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/N1-S-T-NH-SD-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/N1-S-T-NH-SD-SMP-HP
index d3ef873eb6e7..d3ef873eb6e7 100644
--- a/tools/testing/selftests/rcutorture/configs/v0.0/N1-S-T-NH-SD-SMP-HP
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/N1-S-T-NH-SD-SMP-HP
diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/N2-2-t-nh-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/N2-2-t-nh-sd-SMP-hp
index 02e418572b1b..02e418572b1b 100644
--- a/tools/testing/selftests/rcutorture/configs/v0.0/N2-2-t-nh-sd-SMP-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/N2-2-t-nh-sd-SMP-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/N3-3-T-nh-SD-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/N3-3-T-nh-SD-SMP-hp
index b3100f69c8cf..b3100f69c8cf 100644
--- a/tools/testing/selftests/rcutorture/configs/v0.0/N3-3-T-nh-SD-SMP-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/N3-3-T-nh-SD-SMP-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/N4-A-t-NH-sd-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/N4-A-t-NH-sd-SMP-HP
index c56b44530725..c56b44530725 100644
--- a/tools/testing/selftests/rcutorture/configs/v0.0/N4-A-t-NH-sd-SMP-HP
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/N4-A-t-NH-sd-SMP-HP
diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/N5-U-T-NH-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/N5-U-T-NH-sd-SMP-hp
index 90d924fea9e9..90d924fea9e9 100644
--- a/tools/testing/selftests/rcutorture/configs/v0.0/N5-U-T-NH-sd-SMP-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/N5-U-T-NH-sd-SMP-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/NT1-nh b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/NT1-nh
index 023f312a931c..023f312a931c 100644
--- a/tools/testing/selftests/rcutorture/configs/v0.0/NT1-nh
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/NT1-nh
diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/NT3-NH b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/NT3-NH
index 6fd0235dae73..6fd0235dae73 100644
--- a/tools/testing/selftests/rcutorture/configs/v0.0/NT3-NH
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/NT3-NH
diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/P1-S-T-NH-SD-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/P1-S-T-NH-SD-SMP-HP
index f72402d7c13d..f72402d7c13d 100644
--- a/tools/testing/selftests/rcutorture/configs/v0.0/P1-S-T-NH-SD-SMP-HP
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/P1-S-T-NH-SD-SMP-HP
diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/P2-2-t-nh-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/P2-2-t-nh-sd-SMP-hp
index 0f3b667d2a9f..0f3b667d2a9f 100644
--- a/tools/testing/selftests/rcutorture/configs/v0.0/P2-2-t-nh-sd-SMP-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/P2-2-t-nh-sd-SMP-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/P3-3-T-nh-SD-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/P3-3-T-nh-SD-SMP-hp
index b035e141bf2a..b035e141bf2a 100644
--- a/tools/testing/selftests/rcutorture/configs/v0.0/P3-3-T-nh-SD-SMP-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/P3-3-T-nh-SD-SMP-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/P4-A-t-NH-sd-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/P4-A-t-NH-sd-SMP-HP
index 3ccf6a9447f5..3ccf6a9447f5 100644
--- a/tools/testing/selftests/rcutorture/configs/v0.0/P4-A-t-NH-sd-SMP-HP
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/P4-A-t-NH-sd-SMP-HP
diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/P5-U-T-NH-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/P5-U-T-NH-sd-SMP-hp
index ef624ce73d8e..ef624ce73d8e 100644
--- a/tools/testing/selftests/rcutorture/configs/v0.0/P5-U-T-NH-sd-SMP-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/P5-U-T-NH-sd-SMP-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/PT1-nh b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/PT1-nh
index e3361c3894a1..e3361c3894a1 100644
--- a/tools/testing/selftests/rcutorture/configs/v0.0/PT1-nh
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/PT1-nh
diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/PT2-NH b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/PT2-NH
index 64abfc3b4d94..64abfc3b4d94 100644
--- a/tools/testing/selftests/rcutorture/configs/v0.0/PT2-NH
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/PT2-NH
diff --git a/tools/testing/selftests/rcutorture/configs/v0.0/ver_functions.sh b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/ver_functions.sh
index e8052539af54..5ace37a89780 100644
--- a/tools/testing/selftests/rcutorture/configs/v0.0/ver_functions.sh
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/ver_functions.sh
@@ -20,16 +20,14 @@
 #
 # Authors: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
 
-# rcutorture_param_n_barrier_cbs bootparam-string
-#
-# Adds n_barrier_cbs rcutorture module parameter to kernels having it.
-rcutorture_param_n_barrier_cbs () {
-        echo $1
-}
-
-# rcutorture_param_onoff bootparam-string config-file
-#
-# Adds onoff rcutorture module parameters to kernels having it.
-rcutorture_param_onoff () {
-        echo $1
+# per_version_boot_params bootparam-string config-file seconds
+#
+# Adds per-version torture-module parameters to kernels supporting them.
+# Which old kernels do not.
+per_version_boot_params () {
+        echo    rcutorture.stat_interval=15 \
+                rcutorture.shutdown_secs=$3 \
+                rcutorture.rcutorture_runnable=1 \
+                rcutorture.test_no_idle_hz=1 \
+                rcutorture.verbose=1
 }
diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/CFLIST b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/CFLIST
index da4cbc668f2a..da4cbc668f2a 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.12/CFLIST
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/CFLIST
diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/N1-S-T-NH-SD-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N1-S-T-NH-SD-SMP-HP
index d81e11d280aa..d81e11d280aa 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.12/N1-S-T-NH-SD-SMP-HP
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N1-S-T-NH-SD-SMP-HP
diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/N2-2-t-nh-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N2-2-t-nh-sd-SMP-hp
index 02e418572b1b..02e418572b1b 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.12/N2-2-t-nh-sd-SMP-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N2-2-t-nh-sd-SMP-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/N3-3-T-nh-SD-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N3-3-T-nh-SD-SMP-hp
index b3100f69c8cf..b3100f69c8cf 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.12/N3-3-T-nh-SD-SMP-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N3-3-T-nh-SD-SMP-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/N4-A-t-NH-sd-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N4-A-t-NH-sd-SMP-HP
index c56b44530725..c56b44530725 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.12/N4-A-t-NH-sd-SMP-HP
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N4-A-t-NH-sd-SMP-HP
diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/N5-U-T-NH-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N5-U-T-NH-sd-SMP-hp
index 90d924fea9e9..90d924fea9e9 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.12/N5-U-T-NH-sd-SMP-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N5-U-T-NH-sd-SMP-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/N6---t-nh-SD-smp-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N6---t-nh-SD-smp-hp
index 0ccc36d72738..0ccc36d72738 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.12/N6---t-nh-SD-smp-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N6---t-nh-SD-smp-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/N7-4-T-NH-SD-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N7-4-T-NH-SD-SMP-HP
index 3f640cf84973..3f640cf84973 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.12/N7-4-T-NH-SD-SMP-HP
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N7-4-T-NH-SD-SMP-HP
diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/N8-2-T-NH-SD-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N8-2-T-NH-SD-SMP-HP
index 285da2dd8ac3..285da2dd8ac3 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.12/N8-2-T-NH-SD-SMP-HP
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N8-2-T-NH-SD-SMP-HP
diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/NT1-nh b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/NT1-nh
index 023f312a931c..023f312a931c 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.12/NT1-nh
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/NT1-nh
diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/NT3-NH b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/NT3-NH
index 6fd0235dae73..6fd0235dae73 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.12/NT3-NH
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/NT3-NH
diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/P1-S-T-NH-SD-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P1-S-T-NH-SD-SMP-HP
index 9647c44cf4b7..9647c44cf4b7 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.12/P1-S-T-NH-SD-SMP-HP
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P1-S-T-NH-SD-SMP-HP
diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/P2-2-t-nh-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P2-2-t-nh-sd-SMP-hp
index 0f3b667d2a9f..0f3b667d2a9f 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.12/P2-2-t-nh-sd-SMP-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P2-2-t-nh-sd-SMP-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/P3-3-T-nh-SD-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P3-3-T-nh-SD-SMP-hp
index b035e141bf2a..b035e141bf2a 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.12/P3-3-T-nh-SD-SMP-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P3-3-T-nh-SD-SMP-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/P4-A-t-NH-sd-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P4-A-t-NH-sd-SMP-HP
index 3ccf6a9447f5..3ccf6a9447f5 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.12/P4-A-t-NH-sd-SMP-HP
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P4-A-t-NH-sd-SMP-HP
diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/P5-U-T-NH-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P5-U-T-NH-sd-SMP-hp
index ef624ce73d8e..ef624ce73d8e 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.12/P5-U-T-NH-sd-SMP-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P5-U-T-NH-sd-SMP-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/P6---t-nh-SD-smp-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P6---t-nh-SD-smp-hp
index f4c9175828bf..f4c9175828bf 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.12/P6---t-nh-SD-smp-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P6---t-nh-SD-smp-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP
index 77a8c5b75763..77a8c5b75763 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP
diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-all b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-all
index 0eecebc6e95f..0eecebc6e95f 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-all
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-all
diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-none b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-none
index 0eecebc6e95f..0eecebc6e95f 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-none
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-none
diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-hp
index 588bc70420cd..588bc70420cd 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/PT1-nh b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/PT1-nh
index e3361c3894a1..e3361c3894a1 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.12/PT1-nh
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/PT1-nh
diff --git a/tools/testing/selftests/rcutorture/configs/v3.12/PT2-NH b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/PT2-NH
index 64abfc3b4d94..64abfc3b4d94 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.12/PT2-NH
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/PT2-NH
diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/CFLIST b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/CFLIST
index 18223947bbcb..18223947bbcb 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.3/CFLIST
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/CFLIST
diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/N1-S-T-NH-SD-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/N1-S-T-NH-SD-SMP-HP
index d81e11d280aa..d81e11d280aa 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.3/N1-S-T-NH-SD-SMP-HP
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/N1-S-T-NH-SD-SMP-HP
diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/N2-2-t-nh-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/N2-2-t-nh-sd-SMP-hp
index 02e418572b1b..02e418572b1b 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.3/N2-2-t-nh-sd-SMP-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/N2-2-t-nh-sd-SMP-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/N3-3-T-nh-SD-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/N3-3-T-nh-SD-SMP-hp
index b3100f69c8cf..b3100f69c8cf 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.3/N3-3-T-nh-SD-SMP-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/N3-3-T-nh-SD-SMP-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/N4-A-t-NH-sd-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/N4-A-t-NH-sd-SMP-HP
index c56b44530725..c56b44530725 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.3/N4-A-t-NH-sd-SMP-HP
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/N4-A-t-NH-sd-SMP-HP
diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/N5-U-T-NH-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/N5-U-T-NH-sd-SMP-hp
index 90d924fea9e9..90d924fea9e9 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.3/N5-U-T-NH-sd-SMP-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/N5-U-T-NH-sd-SMP-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/NT1-nh b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/NT1-nh
index 023f312a931c..023f312a931c 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.3/NT1-nh
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/NT1-nh
diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/NT3-NH b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/NT3-NH
index 6fd0235dae73..6fd0235dae73 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.3/NT3-NH
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/NT3-NH
diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/P1-S-T-NH-SD-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/P1-S-T-NH-SD-SMP-HP
index 9647c44cf4b7..9647c44cf4b7 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.3/P1-S-T-NH-SD-SMP-HP
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/P1-S-T-NH-SD-SMP-HP
diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/P2-2-t-nh-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/P2-2-t-nh-sd-SMP-hp
index 0f3b667d2a9f..0f3b667d2a9f 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.3/P2-2-t-nh-sd-SMP-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/P2-2-t-nh-sd-SMP-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/P3-3-T-nh-SD-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/P3-3-T-nh-SD-SMP-hp
index b035e141bf2a..b035e141bf2a 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.3/P3-3-T-nh-SD-SMP-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/P3-3-T-nh-SD-SMP-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/P4-A-t-NH-sd-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/P4-A-t-NH-sd-SMP-HP
index 3ccf6a9447f5..3ccf6a9447f5 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.3/P4-A-t-NH-sd-SMP-HP
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/P4-A-t-NH-sd-SMP-HP
diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/P5-U-T-NH-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/P5-U-T-NH-sd-SMP-hp
index ef624ce73d8e..ef624ce73d8e 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.3/P5-U-T-NH-sd-SMP-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/P5-U-T-NH-sd-SMP-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/PT1-nh b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/PT1-nh
index e3361c3894a1..e3361c3894a1 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.3/PT1-nh
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/PT1-nh
diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/PT2-NH b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/PT2-NH
index 64abfc3b4d94..64abfc3b4d94 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.3/PT2-NH
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/PT2-NH
diff --git a/tools/testing/selftests/rcutorture/configs/ver_functions.sh b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/ver_functions.sh
index 5e40eadea777..bae55692ce6e 100644
--- a/tools/testing/selftests/rcutorture/configs/ver_functions.sh
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/ver_functions.sh
@@ -20,18 +20,6 @@
 #
 # Authors: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
 
-# rcutorture_param_n_barrier_cbs bootparam-string
-#
-# Adds n_barrier_cbs rcutorture module parameter to kernels having it.
-rcutorture_param_n_barrier_cbs () {
-        if echo $1 | grep -q "rcutorture\.n_barrier_cbs"
-        then
-                echo $1
-        else
-                echo $1 rcutorture.n_barrier_cbs=4
-        fi
-}
-
 # rcutorture_param_onoff bootparam-string config-file
 #
 # Adds onoff rcutorture module parameters to kernels having it.
@@ -39,8 +27,18 @@ rcutorture_param_onoff () {
         if ! bootparam_hotplug_cpu "$1" && configfrag_hotplug_cpu "$2"
         then
                 echo CPU-hotplug kernel, adding rcutorture onoff. 1>&2
-                echo $1 rcutorture.onoff_interval=3 rcutorture.onoff_holdoff=30
-        else
-                echo $1
+                echo rcutorture.onoff_interval=3 rcutorture.onoff_holdoff=30
         fi
 }
+
+# per_version_boot_params bootparam-string config-file seconds
+#
+# Adds per-version torture-module parameters to kernels supporting them.
+per_version_boot_params () {
+        echo $1 `rcutorture_param_onoff "$1" "$2"` \
+                rcutorture.stat_interval=15 \
+                rcutorture.shutdown_secs=$3 \
+                rcutorture.rcutorture_runnable=1 \
+                rcutorture.test_no_idle_hz=1 \
+                rcutorture.verbose=1
+}
diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/CFLIST b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/CFLIST
index 18223947bbcb..18223947bbcb 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.5/CFLIST
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/CFLIST
diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/N1-S-T-NH-SD-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/N1-S-T-NH-SD-SMP-HP
index d81e11d280aa..d81e11d280aa 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.5/N1-S-T-NH-SD-SMP-HP
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/N1-S-T-NH-SD-SMP-HP
diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/N2-2-t-nh-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/N2-2-t-nh-sd-SMP-hp
index 02e418572b1b..02e418572b1b 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.5/N2-2-t-nh-sd-SMP-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/N2-2-t-nh-sd-SMP-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/N3-3-T-nh-SD-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/N3-3-T-nh-SD-SMP-hp
index b3100f69c8cf..b3100f69c8cf 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.5/N3-3-T-nh-SD-SMP-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/N3-3-T-nh-SD-SMP-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/N4-A-t-NH-sd-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/N4-A-t-NH-sd-SMP-HP
index c56b44530725..c56b44530725 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.5/N4-A-t-NH-sd-SMP-HP
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/N4-A-t-NH-sd-SMP-HP
diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/N5-U-T-NH-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/N5-U-T-NH-sd-SMP-hp
index 90d924fea9e9..90d924fea9e9 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.5/N5-U-T-NH-sd-SMP-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/N5-U-T-NH-sd-SMP-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/NT1-nh b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/NT1-nh
index 023f312a931c..023f312a931c 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.5/NT1-nh
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/NT1-nh
diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/NT3-NH b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/NT3-NH
index 6fd0235dae73..6fd0235dae73 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.5/NT3-NH
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/NT3-NH
diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/P1-S-T-NH-SD-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/P1-S-T-NH-SD-SMP-HP
index 9647c44cf4b7..9647c44cf4b7 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.5/P1-S-T-NH-SD-SMP-HP
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/P1-S-T-NH-SD-SMP-HP
diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/P2-2-t-nh-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/P2-2-t-nh-sd-SMP-hp
index 0f3b667d2a9f..0f3b667d2a9f 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.5/P2-2-t-nh-sd-SMP-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/P2-2-t-nh-sd-SMP-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/P3-3-T-nh-SD-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/P3-3-T-nh-SD-SMP-hp
index b035e141bf2a..b035e141bf2a 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.5/P3-3-T-nh-SD-SMP-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/P3-3-T-nh-SD-SMP-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/P4-A-t-NH-sd-SMP-HP b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/P4-A-t-NH-sd-SMP-HP
index 3ccf6a9447f5..3ccf6a9447f5 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.5/P4-A-t-NH-sd-SMP-HP
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/P4-A-t-NH-sd-SMP-HP
diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/P5-U-T-NH-sd-SMP-hp b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/P5-U-T-NH-sd-SMP-hp
index ef624ce73d8e..ef624ce73d8e 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.5/P5-U-T-NH-sd-SMP-hp
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/P5-U-T-NH-sd-SMP-hp
diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/PT1-nh b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/PT1-nh
index e3361c3894a1..e3361c3894a1 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.5/PT1-nh
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/PT1-nh
diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/PT2-NH b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/PT2-NH
index 64abfc3b4d94..64abfc3b4d94 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.5/PT2-NH
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/PT2-NH
diff --git a/tools/testing/selftests/rcutorture/configs/v3.5/ver_functions.sh b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/ver_functions.sh
index 6a5f13aab44d..8977d8d31b19 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.5/ver_functions.sh
+++ b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/ver_functions.sh
@@ -26,9 +26,9 @@
 rcutorture_param_n_barrier_cbs () {
         if echo $1 | grep -q "rcutorture\.n_barrier_cbs"
         then
-                echo $1
+                :
         else
-                echo $1 rcutorture.n_barrier_cbs=4
+                echo rcutorture.n_barrier_cbs=4
         fi
 }
 
@@ -38,9 +38,20 @@ rcutorture_param_n_barrier_cbs () {
 rcutorture_param_onoff () {
         if ! bootparam_hotplug_cpu "$1" && configfrag_hotplug_cpu "$2"
         then
-                echo CPU-hotplug kernel, adding rcutorture onoff.
-                echo $1 rcutorture.onoff_interval=3 rcutorture.onoff_holdoff=30
-        else
-                echo $1
+                echo CPU-hotplug kernel, adding rcutorture onoff. 1>&2
+                echo rcutorture.onoff_interval=3 rcutorture.onoff_holdoff=30
         fi
 }
+
+# per_version_boot_params bootparam-string config-file seconds
+#
+# Adds per-version torture-module parameters to kernels supporting them.
+per_version_boot_params () {
+        echo $1 `rcutorture_param_onoff "$1" "$2"` \
+                `rcutorture_param_n_barrier_cbs "$1"` \
+                rcutorture.stat_interval=15 \
+                rcutorture.shutdown_secs=$3 \
+                rcutorture.rcutorture_runnable=1 \
+                rcutorture.test_no_idle_hz=1 \
+                rcutorture.verbose=1
+}
diff --git a/tools/testing/selftests/rcutorture/configs/v3.3/ver_functions.sh b/tools/testing/selftests/rcutorture/configs/rcu/ver_functions.sh
index c37432f3572c..8977d8d31b19 100644
--- a/tools/testing/selftests/rcutorture/configs/v3.3/ver_functions.sh
+++ b/tools/testing/selftests/rcutorture/configs/rcu/ver_functions.sh
@@ -24,7 +24,12 @@
 #
 # Adds n_barrier_cbs rcutorture module parameter to kernels having it.
 rcutorture_param_n_barrier_cbs () {
-        echo $1
+        if echo $1 | grep -q "rcutorture\.n_barrier_cbs"
+        then
+                :
+        else
+                echo rcutorture.n_barrier_cbs=4
+        fi
 }
 
 # rcutorture_param_onoff bootparam-string config-file
@@ -33,9 +38,20 @@ rcutorture_param_n_barrier_cbs () {
 rcutorture_param_onoff () {
         if ! bootparam_hotplug_cpu "$1" && configfrag_hotplug_cpu "$2"
         then
-                echo CPU-hotplug kernel, adding rcutorture onoff.
-                echo $1 rcutorture.onoff_interval=3 rcutorture.onoff_holdoff=30
-        else
-                echo $1
+                echo CPU-hotplug kernel, adding rcutorture onoff. 1>&2
+                echo rcutorture.onoff_interval=3 rcutorture.onoff_holdoff=30
         fi
 }
+
+# per_version_boot_params bootparam-string config-file seconds
+#
+# Adds per-version torture-module parameters to kernels supporting them.
+per_version_boot_params () {
+        echo $1 `rcutorture_param_onoff "$1" "$2"` \
+                `rcutorture_param_n_barrier_cbs "$1"` \
+                rcutorture.stat_interval=15 \
+                rcutorture.shutdown_secs=$3 \
+                rcutorture.rcutorture_runnable=1 \
+                rcutorture.test_no_idle_hz=1 \
+                rcutorture.verbose=1
+}
diff --git a/tools/testing/selftests/rcutorture/doc/TREE_RCU-Kconfig.txt b/tools/testing/selftests/rcutorture/doc/TREE_RCU-kconfig.txt
index adbb76cffb49..adbb76cffb49 100644
--- a/tools/testing/selftests/rcutorture/doc/TREE_RCU-Kconfig.txt
+++ b/tools/testing/selftests/rcutorture/doc/TREE_RCU-kconfig.txt
diff --git a/tools/virtio/linux/kmemleak.h b/tools/virtio/linux/kmemleak.h
new file mode 100644
index 000000000000..c07072270e2f
--- /dev/null
+++ b/tools/virtio/linux/kmemleak.h
@@ -0,0 +1,3 @@
+static inline void kmemleak_ignore(const void *ptr)
+{
+}
diff --git a/tools/virtio/linux/virtio.h b/tools/virtio/linux/virtio.h
index 844783040703..5a2d1f0f6bc7 100644
--- a/tools/virtio/linux/virtio.h
+++ b/tools/virtio/linux/virtio.h
@@ -63,7 +63,7 @@ int virtqueue_add_inbuf(struct virtqueue *vq,
                         void *data,
                         gfp_t gfp);
 
-void virtqueue_kick(struct virtqueue *vq);
+bool virtqueue_kick(struct virtqueue *vq);
 
 void *virtqueue_get_buf(struct virtqueue *vq, unsigned int *len);
 
@@ -79,7 +79,7 @@ struct virtqueue *vring_new_virtqueue(unsigned int index,
                                       struct virtio_device *vdev,
                                       bool weak_barriers,
                                       void *pages,
-                                      void (*notify)(struct virtqueue *vq),
+                                      bool (*notify)(struct virtqueue *vq),
                                       void (*callback)(struct virtqueue *vq),
                                       const char *name);
 void vring_del_virtqueue(struct virtqueue *vq);
diff --git a/tools/virtio/virtio_test.c b/tools/virtio/virtio_test.c
index bdb71a26ae35..00ea679b3826 100644
--- a/tools/virtio/virtio_test.c
+++ b/tools/virtio/virtio_test.c
@@ -172,7 +172,7 @@ static void run_test(struct vdev_info *dev, struct vq_info *vq,
                                                          GFP_ATOMIC);
                                 if (likely(r == 0)) {
                                         ++started;
-                                        if (unlikely(!virtqueue_kick(vq->vq))
+                                        if (unlikely(!virtqueue_kick(vq->vq)))
                                                 r = -1;
                                 }
                         } else
diff --git a/tools/vm/page-types.c b/tools/vm/page-types.c
index f9be24d9efac..05654f5e48d5 100644
--- a/tools/vm/page-types.c
+++ b/tools/vm/page-types.c
@@ -19,7 +19,8 @@
  * Authors: Wu Fengguang <fengguang.wu@intel.com>
  */
 
-#define _LARGEFILE64_SOURCE
+#define _FILE_OFFSET_BITS 64
+#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -29,11 +30,14 @@
 #include <getopt.h>
 #include <limits.h>
 #include <assert.h>
+#include <ftw.h>
+#include <time.h>
 #include <sys/types.h>
 #include <sys/errno.h>
 #include <sys/fcntl.h>
 #include <sys/mount.h>
 #include <sys/statfs.h>
+#include <sys/mman.h>
 #include "../../include/uapi/linux/magic.h"
 #include "../../include/uapi/linux/kernel-page-flags.h"
 #include <api/fs/debugfs.h>
@@ -158,6 +162,7 @@ static int		opt_raw;	/* for kernel developers */
 static int              opt_list;       /* list pages (in ranges) */
 static int              opt_no_summary; /* don't show summary */
 static pid_t            opt_pid;        /* process to walk */
+const char *            opt_file;
 
 #define MAX_ADDR_RANGES 1024
 static int              nr_addr_ranges;
@@ -253,12 +258,7 @@ static unsigned long do_u64_read(int fd, char *name,
         if (index > ULONG_MAX / 8)
                 fatal("index overflow: %lu\n", index);
 
-        if (lseek(fd, index * 8, SEEK_SET) < 0) {
-                perror(name);
-                exit(EXIT_FAILURE);
-        }
-
-        bytes = read(fd, buf, count * 8);
+        bytes = pread(fd, buf, count * 8, (off_t)index * 8);
         if (bytes < 0) {
                 perror(name);
                 exit(EXIT_FAILURE);
@@ -343,8 +343,8 @@ static char *page_flag_longname(uint64_t flags)
  * page list and summary
  */
 
-static void show_page_range(unsigned long voffset,
-                            unsigned long offset, uint64_t flags)
+static void show_page_range(unsigned long voffset, unsigned long offset,
+                            unsigned long size, uint64_t flags)
 {
         static uint64_t      flags0;
         static unsigned long voff;
@@ -352,14 +352,16 @@ static void show_page_range(unsigned long voffset,
         static unsigned long count;
 
         if (flags == flags0 && offset == index + count &&
-            (!opt_pid || voffset == voff + count)) {
-                count++;
+            size && voffset == voff + count) {
+                count += size;
                 return;
         }
 
         if (count) {
                 if (opt_pid)
                         printf("%lx\t", voff);
+                if (opt_file)
+                        printf("%lu\t", voff);
                 printf("%lx\t%lx\t%s\n",
                                 index, count, page_flag_name(flags0));
         }
@@ -367,7 +369,12 @@ static void show_page_range(unsigned long voffset,
         flags0 = flags;
         index  = offset;
         voff   = voffset;
-        count  = 1;
+        count  = size;
+}
+
+static void flush_page_range(void)
+{
+        show_page_range(0, 0, 0, 0);
 }
 
 static void show_page(unsigned long voffset,
@@ -375,6 +382,8 @@ static void show_page(unsigned long voffset,
 {
         if (opt_pid)
                 printf("%lx\t", voffset);
+        if (opt_file)
+                printf("%lu\t", voffset);
         printf("%lx\t%s\n", offset, page_flag_name(flags));
 }
 
@@ -565,7 +574,7 @@ static void add_page(unsigned long voffset,
                 unpoison_page(offset);
 
         if (opt_list == 1)
-                show_page_range(voffset, offset, flags);
+                show_page_range(voffset, offset, 1, flags);
         else if (opt_list == 2)
                 show_page(voffset, offset, flags);
 
@@ -667,7 +676,7 @@ static void walk_addr_ranges(void)
 
         for (i = 0; i < nr_addr_ranges; i++)
                 if (!opt_pid)
-                        walk_pfn(0, opt_offset[i], opt_size[i], 0);
+                        walk_pfn(opt_offset[i], opt_offset[i], opt_size[i], 0);
                 else
                         walk_task(opt_offset[i], opt_size[i]);
 
@@ -699,9 +708,7 @@ static void usage(void)
 "            -a|--addr    addr-spec     Walk a range of pages\n"
 "            -b|--bits    bits-spec     Walk pages with specified bits\n"
 "            -p|--pid     pid           Walk process address space\n"
-#if 0 /* planned features */
 "            -f|--file    filename      Walk file address space\n"
-#endif
 "            -l|--list                  Show page details in ranges\n"
 "            -L|--list-each             Show page details one by one\n"
 "            -N|--no-summary            Don't show summary info\n"
@@ -799,8 +806,130 @@ static void parse_pid(const char *str)
         fclose(file);
 }
 
+static void show_file(const char *name, const struct stat *st)
+{
+        unsigned long long size = st->st_size;
+        char atime[64], mtime[64];
+        long now = time(NULL);
+
+        printf("%s\tInode: %u\tSize: %llu (%llu pages)\n",
+                        name, (unsigned)st->st_ino,
+                        size, (size + page_size - 1) / page_size);
+
+        strftime(atime, sizeof(atime), "%c", localtime(&st->st_atime));
+        strftime(mtime, sizeof(mtime), "%c", localtime(&st->st_mtime));
+
+        printf("Modify: %s (%ld seconds ago)\nAccess: %s (%ld seconds ago)\n",
+                        mtime, now - st->st_mtime,
+                        atime, now - st->st_atime);
+}
+
+static void walk_file(const char *name, const struct stat *st)
+{
+        uint8_t vec[PAGEMAP_BATCH];
+        uint64_t buf[PAGEMAP_BATCH], flags;
+        unsigned long nr_pages, pfn, i;
+        int fd;
+        off_t off;
+        ssize_t len;
+        void *ptr;
+        int first = 1;
+
+        fd = checked_open(name, O_RDONLY|O_NOATIME|O_NOFOLLOW);
+
+        for (off = 0; off < st->st_size; off += len) {
+                nr_pages = (st->st_size - off + page_size - 1) / page_size;
+                if (nr_pages > PAGEMAP_BATCH)
+                        nr_pages = PAGEMAP_BATCH;
+                len = nr_pages * page_size;
+
+                ptr = mmap(NULL, len, PROT_READ, MAP_SHARED, fd, off);
+                if (ptr == MAP_FAILED)
+                        fatal("mmap failed: %s", name);
+
+                /* determine cached pages */
+                if (mincore(ptr, len, vec))
+                        fatal("mincore failed: %s", name);
+
+                /* turn off readahead */
+                if (madvise(ptr, len, MADV_RANDOM))
+                        fatal("madvice failed: %s", name);
+
+                /* populate ptes */
+                for (i = 0; i < nr_pages ; i++) {
+                        if (vec[i] & 1)
+                                (void)*(volatile int *)(ptr + i * page_size);
+                }
+
+                /* turn off harvesting reference bits */
+                if (madvise(ptr, len, MADV_SEQUENTIAL))
+                        fatal("madvice failed: %s", name);
+
+                if (pagemap_read(buf, (unsigned long)ptr / page_size,
+                                        nr_pages) != nr_pages)
+                        fatal("cannot read pagemap");
+
+                munmap(ptr, len);
+
+                for (i = 0; i < nr_pages; i++) {
+                        pfn = pagemap_pfn(buf[i]);
+                        if (!pfn)
+                                continue;
+                        if (!kpageflags_read(&flags, pfn, 1))
+                                continue;
+                        if (first && opt_list) {
+                                first = 0;
+                                flush_page_range();
+                                show_file(name, st);
+                        }
+                        add_page(off / page_size + i, pfn, flags, buf[i]);
+                }
+        }
+
+        close(fd);
+}
+
+int walk_tree(const char *name, const struct stat *st, int type, struct FTW *f)
+{
+        (void)f;
+        switch (type) {
+        case FTW_F:
+                if (S_ISREG(st->st_mode))
+                        walk_file(name, st);
+                break;
+        case FTW_DNR:
+                fprintf(stderr, "cannot read dir: %s\n", name);
+                break;
+        }
+        return 0;
+}
+
+static void walk_page_cache(void)
+{
+        struct stat st;
+
+        kpageflags_fd = checked_open(PROC_KPAGEFLAGS, O_RDONLY);
+        pagemap_fd = checked_open("/proc/self/pagemap", O_RDONLY);
+
+        if (stat(opt_file, &st))
+                fatal("stat failed: %s\n", opt_file);
+
+        if (S_ISREG(st.st_mode)) {
+                walk_file(opt_file, &st);
+        } else if (S_ISDIR(st.st_mode)) {
+                /* do not follow symlinks and mountpoints */
+                if (nftw(opt_file, walk_tree, 64, FTW_MOUNT | FTW_PHYS) < 0)
+                        fatal("nftw failed: %s\n", opt_file);
+        } else
+                fatal("unhandled file type: %s\n", opt_file);
+
+        close(kpageflags_fd);
+        close(pagemap_fd);
+}
+
 static void parse_file(const char *name)
 {
+        opt_file = name;
 }
 
 static void parse_addr_range(const char *optarg)
@@ -991,15 +1120,20 @@ int main(int argc, char *argv[])
 
         if (opt_list && opt_pid)
                 printf("voffset\t");
+        if (opt_list && opt_file)
+                printf("foffset\t");
         if (opt_list == 1)
                 printf("offset\tlen\tflags\n");
         if (opt_list == 2)
                 printf("offset\tflags\n");
 
-        walk_addr_ranges();
+        if (opt_file)
+                walk_page_cache();
+        else
+                walk_addr_ranges();
 
         if (opt_list == 1)
-                show_page_range(0, 0, 0);  /* drain the buffer */
+                flush_page_range();
 
         if (opt_no_summary)
                 return 0;