Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core

Pull perf/core improvements and fixes from Arnaldo:

User visible:

  * Add several futex 'perf bench' microbenchmarks (Davidlohr Bueso)

  * Speed up thread map generation (Don Zickus)

  * Fix synthesizing mmaps for threads (Don Zickus)

  * Fix invalid output on event group stdio report  (Namhyung Kim)

  * Introduce 'perf kvm --list-cmds' command line option for use by
    scripts (Ramkumar Ramachandra)

Documentation:

  * Clarify load-latency information in the 'perf mem' docs (Andi Kleen)

  * Clarify x86 register naming in 'perf probe' docs (Andi Kleen)

Refactorings:

  * hists browser refactorings to reuse code accross UIs (Namhyung Kim)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

4 files changed, 155 insertions, 194 deletions

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, ".");
         }