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

Commit 82119cbe authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo-4.14-20170801' of... 

Merge tag 'perf-core-for-mingo-4.14-20170801' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Pull perf/core improvements from Arnaldo Carvalho de Melo:

User visible changes:

- Beautifiers for the 'cmd' arg of several ioctl types, including:
  sound, DRM, KVM, vhost virtio and perf_events.

  This was done by using scripts that extract the information from
  the UAPI headers, generating string tables that are then used in
  the 'perf trace' syscall argument ioctl beautifier.

  More work needed to further use it, for instance, to use the
  _IOC_DIR value where it is used sanely to suppress the third
  argument, to set formatters for non-pointer values and ultimately
  for using eBPF + pahole-like code to collect + beautify structs in
  the third arg.

  Using the current scheme of having tools/ copies of kernel headers
  we'll make sure tooling stays working when changes are made to the
  kernel ABI headers and will be notified when they get changed,
  reducing the time for 'perf trace' to support new ABIs and allowing
  the tools/perf/ codebase to have the definitions it needs to
  build in dozens of distros/versions, as routinely tested using
  containers for, at this time, 47 environments. (Arnaldo Carvalho de Melo)

Infrastructure changes:

- Clarify header version warning message (Ingo Molnar)

- Sync kernel ABI headers with tooling headers (Ingo Molnar, Arnaldo Carvalho de Melo)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents d9f5f32a 81e3d8b2

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

+8 −0
Original line number Diff line number Diff line
@@ -203,6 +203,14 @@ struct kvm_arch_memory_slot { 
#define KVM_DEV_ARM_VGIC_LINE_LEVEL_INTID_MASK 0x3ff

#define VGIC_LEVEL_INFO_LINE_LEVEL	0



/* Device Control API on vcpu fd */

#define KVM_ARM_VCPU_PMU_V3_CTRL	0

#define   KVM_ARM_VCPU_PMU_V3_IRQ	0

#define   KVM_ARM_VCPU_PMU_V3_INIT	1

#define KVM_ARM_VCPU_TIMER_CTRL		1

#define   KVM_ARM_VCPU_TIMER_IRQ_VTIMER		0

#define   KVM_ARM_VCPU_TIMER_IRQ_PTIMER		1



#define   KVM_DEV_ARM_VGIC_CTRL_INIT		0

#define   KVM_DEV_ARM_ITS_SAVE_TABLES		1

#define   KVM_DEV_ARM_ITS_RESTORE_TABLES	2

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

+3 −0
Original line number Diff line number Diff line
@@ -232,6 +232,9 @@ struct kvm_arch_memory_slot { 
#define KVM_ARM_VCPU_PMU_V3_CTRL	0

#define   KVM_ARM_VCPU_PMU_V3_IRQ	0

#define   KVM_ARM_VCPU_PMU_V3_INIT	1

#define KVM_ARM_VCPU_TIMER_CTRL		1

#define   KVM_ARM_VCPU_TIMER_IRQ_VTIMER		0

#define   KVM_ARM_VCPU_TIMER_IRQ_PTIMER		1



/* KVM_IRQ_LINE irq field index values */

#define KVM_ARM_IRQ_TYPE_SHIFT		24

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

+6 −0
Original line number Diff line number Diff line
@@ -60,6 +60,12 @@ struct kvm_regs { 


#define KVM_SREGS_E_FSL_PIDn	(1 << 0) /* PID1/PID2 */



/* flags for kvm_run.flags */

#define KVM_RUN_PPC_NMI_DISP_MASK		(3 << 0)

#define   KVM_RUN_PPC_NMI_DISP_FULLY_RECOV	(1 << 0)

#define   KVM_RUN_PPC_NMI_DISP_LIMITED_RECOV	(2 << 0)

#define   KVM_RUN_PPC_NMI_DISP_NOT_RECOV	(3 << 0)



/*

 * Feature bits indicate which sections of the sregs struct are valid,

 * both in KVM_GET_SREGS and KVM_SET_SREGS.  On KVM_SET_SREGS, registers

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

+12 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#define KVM_DEV_FLIC_CLEAR_IO_IRQ	8

#define KVM_DEV_FLIC_AISM		9

#define KVM_DEV_FLIC_AIRQ_INJECT	10

#define KVM_DEV_FLIC_AISM_ALL		11

/*

 * We can have up to 4*64k pending subchannels + 8 adapter interrupts,

 * as well as up  to ASYNC_PF_PER_VCPU*KVM_MAX_VCPUS pfault done interrupts.
@@ -53,6 +54,11 @@ struct kvm_s390_ais_req { 
	__u16 mode;

};



struct kvm_s390_ais_all {

	__u8 simm;

	__u8 nimm;

};



#define KVM_S390_IO_ADAPTER_MASK 1

#define KVM_S390_IO_ADAPTER_MAP 2

#define KVM_S390_IO_ADAPTER_UNMAP 3
@@ -70,6 +76,7 @@ struct kvm_s390_io_adapter_req { 
#define KVM_S390_VM_TOD			1

#define KVM_S390_VM_CRYPTO		2

#define KVM_S390_VM_CPU_MODEL		3

#define KVM_S390_VM_MIGRATION		4



/* kvm attributes for mem_ctrl */

#define KVM_S390_VM_MEM_ENABLE_CMMA	0
@@ -151,6 +158,11 @@ struct kvm_s390_vm_cpu_subfunc { 
#define KVM_S390_VM_CRYPTO_DISABLE_AES_KW	2

#define KVM_S390_VM_CRYPTO_DISABLE_DEA_KW	3



/* kvm attributes for migration mode */

#define KVM_S390_VM_MIGRATION_STOP	0

#define KVM_S390_VM_MIGRATION_START	1

#define KVM_S390_VM_MIGRATION_STATUS	2



/* for KVM_GET_REGS and KVM_SET_REGS */

struct kvm_regs {

	/* general purpose regs for s390 */

tools/arch/x86/include/asm/cpufeatures.h

+2 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ 


#define X86_FEATURE_HW_PSTATE	( 7*32+ 8) /* AMD HW-PState */

#define X86_FEATURE_PROC_FEEDBACK ( 7*32+ 9) /* AMD ProcFeedbackInterface */

#define X86_FEATURE_SME		( 7*32+10) /* AMD Secure Memory Encryption */



#define X86_FEATURE_INTEL_PPIN	( 7*32+14) /* Intel Processor Inventory Number */

#define X86_FEATURE_INTEL_PT	( 7*32+15) /* Intel Processor Trace */
@@ -286,6 +287,7 @@ 
#define X86_FEATURE_PAUSEFILTER (15*32+10) /* filtered pause intercept */

#define X86_FEATURE_PFTHRESHOLD (15*32+12) /* pause filter threshold */

#define X86_FEATURE_AVIC	(15*32+13) /* Virtual Interrupt Controller */

#define X86_FEATURE_VIRTUAL_VMLOAD_VMSAVE (15*32+15) /* Virtual VMLOAD VMSAVE */



/* Intel-defined CPU features, CPUID level 0x00000007:0 (ecx), word 16 */

#define X86_FEATURE_AVX512VBMI  (16*32+ 1) /* AVX512 Vector Bit Manipulation instructions*/