6 files changed, 30 insertions, 25 deletions

diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index 29739b347599..bec0b62d8e38 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -768,8 +768,8 @@ static int annotate_browser__run(struct annotate_browser *browser,
                 "UP/DOWN/PGUP\n"
                 "PGDN/SPACE    Navigate\n"
                 "q/ESC/CTRL+C  Exit\n\n"
-                "->            Go to target\n"
-                "<-            Exit\n"
+                "ENTER         Go to target\n"
+                "ESC           Exit\n"
                 "H             Cycle thru hottest instructions\n"
                 "j             Toggle showing jump to target arrows\n"
                 "J             Toggle showing number of jump sources on targets\n"
@@ -1056,7 +1056,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map,
                 goto out_free_offsets;
         }
 
-        ui_helpline__push("Press <- or ESC to exit");
+        ui_helpline__push("Press ESC to exit");
 
         notes = symbol__annotation(sym);
         browser.start = map__rip_2objdump(map, sym->start);
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 9b7346a881cf..e5afb8936040 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -1496,7 +1496,7 @@ do_zoom_thread(struct hist_browser *browser, struct popup_action *act)
                 thread__zput(browser->hists->thread_filter);
                 ui_helpline__pop();
         } else {
-                ui_helpline__fpush("To zoom out press <- or -> + \"Zoom out of %s(%d) thread\"",
+                ui_helpline__fpush("To zoom out press ESC or ENTER + \"Zoom out of %s(%d) thread\"",
                                    thread->comm_set ? thread__comm_str(thread) : "",
                                    thread->tid);
                 browser->hists->thread_filter = thread__get(thread);
@@ -1540,7 +1540,7 @@ do_zoom_dso(struct hist_browser *browser, struct popup_action *act)
         } else {
                 if (map == NULL)
                         return 0;
-                ui_helpline__fpush("To zoom out press <- or -> + \"Zoom out of %s DSO\"",
+                ui_helpline__fpush("To zoom out press ESC or ENTER + \"Zoom out of %s DSO\"",
                                    __map__is_kernel(map) ? "the Kernel" : map->dso->short_name);
                 browser->hists->dso_filter = map->dso;
                 perf_hpp__set_elide(HISTC_DSO, true);
@@ -1761,14 +1761,15 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
         "For multiple event sessions:\n\n"                              \
         "TAB/UNTAB     Switch events\n\n"                               \
         "For symbolic views (--sort has sym):\n\n"                      \
-        "->            Zoom into DSO/Threads & Annotate current symbol\n" \
-        "<-            Zoom out\n"                                      \
+        "ENTER         Zoom into DSO/Threads & Annotate current symbol\n" \
+        "ESC           Zoom out\n"                                      \
         "a             Annotate current symbol\n"                       \
         "C             Collapse all callchains\n"                       \
         "d             Zoom into current DSO\n"                         \
         "E             Expand all callchains\n"                         \
         "F             Toggle percentage of filtered entries\n"         \
         "H             Display column headers\n"                        \
+        "m             Display context menu\n"                          \
         "S             Zoom into current Processor Socket\n"            \
 
         /* help messages are sorted by lexical order of the hotkey */
@@ -1889,7 +1890,8 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
                         continue;
                 case '/':
                         if (ui_browser__input_window("Symbol to show",
-                                        "Please enter the name of symbol you want to see",
+                                        "Please enter the name of symbol you want to see.\n"
+                                        "To remove the filter later, press / + ENTER.",
                                         buf, "ENTER: OK, ESC: Cancel",
                                         delay_secs * 2) == K_ENTER) {
                                 hists->symbol_filter_str = *buf ? buf : NULL;
@@ -1934,6 +1936,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
                         continue;
                 case K_ENTER:
                 case K_RIGHT:
+                case 'm':
                         /* menu */
                         break;
                 case K_ESC:
diff --git a/tools/perf/ui/browsers/map.c b/tools/perf/ui/browsers/map.c
index 8c154c7d4669..80912778bb6d 100644
--- a/tools/perf/ui/browsers/map.c
+++ b/tools/perf/ui/browsers/map.c
@@ -72,7 +72,7 @@ static int map_browser__run(struct map_browser *browser)
         int key;
 
         if (ui_browser__show(&browser->b, browser->map->dso->long_name,
-                             "Press <- or ESC to exit, %s / to search",
+                             "Press ESC to exit, %s / to search",
                              verbose ? "" : "restart with -v to use") < 0)
                 return -1;
 
diff --git a/tools/perf/ui/browsers/scripts.c b/tools/perf/ui/browsers/scripts.c
index e13b48d705ef..ad6b6ee3770e 100644
--- a/tools/perf/ui/browsers/scripts.c
+++ b/tools/perf/ui/browsers/scripts.c
@@ -89,7 +89,7 @@ static int script_browser__run(struct perf_script_browser *browser)
         int key;
 
         if (ui_browser__show(&browser->b, browser->script_name,
-                             "Press <- or ESC to exit") < 0)
+                             "Press ESC to exit") < 0)
                 return -1;
 
         while (1) {
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index bcda43bee4d4..e7bf0c46918d 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -1607,6 +1607,15 @@ int dso__load_vmlinux_path(struct dso *dso, struct map *map,
         int i, err = 0;
         char *filename = NULL;
 
+        pr_debug("Looking at the vmlinux_path (%d entries long)\n",
+                 vmlinux_path__nr_entries + 1);
+
+        for (i = 0; i < vmlinux_path__nr_entries; ++i) {
+                err = dso__load_vmlinux(dso, map, vmlinux_path[i], false, filter);
+                if (err > 0)
+                        goto out;
+        }
+
         if (!symbol_conf.ignore_vmlinux_buildid)
                 filename = dso__build_id_filename(dso, NULL, 0);
         if (filename != NULL) {
@@ -1615,15 +1624,6 @@ int dso__load_vmlinux_path(struct dso *dso, struct map *map,
                         goto out;
                 free(filename);
         }
-
-        pr_debug("Looking at the vmlinux_path (%d entries long)\n",
-                 vmlinux_path__nr_entries + 1);
-
-        for (i = 0; i < vmlinux_path__nr_entries; ++i) {
-                err = dso__load_vmlinux(dso, map, vmlinux_path[i], false, filter);
-                if (err > 0)
-                        break;
-        }
 out:
         return err;
 }
diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c
index 4c00507ee3fd..f729f9e99f99 100644
--- a/tools/perf/util/unwind-libunwind.c
+++ b/tools/perf/util/unwind-libunwind.c
@@ -330,6 +330,7 @@ find_proc_info(unw_addr_space_t as, unw_word_t ip, unw_proc_info_t *pi,
         struct map *map;
         unw_dyn_info_t di;
         u64 table_data, segbase, fde_count;
+        int ret = -EINVAL;
 
         map = find_map(ip, ui);
         if (!map || !map->dso)
@@ -348,13 +349,14 @@ find_proc_info(unw_addr_space_t as, unw_word_t ip, unw_proc_info_t *pi,
                 di.u.rti.table_data = map->start + table_data;
                 di.u.rti.table_len  = fde_count * sizeof(struct table_entry)
                                       / sizeof(unw_word_t);
-                return dwarf_search_unwind_table(as, ip, &di, pi,
-                                                 need_unwind_info, arg);
+                ret = dwarf_search_unwind_table(as, ip, &di, pi,
+                                                need_unwind_info, arg);
         }
 
 #ifndef NO_LIBUNWIND_DEBUG_FRAME
         /* Check the .debug_frame section for unwinding info */
-        if (!read_unwind_spec_debug_frame(map->dso, ui->machine, &segbase)) {
+        if (ret < 0 &&
+            !read_unwind_spec_debug_frame(map->dso, ui->machine, &segbase)) {
                 int fd = dso__data_get_fd(map->dso, ui->machine);
                 int is_exec = elf_is_exec(fd, map->dso->name);
                 unw_word_t base = is_exec ? 0 : map->start;
@@ -370,7 +372,7 @@ find_proc_info(unw_addr_space_t as, unw_word_t ip, unw_proc_info_t *pi,
         }
 #endif
 
-        return -EINVAL;
+        return ret;
 }
 
 static int access_fpreg(unw_addr_space_t __maybe_unused as,
@@ -461,7 +463,7 @@ static int access_mem(unw_addr_space_t __maybe_unused as,
                 if (ret) {
                         pr_debug("unwind: access_mem %p not inside range"
                                  " 0x%" PRIx64 "-0x%" PRIx64 "\n",
-                                 (void *) addr, start, end);
+                                 (void *) (uintptr_t) addr, start, end);
                         *valp = 0;
                         return ret;
                 }
@@ -471,7 +473,7 @@ 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);
+                 (void *) (uintptr_t) addr, (unsigned long)*valp, offset);
         return 0;
 }