Linus,
please pull the latest perf-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
perf-urgent-for-linus
up to: b3c303be4c35: Merge tag 'perf-urgent-for-mingo-5.3-20190729' of
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
A set of updates for perf tools and documentation:
tools:
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
Thanks,
tglx
-->
Andrii Nakryiko (1):
libbpf: fix missing __WORDSIZE definition
Arnaldo Carvalho de Melo (8):
tools include UAPI: Sync x86's syscalls_64.tbl and generic unistd.h to
pick up clone3 and pidfd_open
tools headers UAPI: Update tools's copy of kvm.h headers
tools headers UAPI: Update tools's copy of mman.h headers
tools headers UAPI: Update tools's copy of drm.h headers
tools perf beauty: Fix usbdevfs_ioctl table generator to handle _IOC()
tools headers UAPI: Sync usbdevice_fs.h with the kernels to get new ioctl
tools headers UAPI: Sync sched.h with the kernel
tools headers UAPI: Sync if_link.h with the kernel
Numfor Mbiziwo-Tiapo (1):
perf header: Fix use of unitialized value warning
Vince Weaver (2):
perf header: Fix divide by zero error if f_header.attr_size==0
perf tools: Fix perf.data documentation units for memory size
tools/arch/arm/include/uapi/asm/kvm.h | 12 ++
tools/arch/arm64/include/uapi/asm/kvm.h| 10 +
tools/arch/powerpc/include/uapi/asm/mman.h | 4 -
tools/arch/sparc/include/uapi/asm/mman.h | 4 -
tools/arch/x86/include/uapi/asm/kvm.h | 22 ++-
tools/arch/x86/include/uapi/asm/vmx.h | 1 -
tools/include/uapi/asm-generic/mman-common.h | 15 +-
tools/include/uapi/asm-generic/mman.h | 10 +-
tools/include/uapi/asm-generic/unistd.h| 8 +-
tools/include/uapi/drm/drm.h | 1 +
tools/include/uapi/drm/i915_drm.h | 209 -
tools/include/uapi/linux/if_link.h | 5 +
tools/include/uapi/linux/kvm.h | 3 +
tools/include/uapi/linux/sched.h | 30 ++-
tools/include/uapi/linux/usbdevice_fs.h| 26 +++
tools/lib/bpf/hashmap.h| 5 +
tools/perf/Documentation/perf.data-file-format.txt | 2 +-
tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 2 +
tools/perf/trace/beauty/usbdevfs_ioctl.sh | 9 +-
tools/perf/util/header.c | 9 +-
20 files changed, 352 insertions(+), 35 deletions(-)
diff --git a/tools/arch/arm/include/uapi/asm/kvm.h
b/tools/arch/arm/include/uapi/asm/kvm.h
index 4602464ebdfb..a4217c1a5d01 100644
--- a/tools/arch/arm/include/uapi/asm/kvm.h
+++ b/tools/arch/arm/include/uapi/asm/kvm.h
@@ -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) & 0x))
#define KVM_REG_ARM_PSCI_VERSION KVM_REG_ARM_FW_REG(0)
+#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1KVM_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_2KVM_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_UNKNOWN1
+#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
diff --git a/tools/arch/arm64/include/uapi/asm/kvm.h
b/tools/arch/arm64/include/uapi/asm/kvm.h
index d819a3e8b552..9a507716ae2f 100644
--- a/tools/arch/arm64/include/uapi/asm/kvm.h
+++ b/tools/arch/arm64/include/uapi/asm/kvm.h
@@ -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) & 0x))
#define KVM_REG_ARM_PSCI_VERSION KVM_REG_ARM_FW_REG(0)
+#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1KVM_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
