Commit 1651d120 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo' of... 

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

 * The libaudit test was failing in some systems due to a unescaped newline, fix
   it so that the 'trace' tool can be built in such systems.

 * Fix installation of libexec components.

 * Add default handler for mmap2 events so that tools that don't explicitely
   define an MMAP2 handler don't crash, fix from David Ahern.

 * Fix to find line information for probe list, from Masami Hiramatsu.

 * Set child_pid after perf_evlist__prepare_workload(), fix from Namhyung Kim.

 * Fix infinite loop on invalid perf.data file, from Namhyung Kim.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents d8b11a0c b314e5cf

tools/perf/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -770,6 +770,7 @@ check: $(OUTPUT)common-cmds.h 
install-bin: all

	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'

	$(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)'

	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'

	$(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'

ifndef NO_LIBPERL

	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace'

tools/perf/builtin-stat.c

+1 −0
Original line number Diff line number Diff line
@@ -457,6 +457,7 @@ static int __run_perf_stat(int argc, const char **argv) 
			perror("failed to prepare workload");

			return -1;

		}

		child_pid = evsel_list->workload.pid;

	}



	if (group)

tools/perf/config/feature-tests.mak

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ define SOURCE_LIBAUDIT 


int main(void)

{

	printf(\"error message: %s\n\", audit_errno_to_name(0));

	printf(\"error message: %s\", audit_errno_to_name(0));

	return audit_open();

}

endef

tools/perf/util/dwarf-aux.c

+21 −4
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ static int __die_search_func_cb(Dwarf_Die *fn_die, void *data) 
 * @die_mem: a buffer for result DIE

 *

 * Search a non-inlined function DIE which includes @addr. Stores the

 * DIE to @die_mem and returns it if found. Returns NULl if failed.

 * DIE to @die_mem and returns it if found. Returns NULL if failed.

 */

Dwarf_Die *die_find_realfunc(Dwarf_Die *cu_die, Dwarf_Addr addr,

				    Dwarf_Die *die_mem)
@@ -453,16 +453,33 @@ static int __die_find_inline_cb(Dwarf_Die *die_mem, void *data) 
	return DIE_FIND_CB_CONTINUE;

}



/**

 * die_find_top_inlinefunc - Search the top inlined function at given address

 * @sp_die: a subprogram DIE which including @addr

 * @addr: target address

 * @die_mem: a buffer for result DIE

 *

 * Search an inlined function DIE which includes @addr. Stores the

 * DIE to @die_mem and returns it if found. Returns NULL if failed.

 * Even if several inlined functions are expanded recursively, this

 * doesn't trace it down, and returns the topmost one.

 */

Dwarf_Die *die_find_top_inlinefunc(Dwarf_Die *sp_die, Dwarf_Addr addr,

				   Dwarf_Die *die_mem)

{

	return die_find_child(sp_die, __die_find_inline_cb, &addr, die_mem);

}



/**

 * die_find_inlinefunc - Search an inlined function at given address

 * @cu_die: a CU DIE which including @addr

 * @sp_die: a subprogram DIE which including @addr

 * @addr: target address

 * @die_mem: a buffer for result DIE

 *

 * Search an inlined function DIE which includes @addr. Stores the

 * DIE to @die_mem and returns it if found. Returns NULl if failed.

 * DIE to @die_mem and returns it if found. Returns NULL if failed.

 * If several inlined functions are expanded recursively, this trace

 * it and returns deepest one.

 * it down and returns deepest one.

 */

Dwarf_Die *die_find_inlinefunc(Dwarf_Die *sp_die, Dwarf_Addr addr,

			       Dwarf_Die *die_mem)

tools/perf/util/dwarf-aux.h

+5 −1
Original line number Diff line number Diff line
@@ -79,7 +79,11 @@ extern Dwarf_Die *die_find_child(Dwarf_Die *rt_die, 
extern Dwarf_Die *die_find_realfunc(Dwarf_Die *cu_die, Dwarf_Addr addr,

				    Dwarf_Die *die_mem);



/* Search an inlined function including given address */

/* Search the top inlined function including given address */

extern Dwarf_Die *die_find_top_inlinefunc(Dwarf_Die *sp_die, Dwarf_Addr addr,

					  Dwarf_Die *die_mem);



/* Search the deepest inlined function including given address */

extern Dwarf_Die *die_find_inlinefunc(Dwarf_Die *sp_die, Dwarf_Addr addr,

				      Dwarf_Die *die_mem);

CRA Git | Maintained and supported by SUSTech CRA and CCSE