Skip to content

Commit 590627f

Browse files
torvaldstorvalds
committed
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf tooling fixes from Thomas Gleixner: "Core libraries: - Fix max perf_event_attr.precise_ip detection. - Fix parser error for uncore event alias - Fixup ordering of kernel maps after obtaining the main kernel map address. Intel PT: - Fix TSC slip where A TSC packet can slip past MTC packets so that the timestamp appears to go backwards. - Fixes for exported-sql-viewer GUI conversion to python3. ARM coresight: - Fix the build by adding a missing case value for enumeration value introduced in newer library, that now is the required one. tool headers: - Syncronize kernel headers with the kernel, getting new io_uring and pidfd_send_signal syscalls so that 'perf trace' can handle them" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf pmu: Fix parser error for uncore event alias perf scripts python: exported-sql-viewer.py: Fix python3 support perf scripts python: exported-sql-viewer.py: Fix never-ending loop perf machine: Update kernel map address and re-order properly tools headers uapi: Sync powerpc's asm/kvm.h copy with the kernel sources tools headers: Update x86's syscall_64.tbl and uapi/asm-generic/unistd tools headers uapi: Update drm/i915_drm.h tools arch x86: Sync asm/cpufeatures.h with the kernel sources tools headers uapi: Sync linux/fcntl.h to get the F_SEAL_FUTURE_WRITE addition tools headers uapi: Sync asm-generic/mman-common.h and linux/mman.h perf evsel: Fix max perf_event_attr.precise_ip detection perf intel-pt: Fix TSC slip perf cs-etm: Add missing case value
2 parents c29d854 + 22261fd commit 590627f

File tree

26 files changed

+288
-103
lines changed

26 files changed

+288
-103
lines changed

‎tools/arch/alpha/include/uapi/asm/mman.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
#define MAP_NONBLOCK 0x40000
2828
#define MAP_NORESERVE 0x10000
2929
#define MAP_POPULATE 0x20000
30-
#define MAP_PRIVATE 0x02
31-
#define MAP_SHARED 0x01
3230
#define MAP_STACK 0x80000
3331
#define PROT_EXEC 0x4
3432
#define PROT_GROWSDOWN 0x01000000

‎tools/arch/mips/include/uapi/asm/mman.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
#define MAP_NONBLOCK 0x20000
2929
#define MAP_NORESERVE 0x0400
3030
#define MAP_POPULATE 0x10000
31-
#define MAP_PRIVATE 0x002
32-
#define MAP_SHARED 0x001
3331
#define MAP_STACK 0x40000
3432
#define PROT_EXEC 0x04
3533
#define PROT_GROWSDOWN 0x01000000

