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

Commit 58f6d428 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 

Pull perf fixes from Thomas Gleixner:
 "A pile of perf updates:

   - Fix broken sanity check in the /proc/sys/kernel/perf_cpu_time_max_percent
     write handler

   - Cure a perf script crash which caused by an unitinialized data
     structure

   - Highlight the hottest instruction in perf top and not a random one

   - Cure yet another clang issue when building perf python

   - Handle topology entries with no CPU correctly in the tools

   - Handle perf data which contains both tracepoints and performance
     counter entries correctly.

   - Add a missing NULL pointer check in perf ordered_events_free()"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf script: Fix crash when processing recorded stat data
  perf top: Fix wrong hottest instruction highlighted
  perf tools: Handle TOPOLOGY headers with no CPU
  perf python: Remove -fstack-clash-protection when building with some clang versions
  perf core: Fix perf_proc_update_handler() bug
  perf script: Fix crash with printing mixed trace point and other events
  perf ordered_events: Fix crash in ordered_events__free
parents 89401be6 d3c8c0af

kernel/events/core.c

+7 −7
Original line number Diff line number Diff line
@@ -436,18 +436,18 @@ int perf_proc_update_handler(struct ctl_table *table, int write, 
		void __user *buffer, size_t *lenp,

		loff_t *ppos)

{

	int ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);



	if (ret || !write)

		return ret;



	int ret;

	int perf_cpu = sysctl_perf_cpu_time_max_percent;

	/*

	 * If throttling is disabled don't allow the write:

	 */

	if (sysctl_perf_cpu_time_max_percent == 100 ||

	    sysctl_perf_cpu_time_max_percent == 0)

	if (write && (perf_cpu == 100 || perf_cpu == 0))

		return -EINVAL;



	ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);

	if (ret || !write)

		return ret;



	max_samples_per_tick = DIV_ROUND_UP(sysctl_perf_event_sample_rate, HZ);

	perf_sample_period_ns = NSEC_PER_SEC / sysctl_perf_event_sample_rate;

	update_perf_cpu_limits();

tools/perf/builtin-script.c

+3 −6
Original line number Diff line number Diff line
@@ -1681,13 +1681,8 @@ static void perf_sample__fprint_metric(struct perf_script *script, 
		.force_header = false,

	};

	struct perf_evsel *ev2;

	static bool init;

	u64 val;



	if (!init) {

		perf_stat__init_shadow_stats();

		init = true;

	}

	if (!evsel->stats)

		perf_evlist__alloc_stats(script->session->evlist, false);

	if (evsel_script(evsel->leader)->gnum++ == 0)
@@ -1794,7 +1789,7 @@ static void process_event(struct perf_script *script, 
		return;

	}



	if (PRINT_FIELD(TRACE)) {

	if (PRINT_FIELD(TRACE) && sample->raw_data) {

		event_format__fprintf(evsel->tp_format, sample->cpu,

				      sample->raw_data, sample->raw_size, fp);

	}
@@ -2359,6 +2354,8 @@ static int __cmd_script(struct perf_script *script) 


	signal(SIGINT, sig_handler);



	perf_stat__init_shadow_stats();



	/* override event processing functions */

	if (script->show_task_events) {

		script->tool.comm = process_comm_event;

tools/perf/ui/browsers/annotate.c

+10 −6
Original line number Diff line number Diff line
@@ -224,20 +224,24 @@ static unsigned int annotate_browser__refresh(struct ui_browser *browser) 
	return ret;

}



static int disasm__cmp(struct annotation_line *a, struct annotation_line *b)

static double disasm__cmp(struct annotation_line *a, struct annotation_line *b,

						  int percent_type)

{

	int i;



	for (i = 0; i < a->data_nr; i++) {

		if (a->data[i].percent == b->data[i].percent)

		if (a->data[i].percent[percent_type] == b->data[i].percent[percent_type])

			continue;

		return a->data[i].percent < b->data[i].percent;

		return a->data[i].percent[percent_type] -

			   b->data[i].percent[percent_type];

	}

	return 0;

}



static void disasm_rb_tree__insert(struct rb_root *root, struct annotation_line *al)

static void disasm_rb_tree__insert(struct annotate_browser *browser,

				struct annotation_line *al)

{

	struct rb_root *root = &browser->entries;

	struct rb_node **p = &root->rb_node;

	struct rb_node *parent = NULL;

	struct annotation_line *l;
@@ -246,7 +250,7 @@ static void disasm_rb_tree__insert(struct rb_root *root, struct annotation_line 
		parent = *p;

		l = rb_entry(parent, struct annotation_line, rb_node);



		if (disasm__cmp(al, l))

		if (disasm__cmp(al, l, browser->opts->percent_type) < 0)

			p = &(*p)->rb_left;

		else

			p = &(*p)->rb_right;
@@ -329,7 +333,7 @@ static void annotate_browser__calc_percent(struct annotate_browser *browser, 
			RB_CLEAR_NODE(&pos->al.rb_node);

			continue;

		}

		disasm_rb_tree__insert(&browser->entries, &pos->al);

		disasm_rb_tree__insert(browser, &pos->al);

	}

	pthread_mutex_unlock(&notes->lock);

tools/perf/util/cpumap.c

+9 −2
Original line number Diff line number Diff line
@@ -134,7 +134,12 @@ struct cpu_map *cpu_map__new(const char *cpu_list) 
	if (!cpu_list)

		return cpu_map__read_all_cpu_map();



	if (!isdigit(*cpu_list))

	/*

	 * must handle the case of empty cpumap to cover

	 * TOPOLOGY header for NUMA nodes with no CPU

	 * ( e.g., because of CPU hotplug)

	 */

	if (!isdigit(*cpu_list) && *cpu_list != '\0')

		goto out;



	while (isdigit(*cpu_list)) {
@@ -181,8 +186,10 @@ struct cpu_map *cpu_map__new(const char *cpu_list) 


	if (nr_cpus > 0)

		cpus = cpu_map__trim_new(nr_cpus, tmp_cpus);

	else

	else if (*cpu_list != '\0')

		cpus = cpu_map__default_new();

	else

		cpus = cpu_map__dummy_new();

invalid:

	free(tmp_cpus);

out:

tools/perf/util/ordered-events.c

+4 −2
Original line number Diff line number Diff line
@@ -391,8 +391,10 @@ void ordered_events__free(struct ordered_events *oe) 
	 * Current buffer might not have all the events allocated

	 * yet, we need to free only allocated ones ...

	 */

	if (oe->buffer) {

		list_del(&oe->buffer->list);

		ordered_events_buffer__free(oe->buffer, oe->buffer_idx, oe);

	}



	/* ... and continue with the rest */

	list_for_each_entry_safe(buffer, tmp, &oe->to_free, list) {