6 files changed, 37 insertions, 11 deletions

diff --git a/tools/include/uapi/sound/asound.h b/tools/include/uapi/sound/asound.h
index 404d4b9ffe76..df1153cea0b7 100644
--- a/tools/include/uapi/sound/asound.h
+++ b/tools/include/uapi/sound/asound.h
@@ -32,6 +32,7 @@
 
 #ifndef __KERNEL__
 #include <stdlib.h>
+#include <time.h>
 #endif
 
 /*
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 1999d6533d12..fbbb0da43abb 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -1377,6 +1377,7 @@ int cmd_top(int argc, const char **argv)
                          * */
                         .overwrite      = 0,
                         .sample_time    = true,
+                        .sample_time_set = true,
                 },
                 .max_stack           = sysctl__max_stack(),
                 .annotation_opts     = annotation__default_options,
diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c
index c6351b557bb0..9494f9dc61ec 100644
--- a/tools/perf/util/env.c
+++ b/tools/perf/util/env.c
@@ -57,9 +57,11 @@ struct bpf_prog_info_node *perf_env__find_bpf_prog_info(struct perf_env *env,
                 else if (prog_id > node->info_linear->info.id)
                         n = n->rb_right;
                 else
-                        break;
+                        goto out;
         }
+        node = NULL;
 
+out:
         up_read(&env->bpf_progs.lock);
         return node;
 }
@@ -109,10 +111,12 @@ struct btf_node *perf_env__find_btf(struct perf_env *env, __u32 btf_id)
                 else if (btf_id > node->id)
                         n = n->rb_right;
                 else
-                        break;
+                        goto out;
         }
+        node = NULL;
 
         up_read(&env->bpf_progs.lock);
+out:
         return node;
 }
 
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 6689378ee577..51ead577533f 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -1868,12 +1868,12 @@ static void *perf_evlist__poll_thread(void *arg)
 {
         struct perf_evlist *evlist = arg;
         bool draining = false;
-        int i;
+        int i, done = 0;
+
+        while (!done) {
+                bool got_data = false;
 
-        while (draining || !(evlist->thread.done)) {
-                if (draining)
-                        draining = false;
-                else if (evlist->thread.done)
+                if (evlist->thread.done)
                         draining = true;
 
                 if (!draining)
@@ -1894,9 +1894,13 @@ static void *perf_evlist__poll_thread(void *arg)
                                         pr_warning("cannot locate proper evsel for the side band event\n");
 
                                 perf_mmap__consume(map);
+                                got_data = true;
                         }
                         perf_mmap__read_done(map);
                 }
+
+                if (draining && !got_data)
+                        break;
         }
         return NULL;
 }
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index e32628cd20a7..ee71efb9db62 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -261,6 +261,22 @@ bool __map__is_extra_kernel_map(const struct map *map)
         return kmap && kmap->name[0];
 }
 
+bool __map__is_bpf_prog(const struct map *map)
+{
+        const char *name;
+
+        if (map->dso->binary_type == DSO_BINARY_TYPE__BPF_PROG_INFO)
+                return true;
+
+        /*
+         * If PERF_RECORD_BPF_EVENT is not included, the dso will not have
+         * type of DSO_BINARY_TYPE__BPF_PROG_INFO. In such cases, we can
+         * guess the type based on name.
+         */
+        name = map->dso->short_name;
+        return name && (strstr(name, "bpf_prog_") == name);
+}
+
 bool map__has_symbols(const struct map *map)
 {
         return dso__has_symbols(map->dso);
@@ -910,10 +926,8 @@ static void __maps__insert_name(struct maps *maps, struct map *map)
                 rc = strcmp(m->dso->short_name, map->dso->short_name);
                 if (rc < 0)
                         p = &(*p)->rb_left;
-                else if (rc  > 0)
-                        p = &(*p)->rb_right;
                 else
-                        return;
+                        p = &(*p)->rb_right;
         }
         rb_link_node(&map->rb_node_name, parent, p);
         rb_insert_color(&map->rb_node_name, &maps->names);
diff --git a/tools/perf/util/map.h b/tools/perf/util/map.h
index 0e20749f2c55..dc93787c74f0 100644
--- a/tools/perf/util/map.h
+++ b/tools/perf/util/map.h
@@ -159,10 +159,12 @@ int map__set_kallsyms_ref_reloc_sym(struct map *map, const char *symbol_name,
 
 bool __map__is_kernel(const struct map *map);
 bool __map__is_extra_kernel_map(const struct map *map);
+bool __map__is_bpf_prog(const struct map *map);
 
 static inline bool __map__is_kmodule(const struct map *map)
 {
-        return !__map__is_kernel(map) && !__map__is_extra_kernel_map(map);
+        return !__map__is_kernel(map) && !__map__is_extra_kernel_map(map) &&
+               !__map__is_bpf_prog(map);
 }
 
 bool map__has_symbols(const struct map *map);