‎tools/arch/parisc/include/uapi/asm/mman.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
#define MAP_NONBLOCK 0x20000
2828
#define MAP_NORESERVE 0x4000
2929
#define MAP_POPULATE 0x10000
30-
#define MAP_PRIVATE 0x02
31-
#define MAP_SHARED 0x01
3230
#define MAP_STACK 0x40000
3331
#define PROT_EXEC 0x4
3432
#define PROT_GROWSDOWN 0x01000000

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,10 +463,12 @@ struct kvm_ppc_cpu_char {
463463
#define KVM_PPC_CPU_CHAR_BR_HINT_HONOURED (1ULL << 58)
464464
#define KVM_PPC_CPU_CHAR_MTTRIG_THR_RECONF (1ULL << 57)
465465
#define KVM_PPC_CPU_CHAR_COUNT_CACHE_DIS (1ULL << 56)
466+
#define KVM_PPC_CPU_CHAR_BCCTR_FLUSH_ASSIST (1ull << 54)
466467

467468
#define KVM_PPC_CPU_BEHAV_FAVOUR_SECURITY (1ULL << 63)
468469
#define KVM_PPC_CPU_BEHAV_L1D_FLUSH_PR (1ULL << 62)
469470
#define KVM_PPC_CPU_BEHAV_BNDS_CHK_SPEC_BAR (1ULL << 61)
471+
#define KVM_PPC_CPU_BEHAV_FLUSH_COUNT_CACHE (1ull << 58)
470472

471473
/* Per-vcpu XICS interrupt controller state */
472474
#define KVM_REG_PPC_ICP_STATE (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0x8c)

‎tools/arch/x86/include/asm/cpufeatures.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@
344344
/* Intel-defined CPU features, CPUID level 0x00000007:0 (EDX), word 18 */
345345
#define X86_FEATURE_AVX512_4VNNIW (18*32+ 2) /* AVX-512 Neural Network Instructions */
346346
#define X86_FEATURE_AVX512_4FMAPS (18*32+ 3) /* AVX-512 Multiply Accumulation Single precision */
347+
#define X86_FEATURE_TSX_FORCE_ABORT (18*32+13) /* "" TSX_FORCE_ABORT */
347348
#define X86_FEATURE_PCONFIG (18*32+18) /* Intel PCONFIG */
348349
#define X86_FEATURE_SPEC_CTRL (18*32+26) /* "" Speculation Control (IBRS + IBPB) */
349350
#define X86_FEATURE_INTEL_STIBP (18*32+27) /* "" Single Thread Indirect Branch Predictors */

‎tools/arch/xtensa/include/uapi/asm/mman.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
#define MAP_NONBLOCK 0x20000
2828
#define MAP_NORESERVE 0x0400
2929
#define MAP_POPULATE 0x10000
30-
#define MAP_PRIVATE 0x002
31-
#define MAP_SHARED 0x001
3230
#define MAP_STACK 0x40000
3331
#define PROT_EXEC 0x4
3432
#define PROT_GROWSDOWN 0x01000000

‎tools/build/feature/test-libopencsd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
/*
55
* Check OpenCSD library version is sufficient to provide required features
66
*/
7-
#define OCSD_MIN_VER ((0 << 16) | (10 << 8) | (0))
7+
#define OCSD_MIN_VER ((0 << 16) | (11 << 8) | (0))
88
#if !defined(OCSD_VER_NUM) || (OCSD_VER_NUM < OCSD_MIN_VER)
9-
#error "OpenCSD >= 0.10.0 is required"
9+
#error "OpenCSD >= 0.11.0 is required"
1010
#endif
1111

1212
int main(void)

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2+
#ifndef __ASM_GENERIC_MMAN_COMMON_TOOLS_ONLY_H
3+
#define __ASM_GENERIC_MMAN_COMMON_TOOLS_ONLY_H
4+
5+
#include <asm-generic/mman-common.h>
6+
7+
/* We need this because we need to have tools/include/uapi/ included in the tools
8+
* header search path to get access to stuff that is not yet in the system's
9+
* copy of the files in that directory, but since this cset:
10+
*
11+
* 746c9398f5ac ("arch: move common mmap flags to linux/mman.h")
12+
*
13+
* We end up making sys/mman.h, that is in the system headers, to not find the
14+
* MAP_SHARED and MAP_PRIVATE defines because they are not anymore in our copy
15+
* of asm-generic/mman-common.h. So we define them here and include this header
16+
* from each of the per arch mman.h headers.
17+
*/
18+
#ifndef MAP_SHARED
19+
#define MAP_SHARED 0x01 /* Share changes */
20+
#define MAP_PRIVATE 0x02 /* Changes are private */
21+
#define MAP_SHARED_VALIDATE 0x03 /* share + validate extension flags */
22+
#endif
23+
#endif // __ASM_GENERIC_MMAN_COMMON_TOOLS_ONLY_H

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
#define PROT_GROWSDOWN 0x01000000 /* mprotect flag: extend change to start of growsdown vma */
1616
#define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end of growsup vma */
1717

18-
#define MAP_SHARED 0x01 /* Share changes */
19-
#define MAP_PRIVATE 0x02 /* Changes are private */
20-
#define MAP_SHARED_VALIDATE 0x03 /* share + validate extension flags */
18+
/* 0x01 - 0x03 are defined in linux/mman.h */
2119
#define MAP_TYPE 0x0f /* Mask for type of mapping */
2220
#define MAP_FIXED 0x10 /* Interpret addr exactly */
2321
#define MAP_ANONYMOUS 0x20 /* don't use a file */

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#ifndef __ASM_GENERIC_MMAN_H
33
#define __ASM_GENERIC_MMAN_H
44

5-
#include <asm-generic/mman-common.h>
5+
#include <asm-generic/mman-common-tools.h>
66

77
#define MAP_GROWSDOWN 0x0100 /* stack-like segment */
88
#define MAP_DENYWRITE 0x0800 /* ETXTBSY */

0 commit comments

Comments
 (0)