8 files changed, 85 insertions, 28 deletions

diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
index 146fd6147e84..d9834b362943 100644
--- a/tools/hv/hv_kvp_daemon.c
+++ b/tools/hv/hv_kvp_daemon.c
@@ -701,14 +701,18 @@ int main(void)
         pfd.fd = fd;
 
         while (1) {
+                struct sockaddr *addr_p = (struct sockaddr *) &addr;
+                socklen_t addr_l = sizeof(addr);
                 pfd.events = POLLIN;
                 pfd.revents = 0;
                 poll(&pfd, 1, -1);
 
-                len = recv(fd, kvp_recv_buffer, sizeof(kvp_recv_buffer), 0);
+                len = recvfrom(fd, kvp_recv_buffer, sizeof(kvp_recv_buffer), 0,
+                                addr_p, &addr_l);
 
-                if (len < 0) {
-                        syslog(LOG_ERR, "recv failed; error:%d", len);
+                if (len < 0 || addr.nl_pid) {
+                        syslog(LOG_ERR, "recvfrom failed; pid:%u error:%d %s",
+                                        addr.nl_pid, errno, strerror(errno));
                         close(fd);
                         return -1;
                 }
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 262589991ea4..07b5c7703dd1 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -1179,6 +1179,12 @@ int cmd_stat(int argc, const char **argv, const char *prefix __used)
                 fprintf(stderr, "cannot use both --output and --log-fd\n");
                 usage_with_options(stat_usage, options);
         }
+
+        if (output_fd < 0) {
+                fprintf(stderr, "argument to --log-fd must be a > 0\n");
+                usage_with_options(stat_usage, options);
+        }
+
         if (!output) {
                 struct timespec tm;
                 mode = append_file ? "a" : "w";
@@ -1190,7 +1196,7 @@ int cmd_stat(int argc, const char **argv, const char *prefix __used)
                 }
                 clock_gettime(CLOCK_REALTIME, &tm);
                 fprintf(output, "# started on %s\n", ctime(&tm.tv_sec));
-        } else if (output_fd != 2) {
+        } else if (output_fd > 0) {
                 mode = append_file ? "a" : "w";
                 output = fdopen(output_fd, mode);
                 if (!output) {
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 2dd5edf161b7..e909d43cf542 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -1942,7 +1942,6 @@ int perf_file_header__read(struct perf_file_header *header,
                 else
                         return -1;
         } else if (ph->needs_swap) {
-                unsigned int i;
                 /*
                  * feature bitmap is declared as an array of unsigned longs --
                  * not good since its size can differ between the host that
@@ -1958,14 +1957,17 @@ int perf_file_header__read(struct perf_file_header *header,
                  * file), punt and fallback to the original behavior --
                  * clearing all feature bits and setting buildid.
                  */
-                for (i = 0; i < BITS_TO_LONGS(HEADER_FEAT_BITS); ++i)
-                        header->adds_features[i] = bswap_64(header->adds_features[i]);
+                mem_bswap_64(&header->adds_features,
+                            BITS_TO_U64(HEADER_FEAT_BITS));
 
                 if (!test_bit(HEADER_HOSTNAME, header->adds_features)) {
-                        for (i = 0; i < BITS_TO_LONGS(HEADER_FEAT_BITS); ++i) {
-                                header->adds_features[i] = bswap_64(header->adds_features[i]);
-                                header->adds_features[i] = bswap_32(header->adds_features[i]);
-                        }
+                        /* unswap as u64 */
+                        mem_bswap_64(&header->adds_features,
+                                    BITS_TO_U64(HEADER_FEAT_BITS));
+
+                        /* unswap as u32 */
+                        mem_bswap_32(&header->adds_features,
+                                    BITS_TO_U32(HEADER_FEAT_BITS));
                 }
 
                 if (!test_bit(HEADER_HOSTNAME, header->adds_features)) {
@@ -2091,6 +2093,35 @@ static int read_attr(int fd, struct perf_header *ph,
         return ret <= 0 ? -1 : 0;
 }
 
+static int perf_evsel__set_tracepoint_name(struct perf_evsel *evsel)
+{
+        struct event_format *event = trace_find_event(evsel->attr.config);
+        char bf[128];
+
+        if (event == NULL)
+                return -1;
+
+        snprintf(bf, sizeof(bf), "%s:%s", event->system, event->name);
+        evsel->name = strdup(bf);
+        if (event->name == NULL)
+                return -1;
+
+        return 0;
+}
+
+static int perf_evlist__set_tracepoint_names(struct perf_evlist *evlist)
+{
+        struct perf_evsel *pos;
+
+        list_for_each_entry(pos, &evlist->entries, node) {
+                if (pos->attr.type == PERF_TYPE_TRACEPOINT &&
+                    perf_evsel__set_tracepoint_name(pos))
+                        return -1;
+        }
+
+        return 0;
+}
+
 int perf_session__read_header(struct perf_session *session, int fd)
 {
         struct perf_header *header = &session->header;
@@ -2172,6 +2203,9 @@ int perf_session__read_header(struct perf_session *session, int fd)
 
         lseek(fd, header->data_offset, SEEK_SET);
 
+        if (perf_evlist__set_tracepoint_names(session->evlist))
+                goto out_delete_evlist;
+
         header->frozen = 1;
         return 0;
 out_errno:
diff --git a/tools/perf/util/include/linux/bitops.h b/tools/perf/util/include/linux/bitops.h
index f1584833bd22..587a230d2075 100644
--- a/tools/perf/util/include/linux/bitops.h
+++ b/tools/perf/util/include/linux/bitops.h
@@ -8,6 +8,8 @@
 #define BITS_PER_LONG __WORDSIZE
 #define BITS_PER_BYTE           8
 #define BITS_TO_LONGS(nr)       DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long))
+#define BITS_TO_U64(nr)         DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(u64))
+#define BITS_TO_U32(nr)         DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(u32))
 
 #define for_each_set_bit(bit, addr, size) \
         for ((bit) = find_first_bit((addr), (size));            \
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index 35ae56864e4f..a1f4e3669142 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -669,25 +669,26 @@ struct machine *machines__find(struct rb_root *self, pid_t pid)
 struct machine *machines__findnew(struct rb_root *self, pid_t pid)
 {
         char path[PATH_MAX];
-        const char *root_dir;
+        const char *root_dir = "";
         struct machine *machine = machines__find(self, pid);
 
-        if (!machine || machine->pid != pid) {
-                if (pid == HOST_KERNEL_ID || pid == DEFAULT_GUEST_KERNEL_ID)
-                        root_dir = "";
-                else {
-                        if (!symbol_conf.guestmount)
-                                goto out;
-                        sprintf(path, "%s/%d", symbol_conf.guestmount, pid);
-                        if (access(path, R_OK)) {
-                                pr_err("Can't access file %s\n", path);
-                                goto out;
-                        }
-                        root_dir = path;
+        if (machine && (machine->pid == pid))
+                goto out;
+
+        if ((pid != HOST_KERNEL_ID) &&
+            (pid != DEFAULT_GUEST_KERNEL_ID) &&
+            (symbol_conf.guestmount)) {
+                sprintf(path, "%s/%d", symbol_conf.guestmount, pid);
+                if (access(path, R_OK)) {
+                        pr_err("Can't access file %s\n", path);
+                        machine = NULL;
+                        goto out;
                 }
-                machine = machines__add(self, pid, root_dir);
+                root_dir = path;
         }
 
+        machine = machines__add(self, pid, root_dir);
+
 out:
         return machine;
 }
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 2600916efa83..56142d0fb8d7 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -442,6 +442,16 @@ static void perf_tool__fill_defaults(struct perf_tool *tool)
                         tool->finished_round = process_finished_round_stub;
         }
 }
+ 
+void mem_bswap_32(void *src, int byte_size)
+{
+        u32 *m = src;
+        while (byte_size > 0) {
+                *m = bswap_32(*m);
+                byte_size -= sizeof(u32);
+                ++m;
+        }
+}
 
 void mem_bswap_64(void *src, int byte_size)
 {
@@ -916,7 +926,7 @@ static struct machine *
                 else
                         pid = event->ip.pid;
 
-                return perf_session__find_machine(session, pid);
+                return perf_session__findnew_machine(session, pid);
         }
 
         return perf_session__find_host_machine(session);
diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index 7a5434c00565..0c702e3f0a36 100644
--- a/tools/perf/util/session.h
+++ b/tools/perf/util/session.h
@@ -80,6 +80,7 @@ struct branch_info *machine__resolve_bstack(struct machine *self,
 bool perf_session__has_traces(struct perf_session *self, const char *msg);
 
 void mem_bswap_64(void *src, int byte_size);
+void mem_bswap_32(void *src, int byte_size);
 void perf_event__attr_swap(struct perf_event_attr *attr);
 
 int perf_session__create_kernel_maps(struct perf_session *self);
diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index df2fddbf0cd2..5dd3b5ec8411 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -198,9 +198,8 @@ void print_trace_event(int cpu, void *data, int size)
         record.data = data;
 
         trace_seq_init(&s);
-        pevent_print_event(pevent, &s, &record);
+        pevent_event_info(&s, event, &record);
         trace_seq_do_printf(&s);
-        printf("\n");
 }
 
 void print_event(int cpu, void *data, int size, unsigned long long nsecs,