perf fixes
Subsystems (5)
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: 6f55967ad9d9752813e36de6d5fdbd19741adfc7 perf/x86/intel: Fix race in intel_pmu_disable_event()
I'd like to apologize for this very late pull request: I was dithering through the week whether to send the fixes, and then yesterday Jiri's crash fix for a regression introduced in this cycle clearly marked perf/urgent as 'must merge now'.
Most of the commits are tooling fixes, plus there's three kernel fixes via four commits:
- race fix in the Intel PEBS code
- fix an AUX bug and roll back a previous attempt
- fix AMD family 17h generic HW cache-event perf counters
The largest diffstat contribution comes from the AMD fix - a new event table is introduced, which is a fairly low risk change but has a large linecount.
Thanks,
Ingo
------------------>
Alexander Shishkin (2):
perf/ring_buffer: Fix AUX software double buffering perf/x86/intel/pt: Remove software double buffering PMU capability
Arnaldo Carvalho de Melo (5):
tools uapi x86: Sync vmx.h with the kernel
perf bench numa: Add define for RUSAGE_THREAD if not present tools build: Add -ldl to the disassembler-four-args feature test tools arch uapi: Copy missing unistd.h headers for arc, hexagon and riscv perf tools: Remove needless asm/unistd.h include fixing build in some places
Bo YU (1):
perf bpf: Return value with unlocking in perf_env__find_btf()
Jiri Olsa (1):
perf/x86/intel: Fix race in intel_pmu_disable_event()
Kim Phillips (2):
perf/x86/amd: Update generic hardware cache events for Family 17h
MAINTAINERS: Include vendor specific files under arch/*/events/*
Leo Yan (3):
tools lib traceevent: Change tag string for error
perf cs-etm: Don't check cs_etm_queue::prev_packet validity perf cs-etm: Always allocate memory for cs_etm_queue::prev_packet
Thadeu Lima de Souza Cascardo (1):
perf annotate: Fix build on 32 bit for BPF annotation
Thomas Richter (1):
perf report: Report OOM in status line in the GTK UI
MAINTAINERS | 1 + arch/x86/events/amd/core.c | 111 ++++++++++++++++++++++++++- arch/x86/events/intel/core.c | 10 ++- arch/x86/events/intel/pt.c | 3 +- include/linux/perf_event.h | 1 - kernel/events/ring_buffer.c | 3 +- tools/arch/arc/include/uapi/asm/unistd.h | 51 ++++++++++++ tools/arch/hexagon/include/uapi/asm/unistd.h | 40 ++++++++++ tools/arch/riscv/include/uapi/asm/unistd.h | 42 ++++++++++ tools/arch/x86/include/uapi/asm/vmx.h | 1 + tools/lib/traceevent/parse-utils.c | 2 +- tools/perf/Makefile.config | 2 +- tools/perf/bench/numa.c | 4 + tools/perf/util/annotate.c | 8 +- tools/perf/util/cloexec.c | 1 - tools/perf/util/cs-etm.c | 14 +--- tools/perf/util/env.c | 2 +- tools/perf/util/session.c | 8 +- 18 files changed, 272 insertions(+), 32 deletions(-) create mode 100644 tools/arch/arc/include/uapi/asm/unistd.h create mode 100644 tools/arch/hexagon/include/uapi/asm/unistd.h create mode 100644 tools/arch/riscv/include/uapi/asm/unistd.h
MAINTAINERS +1 -0
@@ -12176,6 +12176,7 @@ F: arch/*/kernel/*/*/perf_event*.c F: arch/*/include/asm/perf_event.h F: arch/*/kernel/perf_callchain.c F: arch/*/events/* +F: arch/*/events/*/* F: tools/perf/ PERSONALITY HANDLING
arch/x86/events/amd/core.c +108 -3
123 lines not on this page · raw message
arch/x86/events/intel/core.c +7 -3
@@ -2091,15 +2091,19 @@ static void intel_pmu_disable_event(struct perf_event *event) cpuc->intel_ctrl_host_mask &= ~(1ull << hwc->idx); cpuc->intel_cp_status &= ~(1ull << hwc->idx); -if (unlikely (event->attr.precise_ip)) -intel_pmu_pebs_disable (event); -if (unlikely (hwc->config_base ==MSR_ARCH_PERFMON_FIXED_CTR_CTRL )) {intel_pmu_disable_fixed (hwc);return ; }x86_pmu_disable_event (event); + +/* +* Needs to be called after x86_pmu_disable_event, +* so we don't trigger the event without PEBS bit set. +*/ +if (unlikely (event->attr.precise_ip)) +intel_pmu_pebs_disable (event); }static void intel_pmu_del_event (struct perf_event *event)
arch/x86/events/intel/pt.c +1 -2
@@ -1525,8 +1525,7 @@ static __init int pt_init(void) }if (!intel_pt_validate_hw_cap (PT_CAP_topa_multiple_entries)) - pt_pmu.pmu.capabilities = -PERF_PMU_CAP_AUX_NO_SG |PERF_PMU_CAP_AUX_SW_DOUBLEBUF ; + pt_pmu.pmu.capabilities =PERF_PMU_CAP_AUX_NO_SG ; pt_pmu.pmu.capabilities |=PERF_PMU_CAP_EXCLUSIVE |PERF_PMU_CAP_ITRACE ; pt_pmu.pmu.attr_groups = pt_attr_groups;
include/linux/perf_event.h +0 -1
@@ -240,7 +240,6 @@ struct perf_event;#define PERF_PMU_CAP_NO_INTERRUPT 0x01#define PERF_PMU_CAP_NO_NMI 0x02#define PERF_PMU_CAP_AUX_NO_SG 0x04 -#define PERF_PMU_CAP_AUX_SW_DOUBLEBUF 0x08#define PERF_PMU_CAP_EXCLUSIVE 0x10#define PERF_PMU_CAP_ITRACE 0x20#define PERF_PMU_CAP_HETEROGENEOUS_CPUS 0x40
kernel/events/ring_buffer.c +1 -2
@@ -610,8 +610,7 @@ int rb_alloc_aux(struct ring_buffer *rb, struct perf_event *event,* PMU requests more than one contiguous chunks of memory * for SW double buffering */ -if ((event->pmu->capabilities &PERF_PMU_CAP_AUX_SW_DOUBLEBUF ) && - !overwrite) { +if (!overwrite) {if (!max_order)return -EINVAL ;
tools/arch/arc/include/uapi/asm/unistd.h new file +51 -0
51 lines not on this page · raw message
tools/arch/hexagon/include/uapi/asm/unistd.h new file +40 -0
@@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* +* Syscall support for Hexagon +* +* Copyright (c) 2010-2011, The Linux Foundation. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 and +* only version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +* 02110-1301, USA. +*/ + +/* +* The kernel pulls this unistd.h in three different ways: +* 1. the "normal" way which gets all the __NR defines +* 2. with __SYSCALL defined to produce function declarations +* 3. with __SYSCALL defined to produce syscall table initialization +* See also: syscalltab.c +*/ + +#define sys_mmap2 sys_mmap_pgoff +#define __ARCH_WANT_RENAMEAT +#define __ARCH_WANT_STAT64 +#define __ARCH_WANT_SET_GET_RLIMIT +#define __ARCH_WANT_SYS_EXECVE +#define __ARCH_WANT_SYS_CLONE +#define __ARCH_WANT_SYS_VFORK +#define __ARCH_WANT_SYS_FORK +#define __ARCH_WANT_TIME32_SYSCALLS + +#include <asm-generic/unistd.h>
tools/arch/riscv/include/uapi/asm/unistd.h new file +42 -0
42 lines not on this page · raw message
tools/arch/x86/include/uapi/asm/vmx.h +1 -0
@@ -146,6 +146,7 @@#define VMX_ABORT_SAVE_GUEST_MSR_FAIL 1#define VMX_ABORT_LOAD_HOST_PDPTE_FAIL 2 +#define VMX_ABORT_VMCS_CORRUPTED 3#define VMX_ABORT_LOAD_HOST_MSR_FAIL 4#endif /* _UAPIVMX_H */
tools/lib/traceevent/parse-utils.c +1 -1
@@ -14,7 +14,7 @@void __vwarning (const char *fmt,va_list ap) {if (errno) -perror ("trace-cmd" ); +perror ("libtraceevent" ); errno =0 ;fprintf (stderr," " );
tools/perf/Makefile.config +1 -1
@@ -227,7 +227,7 @@ FEATURE_CHECK_LDFLAGS-libpython-version := $(PYTHON_EMBED_LDOPTS) FEATURE_CHECK_LDFLAGS-libaio = -lrt -FEATURE_CHECK_LDFLAGS-disassembler-four-args = -lbfd -lopcodes +FEATURE_CHECK_LDFLAGS-disassembler-four-args = -lbfd -lopcodes -ldl CFLAGS += -fno-omit-frame-pointer CFLAGS += -ggdb3
tools/perf/bench/numa.c +4 -0
@@ -39,6 +39,10 @@#include <numa.h> #include <numaif.h> +#ifndef RUSAGE_THREAD +# define RUSAGE_THREAD 1 +#endif +/* * Regular printout to the terminal, supressed if -q is specified: */
tools/perf/util/annotate.c +4 -4
@@ -1714,8 +1714,8 @@ static int symbol__disassemble_bpf(struct symbol *sym,if (dso->binary_type !=DSO_BINARY_TYPE__BPF_PROG_INFO )return -1 ; -pr_debug ("%s: handling sym %s addr %lx len %lx\n" , __func__, - sym->name, sym->start, sym->end - sym->start); +pr_debug ("%s: handling sym %s addr %" PRIx64" len %" PRIx64"\n" , __func__, + sym->name, sym->start, sym->end - sym->start);memset (tpath,0 ,sizeof (tpath));perf_exe (tpath,sizeof (tpath));
@@ -1740,7 +1740,7 @@ static int symbol__disassemble_bpf(struct symbol *sym, info_linear = info_node->info_linear; sub_id = dso->bpf_prog.sub_id; - info.buffer = (void *)(info_linear->info.jited_prog_insns); + info.buffer = (void *)(uintptr_t )(info_linear->info.jited_prog_insns); info.buffer_length = info_linear->info.jited_prog_len;if (info_linear->info.nr_line_info)
@@ -1776,7 +1776,7 @@ static int symbol__disassemble_bpf(struct symbol *sym,const char *srcline;u64 addr; - addr = pc + ((u64 *)(info_linear->info.jited_ksyms))[sub_id]; + addr = pc + ((u64 *)(uintptr_t )(info_linear->info.jited_ksyms))[sub_id]; count =disassemble (pc, &info);if (prog_linfo)
tools/perf/util/cloexec.c +0 -1
@@ -7,7 +7,6 @@#include "asm/bug.h" #include "debug.h" #include <unistd.h> -#include <asm/unistd.h> #include <sys/syscall.h> static unsigned long flag =PERF_FLAG_FD_CLOEXEC ;
tools/perf/util/cs-etm.c +4 -10
@@ -422,11 +422,9 @@ static struct cs_etm_queue *cs_etm__alloc_queue(struct cs_etm_auxtrace *etm)if (!etmq->packet) goto out_free; -if (etm->synth_opts.last_branch || etm->sample_branches) { - etmq->prev_packet =zalloc (szp); -if (!etmq->prev_packet) - goto out_free; - } + etmq->prev_packet =zalloc (szp); +if (!etmq->prev_packet) + goto out_free;if (etm->synth_opts.last_branch) {size_t sz =sizeof (struct branch_stack );
@@ -981,7 +979,6 @@ static int cs_etm__sample(struct cs_etm_queue *etmq)* PREV_PACKET is a branch. */ if (etm->synth_opts.last_branch && - etmq->prev_packet && etmq->prev_packet->sample_type ==CS_ETM_RANGE && etmq->prev_packet->last_instr_taken_branch)cs_etm__update_last_branch_rb (etmq);
@@ -1014,7 +1011,7 @@ static int cs_etm__sample(struct cs_etm_queue *etmq) etmq->period_instructions = instrs_over; } -if (etm->sample_branches && etmq->prev_packet) { +if (etm->sample_branches) {bool generate_sample = false;/* Generate sample for tracing on packet */
@@ -1071,9 +1068,6 @@ static int cs_etm__flush(struct cs_etm_queue *etmq)struct cs_etm_auxtrace *etm = etmq->etm;struct cs_etm_packet *tmp; -if (!etmq->prev_packet) -return 0 ; -/* Handle start tracing packet */ if (etmq->prev_packet->sample_type ==CS_ETM_EMPTY ) goto swap_packet;
tools/perf/util/env.c +1 -1
@@ -115,8 +115,8 @@ struct btf_node *perf_env__find_btf(struct perf_env *env, __u32 btf_id) } node =NULL ; -up_read (&env->bpf_progs.lock); out: +up_read (&env->bpf_progs.lock);return node; }
tools/perf/util/session.c +5 -3
@@ -1928,12 +1928,14 @@ reader__process_events(struct reader *rd, struct perf_session *session, size = event->header.size; + skip = -EINVAL ; +if (size <sizeof (struct perf_event_header ) || (skip = rd->process (session, event, file_pos)) <0 ) { -pr_err ("%#" PRIx64" [%#x]: failed to process type: %d\n" , +pr_err ("%#" PRIx64" [%#x]: failed to process type: %d [%s]\n" , file_offset + head, event->header.size, - event->header.type); - err = -EINVAL ; + event->header.type,strerror (-skip)); + err = skip; goto out; }
The pull request you sent on Sun, 5 May 2019 14:47:46 +0200:
The pull request you sent on Sun, 5 May 2019 14:47:46 +0200:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.gitperf-urgent-for-linus
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/7178fb0b239d1c037876301c116fc9a6c1bd2ac0
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker