Merge branch 'perf/urgent' into perf/core

Merge Reason: to pick the fix:

 commit e7f01d1
     perf tools: Use scnprintf where applicable

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

14 files changed, 49 insertions, 34 deletions

diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index cc27148635cd..b492e3a51268 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -268,6 +268,8 @@ LIB_H += util/include/asm/uaccess.h
 LIB_H += util/include/dwarf-regs.h
 LIB_H += util/include/asm/dwarf2.h
 LIB_H += util/include/asm/cpufeature.h
+LIB_H += util/include/asm/unistd_32.h
+LIB_H += util/include/asm/unistd_64.h
 LIB_H += perf.h
 LIB_H += util/annotate.h
 LIB_H += util/cache.h
diff --git a/tools/perf/arch/powerpc/util/header.c b/tools/perf/arch/powerpc/util/header.c
index eba80c292945..2f7073d107fd 100644
--- a/tools/perf/arch/powerpc/util/header.c
+++ b/tools/perf/arch/powerpc/util/header.c
@@ -25,7 +25,7 @@ get_cpuid(char *buffer, size_t sz)
 
         pvr = mfspr(SPRN_PVR);
 
-        nb = snprintf(buffer, sz, "%lu,%lu$", PVR_VER(pvr), PVR_REV(pvr));
+        nb = scnprintf(buffer, sz, "%lu,%lu$", PVR_VER(pvr), PVR_REV(pvr));
 
         /* look for end marker to ensure the entire data fit */
         if (strchr(buffer, '$')) {
diff --git a/tools/perf/arch/x86/util/header.c b/tools/perf/arch/x86/util/header.c
index f94006068d2b..146d12a1cec0 100644
--- a/tools/perf/arch/x86/util/header.c
+++ b/tools/perf/arch/x86/util/header.c
@@ -48,7 +48,7 @@ get_cpuid(char *buffer, size_t sz)
                 if (family >= 0x6)
                         model += ((a >> 16) & 0xf) << 4;
         }
-        nb = snprintf(buffer, sz, "%s,%u,%u,%u$", vendor, family, model, step);
+        nb = scnprintf(buffer, sz, "%s,%u,%u,%u$", vendor, family, model, step);
 
         /* look for end marker to ensure the entire data fit */
         if (strchr(buffer, '$')) {
diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index eec392e48067..89e3355ab173 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -10,6 +10,9 @@ void get_term_dimensions(struct winsize *ws);
 #define rmb()           asm volatile("lock; addl $0,0(%%esp)" ::: "memory")
 #define cpu_relax()     asm volatile("rep; nop" ::: "memory");
 #define CPUINFO_PROC    "model name"
+#ifndef __NR_perf_event_open
+# define __NR_perf_event_open 336
+#endif
 #endif
 
 #if defined(__x86_64__)
@@ -17,6 +20,9 @@ void get_term_dimensions(struct winsize *ws);
 #define rmb()           asm volatile("lfence" ::: "memory")
 #define cpu_relax()     asm volatile("rep; nop" ::: "memory");
 #define CPUINFO_PROC    "model name"
+#ifndef __NR_perf_event_open
+# define __NR_perf_event_open 298
+#endif
 #endif
 
 #ifdef __powerpc__
diff --git a/tools/perf/util/color.c b/tools/perf/util/color.c
index 521c38a79190..11e46da17bbb 100644
--- a/tools/perf/util/color.c
+++ b/tools/perf/util/color.c
@@ -1,3 +1,4 @@
+#include <linux/kernel.h>
 #include "cache.h"
 #include "color.h"
 
@@ -182,12 +183,12 @@ static int __color_vsnprintf(char *bf, size_t size, const char *color,
         }
 
         if (perf_use_color_default && *color)
-                r += snprintf(bf, size, "%s", color);
-        r += vsnprintf(bf + r, size - r, fmt, args);
+                r += scnprintf(bf, size, "%s", color);
+        r += vscnprintf(bf + r, size - r, fmt, args);
         if (perf_use_color_default && *color)
-                r += snprintf(bf + r, size - r, "%s", PERF_COLOR_RESET);
+                r += scnprintf(bf + r, size - r, "%s", PERF_COLOR_RESET);
         if (trail)
-                r += snprintf(bf + r, size - r, "%s", trail);
+                r += scnprintf(bf + r, size - r, "%s", trail);
         return r;
 }
 
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 0d9b6da86a39..fcd9cf3ea63e 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -291,7 +291,7 @@ int build_id_cache__add_s(const char *sbuild_id, const char *debugdir,
         if (realname == NULL || filename == NULL || linkname == NULL)
                 goto out_free;
 
-        len = snprintf(filename, size, "%s%s%s",
+        len = scnprintf(filename, size, "%s%s%s",
                        debugdir, is_kallsyms ? "/" : "", realname);
         if (mkdir_p(filename, 0755))
                 goto out_free;
@@ -306,7 +306,7 @@ int build_id_cache__add_s(const char *sbuild_id, const char *debugdir,
                         goto out_free;
         }
 
-        len = snprintf(linkname, size, "%s/.build-id/%.2s",
+        len = scnprintf(linkname, size, "%s/.build-id/%.2s",
                        debugdir, sbuild_id);
 
         if (access(linkname, X_OK) && mkdir_p(linkname, 0755))
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 2c624ad371a7..5fb19013ca0c 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -840,7 +840,7 @@ static int hist_entry__pcnt_snprintf(struct hist_entry *he, char *s,
                                                      sep ? "%.2f" : "   %6.2f%%",
                                                      (period * 100.0) / total);
                 else
-                        ret = snprintf(s, size, sep ? "%.2f" : "   %6.2f%%",
+                        ret = scnprintf(s, size, sep ? "%.2f" : "   %6.2f%%",
                                        (period * 100.0) / total);
                 if (symbol_conf.show_cpu_utilization) {
                         ret += percent_color_snprintf(s + ret, size - ret,
@@ -863,20 +863,20 @@ static int hist_entry__pcnt_snprintf(struct hist_entry *he, char *s,
                         }
                 }
         } else
-                ret = snprintf(s, size, sep ? "%" PRIu64 : "%12" PRIu64 " ", period);
+                ret = scnprintf(s, size, sep ? "%" PRIu64 : "%12" PRIu64 " ", period);
 
         if (symbol_conf.show_nr_samples) {
                 if (sep)
-                        ret += snprintf(s + ret, size - ret, "%c%" PRIu64, *sep, nr_events);
+                        ret += scnprintf(s + ret, size - ret, "%c%" PRIu64, *sep, nr_events);
                 else
-                        ret += snprintf(s + ret, size - ret, "%11" PRIu64, nr_events);
+                        ret += scnprintf(s + ret, size - ret, "%11" PRIu64, nr_events);
         }
 
         if (symbol_conf.show_total_period) {
                 if (sep)
-                        ret += snprintf(s + ret, size - ret, "%c%" PRIu64, *sep, period);
+                        ret += scnprintf(s + ret, size - ret, "%c%" PRIu64, *sep, period);
                 else
-                        ret += snprintf(s + ret, size - ret, " %12" PRIu64, period);
+                        ret += scnprintf(s + ret, size - ret, " %12" PRIu64, period);
         }
 
         if (pair_hists) {
@@ -891,25 +891,25 @@ static int hist_entry__pcnt_snprintf(struct hist_entry *he, char *s,
                 diff = new_percent - old_percent;
 
                 if (fabs(diff) >= 0.01)
-                        snprintf(bf, sizeof(bf), "%+4.2F%%", diff);
+                        ret += scnprintf(bf, sizeof(bf), "%+4.2F%%", diff);
                 else
-                        snprintf(bf, sizeof(bf), " ");
+                        ret += scnprintf(bf, sizeof(bf), " ");
 
                 if (sep)
-                        ret += snprintf(s + ret, size - ret, "%c%s", *sep, bf);
+                        ret += scnprintf(s + ret, size - ret, "%c%s", *sep, bf);
                 else
-                        ret += snprintf(s + ret, size - ret, "%11.11s", bf);
+                        ret += scnprintf(s + ret, size - ret, "%11.11s", bf);
 
                 if (show_displacement) {
                         if (displacement)
-                                snprintf(bf, sizeof(bf), "%+4ld", displacement);
+                                ret += scnprintf(bf, sizeof(bf), "%+4ld", displacement);
                         else
-                                snprintf(bf, sizeof(bf), " ");
+                                ret += scnprintf(bf, sizeof(bf), " ");
 
                         if (sep)
-                                ret += snprintf(s + ret, size - ret, "%c%s", *sep, bf);
+                                ret += scnprintf(s + ret, size - ret, "%c%s", *sep, bf);
                         else
-                                ret += snprintf(s + ret, size - ret, "%6.6s", bf);
+                                ret += scnprintf(s + ret, size - ret, "%6.6s", bf);
                 }
         }
 
@@ -927,7 +927,7 @@ int hist_entry__snprintf(struct hist_entry *he, char *s, size_t size,
                 if (se->elide)
                         continue;
 
-                ret += snprintf(s + ret, size - ret, "%s", sep ?: "  ");
+                ret += scnprintf(s + ret, size - ret, "%s", sep ?: "  ");
                 ret += se->se_snprintf(he, s + ret, size - ret,
                                        hists__col_len(hists, se->se_width_idx));
         }
diff --git a/tools/perf/util/include/asm/unistd_32.h b/tools/perf/util/include/asm/unistd_32.h
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/tools/perf/util/include/asm/unistd_32.h
@@ -0,0 +1 @@
+
diff --git a/tools/perf/util/include/asm/unistd_64.h b/tools/perf/util/include/asm/unistd_64.h
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/tools/perf/util/include/asm/unistd_64.h
@@ -0,0 +1 @@
+
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index bec1cc6a1f38..201b40f0ca0b 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -165,7 +165,7 @@ struct tracepoint_path *tracepoint_id_to_path(u64 config)
         struct tracepoint_path *path = NULL;
         DIR *sys_dir, *evt_dir;
         struct dirent *sys_next, *evt_next, sys_dirent, evt_dirent;
-        char id_buf[4];
+        char id_buf[24];
         int fd;
         u64 id;
         char evt_path[MAXPATHLEN];
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 88dbcf6f9575..a27237430c5f 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -34,6 +34,9 @@ static int repsep_snprintf(char *bf, size_t size, const char *fmt, ...)
                 }
         }
         va_end(ap);
+
+        if (n >= (int)size)
+                return size - 1;
         return n;
 }
 
diff --git a/tools/perf/util/strbuf.c b/tools/perf/util/strbuf.c
index 92e068517c1a..2eeb51baf077 100644
--- a/tools/perf/util/strbuf.c
+++ b/tools/perf/util/strbuf.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include <linux/kernel.h>
 
 int prefixcmp(const char *str, const char *prefix)
 {
@@ -89,14 +90,14 @@ void strbuf_addf(struct strbuf *sb, const char *fmt, ...)
         if (!strbuf_avail(sb))
                 strbuf_grow(sb, 64);
         va_start(ap, fmt);
-        len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);
+        len = vscnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);
         va_end(ap);
         if (len < 0)
-                die("your vsnprintf is broken");
+                die("your vscnprintf is broken");
         if (len > strbuf_avail(sb)) {
                 strbuf_grow(sb, len);
                 va_start(ap, fmt);
-                len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);
+                len = vscnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);
                 va_end(ap);
                 if (len > strbuf_avail(sb)) {
                         die("this should not happen, your snprintf is broken");
diff --git a/tools/perf/util/ui/browsers/hists.c b/tools/perf/util/ui/browsers/hists.c
index c4173c9733bb..d7a1c4afe28b 100644
--- a/tools/perf/util/ui/browsers/hists.c
+++ b/tools/perf/util/ui/browsers/hists.c
@@ -840,18 +840,18 @@ static int hists__browser_title(struct hists *self, char *bf, size_t size,
         unsigned long nr_events = self->stats.nr_events[PERF_RECORD_SAMPLE];
 
         nr_events = convert_unit(nr_events, &unit);
-        printed = snprintf(bf, size, "Events: %lu%c %s", nr_events, unit, ev_name);
+        printed = scnprintf(bf, size, "Events: %lu%c %s", nr_events, unit, ev_name);
 
         if (self->uid_filter_str)
                 printed += snprintf(bf + printed, size - printed,
                                     ", UID: %s", self->uid_filter_str);
         if (thread)
-                printed += snprintf(bf + printed, size - printed,
+                printed += scnprintf(bf + printed, size - printed,
                                     ", Thread: %s(%d)",
                                     (thread->comm_set ? thread->comm : ""),
                                     thread->pid);
         if (dso)
-                printed += snprintf(bf + printed, size - printed,
+                printed += scnprintf(bf + printed, size - printed,
                                     ", DSO: %s", dso->short_name);
         return printed;
 }
@@ -1174,7 +1174,7 @@ static void perf_evsel_menu__write(struct ui_browser *browser,
                                                        HE_COLORSET_NORMAL);
 
         nr_events = convert_unit(nr_events, &unit);
-        printed = snprintf(bf, sizeof(bf), "%lu%c%s%s", nr_events,
+        printed = scnprintf(bf, sizeof(bf), "%lu%c%s%s", nr_events,
                            unit, unit == ' ' ? "" : " ", ev_name);
         slsmg_printf("%s", bf);
 
@@ -1184,8 +1184,8 @@ static void perf_evsel_menu__write(struct ui_browser *browser,
                 if (!current_entry)
                         ui_browser__set_color(browser, HE_COLORSET_TOP);
                 nr_events = convert_unit(nr_events, &unit);
-                snprintf(bf, sizeof(bf), ": %ld%c%schunks LOST!", nr_events,
-                         unit, unit == ' ' ? "" : " ");
+                printed += scnprintf(bf, sizeof(bf), ": %ld%c%schunks LOST!",
+                                     nr_events, unit, unit == ' ' ? "" : " ");
                 warn = bf;
         }
 
diff --git a/tools/perf/util/ui/helpline.c b/tools/perf/util/ui/helpline.c
index 4f48f5901b30..2f950c2641c8 100644
--- a/tools/perf/util/ui/helpline.c
+++ b/tools/perf/util/ui/helpline.c
@@ -64,7 +64,7 @@ int ui_helpline__show_help(const char *format, va_list ap)
         static int backlog;
 
         pthread_mutex_lock(&ui__lock);
-        ret = vsnprintf(ui_helpline__last_msg + backlog,
+        ret = vscnprintf(ui_helpline__last_msg + backlog,
                         sizeof(ui_helpline__last_msg) - backlog, format, ap);
         backlog += ret;