Commit c042f7e9 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo-4.17-20180420' of... 

Merge tag 'perf-urgent-for-mingo-4.17-20180420' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fixes and improvements from Arnaldo Carvalho de Melo:

- Store context switch out type in PERF_RECORD_SWITCH[_CPU_WIDE].
  The percentage of preempting and non-preempting context switches help
  understanding the nature of workloads (CPU or IO bound) that are running
  on a machine. This adds the kernel facility and userspace changes needed
  to show this information in 'perf script' and 'perf report -D' (Alexey Budankov)

- Remove old error messages about things that unlikely to be the root cause
  in modern systems (Andi Kleen)

- Synchronize kernel ABI headers, v4.17-rc1 (Ingo Molnar)

- Support MAP_FIXED_NOREPLACE, noticed when updating the tools/include/
  copies (Arnaldo Carvalho de Melo)

- Fixup BPF test using epoll_pwait syscall function probe, to cope with
  the syscall routines renames performed in this development cycle (Arnaldo Carvalho de Melo)

- Fix sample_max_stack maximum check and do not proceed when an error
  has been detect, return them to avoid misidentifying errors (Jiri Olsa)

- Add '\n' at the end of parse-options error messages (Ravi Bangoria)

- Add s390 support for detailed/verbose PMU event description (Thomas Richter)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 15a3e845 8a9fd832

include/linux/coresight-pmu.h

+1 −12
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright(C) 2015 Linaro Limited. All rights reserved.

 * Author: Mathieu Poirier <mathieu.poirier@linaro.org>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License 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, see <http://www.gnu.org/licenses/>.

 */



#ifndef _LINUX_CORESIGHT_PMU_H

include/uapi/linux/perf_event.h

+15 −3
Original line number Diff line number Diff line
@@ -650,11 +650,23 @@ struct perf_event_mmap_page { 
#define PERF_RECORD_MISC_COMM_EXEC		(1 << 13)

#define PERF_RECORD_MISC_SWITCH_OUT		(1 << 13)

/*

 * These PERF_RECORD_MISC_* flags below are safely reused

 * for the following events:

 *

 *   PERF_RECORD_MISC_EXACT_IP           - PERF_RECORD_SAMPLE of precise events

 *   PERF_RECORD_MISC_SWITCH_OUT_PREEMPT - PERF_RECORD_SWITCH* events

 *

 *

 * PERF_RECORD_MISC_EXACT_IP:

 *   Indicates that the content of PERF_SAMPLE_IP points to

 *   the actual instruction that triggered the event. See also

 *   perf_event_attr::precise_ip.

 *

 * PERF_RECORD_MISC_SWITCH_OUT_PREEMPT:

 *   Indicates that thread was preempted in TASK_RUNNING state.

 */

#define PERF_RECORD_MISC_EXACT_IP		(1 << 14)

#define PERF_RECORD_MISC_SWITCH_OUT_PREEMPT	(1 << 14)

/*

 * Reserve the last bit to indicate some extended misc field

 */

kernel/events/callchain.c

+11 −14
Original line number Diff line number Diff line
@@ -119,10 +119,6 @@ int get_callchain_buffers(int event_max_stack) 
		goto exit;

	}



	if (count > 1) {

		/* If the allocation failed, give up */

		if (!callchain_cpus_entries)

			err = -ENOMEM;

	/*

	 * If requesting per event more than the global cap,

	 * return a different error to help userspace figure
@@ -130,11 +126,12 @@ int get_callchain_buffers(int event_max_stack) 
	 *

	 * And also do it here so that we have &callchain_mutex held.

	 */

		if (event_max_stack > sysctl_perf_event_max_stack)

	if (event_max_stack > sysctl_perf_event_max_stack) {

		err = -EOVERFLOW;

		goto exit;

	}



	if (count == 1)

		err = alloc_callchain_buffers();

exit:

	if (err)

kernel/events/core.c

+6 −2
Original line number Diff line number Diff line
@@ -7587,6 +7587,10 @@ static void perf_event_switch(struct task_struct *task, 
		},

	};



	if (!sched_in && task->state == TASK_RUNNING)

		switch_event.event_id.header.misc |=

				PERF_RECORD_MISC_SWITCH_OUT_PREEMPT;



	perf_iterate_sb(perf_event_switch_output,

		       &switch_event,

		       NULL);
@@ -10205,9 +10209,9 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr, 
		 * __u16 sample size limit.

		 */

		if (attr->sample_stack_user >= USHRT_MAX)

			ret = -EINVAL;

			return -EINVAL;

		else if (!IS_ALIGNED(attr->sample_stack_user, sizeof(u64)))

			ret = -EINVAL;

			return -EINVAL;

	}



	if (!attr->sample_max_stack)

tools/arch/arm/include/uapi/asm/kvm.h

+9 −0
Original line number Diff line number Diff line
@@ -135,6 +135,15 @@ struct kvm_arch_memory_slot { 
#define KVM_REG_ARM_CRM_SHIFT		7

#define KVM_REG_ARM_32_CRN_MASK		0x0000000000007800

#define KVM_REG_ARM_32_CRN_SHIFT	11

/*

 * For KVM currently all guest registers are nonsecure, but we reserve a bit

 * in the encoding to distinguish secure from nonsecure for AArch32 system

 * registers that are banked by security. This is 1 for the secure banked

 * register, and 0 for the nonsecure banked register or if the register is

 * not banked by security.

 */

#define KVM_REG_ARM_SECURE_MASK	0x0000000010000000

#define KVM_REG_ARM_SECURE_SHIFT	28



#define ARM_CP15_REG_SHIFT_MASK(x,n) \

	(((x) << KVM_REG_ARM_ ## n ## _SHIFT) & KVM_REG_ARM_ ## n ## _MASK)

CRA Git | Maintained and supported by SUSTech CRA and CCSE