Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54a0f913 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf top: Fix live annotation in the --stdio interface
  perf top tui: Don't recalc column widths considering just the first page
  perf report: Add progress bar when processing time ordered events
  perf hists browser: Warn about lost events
  perf tools: Fix a typo of command name as trace-cmd
  perf hists: Fix recalculation of total_period when sorting entries
  perf header: Fix build on old systems
  perf ui browser: Handle K_RESIZE in dialog windows
  perf ui browser: No need to switch char sets that often
  perf hists browser: Use K_TIMER
  perf ui: Rename ui__warning_paranoid to ui__error_paranoid
  perf ui: Reimplement the popup windows using libslang
  perf ui: Reimplement ui__popup_menu using ui__browser
  perf ui: Reimplement ui_helpline using libslang
  perf ui: Improve handling sigwinch a bit
  perf ui progress: Reimplement using slang
  perf evlist: Fix grouping of multiple events
parents 94956eed f9e3d4b1

tools/perf/builtin-record.c

+10 −3
Original line number Diff line number Diff line
@@ -262,13 +262,16 @@ static bool perf_evlist__equal(struct perf_evlist *evlist, 


static void open_counters(struct perf_evlist *evlist)

{

	struct perf_evsel *pos;

	struct perf_evsel *pos, *first;



	if (evlist->cpus->map[0] < 0)

		no_inherit = true;



	first = list_entry(evlist->entries.next, struct perf_evsel, node);



	list_for_each_entry(pos, &evlist->entries, node) {

		struct perf_event_attr *attr = &pos->attr;

		struct xyarray *group_fd = NULL;

		/*

		 * Check if parse_single_tracepoint_event has already asked for

		 * PERF_SAMPLE_TIME.
@@ -283,15 +286,19 @@ static void open_counters(struct perf_evlist *evlist) 
		 */

		bool time_needed = attr->sample_type & PERF_SAMPLE_TIME;



		if (group && pos != first)

			group_fd = first->fd;



		config_attr(pos, evlist);

retry_sample_id:

		attr->sample_id_all = sample_id_all_avail ? 1 : 0;

try_again:

		if (perf_evsel__open(pos, evlist->cpus, evlist->threads, group) < 0) {

		if (perf_evsel__open(pos, evlist->cpus, evlist->threads, group,

				     group_fd) < 0) {

			int err = errno;



			if (err == EPERM || err == EACCES) {

				ui__warning_paranoid();

				ui__error_paranoid();

				exit(EXIT_FAILURE);

			} else if (err ==  ENODEV && cpu_list) {

				die("No such device - did you specify"

tools/perf/builtin-stat.c

+14 −6
Original line number Diff line number Diff line
@@ -278,9 +278,14 @@ struct stats runtime_itlb_cache_stats[MAX_NR_CPUS]; 
struct stats			runtime_dtlb_cache_stats[MAX_NR_CPUS];

struct stats			walltime_nsecs_stats;



static int create_perf_stat_counter(struct perf_evsel *evsel)

static int create_perf_stat_counter(struct perf_evsel *evsel,

				    struct perf_evsel *first)

{

	struct perf_event_attr *attr = &evsel->attr;

	struct xyarray *group_fd = NULL;



	if (group && evsel != first)

		group_fd = first->fd;



	if (scale)

		attr->read_format = PERF_FORMAT_TOTAL_TIME_ENABLED |
@@ -289,14 +294,15 @@ static int create_perf_stat_counter(struct perf_evsel *evsel) 
	attr->inherit = !no_inherit;



	if (system_wide)

		return perf_evsel__open_per_cpu(evsel, evsel_list->cpus, group);



		return perf_evsel__open_per_cpu(evsel, evsel_list->cpus,

						group, group_fd);

	if (target_pid == -1 && target_tid == -1) {

		attr->disabled = 1;

		attr->enable_on_exec = 1;

	}



	return perf_evsel__open_per_thread(evsel, evsel_list->threads, group);

	return perf_evsel__open_per_thread(evsel, evsel_list->threads,

					   group, group_fd);

}



/*
@@ -396,7 +402,7 @@ static int read_counter(struct perf_evsel *counter) 
static int run_perf_stat(int argc __used, const char **argv)

{

	unsigned long long t0, t1;

	struct perf_evsel *counter;

	struct perf_evsel *counter, *first;

	int status = 0;

	int child_ready_pipe[2], go_pipe[2];

	const bool forks = (argc > 0);
@@ -453,8 +459,10 @@ static int run_perf_stat(int argc __used, const char **argv) 
		close(child_ready_pipe[0]);

	}



	first = list_entry(evsel_list->entries.next, struct perf_evsel, node);



	list_for_each_entry(counter, &evsel_list->entries, node) {

		if (create_perf_stat_counter(counter) < 0) {

		if (create_perf_stat_counter(counter, first) < 0) {

			if (errno == EINVAL || errno == ENOSYS || errno == ENOENT) {

				if (verbose)

					ui__warning("%s event is not supported by the kernel.\n",

tools/perf/builtin-test.c

+3 −3
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ static int test__open_syscall_event(void) 
		goto out_thread_map_delete;

	}



	if (perf_evsel__open_per_thread(evsel, threads, false) < 0) {

	if (perf_evsel__open_per_thread(evsel, threads, false, NULL) < 0) {

		pr_debug("failed to open counter: %s, "

			 "tweak /proc/sys/kernel/perf_event_paranoid?\n",

			 strerror(errno));
@@ -366,7 +366,7 @@ static int test__open_syscall_event_on_all_cpus(void) 
		goto out_thread_map_delete;

	}



	if (perf_evsel__open(evsel, cpus, threads, false) < 0) {

	if (perf_evsel__open(evsel, cpus, threads, false, NULL) < 0) {

		pr_debug("failed to open counter: %s, "

			 "tweak /proc/sys/kernel/perf_event_paranoid?\n",

			 strerror(errno));
@@ -531,7 +531,7 @@ static int test__basic_mmap(void) 


		perf_evlist__add(evlist, evsels[i]);



		if (perf_evsel__open(evsels[i], cpus, threads, false) < 0) {

		if (perf_evsel__open(evsels[i], cpus, threads, false, NULL) < 0) {

			pr_debug("failed to open counter: %s, "

				 "tweak /proc/sys/kernel/perf_event_paranoid?\n",

				 strerror(errno));

tools/perf/builtin-top.c

+38 −16
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ static bool vmlinux_warned; 
static bool			inherit				=  false;

static int			realtime_prio			=      0;

static bool			group				=  false;

static bool			sample_id_all_avail		=   true;

static unsigned int		mmap_pages			=    128;



static bool			dump_symtab                     =  false;
@@ -199,7 +200,8 @@ static void record_precise_ip(struct hist_entry *he, int counter, u64 ip) 
	struct symbol *sym;



	if (he == NULL || he->ms.sym == NULL ||

	    (he != top.sym_filter_entry && use_browser != 1))

	    ((top.sym_filter_entry == NULL ||

	      top.sym_filter_entry->ms.sym != he->ms.sym) && use_browser != 1))

		return;



	sym = he->ms.sym;
@@ -289,11 +291,13 @@ static void print_sym_table(void) 


	printf("%-*.*s\n", win_width, win_width, graph_dotted_line);



	if (top.total_lost_warned != top.session->hists.stats.total_lost) {

		top.total_lost_warned = top.session->hists.stats.total_lost;

		color_fprintf(stdout, PERF_COLOR_RED, "WARNING:");

		printf(" LOST %" PRIu64 " events, Check IO/CPU overload\n",

		       top.total_lost_warned);

	if (top.sym_evsel->hists.stats.nr_lost_warned !=

	    top.sym_evsel->hists.stats.nr_events[PERF_RECORD_LOST]) {

		top.sym_evsel->hists.stats.nr_lost_warned =

			top.sym_evsel->hists.stats.nr_events[PERF_RECORD_LOST];

		color_fprintf(stdout, PERF_COLOR_RED,

			      "WARNING: LOST %d chunks, Check IO/CPU overload",

			      top.sym_evsel->hists.stats.nr_lost_warned);

		++printed;

	}
@@ -561,7 +565,6 @@ static void perf_top__sort_new_samples(void *arg) 
	hists__decay_entries_threaded(&t->sym_evsel->hists,

				      top.hide_user_symbols,

				      top.hide_kernel_symbols);

	hists__output_recalc_col_len(&t->sym_evsel->hists, winsize.ws_row - 3);

}



static void *display_thread_tui(void *arg __used)
@@ -671,6 +674,7 @@ static int symbol_filter(struct map *map __used, struct symbol *sym) 
}



static void perf_event__process_sample(const union perf_event *event,

				       struct perf_evsel *evsel,

				       struct perf_sample *sample,

				       struct perf_session *session)

{
@@ -770,12 +774,8 @@ static void perf_event__process_sample(const union perf_event *event, 
	}



	if (al.sym == NULL || !al.sym->ignore) {

		struct perf_evsel *evsel;

		struct hist_entry *he;



		evsel = perf_evlist__id2evsel(top.evlist, sample->id);

		assert(evsel != NULL);



		if ((sort__has_parent || symbol_conf.use_callchain) &&

		    sample->callchain) {

			err = perf_session__resolve_callchain(session, al.thread,
@@ -807,6 +807,7 @@ static void perf_event__process_sample(const union perf_event *event, 
static void perf_session__mmap_read_idx(struct perf_session *self, int idx)

{

	struct perf_sample sample;

	struct perf_evsel *evsel;

	union perf_event *event;

	int ret;
@@ -817,10 +818,16 @@ static void perf_session__mmap_read_idx(struct perf_session *self, int idx) 
			continue;

		}



		evsel = perf_evlist__id2evsel(self->evlist, sample.id);

		assert(evsel != NULL);



		if (event->header.type == PERF_RECORD_SAMPLE)

			perf_event__process_sample(event, &sample, self);

		else

			perf_event__process_sample(event, evsel, &sample, self);

		else if (event->header.type < PERF_RECORD_MAX) {

			hists__inc_nr_events(&evsel->hists, event->header.type);

			perf_event__process(event, &sample, self);

		} else

			++self->hists.stats.nr_unknown_events;

	}

}
@@ -834,10 +841,16 @@ static void perf_session__mmap_read(struct perf_session *self) 


static void start_counters(struct perf_evlist *evlist)

{

	struct perf_evsel *counter;

	struct perf_evsel *counter, *first;



	first = list_entry(evlist->entries.next, struct perf_evsel, node);



	list_for_each_entry(counter, &evlist->entries, node) {

		struct perf_event_attr *attr = &counter->attr;

		struct xyarray *group_fd = NULL;



		if (group && counter != first)

			group_fd = first->fd;



		attr->sample_type = PERF_SAMPLE_IP | PERF_SAMPLE_TID;
@@ -858,14 +871,23 @@ static void start_counters(struct perf_evlist *evlist) 
		attr->mmap = 1;

		attr->comm = 1;

		attr->inherit = inherit;

retry_sample_id:

		attr->sample_id_all = sample_id_all_avail ? 1 : 0;

try_again:

		if (perf_evsel__open(counter, top.evlist->cpus,

				     top.evlist->threads, group) < 0) {

				     top.evlist->threads, group,

				     group_fd) < 0) {

			int err = errno;



			if (err == EPERM || err == EACCES) {

				ui__warning_paranoid();

				ui__error_paranoid();

				goto out_err;

			} else if (err == EINVAL && sample_id_all_avail) {

				/*

				 * Old kernel, no attr->sample_id_type_all field

				 */

				sample_id_all_avail = false;

				goto retry_sample_id;

			}

			/*

			 * If it's cycles then fall back to hrtimer

tools/perf/util/annotate.c

+6 −3
Original line number Diff line number Diff line
@@ -310,9 +310,12 @@ int symbol__annotate(struct symbol *sym, struct map *map, size_t privsize) 
		}

		err = -ENOENT;

		dso->annotate_warned = 1;

		pr_err("Can't annotate %s: No vmlinux file%s was found in the "

		       "path.\nPlease use 'perf buildid-cache -av vmlinux' or "

		       "--vmlinux vmlinux.\n",

		pr_err("Can't annotate %s:\n\n"

		       "No vmlinux file%s\nwas found in the path.\n\n"

		       "Please use:\n\n"

		       "  perf buildid-cache -av vmlinux\n\n"

		       "or:\n\n"

		       "  --vmlinux vmlinux",

		       sym->name, build_id_msg ?: "");

		goto out_free_filename;

	}