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

Merge tag 'perf-urgent-for-mingo-5.4-20191001' of... 

Merge tag 'perf-urgent-for-mingo-5.4-20191001' 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 script:

  Andi Kleen:

    - Fix recovery from LBR/binary mismatch in the "brstackinsn" --field.

perf annotate:

  Arnaldo Carvalho de Melo:

  - Propagate errors so that meaningful messages can be presented to the
    user in case of problems.

perf map:

  Steve MacLean:

  - Fix handling of maps partially overlapped, resolving symbols in the
    ranges not replaced by new mmaps.

perf tests:

  Ian Rogers:

  - Use raise() instead of NULL derefs to avoid causing a SIGILL rather than a
    SIGSEGV for optimized builds that turn NULL derefs into ud2 instructions.

perf LLVM:

  Ian Rogers:

  - Don't access out-of-scope array.

perf inject:

  Steve MacLean:

  - Fix JIT_CODE_MOVE filename, that was having a u64 truncaded into a 32-bit
    snprintf format and also a missing ".so" suffix in another case.

libsubcmd:

  Ian Rogers:

  - Make _FORTIFY_SOURCE defines dependent on the feature, avoiding
    false positives with with memory sanitizers such as LLVM's ASan.

Vendor specific events:

Intel:

  Andi Kleen:

  - Fix period for Intel fixed counters.

s390:

  Thomas Richter (2):

  - Fix some event details transaction for machine type 8561.

tools headers UAPI:

  Arnaldo Carvalho de Melo:

  - Sync headers with the kernel, catching new usbdevfs ioctls and
    madvise behaviours to properly decode in 'perf trace' output.

Documentation:

  Steve MacLean:

  - Correct and clarify jitdump spec.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents da0c9ea1 11aad897

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

+3 −1
Original line number Diff line number Diff line
@@ -266,8 +266,10 @@ struct kvm_vcpu_events { 
#define   KVM_DEV_ARM_ITS_CTRL_RESET		4



/* KVM_IRQ_LINE irq field index values */

#define KVM_ARM_IRQ_VCPU2_SHIFT		28

#define KVM_ARM_IRQ_VCPU2_MASK		0xf

#define KVM_ARM_IRQ_TYPE_SHIFT		24

#define KVM_ARM_IRQ_TYPE_MASK		0xff

#define KVM_ARM_IRQ_TYPE_MASK		0xf

#define KVM_ARM_IRQ_VCPU_SHIFT		16

#define KVM_ARM_IRQ_VCPU_MASK		0xff

#define KVM_ARM_IRQ_NUM_SHIFT		0

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

+3 −1
Original line number Diff line number Diff line
@@ -325,8 +325,10 @@ struct kvm_vcpu_events { 
#define   KVM_ARM_VCPU_TIMER_IRQ_PTIMER		1



/* KVM_IRQ_LINE irq field index values */

#define KVM_ARM_IRQ_VCPU2_SHIFT		28

#define KVM_ARM_IRQ_VCPU2_MASK		0xf

#define KVM_ARM_IRQ_TYPE_SHIFT		24

#define KVM_ARM_IRQ_TYPE_MASK		0xff

#define KVM_ARM_IRQ_TYPE_MASK		0xf

#define KVM_ARM_IRQ_VCPU_SHIFT		16

#define KVM_ARM_IRQ_VCPU_MASK		0xff

#define KVM_ARM_IRQ_NUM_SHIFT		0

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

+6 −0
Original line number Diff line number Diff line
@@ -231,6 +231,12 @@ struct kvm_guest_debug_arch { 
#define KVM_SYNC_GSCB   (1UL << 9)

#define KVM_SYNC_BPBC   (1UL << 10)

#define KVM_SYNC_ETOKEN (1UL << 11)



#define KVM_SYNC_S390_VALID_FIELDS \

	(KVM_SYNC_PREFIX | KVM_SYNC_GPRS | KVM_SYNC_ACRS | KVM_SYNC_CRS | \

	 KVM_SYNC_ARCH0 | KVM_SYNC_PFAULT | KVM_SYNC_VRS | KVM_SYNC_RICCB | \

	 KVM_SYNC_FPRS | KVM_SYNC_GSCB | KVM_SYNC_BPBC | KVM_SYNC_ETOKEN)



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

#define SDNXC 8

#define SDNXL (1UL << SDNXC)

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

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#define EXIT_REASON_EXCEPTION_NMI       0

#define EXIT_REASON_EXTERNAL_INTERRUPT  1

#define EXIT_REASON_TRIPLE_FAULT        2

#define EXIT_REASON_INIT_SIGNAL			3



#define EXIT_REASON_PENDING_INTERRUPT   7

#define EXIT_REASON_NMI_WINDOW          8
@@ -90,6 +91,7 @@ 
	{ EXIT_REASON_EXCEPTION_NMI,         "EXCEPTION_NMI" }, \

	{ EXIT_REASON_EXTERNAL_INTERRUPT,    "EXTERNAL_INTERRUPT" }, \

	{ EXIT_REASON_TRIPLE_FAULT,          "TRIPLE_FAULT" }, \

	{ EXIT_REASON_INIT_SIGNAL,           "INIT_SIGNAL" }, \

	{ EXIT_REASON_PENDING_INTERRUPT,     "PENDING_INTERRUPT" }, \

	{ EXIT_REASON_NMI_WINDOW,            "NMI_WINDOW" }, \

	{ EXIT_REASON_TASK_SWITCH,           "TASK_SWITCH" }, \

tools/include/uapi/asm-generic/mman-common.h

+3 −0
Original line number Diff line number Diff line
@@ -67,6 +67,9 @@ 
#define MADV_WIPEONFORK 18		/* Zero memory on fork, child only */

#define MADV_KEEPONFORK 19		/* Undo MADV_WIPEONFORK */



#define MADV_COLD	20		/* deactivate these pages */

#define MADV_PAGEOUT	21		/* reclaim these pages */



/* compatibility flags */

#define MAP_FILE	0

CRA Git | Maintained and supported by SUSTech CRA and CCSE