perf/urgent fixes:
- 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: Arnaldo Carvalho de Melo <acme@redhat.com> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJV5c4GAAoJENZQFvNTUqpAwEAP/0wOxyXgCdkzYHFL6mCZhqiE YvplpsZmAC/ew9ticgJeClAz3EVj13jTbq+5MyQ7bP90c3zNrNQ/i6FO9+dixo3G mz1OrRrJ663M+wAavc0uw3ZgLtx0SLZ1EEtNb2u657MMQIOPlXJ610tD79Nz7PHY qy/nwd8mc2CvRFRy0JfGEWtMsVlK+zUsYMeVw66NCJmNaWsgpsdY7M/CLwUcikob SDXox037vN10ifxRzE++VmOri2FNr2G8l8uSxoUal7/QTgTk1ELJUsG0hXw3JkGd 5WhMjuCmNnMWkjMmQiEpZBsESrUV6u+ex6GcG7OU0zd6fTqSJTIJCm+BBwHuTKXS 4vzUGc910VUnyZl9qUlz9wSn3xfHoLHde2J1dKiK1yf97sPjiYbd0vmNlsengSjn iDolHh/IWL8gnSCIwdDNw3wLthXYXjTAQnWXlD2r4DyceNb5vNpST6T8RIPB+bU9 MYoBmZV273OSxwfmaH2lTDmnzVnUlErPVM1xnVGgVbWJPRJtuPyiiREKMcJp0h5S DqIUsoFrtp9/4U/MtKdK+LzXti5OqufAZThEyZ1/0r378A/L9BazjgPSCzQ+AYTN iwIWtumEz2wUSr5kcfoDWwzKvvXLj+DU2AFSQ1VHXPMBqPX+3Vyk5IgMnjcj17Qx 6Cq4KVpcWq+y1XPv5roy =+Rg2 -----END PGP SIGNATURE----- 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: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
commit
5b923564cc
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -1,30 +1,28 @@
|
|||
#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
|
||||
};
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -2,6 +2,10 @@
|
|||
#include "perf_regs.h"
|
||||
#include "event.h"
|
||||
|
||||
const struct sample_reg __weak sample_reg_masks[] = {
|
||||
SMPL_REG_END
|
||||
};
|
||||
|
||||
int perf_reg_value(u64 *valp, struct regs_dump *regs, int id)
|
||||
{
|
||||
int i, idx = 0;
|
||||
|
|
|
@ -9,6 +9,8 @@ struct sample_reg {
|
|||
const char *name;
|
||||
uint64_t mask;
|
||||
};
|
||||
#define SMPL_REG(n, b) { .name = #n, .mask = 1ULL << (b) }
|
||||
#define SMPL_REG_END { .name = NULL }
|
||||
|
||||
extern const struct sample_reg sample_reg_masks[];
|
||||
|
||||
|
|
Loading…
Reference in a new issue