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

Commit 5b923564 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:

  - Fix link time error with sample_reg_masks on non-x86. (Stephane Eranian)

  - Fix potential array out of bounds access. (Wang Nan)

  - Fix Intel PT instruction decoder dependency problem. (Wang Nan)

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

tools/perf/arch/sh/util/dwarf-regs.c

+1 −1
Original line number Diff line number Diff line
@@ -51,5 +51,5 @@ const char *sh_regs_table[SH_MAX_REGS] = { 
/* Return architecture dependent register string (for kprobe-tracer) */

const char *get_arch_regstr(unsigned int n)

{

	return (n <= SH_MAX_REGS) ? sh_regs_table[n] : NULL;

	return (n < SH_MAX_REGS) ? sh_regs_table[n] : NULL;

}

tools/perf/arch/sparc/util/dwarf-regs.c

+1 −1
Original line number Diff line number Diff line
@@ -39,5 +39,5 @@ const char *sparc_regs_table[SPARC_MAX_REGS] = { 
 */

const char *get_arch_regstr(unsigned int n)

{

	return (n <= SPARC_MAX_REGS) ? sparc_regs_table[n] : NULL;

	return (n < SPARC_MAX_REGS) ? sparc_regs_table[n] : NULL;

}

tools/perf/arch/x86/util/dwarf-regs.c

+1 −1
Original line number Diff line number Diff line
@@ -71,5 +71,5 @@ const char *x86_64_regs_table[X86_64_MAX_REGS] = { 
/* Return architecture dependent register string (for kprobe-tracer) */

const char *get_arch_regstr(unsigned int n)

{

	return (n <= ARCH_MAX_REGS) ? arch_regs_table[n] : NULL;

	return (n < ARCH_MAX_REGS) ? arch_regs_table[n] : NULL;

}

tools/perf/arch/x86/util/perf_regs.c

+21 −23
Original line number Diff line number Diff line 
#include "../../perf.h"

#include "../../util/perf_regs.h"



#define REG(n, b) { .name = #n, .mask = 1ULL << (b) }

#define REG_END { .name = NULL }

const struct sample_reg sample_reg_masks[] = {

	REG(AX, PERF_REG_X86_AX),

	REG(BX, PERF_REG_X86_BX),

	REG(CX, PERF_REG_X86_CX),

	REG(DX, PERF_REG_X86_DX),

	REG(SI, PERF_REG_X86_SI),

	REG(DI, PERF_REG_X86_DI),

	REG(BP, PERF_REG_X86_BP),

	REG(SP, PERF_REG_X86_SP),

	REG(IP, PERF_REG_X86_IP),

	REG(FLAGS, PERF_REG_X86_FLAGS),

	REG(CS, PERF_REG_X86_CS),

	REG(SS, PERF_REG_X86_SS),

	SMPL_REG(AX, PERF_REG_X86_AX),

	SMPL_REG(BX, PERF_REG_X86_BX),

	SMPL_REG(CX, PERF_REG_X86_CX),

	SMPL_REG(DX, PERF_REG_X86_DX),

	SMPL_REG(SI, PERF_REG_X86_SI),

	SMPL_REG(DI, PERF_REG_X86_DI),

	SMPL_REG(BP, PERF_REG_X86_BP),

	SMPL_REG(SP, PERF_REG_X86_SP),

	SMPL_REG(IP, PERF_REG_X86_IP),

	SMPL_REG(FLAGS, PERF_REG_X86_FLAGS),

	SMPL_REG(CS, PERF_REG_X86_CS),

	SMPL_REG(SS, PERF_REG_X86_SS),

#ifdef HAVE_ARCH_X86_64_SUPPORT

	REG(R8, PERF_REG_X86_R8),

	REG(R9, PERF_REG_X86_R9),

	REG(R10, PERF_REG_X86_R10),

	REG(R11, PERF_REG_X86_R11),

	REG(R12, PERF_REG_X86_R12),

	REG(R13, PERF_REG_X86_R13),

	REG(R14, PERF_REG_X86_R14),

	REG(R15, PERF_REG_X86_R15),

	SMPL_REG(R8, PERF_REG_X86_R8),

	SMPL_REG(R9, PERF_REG_X86_R9),

	SMPL_REG(R10, PERF_REG_X86_R10),

	SMPL_REG(R11, PERF_REG_X86_R11),

	SMPL_REG(R12, PERF_REG_X86_R12),

	SMPL_REG(R13, PERF_REG_X86_R13),

	SMPL_REG(R14, PERF_REG_X86_R14),

	SMPL_REG(R15, PERF_REG_X86_R15),

#endif

	REG_END

	SMPL_REG_END

};

tools/perf/util/intel-pt-decoder/Build

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ inat_tables_script = util/intel-pt-decoder/gen-insn-attr-x86.awk 
inat_tables_maps = util/intel-pt-decoder/x86-opcode-map.txt



$(OUTPUT)util/intel-pt-decoder/inat-tables.c: $(inat_tables_script) $(inat_tables_maps)

	$(call rule_mkdir)

	@$(call echo-cmd,gen)$(AWK) -f $(inat_tables_script) $(inat_tables_maps) > $@ || rm -f $@



$(OUTPUT)util/intel-pt-decoder/intel-pt-insn-decoder.o: util/intel-pt-decoder/inat.c $(OUTPUT)util/intel-pt-decoder/inat-tables.c