perf fixes
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: 34c9ca37aaec2e307b837bb099d3b44f0ea04ddc tooling/headers: Synchronize updated s390 and x86 UAPI headers
This tree includes perf namespace support kernel side fixes, plus an accumulated set of perf tooling fixes - including UAPI header synchronization that should make the perf build less noisy.
Thanks,
Ingo
------------------>
Adrian Hunter (1):
perf intel-pt: Bring instruction decoder files into line with the kernel
Andi Kleen (1):
perf record: Fix -c/-F options for cpu event aliases
Andrei Vagin (1):
perf trace: Fix an exit code of trace__symbols_init
Arnaldo Carvalho de Melo (16):
perf evlist: Set the correct idx when adding dummy events
perf record: Generate PERF_RECORD_{MMAP,COMM,EXEC} with --delay perf evsel: Fix up leftover perf_evsel_stat usage via evsel->priv perf script: Fix --per-event-dump for auxtrace synth evsels perf machine: Guard against NULL in machine__exit()
perf evlist: Add helper to check if attr.exclude_kernel is set in all evsels perf report: Ignore kptr_restrict when not sampling the kernel perf record: Ignore kptr_restrict when not sampling the kernel perf top: Ignore kptr_restrict when not sampling the kernel tools headers: Synchronize kernel ABI headers wrt SPDX tags tools headers: Synchronize perf_event.h header
tools headers uapi: Synchronize drm/drm.h
tools headers: Synchronize drm/i915_drm.h
tools headers: Synchronize KVM arch ABI headers
tools headers: Synchronize prctl.h ABI header
tools headers: Syncronize mman.h ABI header
Ingo Molnar (2):
tools/headers: Synchronize kernel x86 UAPI headers tooling/headers: Synchronize updated s390 and x86 UAPI headers
Jiri Olsa (3):
perf: Fix header.size for namespace events perf top: Fix window dimensions change handling perf top: Use signal interface for SIGWINCH handler
Namhyung Kim (1):
perf help: Fix a bug during strstart() conversion
Ravi Bangoria (1):
perf annotate: Do not truncate instruction names at 6 chars
Satheesh Rajendran (1):
perf bench numa: Fixup discontiguous/sparse numa nodes
Thomas Richter (3):
perf test shell: Fix check open filename arg using 'perf trace' on s390x
perf test shell: Fix test case probe libc's inet_pton on s390x
perf test: Fix test 21 for s390xVasily Averin (1):
perf/core: Fix memory leak triggered by perf --namespace
kernel/events/core.c | 5 +- tools/arch/arm/include/uapi/asm/kvm.h | 7 + tools/arch/arm64/include/uapi/asm/kvm.h | 7 + tools/arch/s390/include/uapi/asm/kvm.h | 4 - tools/arch/s390/include/uapi/asm/kvm_perf.h | 4 - tools/arch/x86/include/asm/cpufeatures.h | 537 +++++++++++---------- tools/arch/x86/include/asm/disabled-features.h | 8 +- tools/include/uapi/asm-generic/mman.h | 1 + tools/include/uapi/drm/drm.h | 41 ++ tools/include/uapi/drm/i915_drm.h | 33 +- tools/include/uapi/linux/kcmp.h | 1 + tools/include/uapi/linux/kvm.h | 1 + tools/include/uapi/linux/perf_event.h | 1 + tools/include/uapi/linux/prctl.h | 10 + tools/perf/bench/numa.c | 56 ++- tools/perf/builtin-help.c | 4 +- tools/perf/builtin-record.c | 42 +- tools/perf/builtin-report.c | 3 + tools/perf/builtin-script.c | 31 +- tools/perf/builtin-top.c | 36 +- tools/perf/builtin-trace.c | 6 +- .../perf/tests/shell/trace+probe_libc_inet_pton.sh | 7 +- tools/perf/tests/shell/trace+probe_vfs_getname.sh | 6 +- tools/perf/tests/task-exit.c | 4 + tools/perf/trace/beauty/mmap.c | 3 + tools/perf/util/annotate.c | 18 +- tools/perf/util/evlist.c | 14 +- tools/perf/util/evlist.h | 2 + tools/perf/util/evsel.c | 14 +- tools/perf/util/evsel.h | 1 + tools/perf/util/intel-pt-decoder/inat.h | 10 + .../perf/util/intel-pt-decoder/x86-opcode-map.txt | 2 +- tools/perf/util/machine.c | 3 + tools/perf/util/parse-events.c | 2 + tools/perf/util/parse-events.h | 3 + tools/perf/util/pmu.c | 5 + 36 files changed, 594 insertions(+), 338 deletions(-)
kernel/events/core.c +4 -1
@@ -6639,6 +6639,7 @@ static void perf_event_namespaces_output(struct perf_event *event,struct perf_namespaces_event *namespaces_event = data;struct perf_output_handle handle;struct perf_sample_data sample; +u16 header_size = namespaces_event->event_id.header.size;int ret;if (!perf_event_namespaces_match (event))
@@ -6649,7 +6650,7 @@ static void perf_event_namespaces_output(struct perf_event *event, ret =perf_output_begin (&handle, event, namespaces_event->event_id.header.size);if (ret) -return ; + goto out; namespaces_event->event_id.pid =perf_event_pid (event, namespaces_event->task);
@@ -6661,6 +6662,8 @@ static void perf_event_namespaces_output(struct perf_event *event,perf_event__output_id_sample (event, &handle, &sample);perf_output_end (&handle); +out: + namespaces_event->event_id.header.size = header_size; } static void perf_fill_ns_link_info(struct perf_ns_link_info *ns_link_info,
tools/arch/arm/include/uapi/asm/kvm.h +7 -0
@@ -152,6 +152,12 @@ struct kvm_arch_memory_slot { (__ARM_CP15_REG(op1, 0, crm, 0) | KVM_REG_SIZE_U64)#define ARM_CP15_REG64 (...) __ARM_CP15_REG64(__VA_ARGS__) +/* PL1 Physical Timer Registers */ +#define KVM_REG_ARM_PTIMER_CTL ARM_CP15_REG32(0, 14, 2, 1) +#define KVM_REG_ARM_PTIMER_CNT ARM_CP15_REG64(0, 14) +#define KVM_REG_ARM_PTIMER_CVAL ARM_CP15_REG64(2, 14) + +/* Virtual Timer Registers */ #define KVM_REG_ARM_TIMER_CTL ARM_CP15_REG32(0, 14, 3, 1)#define KVM_REG_ARM_TIMER_CNT ARM_CP15_REG64(1, 14)#define KVM_REG_ARM_TIMER_CVAL ARM_CP15_REG64(3, 14)
@@ -216,6 +222,7 @@ struct kvm_arch_memory_slot {#define KVM_DEV_ARM_ITS_SAVE_TABLES 1#define KVM_DEV_ARM_ITS_RESTORE_TABLES 2#define KVM_DEV_ARM_VGIC_SAVE_PENDING_TABLES 3 +#define KVM_DEV_ARM_ITS_CTRL_RESET 4/* KVM_IRQ_LINE irq field index values */ #define KVM_ARM_IRQ_TYPE_SHIFT 24
tools/arch/arm64/include/uapi/asm/kvm.h +7 -0
@@ -196,6 +196,12 @@ struct kvm_arch_memory_slot {#define ARM64_SYS_REG (...) (__ARM64_SYS_REG(__VA_ARGS__) | KVM_REG_SIZE_U64) +/* Physical Timer EL0 Registers */ +#define KVM_REG_ARM_PTIMER_CTL ARM64_SYS_REG(3, 3, 14, 2, 1) +#define KVM_REG_ARM_PTIMER_CVAL ARM64_SYS_REG(3, 3, 14, 2, 2) +#define KVM_REG_ARM_PTIMER_CNT ARM64_SYS_REG(3, 3, 14, 0, 1) + +/* EL0 Virtual Timer Registers */ #define KVM_REG_ARM_TIMER_CTL ARM64_SYS_REG(3, 3, 14, 3, 1)#define KVM_REG_ARM_TIMER_CNT ARM64_SYS_REG(3, 3, 14, 3, 2)#define KVM_REG_ARM_TIMER_CVAL ARM64_SYS_REG(3, 3, 14, 0, 2)
@@ -228,6 +234,7 @@ struct kvm_arch_memory_slot {#define KVM_DEV_ARM_ITS_SAVE_TABLES 1#define KVM_DEV_ARM_ITS_RESTORE_TABLES 2#define KVM_DEV_ARM_VGIC_SAVE_PENDING_TABLES 3 +#define KVM_DEV_ARM_ITS_CTRL_RESET 4/* Device Control API on vcpu fd */ #define KVM_ARM_VCPU_PMU_V3_CTRL 0
tools/arch/s390/include/uapi/asm/kvm.h +0 -4
@@ -6,10 +6,6 @@* * Copyright IBM Corp. 2008 * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. -* * Author(s): Carsten Otte <[email protected]> * Christian Borntraeger <[email protected]> */
tools/arch/s390/include/uapi/asm/kvm_perf.h +0 -4
@@ -4,10 +4,6 @@* * Copyright 2014 IBM Corp. * Author(s): Alexander Yarygin <[email protected]> -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. */ #ifndef __LINUX_KVM_PERF_S390_H
tools/arch/x86/include/asm/cpufeatures.h +274 -263
593 lines not on this page · raw message
tools/arch/x86/include/asm/disabled-features.h +7 -1
@@ -16,6 +16,12 @@# define DISABLE_MPX (1<<(X86_FEATURE_MPX & 31))#endif +#ifdef CONFIG_X86_INTEL_UMIP +# define DISABLE_UMIP 0 +#else +# define DISABLE_UMIP (1<<(X86_FEATURE_UMIP & 31)) +#endif +#ifdef CONFIG_X86_64 # define DISABLE_VME (1<<(X86_FEATURE_VME & 31))# define DISABLE_K6_MTRR (1<<(X86_FEATURE_K6_MTRR & 31))
@@ -63,7 +69,7 @@#define DISABLED_MASK13 0#define DISABLED_MASK14 0#define DISABLED_MASK15 0 -#define DISABLED_MASK16 (DISABLE_PKU|DISABLE_OSPKE|DISABLE_LA57) +#define DISABLED_MASK16 (DISABLE_PKU|DISABLE_OSPKE|DISABLE_LA57|DISABLE_UMIP)#define DISABLED_MASK17 0#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 18)
tools/include/uapi/asm-generic/mman.h +1 -0
@@ -13,6 +13,7 @@#define MAP_NONBLOCK 0x10000/* do not block on IO */ #define MAP_STACK 0x20000/* give out an address that is best suited for process/thread stacks */ #define MAP_HUGETLB 0x40000/* create a huge page mapping */ +#define MAP_SYNC 0x80000/* perform synchronous page faults for the mapping */ /* Bits [26:31] are reserved, see mman-common.h for MAP_HUGETLB usage */
tools/include/uapi/drm/drm.h +41 -0
71 lines not on this page · raw message
tools/include/uapi/drm/i915_drm.h +27 -6
@@ -397,10 +397,20 @@ typedef struct drm_i915_irq_wait {#define I915_PARAM_MIN_EU_IN_POOL 39#define I915_PARAM_MMAP_GTT_VERSION 40 -/* Query whether DRM_I915_GEM_EXECBUFFER2 supports user defined execution +/* +* Query whether DRM_I915_GEM_EXECBUFFER2 supports user defined execution * priorities and the driver will attempt to execute batches in priority order. +* The param returns a capability bitmask, nonzero implies that the scheduler +* is enabled, with different features present according to the mask. +* +* The initial priority for each batch is supplied by the context and is +* controlled via I915_CONTEXT_PARAM_PRIORITY. */ #define I915_PARAM_HAS_SCHEDULER 41 +#define I915_SCHEDULER_CAP_ENABLED (1ul << 0) +#define I915_SCHEDULER_CAP_PRIORITY (1ul << 1) +#define I915_SCHEDULER_CAP_PREEMPTION (1ul << 2) +#define I915_PARAM_HUC_STATUS 42/* Query whether DRM_I915_GEM_EXECBUFFER2 supports the ability to opt-out of
@@ -1309,14 +1319,16 @@ struct drm_i915_reg_read {* be specified */ __u64 offset; +#define I915_REG_READ_8B_WA (1ul << 0) +__u64 val;/* Return value */ };/* Known registers: * * Render engine timestamp - 0x2358 + 64bit - gen7+ * - Note this register returns an invalid value if using the default -* single instruction 8byte read, in order to workaround that use -* offset (0x2538 | 1) instead. +* single instruction 8byte read, in order to workaround that pass +* flag I915_REG_READ_8B_WA in offset field. * */
@@ -1359,6 +1371,10 @@ struct drm_i915_gem_context_param {#define I915_CONTEXT_PARAM_GTT_SIZE 0x3#define I915_CONTEXT_PARAM_NO_ERROR_CAPTURE 0x4#define I915_CONTEXT_PARAM_BANNABLE 0x5 +#define I915_CONTEXT_PARAM_PRIORITY 0x6 +#define I915_CONTEXT_MAX_USER_PRIORITY 1023/* inclusive */ +#define I915_CONTEXT_DEFAULT_PRIORITY 0 +#define I915_CONTEXT_MIN_USER_PRIORITY -1023/* inclusive */ __u64 value; };
@@ -1510,9 +1526,14 @@ struct drm_i915_perf_oa_config {__u32 n_boolean_regs;__u32 n_flex_regs; -__u64 __user mux_regs_ptr; -__u64 __user boolean_regs_ptr; -__u64 __user flex_regs_ptr; +/* +* These fields are pointers to tuples of u32 values (register +* address, value). For example the expected length of the buffer +* pointed by mux_regs_ptr is (2 * sizeof(u32) * n_mux_regs). +*/ +__u64 mux_regs_ptr; +__u64 boolean_regs_ptr; +__u64 flex_regs_ptr; };#if defined(__cplusplus)
tools/include/uapi/linux/kcmp.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _UAPI_LINUX_KCMP_H#define _UAPI_LINUX_KCMP_H
tools/include/uapi/linux/kvm.h +1 -0
@@ -931,6 +931,7 @@ struct kvm_ppc_resize_hpt {#define KVM_CAP_PPC_SMT_POSSIBLE 147#define KVM_CAP_HYPERV_SYNIC2 148#define KVM_CAP_HYPERV_VP_INDEX 149 +#define KVM_CAP_S390_AIS_MIGRATION 150#ifdef KVM_CAP_IRQ_ROUTING
tools/include/uapi/linux/perf_event.h +1 -0
@@ -942,6 +942,7 @@ enum perf_callchain_context {#define PERF_AUX_FLAG_TRUNCATED 0x01/* record was truncated to fit */ #define PERF_AUX_FLAG_OVERWRITE 0x02/* snapshot from overwrite mode */ #define PERF_AUX_FLAG_PARTIAL 0x04/* record contains gaps */ +#define PERF_AUX_FLAG_COLLISION 0x08/* sample collided with another */ #define PERF_FLAG_FD_NO_GROUP (1UL << 0)#define PERF_FLAG_FD_OUTPUT (1UL << 1)
tools/include/uapi/linux/prctl.h +10 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _LINUX_PRCTL_H#define _LINUX_PRCTL_H
@@ -197,4 +198,13 @@ struct prctl_mm_map {# define PR_CAP_AMBIENT_LOWER 3# define PR_CAP_AMBIENT_CLEAR_ALL 4 +/* arm64 Scalable Vector Extension controls */ +/* Flag values must be kept in sync with ptrace NT_ARM_SVE interface */ +#define PR_SVE_SET_VL 50/* set task vector length */ +# define PR_SVE_SET_VL_ONEXEC (1 << 18)/* defer effect until exec */ +#define PR_SVE_GET_VL 51/* get task vector length */ +/* Bits common to PR_SVE_SET_VL and PR_SVE_GET_VL */ +# define PR_SVE_VL_LEN_MASK 0xffff +# define PR_SVE_VL_INHERIT (1 << 17)/* inherit across exec */ +#endif /* _LINUX_PRCTL_H */
tools/perf/bench/numa.c +51 -5
97 lines not on this page · raw message
tools/perf/builtin-help.c +2 -2
@@ -284,7 +284,7 @@ static int perf_help_config(const char *var, const char *value, void *cb)add_man_viewer (value);return 0 ; } -if (!strstarts (var,"man." )) +if (strstarts (var,"man." ))return add_man_viewer_info (var, value);return 0 ;
@@ -314,7 +314,7 @@ static const char *cmd_to_page(const char *perf_cmd)if (!perf_cmd)return "perf" ; -else if (!strstarts (perf_cmd,"perf" )) +else if (strstarts (perf_cmd,"perf" ))return perf_cmd;return asprintf (&s,"perf-%s" , perf_cmd) <0 ?NULL : s;
tools/perf/builtin-record.c +30 -12
60 lines not on this page · raw message
tools/perf/builtin-report.c +3 -0
@@ -441,6 +441,9 @@ static void report__warn_kptr_restrict(const struct report *rep)struct map *kernel_map =machine__kernel_map (&rep->session->machines.host);struct kmap *kernel_kmap = kernel_map ?map__kmap (kernel_map) :NULL ; +if (perf_evlist__exclude_kernel (rep->session->evlist)) +return ; + if (kernel_map == NULL || (kernel_map->dso->hit && (kernel_kmap->ref_reloc_sym == NULL ||
tools/perf/builtin-script.c +30 -1
@@ -1955,6 +1955,16 @@ static int perf_script__fopen_per_event_dump(struct perf_script *script)struct perf_evsel *evsel;evlist__for_each_entry (script->session->evlist, evsel) { +/* +* Already setup? I.e. we may be called twice in cases like +* Intel PT, one for the intel_pt// and dummy events, then +* for the evsels syntheized from the auxtrace info. +* +* Ses perf_script__process_auxtrace_info. +*/ +if (evsel->priv !=NULL ) +continue ; + evsel->priv =perf_evsel_script__new (evsel, script->session->data);if (evsel->priv ==NULL ) goto out_err_fclose;
@@ -2838,6 +2848,25 @@ int process_cpu_map_event(struct perf_tool *tool __maybe_unused,return set_maps (script); } +#ifdef HAVE_AUXTRACE_SUPPORT +static int perf_script__process_auxtrace_info (struct perf_tool *tool, +union perf_event *event, +struct perf_session *session) +{ +int ret =perf_event__process_auxtrace_info (tool, event, session); + +if (ret ==0 ) { + struct perf_script *script = container_of(tool, struct perf_script, tool); + + ret =perf_script__setup_per_event_dump (script); + } + +return ret; +} +#else +#define perf_script__process_auxtrace_info 0 +#endif +int cmd_script (int argc,const char **argv) {bool show_full_info = false;
@@ -2866,7 +2895,7 @@ int cmd_script(int argc, const char **argv) .feature = perf_event__process_feature, .build_id = perf_event__process_build_id, .id_index = perf_event__process_id_index, - .auxtrace_info = perf_event__process_auxtrace_info, + .auxtrace_info = perf_script__process_auxtrace_info, .auxtrace = perf_event__process_auxtrace, .auxtrace_error = perf_event__process_auxtrace_error, .stat = perf_event__process_stat_event,
tools/perf/builtin-top.c +19 -17
@@ -77,6 +77,7 @@#include "sane_ctype.h" static volatile int done; +static volatile int resize;#define HEADER_LINE_NR 5
@@ -85,11 +86,13 @@ static void perf_top__update_print_entries(struct perf_top *top) top->print_entries = top->winsize.ws_row -HEADER_LINE_NR ; } -static void perf_top__sig_winch (int sig__maybe_unused , -siginfo_t *info__maybe_unused ,void *arg) +static void winch_sig (int sig__maybe_unused ) { -struct perf_top *top = arg; + resize =1 ; +} +static void perf_top__resize (struct perf_top *top) +{get_term_dimensions (&top->winsize);perf_top__update_print_entries (top); }
@@ -473,12 +476,8 @@ static bool perf_top__handle_keypress(struct perf_top *top, int c)case 'e' :prompt_integer (&top->print_entries,"Enter display entries (lines)" );if (top->print_entries ==0 ) { -struct sigaction act = { - .sa_sigaction = perf_top__sig_winch, - .sa_flags =SA_SIGINFO , - }; -perf_top__sig_winch (SIGWINCH ,NULL , top); -sigaction (SIGWINCH , &act,NULL ); +perf_top__resize (top); +signal (SIGWINCH , winch_sig); }else {signal (SIGWINCH ,SIG_DFL ); }
@@ -732,14 +731,16 @@ static void perf_event__process_sample(struct perf_tool *tool,if (!machine->kptr_restrict_warned && symbol_conf.kptr_restrict && al.cpumode ==PERF_RECORD_MISC_KERNEL ) { -ui__warning ( +if (!perf_evlist__exclude_kernel (top->session->evlist)) { +ui__warning ("Kernel address maps (/proc/{kallsyms,modules}) are restricted.\n\n" "Check /proc/sys/kernel/kptr_restrict.\n\n" "Kernel%s samples will not be resolved.\n" , al.map && !RB_EMPTY_ROOT (&al.map->dso->symbols[MAP__FUNCTION ]) ?" modules" :"" ); -if (use_browser <=0 ) -sleep (5 ); +if (use_browser <=0 ) +sleep (5 ); + } machine->kptr_restrict_warned = true; }
@@ -1030,6 +1031,11 @@ static int __cmd_top(struct perf_top *top)if (hits == top->samples) ret =perf_evlist__poll (top->evlist,100 ); + +if (resize) { +perf_top__resize (top); + resize =0 ; + } } ret =0 ;
@@ -1352,12 +1358,8 @@ int cmd_top(int argc, const char **argv)get_term_dimensions (&top.winsize);if (top.print_entries ==0 ) { -struct sigaction act = { - .sa_sigaction = perf_top__sig_winch, - .sa_flags =SA_SIGINFO , - };perf_top__update_print_entries (&top); -sigaction (SIGWINCH , &act,NULL ); +signal (SIGWINCH , winch_sig); } status =__cmd_top (&top);
tools/perf/builtin-trace.c +4 -2
@@ -1152,12 +1152,14 @@ static int trace__symbols_init(struct trace *trace, struct perf_evlist *evlist)if (trace->host ==NULL )return -ENOMEM ; -if (trace_event__register_resolver (trace->host, trace__machine__resolve_kernel_addr) <0 ) -return -errno; + err =trace_event__register_resolver (trace->host, trace__machine__resolve_kernel_addr); +if (err <0 ) + goto out; err =__machine__synthesize_threads (trace->host, &trace->tool, &trace->opts.target, evlist->threads, trace__tool_process, false, trace->opts.proc_map_timeout,1 ); +out:if (err)symbol__exit ();
tools/perf/tests/shell/trace+probe_libc_inet_pton.sh +5 -2
@@ -10,8 +10,8 @@ . $(dirname $0)/lib/probe.sh -ld=$(realpath /lib64/ld*.so.* | uniq) -libc=$(echo $ld | sed 's/ld/libc/g') +libc=$(grep -w libc /proc/self/maps | head -1 | sed -r 's/.*[[:space:]](\/.*)/\1/g') +nm -g $libc 2>/dev/null | fgrep -q inet_pton || exit 254 trace_libc_inet_pton_backtrace() { idx=0
@@ -37,6 +37,9 @@ trace_libc_inet_pton_backtrace() { done } +# Check for IPv6 interface existence +ip a sh lo | fgrep -q inet6 || exit 2 + skip_if_no_perf_probe && \ perf probe -q $libc inet_pton && \ trace_libc_inet_pton_backtrace
tools/perf/tests/shell/trace+probe_vfs_getname.sh +4 -2
@@ -17,8 +17,10 @@ skip_if_no_perf_probe || exit 2 file=$(mktemp /tmp/temporary_file.XXXXX) trace_open_vfs_getname() { - perf trace -e open touch $file 2>&1 | \ - egrep " +[0-9]+\.[0-9]+ +\( +[0-9]+\.[0-9]+ ms\): +touch\/[0-9]+ open\(filename: +${file}, +flags: CREAT\|NOCTTY\|NONBLOCK\|WRONLY, +mode: +IRUGO\|IWUGO\) += +[0-9]+$" + test "$(uname -m)" = s390x && { svc="openat"; txt="dfd: +CWD, +"; } + + perf trace -e ${svc:-open} touch $file 2>&1 | \ + egrep " +[0-9]+\.[0-9]+ +\( +[0-9]+\.[0-9]+ ms\): +touch\/[0-9]+ ${svc:-open}\(${txt}filename: +${file}, +flags: CREAT\|NOCTTY\|NONBLOCK\|WRONLY, +mode: +IRUGO\|IWUGO\) += +[0-9]+$" }
tools/perf/tests/task-exit.c +4 -0
@@ -84,7 +84,11 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unused evsel =perf_evlist__first (evlist); evsel->attr.task =1 ; +#ifdef __s390x__ + evsel->attr.sample_freq =1000000 ; +#else evsel->attr.sample_freq =1 ; +#endif evsel->attr.inherit =0 ; evsel->attr.watermark =0 ; evsel->attr.wakeup_events =1 ;
tools/perf/trace/beauty/mmap.c +3 -0
@@ -62,6 +62,9 @@ static size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size,P_MMAP_FLAG (POPULATE );P_MMAP_FLAG (STACK );P_MMAP_FLAG (UNINITIALIZED ); +#ifdef MAP_SYNC +P_MMAP_FLAG (SYNC ); +#endif #undef P_MMAP_FLAGif (flags)
tools/perf/util/annotate.c +9 -9
@@ -165,7 +165,7 @@ static void ins__delete(struct ins_operands *ops)static int ins__raw_scnprintf (struct ins *ins,char *bf,size_t size,struct ins_operands *ops) { -return scnprintf (bf, size,"%-6.6s %s" , ins->name, ops->raw); +return scnprintf (bf, size,"%-6s %s" , ins->name, ops->raw); } int ins__scnprintf(struct ins *ins, char *bf, size_t size,
@@ -230,12 +230,12 @@ static int call__scnprintf(struct ins *ins, char *bf, size_t size, struct ins_operands *ops) {if (ops->target.name) -return scnprintf (bf, size,"%-6.6s %s" , ins->name, ops->target.name); +return scnprintf (bf, size,"%-6s %s" , ins->name, ops->target.name);if (ops->target.addr ==0 )return ins__raw_scnprintf (ins, bf, size, ops); -return scnprintf (bf, size,"%-6.6s *%" PRIx64, ins->name, ops->target.addr); +return scnprintf (bf, size,"%-6s *%" PRIx64, ins->name, ops->target.addr); }static struct ins_ops call_ops = {
@@ -299,7 +299,7 @@ static int jump__scnprintf(struct ins *ins, char *bf, size_t size, c++; } -return scnprintf (bf, size,"%-6.6s %.*s%" PRIx64, +return scnprintf (bf, size,"%-6s %.*s%" PRIx64, ins->name, c ? c - ops->raw :0 , ops->raw, ops->target.offset); }
@@ -372,7 +372,7 @@ static int lock__scnprintf(struct ins *ins, char *bf, size_t size,if (ops->locked.ins.ops ==NULL )return ins__raw_scnprintf (ins, bf, size, ops); - printed =scnprintf (bf, size,"%-6.6s " , ins->name); + printed =scnprintf (bf, size,"%-6s " , ins->name);return printed +ins__scnprintf (&ops->locked.ins, bf + printed, size - printed, ops->locked.ops); }
@@ -448,7 +448,7 @@ static int mov__parse(struct arch *arch, struct ins_operands *ops, struct map *mstatic int mov__scnprintf (struct ins *ins,char *bf,size_t size,struct ins_operands *ops) { -return scnprintf (bf, size,"%-6.6s %s,%s" , ins->name, +return scnprintf (bf, size,"%-6s %s,%s" , ins->name, ops->source.name ?: ops->source.raw, ops->target.name ?: ops->target.raw); }
@@ -488,7 +488,7 @@ static int dec__parse(struct arch *arch __maybe_unused, struct ins_operands *opsstatic int dec__scnprintf (struct ins *ins,char *bf,size_t size,struct ins_operands *ops) { -return scnprintf (bf, size,"%-6.6s %s" , ins->name, +return scnprintf (bf, size,"%-6s %s" , ins->name, ops->target.name ?: ops->target.raw); }
@@ -500,7 +500,7 @@ static struct ins_ops dec_ops = {static int nop__scnprintf (struct ins *ins__maybe_unused ,char *bf,size_t size,struct ins_operands *ops__maybe_unused ) { -return scnprintf (bf, size,"%-6.6s" ,"nop" ); +return scnprintf (bf, size,"%-6s" ,"nop" ); }static struct ins_ops nop_ops = {
@@ -924,7 +924,7 @@ void disasm_line__free(struct disasm_line *dl)int disasm_line__scnprintf (struct disasm_line *dl,char *bf,size_t size,bool raw) {if (raw || !dl->ins.ops) -return scnprintf (bf, size,"%-6.6s %s" , dl->ins.name, dl->ops.raw); +return scnprintf (bf, size,"%-6s %s" , dl->ins.name, dl->ops.raw);return ins__scnprintf (&dl->ins, bf, size, &dl->ops); }
tools/perf/util/evlist.c +13 -1
@@ -257,7 +257,7 @@ int perf_evlist__add_dummy(struct perf_evlist *evlist) .config = PERF_COUNT_SW_DUMMY, .size = sizeof(attr), /* to capture ABI version */ }; -struct perf_evsel *evsel =perf_evsel__new (&attr); +struct perf_evsel *evsel =perf_evsel__new_idx (&attr, evlist->nr_entries);if (evsel ==NULL )return -ENOMEM ;
@@ -1786,3 +1786,15 @@ void perf_evlist__toggle_bkw_mmap(struct perf_evlist *evlist, state_err:return ; } + +bool perf_evlist__exclude_kernel (struct perf_evlist *evlist) +{ +struct perf_evsel *evsel; + +evlist__for_each_entry (evlist, evsel) { +if (!evsel->attr.exclude_kernel) +return false; + } + +return true; +}
tools/perf/util/evlist.h +2 -0
@@ -312,4 +312,6 @@ perf_evlist__find_evsel_by_str(struct perf_evlist *evlist, const char *str);struct perf_evsel *perf_evlist__event2evsel (struct perf_evlist *evlist,union perf_event *event); + +bool perf_evlist__exclude_kernel (struct perf_evlist *evlist);#endif /* __PERF_EVLIST_H */
tools/perf/util/evsel.c +9 -5
@@ -733,12 +733,16 @@ static void apply_config_terms(struct perf_evsel *evsel,list_for_each_entry (term, config_terms, list) {switch (term->type) {case PERF_EVSEL__CONFIG_TERM_PERIOD : - attr->sample_period = term->val.period; - attr->freq =0 ; +if (!(term->weak && opts->user_interval !=ULLONG_MAX )) { + attr->sample_period = term->val.period; + attr->freq =0 ; + }break ;case PERF_EVSEL__CONFIG_TERM_FREQ : - attr->sample_freq = term->val.freq; - attr->freq =1 ; +if (!(term->weak && opts->user_freq !=UINT_MAX )) { + attr->sample_freq = term->val.freq; + attr->freq =1 ; + }break ;case PERF_EVSEL__CONFIG_TERM_TIME :if (term->val.time)
@@ -1371,7 +1375,7 @@ perf_evsel__process_group_data(struct perf_evsel *leader,static int perf_evsel__read_group (struct perf_evsel *leader,int cpu,int thread) { -struct perf_stat_evsel *ps = leader->priv; +struct perf_stat_evsel *ps = leader->stats;u64 read_format = leader->attr.read_format;int size =perf_evsel__read_size (leader);u64 *data = ps->group_data;
tools/perf/util/evsel.h +1 -0
@@ -67,6 +67,7 @@ struct perf_evsel_config_term {bool overwrite;char *branch; } val; +bool weak; };struct perf_stat_evsel ;
tools/perf/util/intel-pt-decoder/inat.h +10 -0
@@ -97,6 +97,16 @@#define INAT_MAKE_GROUP (grp) ((grp << INAT_GRP_OFFS) | INAT_MODRM)#define INAT_MAKE_IMM (imm) (imm << INAT_IMM_OFFS) +/* Identifiers for segment registers */ +#define INAT_SEG_REG_IGNORE 0 +#define INAT_SEG_REG_DEFAULT 1 +#define INAT_SEG_REG_CS 2 +#define INAT_SEG_REG_SS 3 +#define INAT_SEG_REG_DS 4 +#define INAT_SEG_REG_ES 5 +#define INAT_SEG_REG_FS 6 +#define INAT_SEG_REG_GS 7 +/* Attribute search APIs */ extern insn_attr_t inat_get_opcode_attribute (insn_byte_t opcode);extern int inat_get_last_prefix_id (insn_byte_t last_pfx);
tools/perf/util/intel-pt-decoder/x86-opcode-map.txt +1 -1
@@ -896,7 +896,7 @@ EndTable GrpTable: Grp3_1 0: TEST Eb,Ib -1: +1: TEST Eb,Ib 2: NOT Eb 3: NEG Eb 4: MUL AL,Eb
tools/perf/util/machine.c +3 -0
@@ -172,6 +172,9 @@ void machine__exit(struct machine *machine) {int i; +if (machine ==NULL ) +return ; +machine__destroy_kernel_maps (machine);map_groups__exit (&machine->kmaps);dsos__exit (&machine->dsos);
tools/perf/util/parse-events.c +2 -0
@@ -1116,6 +1116,7 @@ do { \INIT_LIST_HEAD (&__t->list); \ __t->type = PERF_EVSEL__CONFIG_TERM_ ## __type; \ __t->val.__name = __val; \ + __t->weak = term->weak; \list_add_tail (&__t->list, head_terms); \ }while (0 )
@@ -2410,6 +2411,7 @@ static int new_term(struct parse_events_term **_term, *term = *temp;INIT_LIST_HEAD (&term->list); + term->weak = false;switch (term->type_val) {case PARSE_EVENTS__TERM_TYPE_NUM :
tools/perf/util/parse-events.h +3 -0
@@ -101,6 +101,9 @@ struct parse_events_term {/* error string indexes for within parsed string */ int err_term;int err_val; + +/* Coming from implicit alias */ +bool weak; };struct parse_events_error {
tools/perf/util/pmu.c +5 -0
@@ -405,6 +405,11 @@ static int pmu_alias_terms(struct perf_pmu_alias *alias,parse_events_terms__purge (&list);return ret; } +/* +* Weak terms don't override command line options, +* which we don't want for implicit terms in aliases. +*/ + cloned->weak = true;list_add_tail (&cloned->list, &list); }list_splice (&list, terms);