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

Commit 01897f3e 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 updates and fixes from Ingo Molnar:
 "These are almost all tooling updates: 'perf top', 'perf trace' and
  'perf script' fixes and updates, an UAPI header sync with the merge
  window versions, license marker updates, much improved Sparc support
  from David Miller, and a number of fixes"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (66 commits)
  perf intel-pt/bts: Calculate cpumode for synthesized samples
  perf intel-pt: Insert callchain context into synthesized callchains
  perf tools: Don't clone maps from parent when synthesizing forks
  perf top: Start display thread earlier
  tools headers uapi: Update linux/if_link.h header copy
  tools headers uapi: Update linux/netlink.h header copy
  tools headers: Sync the various kvm.h header copies
  tools include uapi: Update linux/mmap.h copy
  perf trace beauty: Use the mmap flags table generated from headers
  perf beauty: Wire up the mmap flags table generator to the Makefile
  perf beauty: Add a generator for MAP_ mmap's flag constants
  tools include uapi: Update asound.h copy
  tools arch uapi: Update asm-generic/unistd.h and arm64 unistd.h copies
  tools include uapi: Update linux/fs.h copy
  perf callchain: Honour the ordering of PERF_CONTEXT_{USER,KERNEL,etc}
  perf cs-etm: Correct CPU mode for samples
  perf unwind: Take pgoff into account when reporting elf to libdwfl
  perf top: Do not use overwrite mode by default
  perf top: Allow disabling the overwrite mode
  perf trace: Beautify mount's first pathname arg
  ...
parents e9ebc215 29995d29

include/uapi/linux/perf_event.h

+2 −0
Original line number Diff line number Diff line
@@ -646,10 +646,12 @@ struct perf_event_mmap_page { 
 *

 *   PERF_RECORD_MISC_MMAP_DATA  - PERF_RECORD_MMAP* events

 *   PERF_RECORD_MISC_COMM_EXEC  - PERF_RECORD_COMM event

 *   PERF_RECORD_MISC_FORK_EXEC  - PERF_RECORD_FORK event (perf internal)

 *   PERF_RECORD_MISC_SWITCH_OUT - PERF_RECORD_SWITCH* events

 */

#define PERF_RECORD_MISC_MMAP_DATA		(1 << 13)

#define PERF_RECORD_MISC_COMM_EXEC		(1 << 13)

#define PERF_RECORD_MISC_FORK_EXEC		(1 << 13)

#define PERF_RECORD_MISC_SWITCH_OUT		(1 << 13)

/*

 * These PERF_RECORD_MISC_* flags below are safely reused

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

+1 −0
Original line number Diff line number Diff line
@@ -16,5 +16,6 @@ 
 */



#define __ARCH_WANT_RENAMEAT

#define __ARCH_WANT_NEW_STAT



#include <asm-generic/unistd.h>

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

+1 −0
Original line number Diff line number Diff line
@@ -634,6 +634,7 @@ struct kvm_ppc_cpu_char { 


#define KVM_REG_PPC_DEC_EXPIRY	(KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xbe)

#define KVM_REG_PPC_ONLINE	(KVM_REG_PPC | KVM_REG_SIZE_U32 | 0xbf)

#define KVM_REG_PPC_PTCR	(KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc0)



/* Transactional Memory checkpointed state:

 * This is all GPRs, all VSX regs and a subset of SPRs

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

+2 −0
Original line number Diff line number Diff line
@@ -160,6 +160,8 @@ struct kvm_s390_vm_cpu_subfunc { 
#define KVM_S390_VM_CRYPTO_ENABLE_DEA_KW	1

#define KVM_S390_VM_CRYPTO_DISABLE_AES_KW	2

#define KVM_S390_VM_CRYPTO_DISABLE_DEA_KW	3

#define KVM_S390_VM_CRYPTO_ENABLE_APIE		4

#define KVM_S390_VM_CRYPTO_DISABLE_APIE		5



/* kvm attributes for migration mode */

#define KVM_S390_VM_MIGRATION_STOP	0

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

+2 −4
Original line number Diff line number Diff line
@@ -300,10 +300,7 @@ struct kvm_vcpu_events { 
		__u8 injected;

		__u8 nr;

		__u8 has_error_code;

		union {

			__u8 pad;

		__u8 pending;

		};

		__u32 error_code;

	} exception;

	struct {
@@ -387,6 +384,7 @@ struct kvm_sync_regs { 


#define KVM_STATE_NESTED_GUEST_MODE	0x00000001

#define KVM_STATE_NESTED_RUN_PENDING	0x00000002

#define KVM_STATE_NESTED_EVMCS		0x00000004



#define KVM_STATE_NESTED_SMM_GUEST_MODE	0x00000001

#define KVM_STATE_NESTED_SMM_VMXON	0x00000002