UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

perf/urgent fixes: 

- 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: Arnaldo Carvalho de Melo <acme@redhat.com>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJXthhPAAoJENZQFvNTUqpAR1gQAInlxdJmEl55EnxpLOvCz8Rd
 QiIcF0xECE25s2FILHf/t2fb889we51QC5tdKrIpNEtAynBGq+wF36ZfKF11fk2u
 Suf6IEb7Oe2g0D+tkgbQ4oJR6RiId3N2een37phAdsA3jekz1mnzONQ7QwJVHwsp
 q7QGOQuMf2ZpOEyNCVAoLb1s2RTOHfQVU8MtFp8Zqp7IQPp8vnMUI0IbOZXTbqhG
 buxWYExsMIMU4tzUqiSRA3IDkyPanfl/OC+JuCj37BzxgwBW4Nnu0/BwYPDiguod
 HoXdXxm4GRaMj/pbHJJaGks2ab9H3Iq9W3Way+Nonyhw2+/rhzBW6aIYysPzDHjJ
 /6nVtp4YawHq8cBRo5MU6fdWhyN6Q6Buapl+M4ZvKTsanehIvrdvJCuFhKOT5AsT
 idx1rdY8Gwg2mfy3BOe7l5vVGNghDZy+9y7bemJZ6W2P4U1aLTXCkZEQd22TauMh
 BilgXQFfm4/BlFKx0h8YvvnXBG1oDhnIvtuuhwLGCDXNgaRpTbeGSe5YdellYJhO
 qXn+kapm0UEqfyEN4JRsOWetl/W9Rwgjb9fNOCwJQtP3nw5kb0EroYD+EY309Dxb
 1+viV9sxprrJcNVq/O2bzdUXgINFrRVbNxbKphwLFk2lLvHEoSmE1M4VKhQEKAxo
 OrAuey9gJbjfqbobOJ4G
 =NgTy
 -----END PGP SIGNATURE-----

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: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2016-08-18 22:50:36 +02:00
parent 71e7bc2bab c53412ee8c
commit de737f33ab
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/include/linux/string.h
View File

@ -8,7 +8,11 @@ void *memdup(const void *src, size_t len);
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);
#endif

6
tools/perf/util/evsel.c
View File

@ -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;
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;
op = (config >> 8) & 0xff;
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;
result = (config >> 16) & 0xff;
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;
err = "invalid-cache";

2
tools/perf/util/unwind-libdw.c
View File

@ -66,7 +66,7 @@ static int entry(u64 ip, struct unwind_info *ui)
if (__report_module(&al, ip, ui))
return -1;
e->ip = ip;
e->ip = al.addr;
e->map = al.map;
e->sym = al.sym;

2
tools/perf/util/unwind-libunwind-local.c
View File

@ -542,7 +542,7 @@ static int entry(u64 ip, struct thread *thread,
thread__find_addr_location(thread, PERF_RECORD_MISC_USER,
MAP__FUNCTION, ip, &al);
e.ip = ip;
e.ip = al.addr;
e.map = al.map;
e.sym = al.sym;