Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c764725 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf fixes from Ingo Molnar:
 "This 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"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (31 commits)
  tooling/headers: Synchronize updated s390 and x86 UAPI headers
  tools headers: Syncronize mman.h ABI header
  tools headers: Synchronize prctl.h ABI header
  tools headers: Synchronize KVM arch ABI headers
  tools headers: Synchronize drm/i915_drm.h
  tools headers uapi: Synchronize drm/drm.h
  tools headers: Synchronize perf_event.h header
  tools headers: Synchronize kernel ABI headers wrt SPDX tags
  tools/headers: Synchronize kernel x86 UAPI headers
  perf intel-pt: Bring instruction decoder files into line with the kernel
  perf test: Fix test 21 for s390x
  perf bench numa: Fixup discontiguous/sparse numa nodes
  perf top: Use signal interface for SIGWINCH handler
  perf top: Fix window dimensions change handling
  perf: Fix header.size for namespace events
  perf top: Ignore kptr_restrict when not sampling the kernel
  perf record: Ignore kptr_restrict when not sampling the kernel
  perf report: Ignore kptr_restrict when not sampling the kernel
  perf evlist: Add helper to check if attr.exclude_kernel is set in all evsels
  perf test shell: Fix test case probe libc's inet_pton on s390x
  ...
parents 189dbab0 34c9ca37

kernel/events/core.c

+4 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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 <cotte@de.ibm.com>

 *               Christian Borntraeger <borntraeger@de.ibm.com>

 */

tools/arch/s390/include/uapi/asm/kvm_perf.h

+0 −4
Original line number Diff line number Diff line
@@ -4,10 +4,6 @@ 
 *

 * Copyright 2014 IBM Corp.

 * Author(s): Alexander Yarygin <yarygin@linux.vnet.ibm.com>

 *

 * 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