Commit 727cde6c 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 tool fixes from Thomas Gleixner:
 "A couple of fixes for perf tools:

   - Build system updates

   - Plug a memory leak in an error path of perf probe

   - Tear down probes correctly when adding fails

   - Fixes to the perf symbol handling

   - Fix ordering of event processing in buildid-list

   - Fix per DSO filtering in the histogram browser"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf probe: Clear probe_trace_event when add_probe_trace_event() fails
  perf probe: Fix memory leaking on failure by clearing all probe_trace_events
  perf inject: Also re-pipe lost_samples event
  perf buildid-list: Requires ordered events
  perf symbols: Fix dso lookup by long name and missing buildids
  perf symbols: Allow forcing reading of non-root owned files by root
  perf hists browser: The dso can be obtained from popup_action->ms.map->dso
  perf hists browser: Fix 'd' hotkey action to filter by DSO
  perf symbols: Rebuild rbtree when adjusting symbols for kcore
  tools: Add a "make all" rule
  tools: Actually install tmon in the install rule
parents 069ec229 e15bf88a

tools/Makefile

+10 −1
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ help: 
	@echo '  from the kernel command line to build and install one of'

	@echo '  the tools above'

	@echo ''

	@echo '  $$ make tools/all'

	@echo ''

	@echo '  builds all tools.'

	@echo ''

	@echo '  $$ make tools/install'

	@echo ''

	@echo '  installs all tools.'
@@ -77,6 +81,11 @@ tmon: FORCE 
freefall: FORCE

	$(call descend,laptop/$@)



all: acpi cgroup cpupower hv firewire lguest \

		perf selftests turbostat usb \

		virtio vm net x86_energy_perf_policy \

		tmon freefall



acpi_install:

	$(call descend,power/$(@:_install=),install)
@@ -101,7 +110,7 @@ freefall_install: 
install: acpi_install cgroup_install cpupower_install hv_install firewire_install lguest_install \

		perf_install selftests_install turbostat_install usb_install \

		virtio_install vm_install net_install x86_energy_perf_policy_install \

		tmon freefall_install

		tmon_install freefall_install



acpi_clean:

	$(call descend,power/acpi,clean)

tools/perf/builtin-inject.c

+1 −0
Original line number Diff line number Diff line
@@ -675,6 +675,7 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused) 
			.fork		= perf_event__repipe,

			.exit		= perf_event__repipe,

			.lost		= perf_event__repipe,

			.lost_samples	= perf_event__repipe,

			.aux		= perf_event__repipe,

			.itrace_start	= perf_event__repipe,

			.context_switch	= perf_event__repipe,

tools/perf/builtin-report.c

+3 −3
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
struct report {

	struct perf_tool	tool;

	struct perf_session	*session;

	bool			force, use_tui, use_gtk, use_stdio;

	bool			use_tui, use_gtk, use_stdio;

	bool			hide_unresolved;

	bool			dont_use_callchains;

	bool			show_full_info;
@@ -678,7 +678,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) 
		   "file", "vmlinux pathname"),

	OPT_STRING(0, "kallsyms", &symbol_conf.kallsyms_name,

		   "file", "kallsyms pathname"),

	OPT_BOOLEAN('f', "force", &report.force, "don't complain, do it"),

	OPT_BOOLEAN('f', "force", &symbol_conf.force, "don't complain, do it"),

	OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules,

		    "load module symbols - WARNING: use only with -k and LIVE kernel"),

	OPT_BOOLEAN('n', "show-nr-samples", &symbol_conf.show_nr_samples,
@@ -832,7 +832,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) 
	}



	file.path  = input_name;

	file.force = report.force;

	file.force = symbol_conf.force;



repeat:

	session = perf_session__new(&file, false, &report.tool);

tools/perf/ui/browsers/hists.c

+1 −6
Original line number Diff line number Diff line
@@ -1430,7 +1430,6 @@ close_file_and_continue: 


struct popup_action {

	struct thread 		*thread;

	struct dso		*dso;

	struct map_symbol 	ms;

	int			socket;
@@ -1565,7 +1564,6 @@ add_dso_opt(struct hist_browser *browser, struct popup_action *act, 
		return 0;



	act->ms.map = map;

	act->dso = map->dso;

	act->fn = do_zoom_dso;

	return 1;

}
@@ -1827,7 +1825,6 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, 


	while (1) {

		struct thread *thread = NULL;

		struct dso *dso = NULL;

		struct map *map = NULL;

		int choice = 0;

		int socked_id = -1;
@@ -1839,8 +1836,6 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, 
		if (browser->he_selection != NULL) {

			thread = hist_browser__selected_thread(browser);

			map = browser->selection->map;

			if (map)

				dso = map->dso;

			socked_id = browser->he_selection->socket;

		}

		switch (key) {
@@ -1874,7 +1869,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, 
			hist_browser__dump(browser);

			continue;

		case 'd':

			actions->dso = dso;

			actions->ms.map = map;

			do_zoom_dso(browser, actions);

			continue;

		case 'V':

tools/perf/util/build-id.c

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ struct perf_tool build_id__mark_dso_hit_ops = { 
	.exit	= perf_event__exit_del_thread,

	.attr		 = perf_event__process_attr,

	.build_id	 = perf_event__process_build_id,

	.ordered_events	 = true,

};



int build_id__sprintf(const u8 *build_id, int len, char *bf)

CRA Git | Maintained and supported by SUSTech CRA and CCSE