Commit 8b7fd679 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:
 "A set of updates for perf tools and documentation:

  perf header:
    - Prevent a division by zero
    - Deal with an uninitialized warning proper

  libbpf:
    - Fix the missiong __WORDSIZE definition for musl & al

  UAPI headers:
    - Synchronize kernel headers

  Documentation:
    - Fix the memory units for perf.data size"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  libbpf: fix missing __WORDSIZE definition
  perf tools: Fix perf.data documentation units for memory size
  perf header: Fix use of unitialized value warning
  perf header: Fix divide by zero error if f_header.attr_size==0
  tools headers UAPI: Sync if_link.h with the kernel
  tools headers UAPI: Sync sched.h with the kernel
  tools headers UAPI: Sync usbdevice_fs.h with the kernels to get new ioctl
  tools perf beauty: Fix usbdevfs_ioctl table generator to handle _IOC()
  tools headers UAPI: Update tools's copy of drm.h headers
  tools headers UAPI: Update tools's copy of mman.h headers
  tools headers UAPI: Update tools's copy of kvm.h headers
  tools include UAPI: Sync x86's syscalls_64.tbl and generic unistd.h to pick up clone3 and pidfd_open
parents 0432a0a0 b3c303be

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

+12 −0
Original line number Diff line number Diff line
@@ -214,6 +214,18 @@ struct kvm_vcpu_events { 
#define KVM_REG_ARM_FW_REG(r)		(KVM_REG_ARM | KVM_REG_SIZE_U64 | \

					 KVM_REG_ARM_FW | ((r) & 0xffff))

#define KVM_REG_ARM_PSCI_VERSION	KVM_REG_ARM_FW_REG(0)

#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1	KVM_REG_ARM_FW_REG(1)

	/* Higher values mean better protection. */

#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1_NOT_AVAIL		0

#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1_AVAIL		1

#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1_NOT_REQUIRED	2

#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2	KVM_REG_ARM_FW_REG(2)

	/* Higher values mean better protection. */

#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_NOT_AVAIL		0

#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_UNKNOWN		1

#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_AVAIL		2

#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_NOT_REQUIRED	3

#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_ENABLED	(1U << 4)



/* Device Control API: ARM VGIC */

#define KVM_DEV_ARM_VGIC_GRP_ADDR	0

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

+10 −0
Original line number Diff line number Diff line
@@ -229,6 +229,16 @@ struct kvm_vcpu_events { 
#define KVM_REG_ARM_FW_REG(r)		(KVM_REG_ARM64 | KVM_REG_SIZE_U64 | \

					 KVM_REG_ARM_FW | ((r) & 0xffff))

#define KVM_REG_ARM_PSCI_VERSION	KVM_REG_ARM_FW_REG(0)

#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1	KVM_REG_ARM_FW_REG(1)

#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1_NOT_AVAIL		0

#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1_AVAIL		1

#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1_NOT_REQUIRED	2

#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2	KVM_REG_ARM_FW_REG(2)

#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_NOT_AVAIL		0

#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_UNKNOWN		1

#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_AVAIL		2

#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_NOT_REQUIRED	3

#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_ENABLED     	(1U << 4)



/* SVE registers */

#define KVM_REG_ARM64_SVE		(0x15 << KVM_REG_ARM_COPROC_SHIFT)

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

+0 −4
Original line number Diff line number Diff line
@@ -4,12 +4,8 @@ 
#define MAP_DENYWRITE	0x0800

#define MAP_EXECUTABLE	0x1000

#define MAP_GROWSDOWN	0x0100

#define MAP_HUGETLB	0x40000

#define MAP_LOCKED	0x80

#define MAP_NONBLOCK	0x10000

#define MAP_NORESERVE   0x40

#define MAP_POPULATE	0x8000

#define MAP_STACK	0x20000

#include <uapi/asm-generic/mman-common.h>

/* MAP_32BIT is undefined on powerpc, fix it for perf */

#define MAP_32BIT	0

tools/arch/sparc/include/uapi/asm/mman.h

+0 −4
Original line number Diff line number Diff line
@@ -4,12 +4,8 @@ 
#define MAP_DENYWRITE	0x0800

#define MAP_EXECUTABLE	0x1000

#define MAP_GROWSDOWN	0x0200

#define MAP_HUGETLB	0x40000

#define MAP_LOCKED      0x100

#define MAP_NONBLOCK	0x10000

#define MAP_NORESERVE   0x40

#define MAP_POPULATE	0x8000

#define MAP_STACK	0x20000

#include <uapi/asm-generic/mman-common.h>

/* MAP_32BIT is undefined on sparc, fix it for perf */

#define MAP_32BIT	0

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

+18 −4
Original line number Diff line number Diff line
@@ -382,6 +382,7 @@ struct kvm_sync_regs { 
#define KVM_X86_QUIRK_CD_NW_CLEARED	   (1 << 1)

#define KVM_X86_QUIRK_LAPIC_MMIO_HOLE	   (1 << 2)

#define KVM_X86_QUIRK_OUT_7E_INC_RIP	   (1 << 3)

#define KVM_X86_QUIRK_MISC_ENABLE_NO_MWAIT (1 << 4)



#define KVM_STATE_NESTED_FORMAT_VMX	0

#define KVM_STATE_NESTED_FORMAT_SVM	1	/* unused */
@@ -432,4 +433,17 @@ struct kvm_nested_state { 
	} data;

};



/* for KVM_CAP_PMU_EVENT_FILTER */

struct kvm_pmu_event_filter {

	__u32 action;

	__u32 nevents;

	__u32 fixed_counter_bitmap;

	__u32 flags;

	__u32 pad[4];

	__u64 events[0];

};



#define KVM_PMU_EVENT_ALLOW 0

#define KVM_PMU_EVENT_DENY 1



#endif /* _ASM_X86_KVM_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE