perf fixes
Subsystems (2)
Linus,
Please pull the latest perf-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-for-linus
# HEAD: b7b4839d93e50adccef29eccb694807cdcb8bee3 perf/x86: Fix leak in uncore_type_init failure paths
Misc smaller fixes.
Thanks,
Ingo
------------------>
Ben Hutchings (1):
perf trace: Decode architecture-specific signal numbers
Dave Jones (1):
perf/x86: Fix leak in uncore_type_init failure paths
Don Zickus (1):
perf machine: Use map as success in ip__resolve_ams
Jiri Olsa (1):
perf symbols: Fix crash in elf_section_by_name
arch/x86/kernel/cpu/perf_event_intel_uncore.c | 3 ++- tools/perf/builtin-trace.c | 10 +++++++++- tools/perf/util/machine.c | 2 +- tools/perf/util/symbol-elf.c | 6 +++--- 4 files changed, 15 insertions(+), 6 deletions(-)
arch/x86/kernel/cpu/perf_event_intel_uncore.c +2 -1
@@ -3334,6 +3334,8 @@ static int __init uncore_type_init(struct intel_uncore_type *type)if (!pmus)return -ENOMEM ; + type->pmus = pmus; + type->unconstrainted = (struct event_constraint )__EVENT_CONSTRAINT (0 , (1ULL << type->num_counters) -1 ,0 , type->num_counters,0 ,0 );
@@ -3369,7 +3371,6 @@ static int __init uncore_type_init(struct intel_uncore_type *type) } type->pmu_group = &uncore_pmu_attr_group; - type->pmus = pmus;return 0 ; fail:uncore_type_exit (type);
tools/perf/builtin-trace.c +9 -1
@@ -825,7 +825,6 @@ static size_t syscall_arg__scnprintf_signum(char *bf, size_t size, struct syscalP_SIGNUM (PIPE );P_SIGNUM (ALRM );P_SIGNUM (TERM ); -P_SIGNUM (STKFLT );P_SIGNUM (CHLD );P_SIGNUM (CONT );P_SIGNUM (STOP );
@@ -841,6 +840,15 @@ static size_t syscall_arg__scnprintf_signum(char *bf, size_t size, struct syscalP_SIGNUM (IO );P_SIGNUM (PWR );P_SIGNUM (SYS ); +#ifdef SIGEMT +P_SIGNUM (EMT ); +#endif +#ifdef SIGSTKFLT +P_SIGNUM (STKFLT ); +#endif +#ifdef SIGSWI +P_SIGNUM (SWI ); +#endif default :break ; }
tools/perf/util/machine.c +1 -1
@@ -1213,7 +1213,7 @@ static void ip__resolve_ams(struct machine *machine, struct thread *thread,*/ thread__find_addr_location (thread, machine, m,MAP__FUNCTION , ip, &al); -if (al.sym) +if (al.map) goto found; } found:
tools/perf/util/symbol-elf.c +3 -3
@@ -151,15 +151,15 @@ Elf_Scn *elf_section_by_name(Elf *elf, GElf_Ehdr *ep,gelf_getshdr (sec, shp); str =elf_strptr (elf, ep->e_shstrndx, shp->sh_name); -if (!strcmp (name, str)) { +if (str && !strcmp (name, str)) {if (idx) *idx = cnt; -break ; +return sec; } ++cnt; } -return sec; +return NULL ; }#define elf_section__for_each_rel (reldata, pos, pos_mem, idx, nr_entries) \