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

Commit de737f33 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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

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

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

- Do not access outside hw cache name arrays (Arnaldo Carvalho de Melo)

- Use addr_location::addr instead of ip for entries when unwinding using
  DWARF CFI, fixing the "srcline" information for userspace application
  callchains (Milian Wolff)

- Reinstate strlcpy() header guard with __UCLIBC__, fixing the build
  with uclibc, detected when building for the ARC architecture (Vineet Gupta)

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

tools/include/linux/string.h

+5 −1
Original line number Original line Diff line number Diff line
@@ -8,7 +8,11 @@ void *memdup(const void *src, size_t len); 




int strtobool(const char *s, bool *res);

int strtobool(const char *s, bool *res);





#ifdef __GLIBC__

/*

 * glibc based builds needs the extern while uClibc doesn't.

 * However uClibc headers also define __GLIBC__ hence the hack below

 */

#if defined(__GLIBC__) && !defined(__UCLIBC__)

extern size_t strlcpy(char *dest, const char *src, size_t size);

extern size_t strlcpy(char *dest, const char *src, size_t size);

#endif

#endif

tools/perf/util/evsel.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -507,17 +507,17 @@ static int __perf_evsel__hw_cache_name(u64 config, char *bf, size_t size) 
	u8 op, result, type = (config >>  0) & 0xff;

	u8 op, result, type = (config >>  0) & 0xff;

	const char *err = "unknown-ext-hardware-cache-type";

	const char *err = "unknown-ext-hardware-cache-type";





	if (type > PERF_COUNT_HW_CACHE_MAX)

	if (type >= PERF_COUNT_HW_CACHE_MAX)

		goto out_err;

		goto out_err;





	op = (config >>  8) & 0xff;

	op = (config >>  8) & 0xff;

	err = "unknown-ext-hardware-cache-op";

	err = "unknown-ext-hardware-cache-op";

	if (op > PERF_COUNT_HW_CACHE_OP_MAX)

	if (op >= PERF_COUNT_HW_CACHE_OP_MAX)

		goto out_err;

		goto out_err;





	result = (config >> 16) & 0xff;

	result = (config >> 16) & 0xff;

	err = "unknown-ext-hardware-cache-result";

	err = "unknown-ext-hardware-cache-result";

	if (result > PERF_COUNT_HW_CACHE_RESULT_MAX)

	if (result >= PERF_COUNT_HW_CACHE_RESULT_MAX)

		goto out_err;

		goto out_err;





	err = "invalid-cache";

	err = "invalid-cache";

tools/perf/util/unwind-libdw.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ static int entry(u64 ip, struct unwind_info *ui) 
	if (__report_module(&al, ip, ui))

	if (__report_module(&al, ip, ui))

		return -1;

		return -1;





	e->ip  = ip;

	e->ip  = al.addr;

	e->map = al.map;

	e->map = al.map;

	e->sym = al.sym;

	e->sym = al.sym;

tools/perf/util/unwind-libunwind-local.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -542,7 +542,7 @@ static int entry(u64 ip, struct thread *thread, 
	thread__find_addr_location(thread, PERF_RECORD_MISC_USER,

	thread__find_addr_location(thread, PERF_RECORD_MISC_USER,

				   MAP__FUNCTION, ip, &al);

				   MAP__FUNCTION, ip, &al);





	e.ip = ip;

	e.ip = al.addr;

	e.map = al.map;

	e.map = al.map;

	e.sym = al.sym;

	e.sym = al.sym;