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

Commit fac3fcae 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 tooling fixes from Thomas Gleixner:

 - Synchronization of tools and kernel headers

 - A series of fixes for perf report addressing various failures:
    * Handle invalid maps proper
    * Plug a memory leak
    * Handle frames and callchain order correctly

 - Fixes for handling inlines and children mode

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tools/include: Sync kernel ABI headers with tooling headers
  perf tools: Put caller above callee in --children mode
  perf report: Do not drop last inlined frame
  perf report: Always honor callchain order for inlined nodes
  perf script: Add --inline option for debugging
  perf report: Fix off-by-one for non-activation frames
  perf report: Fix memory leak in addr2line when called by addr2inlines
  perf report: Don't crash on invalid maps in `-g srcline` mode
parents 805f2869 6e30437b

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

+9 −1
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
#define __KVM_HAVE_IRQ_LINE

#define __KVM_HAVE_READONLY_MEM



#define KVM_COALESCED_MMIO_PAGE_OFFSET 1



#define KVM_REG_SIZE(id)						\

	(1U << (((id) & KVM_REG_SIZE_MASK) >> KVM_REG_SIZE_SHIFT))
@@ -114,6 +116,8 @@ struct kvm_debug_exit_arch { 
};



struct kvm_sync_regs {

	/* Used with KVM_CAP_ARM_USER_IRQ */

	__u64 device_irq_level;

};



struct kvm_arch_memory_slot {
@@ -192,6 +196,7 @@ struct kvm_arch_memory_slot { 
#define KVM_DEV_ARM_VGIC_GRP_REDIST_REGS 5

#define KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS 6

#define KVM_DEV_ARM_VGIC_GRP_LEVEL_INFO  7

#define KVM_DEV_ARM_VGIC_GRP_ITS_REGS	8

#define KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_SHIFT	10

#define KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_MASK \

			(0x3fffffULL << KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_SHIFT)
@@ -199,6 +204,9 @@ struct kvm_arch_memory_slot { 
#define VGIC_LEVEL_INFO_LINE_LEVEL	0



#define   KVM_DEV_ARM_VGIC_CTRL_INIT		0

#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



/* KVM_IRQ_LINE irq field index values */

#define KVM_ARM_IRQ_TYPE_SHIFT		24

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

+9 −1
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 
#define __KVM_HAVE_IRQ_LINE

#define __KVM_HAVE_READONLY_MEM



#define KVM_COALESCED_MMIO_PAGE_OFFSET 1



#define KVM_REG_SIZE(id)						\

	(1U << (((id) & KVM_REG_SIZE_MASK) >> KVM_REG_SIZE_SHIFT))
@@ -143,6 +145,8 @@ struct kvm_debug_exit_arch { 
#define KVM_GUESTDBG_USE_HW		(1 << 17)



struct kvm_sync_regs {

	/* Used with KVM_CAP_ARM_USER_IRQ */

	__u64 device_irq_level;

};



struct kvm_arch_memory_slot {
@@ -212,6 +216,7 @@ struct kvm_arch_memory_slot { 
#define KVM_DEV_ARM_VGIC_GRP_REDIST_REGS 5

#define KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS 6

#define KVM_DEV_ARM_VGIC_GRP_LEVEL_INFO  7

#define KVM_DEV_ARM_VGIC_GRP_ITS_REGS 8

#define KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_SHIFT	10

#define KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_MASK \

			(0x3fffffULL << KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_SHIFT)
@@ -219,6 +224,9 @@ struct kvm_arch_memory_slot { 
#define VGIC_LEVEL_INFO_LINE_LEVEL	0



#define   KVM_DEV_ARM_VGIC_CTRL_INIT		0

#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



/* Device Control API on vcpu fd */

#define KVM_ARM_VCPU_PMU_V3_CTRL	0

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

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ 
#define __KVM_HAVE_IRQ_LINE

#define __KVM_HAVE_GUEST_DEBUG



/* Not always available, but if it is, this is the correct offset.  */

#define KVM_COALESCED_MMIO_PAGE_OFFSET 1



struct kvm_regs {

	__u64 pc;

	__u64 cr;

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

+24 −2
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#define KVM_DEV_FLIC_ADAPTER_REGISTER	6

#define KVM_DEV_FLIC_ADAPTER_MODIFY	7

#define KVM_DEV_FLIC_CLEAR_IO_IRQ	8

#define KVM_DEV_FLIC_AISM		9

#define KVM_DEV_FLIC_AIRQ_INJECT	10

/*

 * 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.
@@ -41,7 +43,14 @@ struct kvm_s390_io_adapter { 
	__u8 isc;

	__u8 maskable;

	__u8 swap;

	__u8 pad;

	__u8 flags;

};



#define KVM_S390_ADAPTER_SUPPRESSIBLE 0x01



struct kvm_s390_ais_req {

	__u8 isc;

	__u16 mode;

};



#define KVM_S390_IO_ADAPTER_MASK 1
@@ -110,6 +119,7 @@ struct kvm_s390_vm_cpu_machine { 
#define KVM_S390_VM_CPU_FEAT_CMMA	10

#define KVM_S390_VM_CPU_FEAT_PFMFI	11

#define KVM_S390_VM_CPU_FEAT_SIGPIF	12

#define KVM_S390_VM_CPU_FEAT_KSS	13

struct kvm_s390_vm_cpu_feat {

	__u64 feat[16];

};
@@ -198,6 +208,10 @@ struct kvm_guest_debug_arch { 
#define KVM_SYNC_VRS    (1UL << 6)

#define KVM_SYNC_RICCB  (1UL << 7)

#define KVM_SYNC_FPRS   (1UL << 8)

#define KVM_SYNC_GSCB   (1UL << 9)

/* length and alignment of the sdnx as a power of two */

#define SDNXC 8

#define SDNXL (1UL << SDNXC)

/* definition of registers in kvm_run */

struct kvm_sync_regs {

	__u64 prefix;	/* prefix register */
@@ -218,8 +232,16 @@ struct kvm_sync_regs { 
	};

	__u8  reserved[512];	/* for future vector expansion */

	__u32 fpc;		/* valid on KVM_SYNC_VRS or KVM_SYNC_FPRS */

	__u8 padding[52];	/* riccb needs to be 64byte aligned */

	__u8 padding1[52];	/* riccb needs to be 64byte aligned */

	__u8 riccb[64];		/* runtime instrumentation controls block */

	__u8 padding2[192];	/* sdnx needs to be 256byte aligned */

	union {

		__u8 sdnx[SDNXL];  /* state description annex */

		struct {

			__u64 reserved1[2];

			__u64 gscb[4];

		};

	};

};



#define KVM_REG_S390_TODPR	(KVM_REG_S390 | KVM_REG_SIZE_U32 | 0x1)

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

+2 −0
Original line number Diff line number Diff line
@@ -202,6 +202,8 @@ 
#define X86_FEATURE_AVX512_4VNNIW (7*32+16) /* AVX-512 Neural Network Instructions */

#define X86_FEATURE_AVX512_4FMAPS (7*32+17) /* AVX-512 Multiply Accumulation Single precision */



#define X86_FEATURE_MBA         ( 7*32+18) /* Memory Bandwidth Allocation */



/* Virtualization flags: Linux defined, word 8 */

#define X86_FEATURE_TPR_SHADOW  ( 8*32+ 0) /* Intel TPR Shadow */

#define X86_FEATURE_VNMI        ( 8*32+ 1) /* Intel Virtual NMI */