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

Merge tag 'perf-urgent-for-mingo-5.3-20190729' of... 

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

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

perf header:

  Vince Weaver:

  - Fix divide by zero error if f_header.attr_size==0, found using a perf tool fuzzer.

  Numfor Mbiziwo-Tiapo:

  - Silence use of uninitialized value warning pointed out by clang's MSAN tool.

libbpf:

  Andrii Nakryiko:

  - Fix missing __WORDSIZE definition in some systems, such as musl libc (Alpine Linux).

tools header UAPI:

  Arnaldo Carvalho de Melo:

  - Sync headers to address perf build warnings:

    - syscalls_64.tbl and generic unistd.h to pick up clone3 and pidfd_open.

    - With new ioctls: kvm.h, drm.h and usbdevice_fs.h.

    - No tooling change: mman.h, sched.h and if_link.h.

Documentation:

  Vince Weaver:

  - Fix perf.data documentation units for memory size, its kB, not bytes.

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

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