Merge commits 'ca6a42586fae' and 'c286c419c784' into perf/urgent
Pick up these two commits from Arnaldo's perf/core tree: ca6a42586fae: perf tools: Emit clearer message for sys_perf_event_open ENOENT return c286c419c784: perf tools: Fixup exit path when not able to open events As they are really fixes we want to have sooner than laer. Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
commit
652d78fd7a
|
@ -275,11 +275,10 @@ try_again:
|
||||||
!no_inherit) < 0) {
|
!no_inherit) < 0) {
|
||||||
int err = errno;
|
int err = errno;
|
||||||
|
|
||||||
if (err == EPERM || err == EACCES)
|
if (err == EPERM || err == EACCES) {
|
||||||
die("Permission error - are you root?\n"
|
ui__warning_paranoid();
|
||||||
"\t Consider tweaking"
|
exit(EXIT_FAILURE);
|
||||||
" /proc/sys/kernel/perf_event_paranoid.\n");
|
} else if (err == ENODEV && cpu_list) {
|
||||||
else if (err == ENODEV && cpu_list) {
|
|
||||||
die("No such device - did you specify"
|
die("No such device - did you specify"
|
||||||
" an out-of-range profile CPU?\n");
|
" an out-of-range profile CPU?\n");
|
||||||
} else if (err == EINVAL && sample_id_all_avail) {
|
} else if (err == EINVAL && sample_id_all_avail) {
|
||||||
|
@ -302,11 +301,19 @@ try_again:
|
||||||
&& attr->config == PERF_COUNT_HW_CPU_CYCLES) {
|
&& attr->config == PERF_COUNT_HW_CPU_CYCLES) {
|
||||||
|
|
||||||
if (verbose)
|
if (verbose)
|
||||||
warning(" ... trying to fall back to cpu-clock-ticks\n");
|
ui__warning("The cycles event is not supported, "
|
||||||
|
"trying to fall back to cpu-clock-ticks\n");
|
||||||
attr->type = PERF_TYPE_SOFTWARE;
|
attr->type = PERF_TYPE_SOFTWARE;
|
||||||
attr->config = PERF_COUNT_SW_CPU_CLOCK;
|
attr->config = PERF_COUNT_SW_CPU_CLOCK;
|
||||||
goto try_again;
|
goto try_again;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (err == ENOENT) {
|
||||||
|
ui__warning("The %s event is not supported.\n",
|
||||||
|
event_name(pos));
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
|
||||||
printf("\n");
|
printf("\n");
|
||||||
error("sys_perf_event_open() syscall returned with %d (%s). /bin/dmesg may provide additional information.\n",
|
error("sys_perf_event_open() syscall returned with %d (%s). /bin/dmesg may provide additional information.\n",
|
||||||
err, strerror(err));
|
err, strerror(err));
|
||||||
|
|
|
@ -850,10 +850,10 @@ try_again:
|
||||||
top.evlist->threads, group, inherit) < 0) {
|
top.evlist->threads, group, inherit) < 0) {
|
||||||
int err = errno;
|
int err = errno;
|
||||||
|
|
||||||
if (err == EPERM || err == EACCES)
|
if (err == EPERM || err == EACCES) {
|
||||||
die("Permission error - are you root?\n"
|
ui__warning_paranoid();
|
||||||
"\t Consider tweaking"
|
goto out_err;
|
||||||
" /proc/sys/kernel/perf_event_paranoid.\n");
|
}
|
||||||
/*
|
/*
|
||||||
* If it's cycles then fall back to hrtimer
|
* If it's cycles then fall back to hrtimer
|
||||||
* based cpu-clock-tick sw counter, which
|
* based cpu-clock-tick sw counter, which
|
||||||
|
@ -861,25 +861,41 @@ try_again:
|
||||||
*/
|
*/
|
||||||
if (attr->type == PERF_TYPE_HARDWARE &&
|
if (attr->type == PERF_TYPE_HARDWARE &&
|
||||||
attr->config == PERF_COUNT_HW_CPU_CYCLES) {
|
attr->config == PERF_COUNT_HW_CPU_CYCLES) {
|
||||||
|
|
||||||
if (verbose)
|
if (verbose)
|
||||||
warning(" ... trying to fall back to cpu-clock-ticks\n");
|
ui__warning("Cycles event not supported,\n"
|
||||||
|
"trying to fall back to cpu-clock-ticks\n");
|
||||||
|
|
||||||
attr->type = PERF_TYPE_SOFTWARE;
|
attr->type = PERF_TYPE_SOFTWARE;
|
||||||
attr->config = PERF_COUNT_SW_CPU_CLOCK;
|
attr->config = PERF_COUNT_SW_CPU_CLOCK;
|
||||||
goto try_again;
|
goto try_again;
|
||||||
}
|
}
|
||||||
printf("\n");
|
|
||||||
error("sys_perf_event_open() syscall returned with %d "
|
if (err == ENOENT) {
|
||||||
"(%s). /bin/dmesg may provide additional information.\n",
|
ui__warning("The %s event is not supported.\n",
|
||||||
err, strerror(err));
|
event_name(counter));
|
||||||
die("No CONFIG_PERF_EVENTS=y kernel support configured?\n");
|
goto out_err;
|
||||||
exit(-1);
|
}
|
||||||
|
|
||||||
|
ui__warning("The sys_perf_event_open() syscall "
|
||||||
|
"returned with %d (%s). /bin/dmesg "
|
||||||
|
"may provide additional information.\n"
|
||||||
|
"No CONFIG_PERF_EVENTS=y kernel support "
|
||||||
|
"configured?\n", err, strerror(err));
|
||||||
|
goto out_err;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (perf_evlist__mmap(evlist, mmap_pages, false) < 0)
|
if (perf_evlist__mmap(evlist, mmap_pages, false) < 0) {
|
||||||
die("failed to mmap with %d (%s)\n", errno, strerror(errno));
|
ui__warning("Failed to mmap with %d (%s)\n",
|
||||||
|
errno, strerror(errno));
|
||||||
|
goto out_err;
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
|
||||||
|
out_err:
|
||||||
|
exit_browser(0);
|
||||||
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __cmd_top(void)
|
static int __cmd_top(void)
|
||||||
|
|
|
@ -57,6 +57,16 @@ void ui__warning(const char *format, ...)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
void ui__warning_paranoid(void)
|
||||||
|
{
|
||||||
|
ui__warning("Permission error - are you root?\n"
|
||||||
|
"Consider tweaking /proc/sys/kernel/perf_event_paranoid:\n"
|
||||||
|
" -1 - Not paranoid at all\n"
|
||||||
|
" 0 - Disallow raw tracepoint access for unpriv\n"
|
||||||
|
" 1 - Disallow cpu events for unpriv\n"
|
||||||
|
" 2 - Disallow kernel profiling for unpriv\n");
|
||||||
|
}
|
||||||
|
|
||||||
void trace_event(union perf_event *event)
|
void trace_event(union perf_event *event)
|
||||||
{
|
{
|
||||||
unsigned char *raw_event = (void *)event;
|
unsigned char *raw_event = (void *)event;
|
||||||
|
|
|
@ -36,5 +36,6 @@ int ui_helpline__show_help(const char *format, va_list ap);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void ui__warning(const char *format, ...) __attribute__((format(printf, 1, 2)));
|
void ui__warning(const char *format, ...) __attribute__((format(printf, 1, 2)));
|
||||||
|
void ui__warning_paranoid(void);
|
||||||
|
|
||||||
#endif /* __PERF_DEBUG_H */
|
#endif /* __PERF_DEBUG_H */
|
||||||
|
|
Loading…
Reference in New Issue