Skip to content

Commit 01897f3

Browse files
torvaldstorvalds
committed
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 ...
2 parents e9ebc21 + 29995d2 commit 01897f3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+3616
-539
lines changed

‎include/uapi/linux/perf_event.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -646,10 +646,12 @@ struct perf_event_mmap_page {
646646
*
647647
* PERF_RECORD_MISC_MMAP_DATA - PERF_RECORD_MMAP* events
648648
* PERF_RECORD_MISC_COMM_EXEC - PERF_RECORD_COMM event
649+
* PERF_RECORD_MISC_FORK_EXEC - PERF_RECORD_FORK event (perf internal)
649650
* PERF_RECORD_MISC_SWITCH_OUT - PERF_RECORD_SWITCH* events
650651
*/
651652
#define PERF_RECORD_MISC_MMAP_DATA (1 << 13)
652653
#define PERF_RECORD_MISC_COMM_EXEC (1 << 13)
654+
#define PERF_RECORD_MISC_FORK_EXEC (1 << 13)
653655
#define PERF_RECORD_MISC_SWITCH_OUT (1 << 13)
654656
/*
655657
* These PERF_RECORD_MISC_* flags below are safely reused

‎kernel/events/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ static inline void update_cgrp_time_from_event(struct perf_event *event)
750750
/*
751751
* Do not update time when cgroup is not active
752752
*/
753-
if (cgroup_is_descendant(cgrp->css.cgroup, event->cgrp->css.cgroup))
753+
if (cgroup_is_descendant(cgrp->css.cgroup, event->cgrp->css.cgroup))
754754
__update_cgrp_time(event->cgrp);
755755
}
756756

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@
1616
*/
1717

1818
#define __ARCH_WANT_RENAMEAT
19+
#define __ARCH_WANT_NEW_STAT
1920

2021
#include <asm-generic/unistd.h>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -634,6 +634,7 @@ struct kvm_ppc_cpu_char {
634634

635635
#define KVM_REG_PPC_DEC_EXPIRY (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xbe)
636636
#define KVM_REG_PPC_ONLINE (KVM_REG_PPC | KVM_REG_SIZE_U32 | 0xbf)
637+
#define KVM_REG_PPC_PTCR (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc0)
637638

638639
/* Transactional Memory checkpointed state:
639640
* This is all GPRs, all VSX regs and a subset of SPRs

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ struct kvm_s390_vm_cpu_subfunc {
160160
#define KVM_S390_VM_CRYPTO_ENABLE_DEA_KW 1
161161
#define KVM_S390_VM_CRYPTO_DISABLE_AES_KW 2
162162
#define KVM_S390_VM_CRYPTO_DISABLE_DEA_KW 3
163+
#define KVM_S390_VM_CRYPTO_ENABLE_APIE 4
164+
#define KVM_S390_VM_CRYPTO_DISABLE_APIE 5
163165

164166
/* kvm attributes for migration mode */
165167
#define KVM_S390_VM_MIGRATION_STOP 0

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -300,10 +300,7 @@ struct kvm_vcpu_events {
300300
__u8 injected;
301301
__u8 nr;
302302
__u8 has_error_code;
303-
union {
304-
__u8 pad;
305-
__u8 pending;
306-
};
303+
__u8 pending;
307304
__u32 error_code;
308305
} exception;
309306
struct {
@@ -387,6 +384,7 @@ struct kvm_sync_regs {
387384

388385
#define KVM_STATE_NESTED_GUEST_MODE 0x00000001
389386
#define KVM_STATE_NESTED_RUN_PENDING 0x00000002
387+
#define KVM_STATE_NESTED_EVMCS 0x00000004
390388

391389
#define KVM_STATE_NESTED_SMM_GUEST_MODE 0x00000001
392390
#define KVM_STATE_NESTED_SMM_VMXON 0x00000002

‎tools/include/uapi/asm-generic/unistd.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,10 +242,12 @@ __SYSCALL(__NR_tee, sys_tee)
242242
/* fs/stat.c */
243243
#define __NR_readlinkat 78
244244
__SYSCALL(__NR_readlinkat, sys_readlinkat)
245+
#if defined(__ARCH_WANT_NEW_STAT) || defined(__ARCH_WANT_STAT64)
245246
#define __NR3264_fstatat 79
246247
__SC_3264(__NR3264_fstatat, sys_fstatat64, sys_newfstatat)
247248
#define __NR3264_fstat 80
248249
__SC_3264(__NR3264_fstat, sys_fstat64, sys_newfstat)
250+
#endif
249251

250252
/* fs/sync.c */
251253
#define __NR_sync 81

0 commit comments

Comments
 (0)