perf fixes
Subsystems (3)
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: cb48b6a26cace226d8b299a48c73e808eb0c4f61 Merge tag 'perf-urgent-for-mingo-4.19-20180912' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Mostly tooling fixes, but also breakpoint and x86 PMU driver fixes.
Thanks,
Ingo
------------------>
Adrian Hunter (1):
perf tools: Fix maps__find_symbol_by_name()
Arnaldo Carvalho de Melo (7):
perf tools: Streamline bpf examples and headers installation tools headers uapi: Update tools's copy of linux/perf_event.h tools headers uapi: Update tools's copy of asm-generic/unistd.h tools headers uapi: Update tools's copy of drm/drm.h tools headers uapi: Update tools's copies of kvm headers tools headers uapi: Update tools's copy of linux/vhost.h tools headers uapi: Update tools's copy of linux/if_link.h
Chris Phlipot (2):
perf util: Fix bad memory access in trace info. perf event-parse: Use fixed size string for comms
Hisao Tanabe (1):
perf evsel: Fix potential null pointer dereference in perf_evsel__new_idx()
Jacek Tomaka (1):
perf/x86/intel: Add support/quirk for the MISPREDICT bit on Knights Landing CPUs
Jiri Olsa (5):
perf tests: Add breakpoint modify tests
perf/hw_breakpoint: Modify breakpoint even if the new attr has disabled set perf/hw_breakpoint: Remove superfluous bp->attr.disabled = 0 perf/hw_breakpoint: Enable breakpoint in modify_user_hw_breakpoint perf/hw_breakpoint: Simplify breakpoint enable in perf_event_modify_breakpoint
Kim Phillips (2):
perf arm64: Fix include path for asm-generic/unistd.h
perf annotate: Fix parsing aarch64 branch instructions after objdump update
Martin Liška (1):
perf annotate: Properly interpret indirect call
Peter Zijlstra (1):
perf/UAPI: Clearly mark __PERF_SAMPLE_CALLCHAIN_EARLY as internal use
Sandipan Das (1):
perf probe powerpc: Ignore SyS symbols irrespective of endianness
Yabin Cui (1):
perf/core: Force USER_DS when recording user stack data
arch/x86/events/intel/lbr.c | 4 + include/uapi/linux/perf_event.h | 2 +- kernel/events/core.c | 15 +- kernel/events/hw_breakpoint.c | 13 +- tools/arch/arm/include/uapi/asm/kvm.h | 13 ++ tools/arch/arm64/include/uapi/asm/kvm.h | 13 ++ tools/arch/s390/include/uapi/asm/kvm.h | 5 +- tools/arch/x86/include/uapi/asm/kvm.h | 37 ++++ tools/include/uapi/asm-generic/unistd.h | 4 +- tools/include/uapi/drm/drm.h | 9 + tools/include/uapi/linux/if_link.h | 17 ++ tools/include/uapi/linux/kvm.h | 6 + tools/include/uapi/linux/perf_event.h | 2 +- tools/include/uapi/linux/vhost.h | 18 ++ tools/perf/Makefile.perf | 14 +- tools/perf/arch/arm64/Makefile | 5 +- tools/perf/arch/arm64/entry/syscalls/mksyscalltbl | 6 +- tools/perf/arch/powerpc/util/sym-handling.c | 4 +- tools/perf/arch/x86/include/arch-tests.h | 1 + tools/perf/arch/x86/tests/Build | 1 + tools/perf/arch/x86/tests/arch-tests.c | 6 + tools/perf/arch/x86/tests/bp-modify.c | 213 ++++++++++++++++++++++ tools/perf/util/annotate.c | 32 +++- tools/perf/util/annotate.h | 1 + tools/perf/util/evsel.c | 5 +- tools/perf/util/map.c | 11 ++ tools/perf/util/trace-event-info.c | 2 +- tools/perf/util/trace-event-parse.c | 7 +- 28 files changed, 423 insertions(+), 43 deletions(-) create mode 100644 tools/perf/arch/x86/tests/bp-modify.c
arch/x86/events/intel/lbr.c +4 -0
@@ -1272,4 +1272,8 @@ void intel_pmu_lbr_init_knl(void) x86_pmu.lbr_sel_mask =LBR_SEL_MASK ; x86_pmu.lbr_sel_map = snb_lbr_sel_map; + +/* Knights Landing does have MISPREDICT bit */ +if (x86_pmu.intel_cap.lbr_format ==LBR_FORMAT_LIP ) + x86_pmu.intel_cap.lbr_format =LBR_FORMAT_EIP_FLAGS ; }
include/uapi/linux/perf_event.h +1 -1
@@ -144,7 +144,7 @@ enum perf_event_sample_format {PERF_SAMPLE_MAX =1U <<20 ,/* non-ABI */ - __PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63, + __PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63, /* non-ABI; internal use */ };/*
kernel/events/core.c +7 -8
@@ -2867,16 +2867,11 @@ static int perf_event_modify_breakpoint(struct perf_event *bp,_perf_event_disable (bp); err =modify_user_hw_breakpoint_check (bp, attr, true); -if (err) { -if (!bp->attr.disabled) -_perf_event_enable (bp); -return err; - } - -if (!attr->disabled) +if (!bp->attr.disabled)_perf_event_enable (bp); -return 0 ; + +return err; } static int perf_event_modify_attr(struct perf_event *event,
@@ -5948,6 +5943,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,unsigned long sp;unsigned int rem;u64 dyn_size; +mm_segment_t fs;/* * We dump:
@@ -5965,7 +5961,10 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,/* Data. */ sp =perf_user_stack_pointer (regs); + fs =get_fs (); +set_fs (USER_DS ); rem =__output_copy_user (handle, (void *) sp, dump_size); +set_fs (fs); dyn_size = dump_size - rem;perf_output_skip (handle, rem);
kernel/events/hw_breakpoint.c +6 -7
@@ -509,6 +509,8 @@ modify_user_hw_breakpoint_check(struct perf_event *bp, struct perf_event_attr *a*/ int modify_user_hw_breakpoint (struct perf_event *bp,struct perf_event_attr *attr) { +int err; +/* * modify_user_hw_breakpoint can be invoked with IRQs disabled and hence it * will not be possible to raise IPIs that invoke __perf_event_disable.
@@ -520,15 +522,12 @@ int modify_user_hw_breakpoint(struct perf_event *bp, struct perf_event_attr *attelse perf_event_disable (bp); -if (!attr->disabled) { -int err =modify_user_hw_breakpoint_check (bp, attr, false); + err =modify_user_hw_breakpoint_check (bp, attr, false); -if (err) -return err; +if (!bp->attr.disabled)perf_event_enable (bp); - bp->attr.disabled =0 ; - } -return 0 ; + +return err; }EXPORT_SYMBOL_GPL (modify_user_hw_breakpoint);
tools/arch/arm/include/uapi/asm/kvm.h +13 -0
@@ -27,6 +27,7 @@#define __KVM_HAVE_GUEST_DEBUG#define __KVM_HAVE_IRQ_LINE#define __KVM_HAVE_READONLY_MEM +#define __KVM_HAVE_VCPU_EVENTS#define KVM_COALESCED_MMIO_PAGE_OFFSET 1
@@ -125,6 +126,18 @@ struct kvm_sync_regs {struct kvm_arch_memory_slot { }; +/* for KVM_GET/SET_VCPU_EVENTS */ +struct kvm_vcpu_events { +struct { +__u8 serror_pending; +__u8 serror_has_esr; +/* Align it to 8 bytes */ +__u8 pad[6 ]; +__u64 serror_esr; + } exception; +__u32 reserved[12 ]; +}; +/* If you need to interpret the index values, here is the key: */ #define KVM_REG_ARM_COPROC_MASK 0x000000000FFF0000#define KVM_REG_ARM_COPROC_SHIFT 16
tools/arch/arm64/include/uapi/asm/kvm.h +13 -0
@@ -39,6 +39,7 @@#define __KVM_HAVE_GUEST_DEBUG#define __KVM_HAVE_IRQ_LINE#define __KVM_HAVE_READONLY_MEM +#define __KVM_HAVE_VCPU_EVENTS#define KVM_COALESCED_MMIO_PAGE_OFFSET 1
@@ -154,6 +155,18 @@ struct kvm_sync_regs {struct kvm_arch_memory_slot { }; +/* for KVM_GET/SET_VCPU_EVENTS */ +struct kvm_vcpu_events { +struct { +__u8 serror_pending; +__u8 serror_has_esr; +/* Align it to 8 bytes */ +__u8 pad[6 ]; +__u64 serror_esr; + } exception; +__u32 reserved[12 ]; +}; +/* If you need to interpret the index values, here is the key: */ #define KVM_REG_ARM_COPROC_MASK 0x000000000FFF0000#define KVM_REG_ARM_COPROC_SHIFT 16
tools/arch/s390/include/uapi/asm/kvm.h +4 -1
@@ -4,7 +4,7 @@/* * KVM s390 specific structures and definitions * -* Copyright IBM Corp. 2008 +* Copyright IBM Corp. 2008, 2018 * * Author(s): Carsten Otte <[email protected]> * Christian Borntraeger <[email protected]>
@@ -225,6 +225,7 @@ struct kvm_guest_debug_arch {#define KVM_SYNC_FPRS (1UL << 8)#define KVM_SYNC_GSCB (1UL << 9)#define KVM_SYNC_BPBC (1UL << 10) +#define KVM_SYNC_ETOKEN (1UL << 11)/* length and alignment of the sdnx as a power of two */ #define SDNXC 8#define SDNXL (1UL << SDNXC)
@@ -258,6 +259,8 @@ struct kvm_sync_regs {struct {__u64 reserved1[2 ];__u64 gscb[4 ]; +__u64 etoken; +__u64 etoken_extension; }; }; };
tools/arch/x86/include/uapi/asm/kvm.h +37 -0
@@ -378,4 +378,41 @@ struct kvm_sync_regs {#define KVM_X86_QUIRK_LINT0_REENABLED (1 << 0)#define KVM_X86_QUIRK_CD_NW_CLEARED (1 << 1) +#define KVM_STATE_NESTED_GUEST_MODE 0x00000001 +#define KVM_STATE_NESTED_RUN_PENDING 0x00000002 + +#define KVM_STATE_NESTED_SMM_GUEST_MODE 0x00000001 +#define KVM_STATE_NESTED_SMM_VMXON 0x00000002 + +struct kvm_vmx_nested_state { +__u64 vmxon_pa; +__u64 vmcs_pa; + +struct { +__u16 flags; + } smm; +}; + +/* for KVM_CAP_NESTED_STATE */ +struct kvm_nested_state { +/* KVM_STATE_* flags */ +__u16 flags; + +/* 0 for VMX, 1 for SVM. */ +__u16 format; + +/* 128 for SVM, 128 + VMCS size for VMX. */ +__u32 size; + +union { +/* VMXON, VMCS */ +struct kvm_vmx_nested_state vmx; + +/* Pad the header to 128 bytes. */ +__u8 pad[120 ]; + }; + +__u8 data[0 ]; +}; +#endif /* _ASM_X86_KVM_H */
tools/include/uapi/asm-generic/unistd.h +3 -1
@@ -734,9 +734,11 @@ __SYSCALL(__NR_pkey_free, sys_pkey_free) __SYSCALL(__NR_statx, sys_statx)#define __NR_io_pgetevents 292 __SC_COMP(__NR_io_pgetevents, sys_io_pgetevents, compat_sys_io_pgetevents) +#define __NR_rseq 293 +__SYSCALL(__NR_rseq, sys_rseq)#undef __NR_syscalls -#define __NR_syscalls 293 +#define __NR_syscalls 294/* * 32 bit systems traditionally used different
tools/include/uapi/drm/drm.h +9 -0
@@ -687,6 +687,15 @@ struct drm_get_cap {*/ #define DRM_CLIENT_CAP_ASPECT_RATIO 4 +/** +* DRM_CLIENT_CAP_WRITEBACK_CONNECTORS +* +* If set to 1, the DRM core will expose special connectors to be used for +* writing back to memory the scene setup in the commit. Depends on client +* also supporting DRM_CLIENT_CAP_ATOMIC +*/ +#define DRM_CLIENT_CAP_WRITEBACK_CONNECTORS 5 +/** DRM_IOCTL_SET_CLIENT_CAP ioctl argument type */ struct drm_set_client_cap {__u64 capability;
tools/include/uapi/linux/if_link.h +17 -0
@@ -164,6 +164,8 @@ enum {IFLA_CARRIER_UP_COUNT ,IFLA_CARRIER_DOWN_COUNT ,IFLA_NEW_IFINDEX , +IFLA_MIN_MTU , +IFLA_MAX_MTU , __IFLA_MAX };
@@ -334,6 +336,7 @@ enum {IFLA_BRPORT_GROUP_FWD_MASK ,IFLA_BRPORT_NEIGH_SUPPRESS ,IFLA_BRPORT_ISOLATED , +IFLA_BRPORT_BACKUP_PORT , __IFLA_BRPORT_MAX };#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
@@ -459,6 +462,16 @@ enum {#define IFLA_MACSEC_MAX (__IFLA_MACSEC_MAX - 1) +/* XFRM section */ +enum { +IFLA_XFRM_UNSPEC , +IFLA_XFRM_LINK , +IFLA_XFRM_IF_ID , + __IFLA_XFRM_MAX +}; + +#define IFLA_XFRM_MAX (__IFLA_XFRM_MAX - 1) +enum macsec_validation_type {MACSEC_VALIDATE_DISABLED =0 ,MACSEC_VALIDATE_CHECK =1 ,
@@ -920,6 +933,7 @@ enum {XDP_ATTACHED_DRV ,XDP_ATTACHED_SKB ,XDP_ATTACHED_HW , + XDP_ATTACHED_MULTI, }; enum {
@@ -928,6 +942,9 @@ enum {IFLA_XDP_ATTACHED ,IFLA_XDP_FLAGS ,IFLA_XDP_PROG_ID , +IFLA_XDP_DRV_PROG_ID , +IFLA_XDP_SKB_PROG_ID , +IFLA_XDP_HW_PROG_ID , __IFLA_XDP_MAX, };
tools/include/uapi/linux/kvm.h +6 -0
@@ -949,6 +949,9 @@ struct kvm_ppc_resize_hpt {#define KVM_CAP_GET_MSR_FEATURES 153#define KVM_CAP_HYPERV_EVENTFD 154#define KVM_CAP_HYPERV_TLBFLUSH 155 +#define KVM_CAP_S390_HPAGE_1M 156 +#define KVM_CAP_NESTED_STATE 157 +#define KVM_CAP_ARM_INJECT_SERROR_ESR 158#ifdef KVM_CAP_IRQ_ROUTING
@@ -1391,6 +1394,9 @@ struct kvm_enc_region {/* Available with KVM_CAP_HYPERV_EVENTFD */ #define KVM_HYPERV_EVENTFD _IOW(KVMIO, 0xbd, struct kvm_hyperv_eventfd) +/* Available with KVM_CAP_NESTED_STATE */ +#define KVM_GET_NESTED_STATE _IOWR(KVMIO, 0xbe, struct kvm_nested_state) +#define KVM_SET_NESTED_STATE _IOW(KVMIO, 0xbf, struct kvm_nested_state)/* Secure Encrypted Virtualization command */ enum sev_cmd_id {
tools/include/uapi/linux/perf_event.h +1 -1
@@ -144,7 +144,7 @@ enum perf_event_sample_format {PERF_SAMPLE_MAX =1U <<20 ,/* non-ABI */ - __PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63, + __PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63, /* non-ABI; internal use */ };/*
tools/include/uapi/linux/vhost.h +18 -0
@@ -65,6 +65,7 @@ struct vhost_iotlb_msg { };#define VHOST_IOTLB_MSG 0x1 +#define VHOST_IOTLB_MSG_V2 0x2struct vhost_msg {int type;
@@ -74,6 +75,15 @@ struct vhost_msg { }; }; +struct vhost_msg_v2 { +__u32 type; +__u32 reserved; +union { +struct vhost_iotlb_msg iotlb; +__u8 padding[64 ]; + }; +}; +struct vhost_memory_region {__u64 guest_phys_addr;__u64 memory_size;/* bytes */
@@ -160,6 +170,14 @@ struct vhost_memory {#define VHOST_GET_VRING_BUSYLOOP_TIMEOUT _IOW(VHOST_VIRTIO, 0x24, \ struct vhost_vring_state) +/* Set or get vhost backend capability */ + +/* Use message type V2 */ +#define VHOST_BACKEND_F_IOTLB_MSG_V2 0x1 + +#define VHOST_SET_BACKEND_FEATURES _IOW(VHOST_VIRTIO, 0x25, __u64) +#define VHOST_GET_BACKEND_FEATURES _IOR(VHOST_VIRTIO, 0x26, __u64) +/* VHOST_NET specific defines */ /* Attach virtio net ring to a raw socket, or tap device.
tools/perf/Makefile.perf +6 -8
@@ -777,14 +777,12 @@ endif $(call QUIET_INSTALL, libexec) \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)' ifndef NO_LIBBPF - $(call QUIET_INSTALL, lib) \ - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perf_include_instdir_SQ)/bpf' - $(call QUIET_INSTALL, include/bpf) \ - $(INSTALL) include/bpf/*.h '$(DESTDIR_SQ)$(perf_include_instdir_SQ)/bpf' - $(call QUIET_INSTALL, lib) \ - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perf_examples_instdir_SQ)/bpf' - $(call QUIET_INSTALL, examples/bpf) \ - $(INSTALL) examples/bpf/*.c '$(DESTDIR_SQ)$(perf_examples_instdir_SQ)/bpf' + $(call QUIET_INSTALL, bpf-headers) \ + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perf_include_instdir_SQ)/bpf'; \ + $(INSTALL) include/bpf/*.h -t '$(DESTDIR_SQ)$(perf_include_instdir_SQ)/bpf' + $(call QUIET_INSTALL, bpf-examples) \ + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perf_examples_instdir_SQ)/bpf'; \ + $(INSTALL) examples/bpf/*.c -t '$(DESTDIR_SQ)$(perf_examples_instdir_SQ)/bpf' endif $(call QUIET_INSTALL, perf-archive) \ $(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'
tools/perf/arch/arm64/Makefile +3 -2
@@ -11,7 +11,8 @@ PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1 out := $(OUTPUT)arch/arm64/include/generated/asm header := $(out)/syscalls.c -sysdef := $(srctree)/tools/include/uapi/asm-generic/unistd.h +incpath := $(srctree)/tools +sysdef := $(srctree)/tools/arch/arm64/include/uapi/asm/unistd.h sysprf := $(srctree)/tools/perf/arch/arm64/entry/syscalls/ systbl := $(sysprf)/mksyscalltbl
@@ -19,7 +20,7 @@ systbl := $(sysprf)/mksyscalltbl _dummy := $(shell [ -d '$(out)' ] || mkdir -p '$(out)') $(header): $(sysdef) $(systbl) - $(Q)$(SHELL) '$(systbl)' '$(CC)' '$(HOSTCC)' $(sysdef) > $@ + $(Q)$(SHELL) '$(systbl)' '$(CC)' '$(HOSTCC)' $(incpath) $(sysdef) > $@ clean:: $(call QUIET_CLEAN, arm64) $(RM) $(header)
tools/perf/arch/arm64/entry/syscalls/mksyscalltbl +3 -3
@@ -11,7 +11,8 @@ gcc=$1 hostcc=$2 -input=$3 +incpath=$3 +input=$4 if ! test -r $input; then echo "Could not read input file" >&2
@@ -28,7 +29,6 @@ create_table_from_c() cat <<-_EoHEADER #include <stdio.h> - #define __ARCH_WANT_RENAMEAT #include "$input" int main(int argc, char *argv[]) {
@@ -42,7 +42,7 @@ create_table_from_c() printf "%s\n" " printf(\"#define SYSCALLTBL_ARM64_MAX_ID %d\\n\", __NR_$last_sc);" printf "}\n" - } | $hostcc -o $create_table_exe -x c - + } | $hostcc -I $incpath/include/uapi -o $create_table_exe -x c - $create_table_exe
tools/perf/arch/powerpc/util/sym-handling.c +3 -1
@@ -22,15 +22,16 @@ bool elf__needs_adjust_symbols(GElf_Ehdr ehdr)#endif -#if !defined(_CALL_ELF) || _CALL_ELF !=2 int arch__choose_best_symbol (struct symbol *syma,struct symbol *symb__maybe_unused ) {char *sym = syma->name; +#if !defined(_CALL_ELF) || _CALL_ELF !=2 /* Skip over any initial dot */ if (*sym =='.' ) sym++; +#endif /* Avoid "SyS" kernel syscall aliases */ if (strlen (sym) >=3 && !strncmp (sym,"SyS" ,3 ))
@@ -41,6 +42,7 @@ int arch__choose_best_symbol(struct symbol *syma,return SYMBOL_A ; } +#if !defined(_CALL_ELF) || _CALL_ELF !=2 /* Allow matching against dot variants */ int arch__compare_symbol_names (const char *namea,const char *nameb) {
tools/perf/arch/x86/include/arch-tests.h +1 -0
@@ -9,6 +9,7 @@ struct test;int test__rdpmc (struct test *test__maybe_unused ,int subtest);int test__perf_time_to_tsc (struct test *test__maybe_unused ,int subtest);int test__insn_x86 (struct test *test__maybe_unused ,int subtest); +int test__bp_modify (struct test *test,int subtest);#ifdef HAVE_DWARF_UNWIND_SUPPORT struct thread ;
tools/perf/arch/x86/tests/Build +1 -0
@@ -5,3 +5,4 @@ libperf-y += arch-tests.o libperf-y += rdpmc.o libperf-y += perf-time-to-tsc.o libperf-$(CONFIG_AUXTRACE) += insn-x86.o +libperf-$(CONFIG_X86_64) += bp-modify.o
tools/perf/arch/x86/tests/arch-tests.c +6 -0
@@ -23,6 +23,12 @@ struct test arch_tests[] = { .desc = "x86 instruction decoder - new instructions", .func = test__insn_x86, }, +#endif +#if defined(__x86_64__) + { + .desc = "x86 bp modify", + .func = test__bp_modify, + }, #endif { .func = NULL,
tools/perf/arch/x86/tests/bp-modify.c new file +213 -0
213 lines not on this page · raw message
tools/perf/util/annotate.c +29 -3
@@ -246,8 +246,14 @@ static int call__parse(struct arch *arch, struct ins_operands *ops, struct map_s indirect_call: tok =strchr (endptr,'*' ); -if (tok !=NULL ) - ops->target.addr =strtoull (tok +1 ,NULL ,16 ); +if (tok !=NULL ) { + endptr++; + +/* Indirect call can use a non-rip register and offset: callq *0x8(%rbx). +* Do not parse such instruction. */ +if (strstr (endptr,"(%r" ) ==NULL ) + ops->target.addr =strtoull (endptr,NULL ,16 ); + } goto find_target; }
@@ -276,7 +282,19 @@ bool ins__is_call(const struct ins *ins)return ins->ops == &call_ops || ins->ops == &s390_call_ops; } -static int jump__parse (struct arch *arch__maybe_unused ,struct ins_operands *ops,struct map_symbol *ms) +/* +* Prevents from matching commas in the comment section, e.g.: +* ffff200008446e70: b.cs ffff2000084470f4 <generic_exec_single+0x314> // b.hs, b.nlast +*/ +static inline const char *validate_comma (const char *c,struct ins_operands *ops) +{ +if (ops->raw_comment && c > ops->raw_comment) +return NULL ; + +return c; +} + +static int jump__parse (struct arch *arch,struct ins_operands *ops,struct map_symbol *ms) {struct map *map = ms->map;struct symbol *sym = ms->sym;
@@ -285,6 +303,10 @@ static int jump__parse(struct arch *arch __maybe_unused, struct ins_operands *op };const char *c =strchr (ops->raw,',' );u64 start, end; + + ops->raw_comment =strchr (ops->raw, arch->objdump.comment_char); + c =validate_comma (c, ops); +/* * Examples of lines to parse for the _cpp_lex_token@@Base * function:
@@ -304,6 +326,7 @@ static int jump__parse(struct arch *arch __maybe_unused, struct ins_operands *op ops->target.addr =strtoull (c,NULL ,16 );if (!ops->target.addr) { c =strchr (c,',' ); + c =validate_comma (c, ops);if (c++ !=NULL ) ops->target.addr =strtoull (c,NULL ,16 ); }
@@ -361,9 +384,12 @@ static int jump__scnprintf(struct ins *ins, char *bf, size_t size,return scnprintf (bf, size,"%-6s %s" , ins->name, ops->target.sym->name); c =strchr (ops->raw,',' ); + c =validate_comma (c, ops); +if (c !=NULL ) {const char *c2 =strchr (c +1 ,',' ); + c2 =validate_comma (c2, ops);/* check for 3-op insn */ if (c2 !=NULL ) c = c2;
tools/perf/util/annotate.h +1 -0
@@ -22,6 +22,7 @@ struct ins {struct ins_operands {char *raw; +char *raw_comment;struct {char *raw;char *name;
tools/perf/util/evsel.c +3 -2
@@ -251,8 +251,9 @@ struct perf_evsel *perf_evsel__new_idx(struct perf_event_attr *attr, int idx) {struct perf_evsel *evsel =zalloc (perf_evsel__object.size); -if (evsel !=NULL ) -perf_evsel__init (evsel, attr, idx); +if (!evsel) +return NULL ; +perf_evsel__init (evsel, attr, idx);if (perf_evsel__is_bpf_output (evsel)) { evsel->attr.sample_type |= (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME |
tools/perf/util/map.c +11 -0
@@ -576,6 +576,13 @@ struct symbol *map_groups__find_symbol(struct map_groups *mg,return NULL ; } +static bool map__contains_symbol (struct map *map,struct symbol *sym) +{ +u64 ip = map->unmap_ip (map, sym->start); + +return ip >= map->start && ip < map->end; +} +struct symbol *maps__find_symbol_by_name (struct maps *maps,const char *name,struct map **mapp) {
@@ -591,6 +598,10 @@ struct symbol *maps__find_symbol_by_name(struct maps *maps, const char *name,if (sym ==NULL )continue ; +if (!map__contains_symbol (pos, sym)) { + sym =NULL ; +continue ; + }if (mapp !=NULL ) *mapp = pos; goto out;
tools/perf/util/trace-event-info.c +1 -1
@@ -377,7 +377,7 @@ static int record_ftrace_printk(void)static int record_saved_cmdline (void ) { -unsigned int size; +unsigned long long size;char *path;struct stat st;int ret, err =0 ;
tools/perf/util/trace-event-parse.c +3 -4
@@ -164,16 +164,15 @@ void parse_ftrace_printk(struct tep_handle *pevent,void parse_saved_cmdline (struct tep_handle *pevent,char *file,unsigned int size__maybe_unused ) { -char *comm; +char comm[17 ];/* Max comm length in the kernel is 16. */ char *line;char *next =NULL ;int pid; line =strtok_r (file,"\n" , &next);while (line) { -sscanf (line,"%d %ms" , &pid, &comm); -tep_register_comm (pevent, comm, pid); -free (comm); +if (sscanf (line,"%d %16s" , &pid, comm) ==2 ) +tep_register_comm (pevent, comm, pid); line =strtok_r (NULL ,"\n" , &next); } }