perf tools: Sync tools and kernel headers for v6.11
Subsystems (8)
Namhyung Kim
maintainercover perf tools: Sync tools and kernel headers for v6.11
Hello,
This is the usual sync up in header files we keep in tools directory. I put a file to give the reason of this work and not to repeat it in every commit message. The changes will be carried in the perf-tools tree.
Thanks,
Namhyung
Namhyung Kim (10):
perf tools: Add tools/include/uapi/README
tools/include: Sync uapi/drm/i915_drm.h with the kernel sources tools/include: Sync uapi/linux/kvm.h with the kernel sources tools/include: Sync uapi/linux/perf.h with the kernel sources tools/include: Sync uapi/sound/asound.h with the kernel sources tools/include: Sync uapi/asm-generic/unistd.h with the kernel sources tools/include: Sync network socket headers with the kernel sources tools/include: Sync filesystem headers with the kernel sources tools/include: Sync x86 headers with the kernel sources tools/include: Sync arm64 headers with the kernel sources
tools/arch/arm64/include/asm/cputype.h | 10 + tools/arch/arm64/include/uapi/asm/unistd.h | 24 +- tools/arch/powerpc/include/uapi/asm/kvm.h | 3 + tools/arch/x86/include/asm/cpufeatures.h | 803 +++++++++--------- tools/arch/x86/include/asm/msr-index.h | 11 + tools/arch/x86/include/uapi/asm/kvm.h | 49 ++ tools/arch/x86/include/uapi/asm/svm.h | 1 + tools/include/uapi/README | 73 ++ tools/include/uapi/asm-generic/unistd.h | 2 +- tools/include/uapi/drm/i915_drm.h | 27 + tools/include/uapi/linux/in.h | 2 + tools/include/uapi/linux/kvm.h | 17 +- tools/include/uapi/linux/perf_event.h | 6 +- tools/include/uapi/linux/stat.h | 12 +- .../arch/powerpc/entry/syscalls/syscall.tbl | 6 +- .../perf/arch/s390/entry/syscalls/syscall.tbl | 2 +- .../arch/x86/entry/syscalls/syscall_64.tbl | 8 +- .../perf/trace/beauty/include/linux/socket.h | 5 +- .../perf/trace/beauty/include/uapi/linux/fs.h | 163 +++- .../trace/beauty/include/uapi/linux/mount.h | 10 +- .../trace/beauty/include/uapi/linux/stat.h | 12 +- .../trace/beauty/include/uapi/sound/asound.h | 9 +- 22 files changed, 810 insertions(+), 445 deletions(-) create mode 100644 tools/include/uapi/README
Signature · 1 line
2.46.0.rc2.264.g509ed76dc8-goog
Namhyung Kim
maintainerPATCH 1/10 perf tools: Add tools/include/uapi/README
Write down the reason why we keep a copy of headers to the README file instead of adding it to every commit messages.
--- tools/include/uapi/README | 73 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 tools/include/uapi/README
tools/include/uapi/README new file +73 -0
@@ -0,0 +1,73 @@ +Why we want a copy of kernel headers in tools? +============================================== + +There used to be no copies, with tools/ code using kernel headers +directly. From time to time tools/perf/ broke due to legitimate kernel +hacking. At some point Linus complained about such direct usage. Then we +adopted the current model. + +The way these headers are used in perf are not restricted to just +including them to compile something. + +There are sometimes used in scripts that convert defines into string +tables, etc, so some change may break one of these scripts, or new MSRs +may use some different #define pattern, etc. + +E.g.: + + $ ls -1 tools/perf/trace/beauty/*.sh | head -5 + tools/perf/trace/beauty/arch_errno_names.sh + tools/perf/trace/beauty/drm_ioctl.sh + tools/perf/trace/beauty/fadvise.sh + tools/perf/trace/beauty/fsconfig.sh + tools/perf/trace/beauty/fsmount.sh + $ + $ tools/perf/trace/beauty/fadvise.sh + static const char *fadvise_advices[] = { + [0] = "NORMAL", + [1] = "RANDOM", + [2] = "SEQUENTIAL", + [3] = "WILLNEED", + [4] = "DONTNEED", + [5] = "NOREUSE", + }; + $ + +The tools/perf/check-headers.sh script, part of the tools/ build +process, points out changes in the original files. + +So its important not to touch the copies in tools/ when doing changes in +the original kernel headers, that will be done later, when +check-headers.sh inform about the change to the perf tools hackers. + +Another explanation from Ingo Molnar: +It's better than all the alternatives we tried so far: + + - Symbolic links and direct #includes: this was the original approach but + was pushed back on from the kernel side, when tooling modified the + headers and broke them accidentally for kernel builds. + + - Duplicate self-defined ABI headers like glibc: double the maintenance + burden, double the chance for mistakes, plus there's no tech-driven + notification mechanism to look at new kernel side changes. + +What we are doing now is a third option: + + - A software-enforced copy-on-write mechanism of kernel headers to + tooling, driven by non-fatal warnings on the tooling side build when + kernel headers get modified: + + Warning: Kernel ABI header differences: + diff -u tools/include/uapi/drm/i915_drm.h include/uapi/drm/i915_drm.h + diff -u tools/include/uapi/linux/fs.h include/uapi/linux/fs.h + diff -u tools/include/uapi/linux/kvm.h include/uapi/linux/kvm.h + ... + + The tooling policy is to always pick up the kernel side headers as-is, + and integate them into the tooling build. The warnings above serve as a + notification to tooling maintainers that there's changes on the kernel + side. + +We've been using this for many years now, and it might seem hacky, but +works surprisingly well. +
Signature · 1 line
2.46.0.rc2.264.g509ed76dc8-goog
Namhyung Kim
maintainerPATCH 2/10 tools/include: Sync uapi/drm/i915_drm.h with the kernel sources
In reply to Namhyung KimTo pick up changes from:
0f1bb41bf396 drm/i915: Support replaying GPU hangs with captured context image
This should be used to beautify DRM syscall arguments and it addresses these tools/perf build warnings:
Warning: Kernel ABI header differences:
diff -u tools/include/uapi/drm/i915_drm.h include/uapi/drm/i915_drm.h
Please see tools/include/uapi/README for details (it's in the first patch of this series).
--- tools/include/uapi/drm/i915_drm.h | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
tools/include/uapi/drm/i915_drm.h +27 -0
@@ -2163,6 +2163,15 @@ struct drm_i915_gem_context_param {* supports this per context flag. */ #define I915_CONTEXT_PARAM_LOW_LATENCY 0xe + +/* +* I915_CONTEXT_PARAM_CONTEXT_IMAGE: +* +* Allows userspace to provide own context images. +* +* Note that this is a debug API not available on production kernel builds. +*/ +#define I915_CONTEXT_PARAM_CONTEXT_IMAGE 0xf/* Must be kept compact -- no holes and well documented */ /** @value: Context parameter value to be set or queried */
@@ -2564,6 +2573,24 @@ struct i915_context_param_engines {struct i915_engine_class_instance engines[N__ ]; \ } __attribute__((packed))name__ +struct i915_gem_context_param_context_image { +/** @engine: Engine class & instance to be configured. */ +struct i915_engine_class_instance engine; + +/** @flags: One of the supported flags or zero. */ +__u32 flags; +#define I915_CONTEXT_IMAGE_FLAG_ENGINE_INDEX (1u << 0) + +/** @size: Size of the image blob pointed to by @image. */ +__u32 size; + +/** @mbz: Must be zero. */ +__u32 mbz; + +/** @image: Userspace memory containing the context image. */ +__u64 image; +} __attribute__((packed)); +/** * struct drm_i915_gem_context_create_ext_setparam - Context parameter * to set or query during context creation.
Signature · 1 line
2.46.0.rc2.264.g509ed76dc8-goog
Namhyung Kim
maintainerPATCH 3/10 tools/include: Sync uapi/linux/kvm.h with the kernel sources
In reply to Namhyung KimAnd other arch-specific UAPI headers to pick up changes from:
4b23e0c199b2 KVM: Ensure new code that references immediate_exit gets extra scrutiny 85542adb65ec KVM: x86: Add KVM_RUN_X86_GUEST_MODE kvm_run flag 6fef518594bc KVM: x86: Add a capability to configure bus frequency for APIC timer 34ff65901735 x86/sev: Use kernel provided SVSM Calling Areas
5dcc1e76144f Merge tag 'kvm-x86-misc-6.11' of https://github.com/kvm-x86/linux into HEAD 9a0d2f4995dd KVM: PPC: Book3S HV: Add one-reg interface for HASHPKEYR register e9eb790b2557 KVM: PPC: Book3S HV: Add one-reg interface for HASHKEYR register 1a1e6865f516 KVM: PPC: Book3S HV: Add one-reg interface for DEXCR register
This should be used to beautify KVM syscall arguments and it addresses these tools/perf build warnings:
Warning: Kernel ABI header differences:
diff -u tools/include/uapi/linux/kvm.h include/uapi/linux/kvm.h
diff -u tools/arch/x86/include/uapi/asm/kvm.h arch/x86/include/uapi/asm/kvm.h diff -u tools/arch/x86/include/uapi/asm/svm.h arch/x86/include/uapi/asm/svm.h diff -u tools/arch/powerpc/include/uapi/asm/kvm.h arch/powerpc/include/uapi/asm/kvm.h
Please see tools/include/uapi/README for details (it's in the first patch of this series).
--- tools/arch/powerpc/include/uapi/asm/kvm.h | 3 ++ tools/arch/x86/include/uapi/asm/kvm.h | 49 +++++++++++++++++++++++ tools/arch/x86/include/uapi/asm/svm.h | 1 + tools/include/uapi/linux/kvm.h | 17 +++++++- 4 files changed, 69 insertions(+), 1 deletion(-)
tools/arch/powerpc/include/uapi/asm/kvm.h +3 -0
@@ -645,6 +645,9 @@ struct kvm_ppc_cpu_char {#define KVM_REG_PPC_SIER3 (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc3)#define KVM_REG_PPC_DAWR1 (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc4)#define KVM_REG_PPC_DAWRX1 (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc5) +#define KVM_REG_PPC_DEXCR (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc6) +#define KVM_REG_PPC_HASHKEYR (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc7) +#define KVM_REG_PPC_HASHPKEYR (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc8)/* Transactional Memory checkpointed state: * This is all GPRs, all VSX regs and a subset of SPRs
tools/arch/x86/include/uapi/asm/kvm.h +49 -0
72 lines not on this page · raw message
tools/arch/x86/include/uapi/asm/svm.h +1 -0
@@ -115,6 +115,7 @@#define SVM_VMGEXIT_AP_CREATE_ON_INIT 0#define SVM_VMGEXIT_AP_CREATE 1#define SVM_VMGEXIT_AP_DESTROY 2 +#define SVM_VMGEXIT_SNP_RUN_VMPL 0x80000018#define SVM_VMGEXIT_HV_FEATURES 0x8000fffd#define SVM_VMGEXIT_TERM_REQUEST 0x8000fffe#define SVM_VMGEXIT_TERM_REASON (reason_set, reason_code) \
tools/include/uapi/linux/kvm.h +16 -1
@@ -192,11 +192,24 @@ struct kvm_xen_exit {/* Flags that describe what fields in emulation_failure hold valid data. */ #define KVM_INTERNAL_ERROR_EMULATION_FLAG_INSTRUCTION_BYTES (1ULL << 0) +/* +* struct kvm_run can be modified by userspace at any time, so KVM must be +* careful to avoid TOCTOU bugs. In order to protect KVM, HINT_UNSAFE_IN_KVM() +* renames fields in struct kvm_run from <symbol> to <symbol>__unsafe when +* compiled into the kernel, ensuring that any use within KVM is obvious and +* gets extra scrutiny. +*/ +#ifdef __KERNEL__ +#define HINT_UNSAFE_IN_KVM (_symbol) _symbol##__unsafe +#else +#define HINT_UNSAFE_IN_KVM (_symbol) _symbol +#endif +/* for KVM_RUN, returned by mmap(vcpu_fd, offset=0) */ struct kvm_run {/* in */ __u8 request_interrupt_window; -__u8 immediate_exit; +__u8 HINT_UNSAFE_IN_KVM(immediate_exit );__u8 padding1[6 ];/* out */
@@ -918,6 +931,8 @@ struct kvm_enable_cap {#define KVM_CAP_GUEST_MEMFD 234#define KVM_CAP_VM_TYPES 235#define KVM_CAP_PRE_FAULT_MEMORY 236 +#define KVM_CAP_X86_APIC_BUS_CYCLES_NS 237 +#define KVM_CAP_X86_GUEST_MODE 238struct kvm_irq_routing_irqchip {__u32 irqchip;
Signature · 1 line
2.46.0.rc2.264.g509ed76dc8-goog
Namhyung Kim
maintainerPATCH 4/10 tools/include: Sync uapi/linux/perf.h with the kernel sources
In reply to Namhyung KimTo pick up changes from:
608f6976c309 perf/x86/intel: Support new data source for Lunar Lake
This should be used to beautify perf syscall arguments and it addresses these tools/perf build warnings:
Warning: Kernel ABI header differences:
diff -u tools/include/uapi/linux/perf_event.h include/uapi/linux/perf_event.h
Please see tools/include/uapi/README for details (it's in the first patch of this series).
--- tools/include/uapi/linux/perf_event.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
tools/include/uapi/linux/perf_event.h +4 -2
@@ -1349,12 +1349,14 @@ union perf_mem_data_src {#define PERF_MEM_LVLNUM_L2 0x02/* L2 */ #define PERF_MEM_LVLNUM_L3 0x03/* L3 */ #define PERF_MEM_LVLNUM_L4 0x04/* L4 */ -/* 5-0x7 available */ +#define PERF_MEM_LVLNUM_L2_MHB 0x05/* L2 Miss Handling Buffer */ +#define PERF_MEM_LVLNUM_MSC 0x06/* Memory-side Cache */ +/* 0x7 available */ #define PERF_MEM_LVLNUM_UNC 0x08/* Uncached */ #define PERF_MEM_LVLNUM_CXL 0x09/* CXL */ #define PERF_MEM_LVLNUM_IO 0x0a/* I/O */ #define PERF_MEM_LVLNUM_ANY_CACHE 0x0b/* Any cache */ -#define PERF_MEM_LVLNUM_LFB 0x0c/* LFB */ +#define PERF_MEM_LVLNUM_LFB 0x0c/* LFB / L1 Miss Handling Buffer */ #define PERF_MEM_LVLNUM_RAM 0x0d/* RAM */ #define PERF_MEM_LVLNUM_PMEM 0x0e/* PMEM */ #define PERF_MEM_LVLNUM_NA 0x0f/* N/A */
Signature · 1 line
2.46.0.rc2.264.g509ed76dc8-goog
Namhyung Kim
maintainerPATCH 5/10 tools/include: Sync uapi/sound/asound.h with the kernel sources
In reply to Namhyung KimTo pick up changes from:
f05c1ffc2745 ALSA: pcm: reinvent the stream synchronization ID API
This should be used to beautify sound syscall arguments and it addresses these tools/perf build warnings:
Warning: Kernel ABI header differences:
diff -u tools/perf/trace/beauty/include/uapi/sound/asound.h include/uapi/sound/asound.h
Please see tools/include/uapi/README for details (it's in the first patch of this series).
--- tools/perf/trace/beauty/include/uapi/sound/asound.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
tools/perf/trace/beauty/include/uapi/sound/asound.h +5 -4
@@ -142,7 +142,7 @@ struct snd_hwdep_dsp_image {* * *****************************************************************************/ -#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 17) +#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 18)typedef unsigned long snd_pcm_uframes_t ;typedef signed long snd_pcm_sframes_t ;
@@ -334,7 +334,7 @@ union snd_pcm_sync_id {unsigned char id[16 ];unsigned short id16[8 ];unsigned int id32[4 ]; -}; +} __attribute__((deprecated));struct snd_pcm_info {unsigned int device;/* RO/WR (control): device number */
@@ -348,7 +348,7 @@ struct snd_pcm_info {int dev_subclass;/* SNDRV_PCM_SUBCLASS_* */ unsigned int subdevices_count;unsigned int subdevices_avail; -union snd_pcm_sync_id sync;/* hardware synchronization ID */ +unsigned char pad1[16 ];/* was: hardware synchronization ID */ unsigned char reserved[64 ];/* reserved for future... */ };
@@ -420,7 +420,8 @@ struct snd_pcm_hw_params {unsigned int rate_num;/* R: rate numerator */ unsigned int rate_den;/* R: rate denominator */ snd_pcm_uframes_t fifo_size;/* R: chip FIFO size in frames */ -unsigned char reserved[64 ];/* reserved for future */ +unsigned char sync[16 ];/* R: synchronization ID (perfect sync - one clock source) */ +unsigned char reserved[48 ];/* reserved for future */ };enum {
Signature · 1 line
2.46.0.rc2.264.g509ed76dc8-goog
Namhyung Kim
maintainerPATCH 6/10 tools/include: Sync uapi/asm-generic/unistd.h with the kernel sources
In reply to Namhyung KimAnd arch syscall tables to pick up changes from:
b1e31c134a8a powerpc: restore some missing spu syscalls d3882564a77c syscalls: fix compat_sys_io_pgetevents_time64 usage 54233a425403 uretprobe: change syscall number, again 63ded110979b uprobe: Change uretprobe syscall scope and number 9142be9e6443 x86/syscall: Mark exit[_group] syscall handlers __noreturn 9aae1baa1c5d x86, arm: Add missing license tag to syscall tables files 5c28424e9a34 syscalls: Fix to add sys_uretprobe to syscall.tbl 190fec72df4a uprobe: Wire up uretprobe system call
This should be used to beautify syscall arguments and it addresses these tools/perf build warnings:
Warning: Kernel ABI header differences:
diff -u tools/arch/arm64/include/uapi/asm/unistd.h arch/arm64/include/uapi/asm/unistd.h diff -u tools/include/uapi/asm-generic/unistd.h include/uapi/asm-generic/unistd.h diff -u tools/perf/arch/x86/entry/syscalls/syscall_64.tbl arch/x86/entry/syscalls/syscall_64.tbl diff -u tools/perf/arch/powerpc/entry/syscalls/syscall.tbl arch/powerpc/kernel/syscalls/syscall.tbl diff -u tools/perf/arch/s390/entry/syscalls/syscall.tbl arch/s390/kernel/syscalls/syscall.tbl
Please see tools/include/uapi/README for details (it's in the first patch of this series).
--- tools/arch/arm64/include/uapi/asm/unistd.h | 24 +------------------ tools/include/uapi/asm-generic/unistd.h | 2 +- .../arch/powerpc/entry/syscalls/syscall.tbl | 6 ++++- .../perf/arch/s390/entry/syscalls/syscall.tbl | 2 +- .../arch/x86/entry/syscalls/syscall_64.tbl | 8 ++++--- 5 files changed, 13 insertions(+), 29 deletions(-)
tools/arch/arm64/include/uapi/asm/unistd.h +1 -23
@@ -1,24 +1,2 @@/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -/* -* Copyright (C) 2012 ARM Ltd. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#define __ARCH_WANT_RENAMEAT -#define __ARCH_WANT_NEW_STAT -#define __ARCH_WANT_SET_GET_RLIMIT -#define __ARCH_WANT_TIME32_SYSCALLS -#define __ARCH_WANT_MEMFD_SECRET - -#include <asm-generic/unistd.h> +#include <asm/unistd_64.h>
tools/include/uapi/asm-generic/unistd.h +1 -1
@@ -737,7 +737,7 @@ __SC_COMP(__NR_pselect6_time64, sys_pselect6, compat_sys_pselect6_time64)#define __NR_ppoll_time64 414 __SC_COMP(__NR_ppoll_time64, sys_ppoll, compat_sys_ppoll_time64)#define __NR_io_pgetevents_time64 416 -__SYSCALL(__NR_io_pgetevents_time64, sys_io_pgetevents) +__SC_COMP(__NR_io_pgetevents_time64, sys_io_pgetevents, compat_sys_io_pgetevents_time64)#define __NR_recvmmsg_time64 417 __SC_COMP(__NR_recvmmsg_time64, sys_recvmmsg, compat_sys_recvmmsg_time64)#define __NR_mq_timedsend_time64 418
tools/perf/arch/powerpc/entry/syscalls/syscall.tbl +5 -1
@@ -230,8 +230,10 @@ 178 nospu rt_sigsuspend sys_rt_sigsuspend compat_sys_rt_sigsuspend 179 32 pread64 sys_ppc_pread64 compat_sys_ppc_pread64 179 64 pread64 sys_pread64 +179 spu pread64 sys_pread64 180 32 pwrite64 sys_ppc_pwrite64 compat_sys_ppc_pwrite64 180 64 pwrite64 sys_pwrite64 +180 spu pwrite64 sys_pwrite64 181 common chown sys_chown 182 common getcwd sys_getcwd 183 common capget sys_capget
@@ -246,6 +248,7 @@ 190 common ugetrlimit sys_getrlimit compat_sys_getrlimit 191 32 readahead sys_ppc_readahead compat_sys_ppc_readahead 191 64 readahead sys_readahead +191 spu readahead sys_readahead 192 32 mmap2 sys_mmap2 compat_sys_mmap2 193 32 truncate64 sys_ppc_truncate64 compat_sys_ppc_truncate64 194 32 ftruncate64 sys_ppc_ftruncate64 compat_sys_ppc_ftruncate64
@@ -293,6 +296,7 @@ 232 nospu set_tid_address sys_set_tid_address 233 32 fadvise64 sys_ppc32_fadvise64 compat_sys_ppc32_fadvise64 233 64 fadvise64 sys_fadvise64 +233 spu fadvise64 sys_fadvise64 234 nospu exit_group sys_exit_group 235 nospu lookup_dcookie sys_ni_syscall 236 common epoll_create sys_epoll_create
@@ -502,7 +506,7 @@ 412 32 utimensat_time64 sys_utimensat sys_utimensat 413 32 pselect6_time64 sys_pselect6 compat_sys_pselect6_time64 414 32 ppoll_time64 sys_ppoll compat_sys_ppoll_time64 -416 32 io_pgetevents_time64 sys_io_pgetevents sys_io_pgetevents +416 32 io_pgetevents_time64 sys_io_pgetevents compat_sys_io_pgetevents_time64 417 32 recvmmsg_time64 sys_recvmmsg compat_sys_recvmmsg_time64 418 32 mq_timedsend_time64 sys_mq_timedsend sys_mq_timedsend 419 32 mq_timedreceive_time64 sys_mq_timedreceive sys_mq_timedreceive
tools/perf/arch/s390/entry/syscalls/syscall.tbl +1 -1
@@ -418,7 +418,7 @@ 412 32 utimensat_time64 - sys_utimensat 413 32 pselect6_time64 - compat_sys_pselect6_time64 414 32 ppoll_time64 - compat_sys_ppoll_time64 -416 32 io_pgetevents_time64 - sys_io_pgetevents +416 32 io_pgetevents_time64 - compat_sys_io_pgetevents_time64 417 32 recvmmsg_time64 - compat_sys_recvmmsg_time64 418 32 mq_timedsend_time64 - sys_mq_timedsend 419 32 mq_timedreceive_time64 - sys_mq_timedreceive
tools/perf/arch/x86/entry/syscalls/syscall_64.tbl +5 -3
@@ -1,8 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note # # 64-bit system call numbers and entry vectors # # The format is: -# <number> <abi> <name> <entry point> +# <number> <abi> <name> <entry point> [<compat entry point> [noreturn]] # # The __x64_sys_*() stubs are created on-the-fly for sys_*() system calls #
@@ -68,7 +69,7 @@ 57 common fork sys_fork 58 common vfork sys_vfork 59 64 execve sys_execve -60 common exit sys_exit +60 common exit sys_exit - noreturn 61 common wait4 sys_wait4 62 common kill sys_kill 63 common uname sys_newuname
@@ -239,7 +240,7 @@ 228 common clock_gettime sys_clock_gettime 229 common clock_getres sys_clock_getres 230 common clock_nanosleep sys_clock_nanosleep -231 common exit_group sys_exit_group +231 common exit_group sys_exit_group - noreturn 232 common epoll_wait sys_epoll_wait 233 common epoll_ctl sys_epoll_ctl 234 common tgkill sys_tgkill
@@ -343,6 +344,7 @@ 332 common statx sys_statx 333 common io_pgetevents sys_io_pgetevents 334 common rseq sys_rseq +335 common uretprobe sys_uretprobe # don't use numbers 387 through 423, add new calls after the last # 'common' entry 424 common pidfd_send_signal sys_pidfd_send_signal
Signature · 1 line
2.46.0.rc2.264.g509ed76dc8-goog
Arnd Bergmann
maintainerRe: [PATCH 06/10] tools/include: Sync uapi/asm-generic/unistd.h with the kernel sources
Quoted 45 lines · Namhyung Kim
And arch syscall tables to pick up changes from:
b1e31c134a8apowerpc: restore some missing spu syscallsd3882564a77csyscalls: fixcompat_sys_io_pgetevents_time64usage54233a425403uretprobe: change syscall number, again63ded110979buprobe: Change uretprobe syscall scope and number9142be9e6443x86/syscall: Mark exit[_group] syscall handlers__noreturn9aae1baa1c5dx86, arm: Add missing license tag to syscall tables files5c28424e9a34syscalls: Fix to addsys_uretprobeto syscall.tbl190fec72df4auprobe: Wire up uretprobe system callThis should be used to beautify syscall arguments and it addresses these
tools/perfbuild warnings:Warning: Kernel ABI header differences:
diff -utools/arch/arm64/include/uapi/asm/unistd.harch/arm64/include/uapi/asm/unistd.h
diff -utools/include/uapi/asm-generic/unistd.hinclude/uapi/asm-generic/unistd.h
diff -utools/perf/arch/x86/entry/syscalls/syscall_64.tblarch/x86/entry/syscalls/syscall_64.tbl
diff -utools/perf/arch/powerpc/entry/syscalls/syscall.tblarch/powerpc/kernel/syscalls/syscall.tbl
diff -utools/perf/arch/s390/entry/syscalls/syscall.tblarch/s390/kernel/syscalls/syscall.tblPlease see
tools/include/uapi/READMEfor details (it's in the first patch of this series).Cc Arnd Bergmann <[email protected]>Signed-off-by Namhyung Kim <[email protected]>--- tools/arch/arm64/include/uapi/asm/unistd.h | 24 +------------------ tools/include/uapi/asm-generic/unistd.h | 2 +- .../arch/powerpc/entry/syscalls/syscall.tbl | 6 ++++- .../perf/arch/s390/entry/syscalls/syscall.tbl | 2 +- .../arch/x86/entry/syscalls/syscall_64.tbl | 8 ++++--- 5 files changed, 13 insertions(+), 29 deletions(-)tools/arch/arm64/include/uapi/asm/unistd.h +0
-0
tools/arch/arm64/include/uapi/asm/unistd.h line 2
Quoted 9 lines
tools/arch/arm64/include/uapi/asm/unistd.h +1
-8- -#define __ARCH_WANT_RENAMEAT -#define __ARCH_WANT_NEW_STAT -#define __ARCH_WANT_SET_GET_RLIMIT -#define __ARCH_WANT_TIME32_SYSCALLS -#define __ARCH_WANT_MEMFD_SECRET - -#include <asm-generic/unistd.h> +#include <asm/unistd_64.h>
This part won't work by itself, since you don't pick up the generated asm/unistd_64.h header but keep the old asm-generic/unistd.h header. Both have the same contents, so the easy way to do this is to just keep the existing version of the arm64 header for 6.11 and add a script to generate it in 6.12 the way we do for x86, using an architecture-independent script.
tools/arch/arm64/include/uapi/asm/unistd.h line 75
Quoted 9 lines
tools/arch/arm64/include/uapi/asm/unistd.h +1
-1@@ -68,7 +69,7 @@ 57 common fork sys_fork 58 common vfork sys_vfork 59 64 execve sys_execve -60 common exit sys_exit +60 common exit sys_exit - noreturn 61 common wait4 sys_wait4 62 common kill sys_kill 63 common uname sys_newuname
Have you checked if this works correctly with the existing tools/perf/arch/x86/entry/syscalls/syscalltbl.sh?
Since not just table file contents but also the file format changed here, there is a good chance that the output is no longer what we need.
Unfortunately, the format on x86 is now incompatible with the one on s390. I have a patch to change s390 in the future so we can use a single script for all of them.
Arnd
Namhyung Kim
maintainerRe: [PATCH 06/10] tools/include: Sync uapi/asm-generic/unistd.h with the kernel sources
Hello,
Quoted 56 lines · Arnd Bergmann
Quoted 45 lines · Namhyung Kim
And arch syscall tables to pick up changes from:
b1e31c134a8apowerpc: restore some missing spu syscallsd3882564a77csyscalls: fixcompat_sys_io_pgetevents_time64usage54233a425403uretprobe: change syscall number, again63ded110979buprobe: Change uretprobe syscall scope and number9142be9e6443x86/syscall: Mark exit[_group] syscall handlers__noreturn9aae1baa1c5dx86, arm: Add missing license tag to syscall tables files5c28424e9a34syscalls: Fix to addsys_uretprobeto syscall.tbl190fec72df4auprobe: Wire up uretprobe system callThis should be used to beautify syscall arguments and it addresses these
tools/perfbuild warnings:Warning: Kernel ABI header differences:
diff -utools/arch/arm64/include/uapi/asm/unistd.harch/arm64/include/uapi/asm/unistd.h
diff -utools/include/uapi/asm-generic/unistd.hinclude/uapi/asm-generic/unistd.h
diff -utools/perf/arch/x86/entry/syscalls/syscall_64.tblarch/x86/entry/syscalls/syscall_64.tbl
diff -utools/perf/arch/powerpc/entry/syscalls/syscall.tblarch/powerpc/kernel/syscalls/syscall.tbl
diff -utools/perf/arch/s390/entry/syscalls/syscall.tblarch/s390/kernel/syscalls/syscall.tblPlease see
tools/include/uapi/READMEfor details (it's in the first patch of this series).Cc Arnd Bergmann <[email protected]>Signed-off-by Namhyung Kim <[email protected]>--- tools/arch/arm64/include/uapi/asm/unistd.h | 24 +------------------ tools/include/uapi/asm-generic/unistd.h | 2 +- .../arch/powerpc/entry/syscalls/syscall.tbl | 6 ++++- .../perf/arch/s390/entry/syscalls/syscall.tbl | 2 +- .../arch/x86/entry/syscalls/syscall_64.tbl | 8 ++++--- 5 files changed, 13 insertions(+), 29 deletions(-)tools/arch/arm64/include/uapi/asm/unistd.h +0
-0tools/arch/arm64/include/uapi/asm/unistd.h line 2
Quoted 9 lines
tools/arch/arm64/include/uapi/asm/unistd.h +1
-8- -#define __ARCH_WANT_RENAMEAT -#define __ARCH_WANT_NEW_STAT -#define __ARCH_WANT_SET_GET_RLIMIT -#define __ARCH_WANT_TIME32_SYSCALLS -#define __ARCH_WANT_MEMFD_SECRET - -#include <asm-generic/unistd.h> +#include <asm/unistd_64.h>
Quoted 7 lines
This part won't work by itself, since you don't pick up the generated
asm/unistd_64.hheader but keep the oldasm-generic/unistd.hheader. Both have the same contents, so the easy way to do this is to just keep the existing version of the arm64 header for 6.11 and add a script to generate it in 6.12 the way we do for x86, using an architecture-independent script.
Thanks for the review, I'll drop the arm64 parts for now.
Quoted 13 lines
tools/arch/arm64/include/uapi/asm/unistd.h line 75
Quoted 10 lines
tools/arch/arm64/include/uapi/asm/unistd.h +1
-1@@ -68,7 +69,7 @@ 57 common fork sys_fork 58 common vfork sys_vfork 59 64 execve sys_execve -60 common exit sys_exit +60 common exit sys_exit - noreturn 61 common wait4 sys_wait4 62 common kill sys_kill 63 common uname sys_newunameHave you checked if this works correctly with the existing
tools/perf/arch/x86/entry/syscalls/syscalltbl.sh?
Yep, the script only cares about the number and the name.
# the params are: nr abi name entry compat
# use _ for intentionally unused variables according to SC2034
while read nr _ name _ _; do
if [ $nr -ge 512 ] ; then # discard compat sycalls
break
fi emit "$nr" "$name"
max_nr=$nrdone < $sorted_table
The only difference I see was the added uretprobe syscall.
$ tools/arch/x86/entry/syscalls/syscalltbl.sh tools/arch/x86/entry/syscalls/syscall_64.tbl x86_64 > b (apply this series...) $ tools/arch/x86/entry/syscalls/syscalltbl.sh tools/arch/x86/entry/syscalls/syscall_64.tbl x86_64 > a
$ diff -u b a --- b 2024-08-07 10:28:04.267738574 -0700 +++ a 2024-08-07 10:28:18.543965369 -0700 @@ -334,6 +334,7 @@ [332] = "statx", [333] = "io_pgetevents", [334] = "rseq", + [335] = "uretprobe", [424] = "pidfd_send_signal", [425] = "io_uring_setup", [426] = "io_uring_enter",
Thanks,
Namhyung
Quoted 10 lines
Since not just table file contents but also the file format changed here, there is a good chance that the output is no longer what we need.
Unfortunately, the format on x86 is now incompatible with the one on s390. I have a patch to change s390 in the future so we can use a single script for all of them.
Arnd
Namhyung Kim
maintainerPATCH 7/10 tools/include: Sync network socket headers with the kernel sources
In reply to Namhyung KimTo pick up changes from:
d25a92ccae6b net/smc: Introduce IPPROTO_SMC 060f4ba6e403 io_uring/net: move charging socket out of zc io_uring bb6aaf736680 net: Split a __sys_listen helper for io_uring dc2e77979412 net: Split a __sys_bind helper for io_uring
This should be used to beautify socket syscall arguments and it addresses these tools/perf build warnings:
Warning: Kernel ABI header differences:
diff -u tools/include/uapi/linux/in.h include/uapi/linux/in.h diff -u tools/perf/trace/beauty/include/linux/socket.h include/linux/socket.h
Please see tools/include/uapi/README for details (it's in the first patch of this series).
--- tools/include/uapi/linux/in.h | 2 ++ tools/perf/trace/beauty/include/linux/socket.h | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-)
tools/include/uapi/linux/in.h +2 -0
@@ -81,6 +81,8 @@ enum {#define IPPROTO_ETHERNET IPPROTO_ETHERNET IPPROTO_RAW = 255, /* Raw IP packets */#define IPPROTO_RAW IPPROTO_RAW + IPPROTO_SMC = 256, /* Shared Memory Communications */ +#define IPPROTO_SMC IPPROTO_SMC IPPROTO_MPTCP = 262, /* Multipath TCP connection */#define IPPROTO_MPTCP IPPROTO_MPTCPIPPROTO_MAX
tools/perf/trace/beauty/include/linux/socket.h +4 -1
@@ -76,7 +76,7 @@ struct msghdr {__kernel_size_t msg_controllen;/* ancillary data buffer length */ struct kiocb *msg_iocb;/* ptr to iocb for async requests */ struct ubuf_info *msg_ubuf; -int (*sg_from_iter)(struct sock *sk,struct sk_buff *skb, +int (*sg_from_iter)(struct sk_buff *skb,struct iov_iter *from,size_t length); };
@@ -442,11 +442,14 @@ extern int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr,extern int __sys_socket (int family,int type,int protocol);extern struct file *__sys_socket_file (int family,int type,int protocol);extern int __sys_bind (int fd,struct sockaddr __user *umyaddr,int addrlen); +extern int __sys_bind_socket (struct socket *sock,struct sockaddr_storage *address, +int addrlen);extern int __sys_connect_file (struct file *file,struct sockaddr_storage *addr,int addrlen,int file_flags);extern int __sys_connect (int fd,struct sockaddr __user *uservaddr,int addrlen);extern int __sys_listen (int fd,int backlog); +extern int __sys_listen_socket (struct socket *sock,int backlog);extern int __sys_getsockname (int fd,struct sockaddr __user *usockaddr,int __user *usockaddr_len); extern int __sys_getpeername(int fd, struct sockaddr __user *usockaddr,
Signature · 1 line
2.46.0.rc2.264.g509ed76dc8-goog
Namhyung Kim
maintainerPATCH 8/10 tools/include: Sync filesystem headers with the kernel sources
In reply to Namhyung KimTo pick up changes from:
0f9ca80fa4f9 fs: Add initial atomic write support info to statx f9af549d1fd3 fs: export mount options via statmount()
0a3deb11858a fs: Allow listmount() in foreign mount namespace 09b31295f833 fs: export the mount ns id via statmount
d04bccd8c19d listmount: allow listing in reverse order
bfc69fd05ef9 fs/procfs: add build ID fetching to PROCMAP_QUERY API ed5d583a88a9 fs/procfs: implement efficient VMA querying API for /proc/<pid>/maps
This should be used to beautify FS syscall arguments and it addresses these tools/perf build warnings:
Warning: Kernel ABI header differences:
diff -u tools/include/uapi/linux/stat.h include/uapi/linux/stat.h
diff -u tools/perf/trace/beauty/include/uapi/linux/fs.h include/uapi/linux/fs.h diff -u tools/perf/trace/beauty/include/uapi/linux/mount.h include/uapi/linux/mount.h diff -u tools/perf/trace/beauty/include/uapi/linux/stat.h include/uapi/linux/stat.h
Please see tools/include/uapi/README for details (it's in the first patch of this series).
--- tools/include/uapi/linux/stat.h | 12 +- .../perf/trace/beauty/include/uapi/linux/fs.h | 163 +++++++++++++++++- .../trace/beauty/include/uapi/linux/mount.h | 10 +- .../trace/beauty/include/uapi/linux/stat.h | 12 +- 4 files changed, 189 insertions(+), 8 deletions(-)
tools/include/uapi/linux/stat.h +10 -2
@@ -126,9 +126,15 @@ struct statx {__u64 stx_mnt_id;__u32 stx_dio_mem_align;/* Memory buffer alignment for direct I/O */ __u32 stx_dio_offset_align;/* File offset alignment for direct I/O */ -__u64 stx_subvol;/* Subvolume identifier */ /* 0xa0 */ -__u64 __spare3[11 ];/* Spare space for future expansion */ +__u64 stx_subvol;/* Subvolume identifier */ +__u32 stx_atomic_write_unit_min;/* Min atomic write unit in bytes */ +__u32 stx_atomic_write_unit_max;/* Max atomic write unit in bytes */ +/* 0xb0 */ +__u32 stx_atomic_write_segments_max;/* Max atomic write segment count */ +__u32 __spare1[1 ]; +/* 0xb8 */ +__u64 __spare3[9 ];/* Spare space for future expansion */ /* 0x100 */ };
@@ -157,6 +163,7 @@ struct statx {#define STATX_DIOALIGN 0x00002000U/* Want/got direct I/O alignment info */ #define STATX_MNT_ID_UNIQUE 0x00004000U/* Want/got extended stx_mount_id */ #define STATX_SUBVOL 0x00008000U/* Want/got stx_subvol */ +#define STATX_WRITE_ATOMIC 0x00010000U/* Want/got atomic_write_* fields */ #define STATX__RESERVED 0x80000000U/* Reserved for future struct statx expansion */
@@ -192,6 +199,7 @@ struct statx {#define STATX_ATTR_MOUNT_ROOT 0x00002000/* Root of a mount */ #define STATX_ATTR_VERITY 0x00100000/* [I] Verity protected file */ #define STATX_ATTR_DAX 0x00200000/* File is currently in DAX state */ +#define STATX_ATTR_WRITE_ATOMIC 0x00400000/* File supports atomic write operations */ #endif /* _UAPI_LINUX_STAT_H */
tools/perf/trace/beauty/include/uapi/linux/fs.h +161 -2
177 lines not on this page · raw message
tools/perf/trace/beauty/include/uapi/linux/mount.h +8 -2
@@ -154,7 +154,7 @@ struct mount_attr {*/ struct statmount {__u32 size;/* Total size, including strings */ -__u32 __spare1; +__u32 mnt_opts;/* [str] Mount options of the mount */ __u64 mask;/* What results were written */ __u32 sb_dev_major;/* Device ID */ __u32 sb_dev_minor;
@@ -172,7 +172,8 @@ struct statmount {__u64 propagate_from;/* Propagation from in current namespace */ __u32 mnt_root;/* [str] Root of mount relative to root of fs */ __u32 mnt_point;/* [str] Mountpoint relative to current root */ -__u64 __spare2[50 ]; +__u64 mnt_ns_id;/* ID of the mount namespace */ +__u64 __spare2[49 ];char str[];/* Variable size part containing strings */ };
@@ -188,10 +189,12 @@ struct mnt_id_req {__u32 spare;__u64 mnt_id;__u64 param; +__u64 mnt_ns_id; };/* List of all mnt_id_req versions. */ #define MNT_ID_REQ_SIZE_VER0 24/* sizeof first published struct */ +#define MNT_ID_REQ_SIZE_VER1 32/* sizeof second published struct */ /* * @mask bits for statmount(2)
@@ -202,10 +205,13 @@ struct mnt_id_req {#define STATMOUNT_MNT_ROOT 0x00000008U/* Want/got mnt_root */ #define STATMOUNT_MNT_POINT 0x00000010U/* Want/got mnt_point */ #define STATMOUNT_FS_TYPE 0x00000020U/* Want/got fs_type */ +#define STATMOUNT_MNT_NS_ID 0x00000040U/* Want/got mnt_ns_id */ +#define STATMOUNT_MNT_OPTS 0x00000080U/* Want/got mnt_opts */ /* * Special @mnt_id values that can be passed to listmount */ #define LSMT_ROOT 0xffffffffffffffff/* root mount */ +#define LISTMOUNT_REVERSE (1 << 0)/* List later mounts first */ #endif /* _UAPI_LINUX_MOUNT_H */
tools/perf/trace/beauty/include/uapi/linux/stat.h +10 -2
@@ -126,9 +126,15 @@ struct statx {__u64 stx_mnt_id;__u32 stx_dio_mem_align;/* Memory buffer alignment for direct I/O */ __u32 stx_dio_offset_align;/* File offset alignment for direct I/O */ -__u64 stx_subvol;/* Subvolume identifier */ /* 0xa0 */ -__u64 __spare3[11 ];/* Spare space for future expansion */ +__u64 stx_subvol;/* Subvolume identifier */ +__u32 stx_atomic_write_unit_min;/* Min atomic write unit in bytes */ +__u32 stx_atomic_write_unit_max;/* Max atomic write unit in bytes */ +/* 0xb0 */ +__u32 stx_atomic_write_segments_max;/* Max atomic write segment count */ +__u32 __spare1[1 ]; +/* 0xb8 */ +__u64 __spare3[9 ];/* Spare space for future expansion */ /* 0x100 */ };
@@ -157,6 +163,7 @@ struct statx {#define STATX_DIOALIGN 0x00002000U/* Want/got direct I/O alignment info */ #define STATX_MNT_ID_UNIQUE 0x00004000U/* Want/got extended stx_mount_id */ #define STATX_SUBVOL 0x00008000U/* Want/got stx_subvol */ +#define STATX_WRITE_ATOMIC 0x00010000U/* Want/got atomic_write_* fields */ #define STATX__RESERVED 0x80000000U/* Reserved for future struct statx expansion */
@@ -192,6 +199,7 @@ struct statx {#define STATX_ATTR_MOUNT_ROOT 0x00002000/* Root of a mount */ #define STATX_ATTR_VERITY 0x00100000/* [I] Verity protected file */ #define STATX_ATTR_DAX 0x00200000/* File is currently in DAX state */ +#define STATX_ATTR_WRITE_ATOMIC 0x00400000/* File supports atomic write operations */ #endif /* _UAPI_LINUX_STAT_H */
Signature · 1 line
2.46.0.rc2.264.g509ed76dc8-goog
Namhyung Kim
maintainerPATCH 9/10 tools/include: Sync x86 headers with the kernel sources
In reply to Namhyung KimTo pick up changes from:
149fd4712bcd perf/x86/intel: Support Perfmon MSRs aliasing 21b362cc762a x86/resctrl: Enable shared RMID mode on Sub-NUMA Cluster (SNC) systems 4f460bff7b6a cpufreq: acpi: move MSR_K7_HWCR_CPB_DIS_BIT into msr-index.h 7ea81936b853 x86/cpufeatures: Add HWP highest perf change feature flag 78ce84b9e0a5 x86/cpufeatures: Flip the /proc/cpuinfo appearance logic 1beb348d5c7f x86/sev: Provide SVSM discovery support
This should be used to beautify x86 syscall arguments and it addresses these tools/perf build warnings:
Warning: Kernel ABI header differences:
diff -u tools/arch/x86/include/asm/cpufeatures.h arch/x86/include/asm/cpufeatures.h diff -u tools/arch/x86/include/asm/msr-index.h arch/x86/include/asm/msr-index.h
Please see tools/include/uapi/README for details (it's in the first patch of this series).
--- tools/arch/x86/include/asm/cpufeatures.h | 803 ++++++++++++----------- tools/arch/x86/include/asm/msr-index.h | 11 + 2 files changed, 414 insertions(+), 400 deletions(-)
tools/arch/x86/include/asm/cpufeatures.h +403 -400
@@ -18,170 +18,170 @@/* * Note: If the comment begins with a quoted string, that string is used -* in /proc/cpuinfo instead of the macro name. If the string is "", -* this feature bit is not displayed in /proc/cpuinfo at all. +* in /proc/cpuinfo instead of the macro name. Otherwise, this feature +* bit is not displayed in /proc/cpuinfo at all. * * When adding new features here that depend on other features, * please update the table in kernel/cpu/cpuid-deps.c as well. */ /* Intel-defined CPU features, CPUID level 0x00000001 (EDX), word 0 */ -#define X86_FEATURE_FPU ( 0*32+ 0)/* Onboard FPU */ -#define X86_FEATURE_VME ( 0*32+ 1)/* Virtual Mode Extensions */ -#define X86_FEATURE_DE ( 0*32+ 2)/* Debugging Extensions */ -#define X86_FEATURE_PSE ( 0*32+ 3)/* Page Size Extensions */ -#define X86_FEATURE_TSC ( 0*32+ 4)/* Time Stamp Counter */ -#define X86_FEATURE_MSR ( 0*32+ 5)/* Model-Specific Registers */ -#define X86_FEATURE_PAE ( 0*32+ 6)/* Physical Address Extensions */ -#define X86_FEATURE_MCE ( 0*32+ 7)/* Machine Check Exception */ -#define X86_FEATURE_CX8 ( 0*32+ 8)/* CMPXCHG8 instruction */ -#define X86_FEATURE_APIC ( 0*32+ 9)/* Onboard APIC */ -#define X86_FEATURE_SEP ( 0*32+11)/* SYSENTER/SYSEXIT */ -#define X86_FEATURE_MTRR ( 0*32+12)/* Memory Type Range Registers */ -#define X86_FEATURE_PGE ( 0*32+13)/* Page Global Enable */ -#define X86_FEATURE_MCA ( 0*32+14)/* Machine Check Architecture */ -#define X86_FEATURE_CMOV ( 0*32+15)/* CMOV instructions (plus FCMOVcc, FCOMI with FPU) */ -#define X86_FEATURE_PAT ( 0*32+16)/* Page Attribute Table */ -#define X86_FEATURE_PSE36 ( 0*32+17)/* 36-bit PSEs */ -#define X86_FEATURE_PN ( 0*32+18)/* Processor serial number */ -#define X86_FEATURE_CLFLUSH ( 0*32+19)/* CLFLUSH instruction */ +#define X86_FEATURE_FPU ( 0*32+ 0)/* "fpu" Onboard FPU */ +#define X86_FEATURE_VME ( 0*32+ 1)/* "vme" Virtual Mode Extensions */ +#define X86_FEATURE_DE ( 0*32+ 2)/* "de" Debugging Extensions */ +#define X86_FEATURE_PSE ( 0*32+ 3)/* "pse" Page Size Extensions */ +#define X86_FEATURE_TSC ( 0*32+ 4)/* "tsc" Time Stamp Counter */ +#define X86_FEATURE_MSR ( 0*32+ 5)/* "msr" Model-Specific Registers */ +#define X86_FEATURE_PAE ( 0*32+ 6)/* "pae" Physical Address Extensions */ +#define X86_FEATURE_MCE ( 0*32+ 7)/* "mce" Machine Check Exception */ +#define X86_FEATURE_CX8 ( 0*32+ 8)/* "cx8" CMPXCHG8 instruction */ +#define X86_FEATURE_APIC ( 0*32+ 9)/* "apic" Onboard APIC */ +#define X86_FEATURE_SEP ( 0*32+11)/* "sep" SYSENTER/SYSEXIT */ +#define X86_FEATURE_MTRR ( 0*32+12)/* "mtrr" Memory Type Range Registers */ +#define X86_FEATURE_PGE ( 0*32+13)/* "pge" Page Global Enable */ +#define X86_FEATURE_MCA ( 0*32+14)/* "mca" Machine Check Architecture */ +#define X86_FEATURE_CMOV ( 0*32+15)/* "cmov" CMOV instructions (plus FCMOVcc, FCOMI with FPU) */ +#define X86_FEATURE_PAT ( 0*32+16)/* "pat" Page Attribute Table */ +#define X86_FEATURE_PSE36 ( 0*32+17)/* "pse36" 36-bit PSEs */ +#define X86_FEATURE_PN ( 0*32+18)/* "pn" Processor serial number */ +#define X86_FEATURE_CLFLUSH ( 0*32+19)/* "clflush" CLFLUSH instruction */ #define X86_FEATURE_DS ( 0*32+21)/* "dts" Debug Store */ -#define X86_FEATURE_ACPI ( 0*32+22)/* ACPI via MSR */ -#define X86_FEATURE_MMX ( 0*32+23)/* Multimedia Extensions */ -#define X86_FEATURE_FXSR ( 0*32+24)/* FXSAVE/FXRSTOR, CR4.OSFXSR */ +#define X86_FEATURE_ACPI ( 0*32+22)/* "acpi" ACPI via MSR */ +#define X86_FEATURE_MMX ( 0*32+23)/* "mmx" Multimedia Extensions */ +#define X86_FEATURE_FXSR ( 0*32+24)/* "fxsr" FXSAVE/FXRSTOR, CR4.OSFXSR */ #define X86_FEATURE_XMM ( 0*32+25)/* "sse" */ #define X86_FEATURE_XMM2 ( 0*32+26)/* "sse2" */ #define X86_FEATURE_SELFSNOOP ( 0*32+27)/* "ss" CPU self snoop */ -#define X86_FEATURE_HT ( 0*32+28)/* Hyper-Threading */ +#define X86_FEATURE_HT ( 0*32+28)/* "ht" Hyper-Threading */ #define X86_FEATURE_ACC ( 0*32+29)/* "tm" Automatic clock control */ -#define X86_FEATURE_IA64 ( 0*32+30)/* IA-64 processor */ -#define X86_FEATURE_PBE ( 0*32+31)/* Pending Break Enable */ +#define X86_FEATURE_IA64 ( 0*32+30)/* "ia64" IA-64 processor */ +#define X86_FEATURE_PBE ( 0*32+31)/* "pbe" Pending Break Enable */ /* AMD-defined CPU features, CPUID level 0x80000001, word 1 */ /* Don't duplicate feature flags which are redundant with Intel! */ -#define X86_FEATURE_SYSCALL ( 1*32+11)/* SYSCALL/SYSRET */ -#define X86_FEATURE_MP ( 1*32+19)/* MP Capable */ -#define X86_FEATURE_NX ( 1*32+20)/* Execute Disable */ -#define X86_FEATURE_MMXEXT ( 1*32+22)/* AMD MMX extensions */ -#define X86_FEATURE_FXSR_OPT ( 1*32+25)/* FXSAVE/FXRSTOR optimizations */ +#define X86_FEATURE_SYSCALL ( 1*32+11)/* "syscall" SYSCALL/SYSRET */ +#define X86_FEATURE_MP ( 1*32+19)/* "mp" MP Capable */ +#define X86_FEATURE_NX ( 1*32+20)/* "nx" Execute Disable */ +#define X86_FEATURE_MMXEXT ( 1*32+22)/* "mmxext" AMD MMX extensions */ +#define X86_FEATURE_FXSR_OPT ( 1*32+25)/* "fxsr_opt" FXSAVE/FXRSTOR optimizations */ #define X86_FEATURE_GBPAGES ( 1*32+26)/* "pdpe1gb" GB pages */ -#define X86_FEATURE_RDTSCP ( 1*32+27)/* RDTSCP */ -#define X86_FEATURE_LM ( 1*32+29)/* Long Mode (x86-64, 64-bit support) */ -#define X86_FEATURE_3DNOWEXT ( 1*32+30)/* AMD 3DNow extensions */ -#define X86_FEATURE_3DNOW ( 1*32+31)/* 3DNow */ +#define X86_FEATURE_RDTSCP ( 1*32+27)/* "rdtscp" RDTSCP */ +#define X86_FEATURE_LM ( 1*32+29)/* "lm" Long Mode (x86-64, 64-bit support) */ +#define X86_FEATURE_3DNOWEXT ( 1*32+30)/* "3dnowext" AMD 3DNow extensions */ +#define X86_FEATURE_3DNOW ( 1*32+31)/* "3dnow" 3DNow */ /* Transmeta-defined CPU features, CPUID level 0x80860001, word 2 */ -#define X86_FEATURE_RECOVERY ( 2*32+ 0)/* CPU in recovery mode */ -#define X86_FEATURE_LONGRUN ( 2*32+ 1)/* Longrun power control */ -#define X86_FEATURE_LRTI ( 2*32+ 3)/* LongRun table interface */ +#define X86_FEATURE_RECOVERY ( 2*32+ 0)/* "recovery" CPU in recovery mode */ +#define X86_FEATURE_LONGRUN ( 2*32+ 1)/* "longrun" Longrun power control */ +#define X86_FEATURE_LRTI ( 2*32+ 3)/* "lrti" LongRun table interface */ /* Other features, Linux-defined mapping, word 3 */ /* This range is used for feature bits which conflict or are synthesized */ -#define X86_FEATURE_CXMMX ( 3*32+ 0)/* Cyrix MMX extensions */ -#define X86_FEATURE_K6_MTRR ( 3*32+ 1)/* AMD K6 nonstandard MTRRs */ -#define X86_FEATURE_CYRIX_ARR ( 3*32+ 2)/* Cyrix ARRs (= MTRRs) */ -#define X86_FEATURE_CENTAUR_MCR ( 3*32+ 3)/* Centaur MCRs (= MTRRs) */ -#define X86_FEATURE_K8 ( 3*32+ 4)/* "" Opteron, Athlon64 */ -#define X86_FEATURE_ZEN5 ( 3*32+ 5)/* "" CPU based on Zen5 microarchitecture */ -#define X86_FEATURE_P3 ( 3*32+ 6)/* "" P3 */ -#define X86_FEATURE_P4 ( 3*32+ 7)/* "" P4 */ -#define X86_FEATURE_CONSTANT_TSC ( 3*32+ 8)/* TSC ticks at a constant rate */ -#define X86_FEATURE_UP ( 3*32+ 9)/* SMP kernel running on UP */ -#define X86_FEATURE_ART ( 3*32+10)/* Always running timer (ART) */ -#define X86_FEATURE_ARCH_PERFMON ( 3*32+11)/* Intel Architectural PerfMon */ -#define X86_FEATURE_PEBS ( 3*32+12)/* Precise-Event Based Sampling */ -#define X86_FEATURE_BTS ( 3*32+13)/* Branch Trace Store */ -#define X86_FEATURE_SYSCALL32 ( 3*32+14)/* "" syscall in IA32 userspace */ -#define X86_FEATURE_SYSENTER32 ( 3*32+15)/* "" sysenter in IA32 userspace */ -#define X86_FEATURE_REP_GOOD ( 3*32+16)/* REP microcode works well */ -#define X86_FEATURE_AMD_LBR_V2 ( 3*32+17)/* AMD Last Branch Record Extension Version 2 */ -#define X86_FEATURE_CLEAR_CPU_BUF ( 3*32+18)/* "" Clear CPU buffers using VERW */ -#define X86_FEATURE_ACC_POWER ( 3*32+19)/* AMD Accumulated Power Mechanism */ -#define X86_FEATURE_NOPL ( 3*32+20)/* The NOPL (0F 1F) instructions */ -#define X86_FEATURE_ALWAYS ( 3*32+21)/* "" Always-present feature */ -#define X86_FEATURE_XTOPOLOGY ( 3*32+22)/* CPU topology enum extensions */ -#define X86_FEATURE_TSC_RELIABLE ( 3*32+23)/* TSC is known to be reliable */ -#define X86_FEATURE_NONSTOP_TSC ( 3*32+24)/* TSC does not stop in C states */ -#define X86_FEATURE_CPUID ( 3*32+25)/* CPU has CPUID instruction itself */ -#define X86_FEATURE_EXTD_APICID ( 3*32+26)/* Extended APICID (8 bits) */ -#define X86_FEATURE_AMD_DCM ( 3*32+27)/* AMD multi-node processor */ -#define X86_FEATURE_APERFMPERF ( 3*32+28)/* P-State hardware coordination feedback capability (APERF/MPERF MSRs) */ -#define X86_FEATURE_RAPL ( 3*32+29)/* AMD/Hygon RAPL interface */ -#define X86_FEATURE_NONSTOP_TSC_S3 ( 3*32+30)/* TSC doesn't stop in S3 state */ -#define X86_FEATURE_TSC_KNOWN_FREQ ( 3*32+31)/* TSC has known frequency */ +#define X86_FEATURE_CXMMX ( 3*32+ 0)/* "cxmmx" Cyrix MMX extensions */ +#define X86_FEATURE_K6_MTRR ( 3*32+ 1)/* "k6_mtrr" AMD K6 nonstandard MTRRs */ +#define X86_FEATURE_CYRIX_ARR ( 3*32+ 2)/* "cyrix_arr" Cyrix ARRs (= MTRRs) */ +#define X86_FEATURE_CENTAUR_MCR ( 3*32+ 3)/* "centaur_mcr" Centaur MCRs (= MTRRs) */ +#define X86_FEATURE_K8 ( 3*32+ 4)/* Opteron, Athlon64 */ +#define X86_FEATURE_ZEN5 ( 3*32+ 5)/* CPU based on Zen5 microarchitecture */ +#define X86_FEATURE_P3 ( 3*32+ 6)/* P3 */ +#define X86_FEATURE_P4 ( 3*32+ 7)/* P4 */ +#define X86_FEATURE_CONSTANT_TSC ( 3*32+ 8)/* "constant_tsc" TSC ticks at a constant rate */ +#define X86_FEATURE_UP ( 3*32+ 9)/* "up" SMP kernel running on UP */ +#define X86_FEATURE_ART ( 3*32+10)/* "art" Always running timer (ART) */ +#define X86_FEATURE_ARCH_PERFMON ( 3*32+11)/* "arch_perfmon" Intel Architectural PerfMon */ +#define X86_FEATURE_PEBS ( 3*32+12)/* "pebs" Precise-Event Based Sampling */ +#define X86_FEATURE_BTS ( 3*32+13)/* "bts" Branch Trace Store */ +#define X86_FEATURE_SYSCALL32 ( 3*32+14)/* syscall in IA32 userspace */ +#define X86_FEATURE_SYSENTER32 ( 3*32+15)/* sysenter in IA32 userspace */ +#define X86_FEATURE_REP_GOOD ( 3*32+16)/* "rep_good" REP microcode works well */ +#define X86_FEATURE_AMD_LBR_V2 ( 3*32+17)/* "amd_lbr_v2" AMD Last Branch Record Extension Version 2 */ +#define X86_FEATURE_CLEAR_CPU_BUF ( 3*32+18)/* Clear CPU buffers using VERW */ +#define X86_FEATURE_ACC_POWER ( 3*32+19)/* "acc_power" AMD Accumulated Power Mechanism */ +#define X86_FEATURE_NOPL ( 3*32+20)/* "nopl" The NOPL (0F 1F) instructions */ +#define X86_FEATURE_ALWAYS ( 3*32+21)/* Always-present feature */ +#define X86_FEATURE_XTOPOLOGY ( 3*32+22)/* "xtopology" CPU topology enum extensions */ +#define X86_FEATURE_TSC_RELIABLE ( 3*32+23)/* "tsc_reliable" TSC is known to be reliable */ +#define X86_FEATURE_NONSTOP_TSC ( 3*32+24)/* "nonstop_tsc" TSC does not stop in C states */ +#define X86_FEATURE_CPUID ( 3*32+25)/* "cpuid" CPU has CPUID instruction itself */ +#define X86_FEATURE_EXTD_APICID ( 3*32+26)/* "extd_apicid" Extended APICID (8 bits) */ +#define X86_FEATURE_AMD_DCM ( 3*32+27)/* "amd_dcm" AMD multi-node processor */ +#define X86_FEATURE_APERFMPERF ( 3*32+28)/* "aperfmperf" P-State hardware coordination feedback capability (APERF/MPERF MSRs) */ +#define X86_FEATURE_RAPL ( 3*32+29)/* "rapl" AMD/Hygon RAPL interface */ +#define X86_FEATURE_NONSTOP_TSC_S3 ( 3*32+30)/* "nonstop_tsc_s3" TSC doesn't stop in S3 state */ +#define X86_FEATURE_TSC_KNOWN_FREQ ( 3*32+31)/* "tsc_known_freq" TSC has known frequency */ /* Intel-defined CPU features, CPUID level 0x00000001 (ECX), word 4 */ #define X86_FEATURE_XMM3 ( 4*32+ 0)/* "pni" SSE-3 */ -#define X86_FEATURE_PCLMULQDQ ( 4*32+ 1)/* PCLMULQDQ instruction */ -#define X86_FEATURE_DTES64 ( 4*32+ 2)/* 64-bit Debug Store */ +#define X86_FEATURE_PCLMULQDQ ( 4*32+ 1)/* "pclmulqdq" PCLMULQDQ instruction */ +#define X86_FEATURE_DTES64 ( 4*32+ 2)/* "dtes64" 64-bit Debug Store */ #define X86_FEATURE_MWAIT ( 4*32+ 3)/* "monitor" MONITOR/MWAIT support */ #define X86_FEATURE_DSCPL ( 4*32+ 4)/* "ds_cpl" CPL-qualified (filtered) Debug Store */ -#define X86_FEATURE_VMX ( 4*32+ 5)/* Hardware virtualization */ -#define X86_FEATURE_SMX ( 4*32+ 6)/* Safer Mode eXtensions */ -#define X86_FEATURE_EST ( 4*32+ 7)/* Enhanced SpeedStep */ -#define X86_FEATURE_TM2 ( 4*32+ 8)/* Thermal Monitor 2 */ -#define X86_FEATURE_SSSE3 ( 4*32+ 9)/* Supplemental SSE-3 */ -#define X86_FEATURE_CID ( 4*32+10)/* Context ID */ -#define X86_FEATURE_SDBG ( 4*32+11)/* Silicon Debug */ -#define X86_FEATURE_FMA ( 4*32+12)/* Fused multiply-add */ -#define X86_FEATURE_CX16 ( 4*32+13)/* CMPXCHG16B instruction */ -#define X86_FEATURE_XTPR ( 4*32+14)/* Send Task Priority Messages */ -#define X86_FEATURE_PDCM ( 4*32+15)/* Perf/Debug Capabilities MSR */ -#define X86_FEATURE_PCID ( 4*32+17)/* Process Context Identifiers */ -#define X86_FEATURE_DCA ( 4*32+18)/* Direct Cache Access */ +#define X86_FEATURE_VMX ( 4*32+ 5)/* "vmx" Hardware virtualization */ +#define X86_FEATURE_SMX ( 4*32+ 6)/* "smx" Safer Mode eXtensions */ +#define X86_FEATURE_EST ( 4*32+ 7)/* "est" Enhanced SpeedStep */ +#define X86_FEATURE_TM2 ( 4*32+ 8)/* "tm2" Thermal Monitor 2 */ +#define X86_FEATURE_SSSE3 ( 4*32+ 9)/* "ssse3" Supplemental SSE-3 */ +#define X86_FEATURE_CID ( 4*32+10)/* "cid" Context ID */ +#define X86_FEATURE_SDBG ( 4*32+11)/* "sdbg" Silicon Debug */ +#define X86_FEATURE_FMA ( 4*32+12)/* "fma" Fused multiply-add */ +#define X86_FEATURE_CX16 ( 4*32+13)/* "cx16" CMPXCHG16B instruction */ +#define X86_FEATURE_XTPR ( 4*32+14)/* "xtpr" Send Task Priority Messages */ +#define X86_FEATURE_PDCM ( 4*32+15)/* "pdcm" Perf/Debug Capabilities MSR */ +#define X86_FEATURE_PCID ( 4*32+17)/* "pcid" Process Context Identifiers */ +#define X86_FEATURE_DCA ( 4*32+18)/* "dca" Direct Cache Access */ #define X86_FEATURE_XMM4_1 ( 4*32+19)/* "sse4_1" SSE-4.1 */ #define X86_FEATURE_XMM4_2 ( 4*32+20)/* "sse4_2" SSE-4.2 */ -#define X86_FEATURE_X2APIC ( 4*32+21)/* X2APIC */ -#define X86_FEATURE_MOVBE ( 4*32+22)/* MOVBE instruction */ -#define X86_FEATURE_POPCNT ( 4*32+23)/* POPCNT instruction */ -#define X86_FEATURE_TSC_DEADLINE_TIMER ( 4*32+24)/* TSC deadline timer */ -#define X86_FEATURE_AES ( 4*32+25)/* AES instructions */ -#define X86_FEATURE_XSAVE ( 4*32+26)/* XSAVE/XRSTOR/XSETBV/XGETBV instructions */ -#define X86_FEATURE_OSXSAVE ( 4*32+27)/* "" XSAVE instruction enabled in the OS */ -#define X86_FEATURE_AVX ( 4*32+28)/* Advanced Vector Extensions */ -#define X86_FEATURE_F16C ( 4*32+29)/* 16-bit FP conversions */ -#define X86_FEATURE_RDRAND ( 4*32+30)/* RDRAND instruction */ -#define X86_FEATURE_HYPERVISOR ( 4*32+31)/* Running on a hypervisor */ +#define X86_FEATURE_X2APIC ( 4*32+21)/* "x2apic" X2APIC */ +#define X86_FEATURE_MOVBE ( 4*32+22)/* "movbe" MOVBE instruction */ +#define X86_FEATURE_POPCNT ( 4*32+23)/* "popcnt" POPCNT instruction */ +#define X86_FEATURE_TSC_DEADLINE_TIMER ( 4*32+24)/* "tsc_deadline_timer" TSC deadline timer */ +#define X86_FEATURE_AES ( 4*32+25)/* "aes" AES instructions */ +#define X86_FEATURE_XSAVE ( 4*32+26)/* "xsave" XSAVE/XRSTOR/XSETBV/XGETBV instructions */ +#define X86_FEATURE_OSXSAVE ( 4*32+27)/* XSAVE instruction enabled in the OS */ +#define X86_FEATURE_AVX ( 4*32+28)/* "avx" Advanced Vector Extensions */ +#define X86_FEATURE_F16C ( 4*32+29)/* "f16c" 16-bit FP conversions */ +#define X86_FEATURE_RDRAND ( 4*32+30)/* "rdrand" RDRAND instruction */ +#define X86_FEATURE_HYPERVISOR ( 4*32+31)/* "hypervisor" Running on a hypervisor */ /* VIA/Cyrix/Centaur-defined CPU features, CPUID level 0xC0000001, word 5 */ #define X86_FEATURE_XSTORE ( 5*32+ 2)/* "rng" RNG present (xstore) */ #define X86_FEATURE_XSTORE_EN ( 5*32+ 3)/* "rng_en" RNG enabled */ #define X86_FEATURE_XCRYPT ( 5*32+ 6)/* "ace" on-CPU crypto (xcrypt) */ #define X86_FEATURE_XCRYPT_EN ( 5*32+ 7)/* "ace_en" on-CPU crypto enabled */ -#define X86_FEATURE_ACE2 ( 5*32+ 8)/* Advanced Cryptography Engine v2 */ -#define X86_FEATURE_ACE2_EN ( 5*32+ 9)/* ACE v2 enabled */ -#define X86_FEATURE_PHE ( 5*32+10)/* PadLock Hash Engine */ -#define X86_FEATURE_PHE_EN ( 5*32+11)/* PHE enabled */ -#define X86_FEATURE_PMM ( 5*32+12)/* PadLock Montgomery Multiplier */ -#define X86_FEATURE_PMM_EN ( 5*32+13)/* PMM enabled */ +#define X86_FEATURE_ACE2 ( 5*32+ 8)/* "ace2" Advanced Cryptography Engine v2 */ +#define X86_FEATURE_ACE2_EN ( 5*32+ 9)/* "ace2_en" ACE v2 enabled */ +#define X86_FEATURE_PHE ( 5*32+10)/* "phe" PadLock Hash Engine */ +#define X86_FEATURE_PHE_EN ( 5*32+11)/* "phe_en" PHE enabled */ +#define X86_FEATURE_PMM ( 5*32+12)/* "pmm" PadLock Montgomery Multiplier */ +#define X86_FEATURE_PMM_EN ( 5*32+13)/* "pmm_en" PMM enabled */ /* More extended AMD flags: CPUID level 0x80000001, ECX, word 6 */ -#define X86_FEATURE_LAHF_LM ( 6*32+ 0)/* LAHF/SAHF in long mode */ -#define X86_FEATURE_CMP_LEGACY ( 6*32+ 1)/* If yes HyperThreading not valid */ -#define X86_FEATURE_SVM ( 6*32+ 2)/* Secure Virtual Machine */ -#define X86_FEATURE_EXTAPIC ( 6*32+ 3)/* Extended APIC space */ -#define X86_FEATURE_CR8_LEGACY ( 6*32+ 4)/* CR8 in 32-bit mode */ -#define X86_FEATURE_ABM ( 6*32+ 5)/* Advanced bit manipulation */ -#define X86_FEATURE_SSE4A ( 6*32+ 6)/* SSE-4A */ -#define X86_FEATURE_MISALIGNSSE ( 6*32+ 7)/* Misaligned SSE mode */ -#define X86_FEATURE_3DNOWPREFETCH ( 6*32+ 8)/* 3DNow prefetch instructions */ -#define X86_FEATURE_OSVW ( 6*32+ 9)/* OS Visible Workaround */ -#define X86_FEATURE_IBS ( 6*32+10)/* Instruction Based Sampling */ -#define X86_FEATURE_XOP ( 6*32+11)/* extended AVX instructions */ -#define X86_FEATURE_SKINIT ( 6*32+12)/* SKINIT/STGI instructions */ -#define X86_FEATURE_WDT ( 6*32+13)/* Watchdog timer */ -#define X86_FEATURE_LWP ( 6*32+15)/* Light Weight Profiling */ -#define X86_FEATURE_FMA4 ( 6*32+16)/* 4 operands MAC instructions */ -#define X86_FEATURE_TCE ( 6*32+17)/* Translation Cache Extension */ -#define X86_FEATURE_NODEID_MSR ( 6*32+19)/* NodeId MSR */ -#define X86_FEATURE_TBM ( 6*32+21)/* Trailing Bit Manipulations */ -#define X86_FEATURE_TOPOEXT ( 6*32+22)/* Topology extensions CPUID leafs */ -#define X86_FEATURE_PERFCTR_CORE ( 6*32+23)/* Core performance counter extensions */ -#define X86_FEATURE_PERFCTR_NB ( 6*32+24)/* NB performance counter extensions */ -#define X86_FEATURE_BPEXT ( 6*32+26)/* Data breakpoint extension */ -#define X86_FEATURE_PTSC ( 6*32+27)/* Performance time-stamp counter */ -#define X86_FEATURE_PERFCTR_LLC ( 6*32+28)/* Last Level Cache performance counter extensions */ -#define X86_FEATURE_MWAITX ( 6*32+29)/* MWAIT extension (MONITORX/MWAITX instructions) */ +#define X86_FEATURE_LAHF_LM ( 6*32+ 0)/* "lahf_lm" LAHF/SAHF in long mode */ +#define X86_FEATURE_CMP_LEGACY ( 6*32+ 1)/* "cmp_legacy" If yes HyperThreading not valid */ +#define X86_FEATURE_SVM ( 6*32+ 2)/* "svm" Secure Virtual Machine */ +#define X86_FEATURE_EXTAPIC ( 6*32+ 3)/* "extapic" Extended APIC space */ +#define X86_FEATURE_CR8_LEGACY ( 6*32+ 4)/* "cr8_legacy" CR8 in 32-bit mode */ +#define X86_FEATURE_ABM ( 6*32+ 5)/* "abm" Advanced bit manipulation */ +#define X86_FEATURE_SSE4A ( 6*32+ 6)/* "sse4a" SSE-4A */ +#define X86_FEATURE_MISALIGNSSE ( 6*32+ 7)/* "misalignsse" Misaligned SSE mode */ +#define X86_FEATURE_3DNOWPREFETCH ( 6*32+ 8)/* "3dnowprefetch" 3DNow prefetch instructions */ +#define X86_FEATURE_OSVW ( 6*32+ 9)/* "osvw" OS Visible Workaround */ +#define X86_FEATURE_IBS ( 6*32+10)/* "ibs" Instruction Based Sampling */ +#define X86_FEATURE_XOP ( 6*32+11)/* "xop" Extended AVX instructions */ +#define X86_FEATURE_SKINIT ( 6*32+12)/* "skinit" SKINIT/STGI instructions */ +#define X86_FEATURE_WDT ( 6*32+13)/* "wdt" Watchdog timer */ +#define X86_FEATURE_LWP ( 6*32+15)/* "lwp" Light Weight Profiling */ +#define X86_FEATURE_FMA4 ( 6*32+16)/* "fma4" 4 operands MAC instructions */ +#define X86_FEATURE_TCE ( 6*32+17)/* "tce" Translation Cache Extension */ +#define X86_FEATURE_NODEID_MSR ( 6*32+19)/* "nodeid_msr" NodeId MSR */ +#define X86_FEATURE_TBM ( 6*32+21)/* "tbm" Trailing Bit Manipulations */ +#define X86_FEATURE_TOPOEXT ( 6*32+22)/* "topoext" Topology extensions CPUID leafs */ +#define X86_FEATURE_PERFCTR_CORE ( 6*32+23)/* "perfctr_core" Core performance counter extensions */ +#define X86_FEATURE_PERFCTR_NB ( 6*32+24)/* "perfctr_nb" NB performance counter extensions */ +#define X86_FEATURE_BPEXT ( 6*32+26)/* "bpext" Data breakpoint extension */ +#define X86_FEATURE_PTSC ( 6*32+27)/* "ptsc" Performance time-stamp counter */ +#define X86_FEATURE_PERFCTR_LLC ( 6*32+28)/* "perfctr_llc" Last Level Cache performance counter extensions */ +#define X86_FEATURE_MWAITX ( 6*32+29)/* "mwaitx" MWAIT extension (MONITORX/MWAITX instructions) */ /* * Auxiliary flags: Linux defined - For features scattered in various
@@ -189,93 +189,93 @@* * Reuse free bits when adding new feature flags! */ -#define X86_FEATURE_RING3MWAIT ( 7*32+ 0)/* Ring 3 MONITOR/MWAIT instructions */ -#define X86_FEATURE_CPUID_FAULT ( 7*32+ 1)/* Intel CPUID faulting */ -#define X86_FEATURE_CPB ( 7*32+ 2)/* AMD Core Performance Boost */ -#define X86_FEATURE_EPB ( 7*32+ 3)/* IA32_ENERGY_PERF_BIAS support */ -#define X86_FEATURE_CAT_L3 ( 7*32+ 4)/* Cache Allocation Technology L3 */ -#define X86_FEATURE_CAT_L2 ( 7*32+ 5)/* Cache Allocation Technology L2 */ -#define X86_FEATURE_CDP_L3 ( 7*32+ 6)/* Code and Data Prioritization L3 */ -#define X86_FEATURE_TDX_HOST_PLATFORM ( 7*32+ 7)/* Platform supports being a TDX host */ -#define X86_FEATURE_HW_PSTATE ( 7*32+ 8)/* AMD HW-PState */ -#define X86_FEATURE_PROC_FEEDBACK ( 7*32+ 9)/* AMD ProcFeedbackInterface */ -#define X86_FEATURE_XCOMPACTED ( 7*32+10)/* "" Use compacted XSTATE (XSAVES or XSAVEC) */ -#define X86_FEATURE_PTI ( 7*32+11)/* Kernel Page Table Isolation enabled */ -#define X86_FEATURE_KERNEL_IBRS ( 7*32+12)/* "" Set/clear IBRS on kernel entry/exit */ -#define X86_FEATURE_RSB_VMEXIT ( 7*32+13)/* "" Fill RSB on VM-Exit */ -#define X86_FEATURE_INTEL_PPIN ( 7*32+14)/* Intel Processor Inventory Number */ -#define X86_FEATURE_CDP_L2 ( 7*32+15)/* Code and Data Prioritization L2 */ -#define X86_FEATURE_MSR_SPEC_CTRL ( 7*32+16)/* "" MSR SPEC_CTRL is implemented */ -#define X86_FEATURE_SSBD ( 7*32+17)/* Speculative Store Bypass Disable */ -#define X86_FEATURE_MBA ( 7*32+18)/* Memory Bandwidth Allocation */ -#define X86_FEATURE_RSB_CTXSW ( 7*32+19)/* "" Fill RSB on context switches */ -#define X86_FEATURE_PERFMON_V2 ( 7*32+20)/* AMD Performance Monitoring Version 2 */ -#define X86_FEATURE_USE_IBPB ( 7*32+21)/* "" Indirect Branch Prediction Barrier enabled */ -#define X86_FEATURE_USE_IBRS_FW ( 7*32+22)/* "" Use IBRS during runtime firmware calls */ -#define X86_FEATURE_SPEC_STORE_BYPASS_DISABLE ( 7*32+23)/* "" Disable Speculative Store Bypass. */ -#define X86_FEATURE_LS_CFG_SSBD ( 7*32+24)/* "" AMD SSBD implementation via LS_CFG MSR */ -#define X86_FEATURE_IBRS ( 7*32+25)/* Indirect Branch Restricted Speculation */ -#define X86_FEATURE_IBPB ( 7*32+26)/* Indirect Branch Prediction Barrier */ -#define X86_FEATURE_STIBP ( 7*32+27)/* Single Thread Indirect Branch Predictors */ -#define X86_FEATURE_ZEN ( 7*32+28)/* "" Generic flag for all Zen and newer */ -#define X86_FEATURE_L1TF_PTEINV ( 7*32+29)/* "" L1TF workaround PTE inversion */ -#define X86_FEATURE_IBRS_ENHANCED ( 7*32+30)/* Enhanced IBRS */ -#define X86_FEATURE_MSR_IA32_FEAT_CTL ( 7*32+31)/* "" MSR IA32_FEAT_CTL configured */ +#define X86_FEATURE_RING3MWAIT ( 7*32+ 0)/* "ring3mwait" Ring 3 MONITOR/MWAIT instructions */ +#define X86_FEATURE_CPUID_FAULT ( 7*32+ 1)/* "cpuid_fault" Intel CPUID faulting */ +#define X86_FEATURE_CPB ( 7*32+ 2)/* "cpb" AMD Core Performance Boost */ +#define X86_FEATURE_EPB ( 7*32+ 3)/* "epb" IA32_ENERGY_PERF_BIAS support */ +#define X86_FEATURE_CAT_L3 ( 7*32+ 4)/* "cat_l3" Cache Allocation Technology L3 */ +#define X86_FEATURE_CAT_L2 ( 7*32+ 5)/* "cat_l2" Cache Allocation Technology L2 */ +#define X86_FEATURE_CDP_L3 ( 7*32+ 6)/* "cdp_l3" Code and Data Prioritization L3 */ +#define X86_FEATURE_TDX_HOST_PLATFORM ( 7*32+ 7)/* "tdx_host_platform" Platform supports being a TDX host */ +#define X86_FEATURE_HW_PSTATE ( 7*32+ 8)/* "hw_pstate" AMD HW-PState */ +#define X86_FEATURE_PROC_FEEDBACK ( 7*32+ 9)/* "proc_feedback" AMD ProcFeedbackInterface */ +#define X86_FEATURE_XCOMPACTED ( 7*32+10)/* Use compacted XSTATE (XSAVES or XSAVEC) */ +#define X86_FEATURE_PTI ( 7*32+11)/* "pti" Kernel Page Table Isolation enabled */ +#define X86_FEATURE_KERNEL_IBRS ( 7*32+12)/* Set/clear IBRS on kernel entry/exit */ +#define X86_FEATURE_RSB_VMEXIT ( 7*32+13)/* Fill RSB on VM-Exit */ +#define X86_FEATURE_INTEL_PPIN ( 7*32+14)/* "intel_ppin" Intel Processor Inventory Number */ +#define X86_FEATURE_CDP_L2 ( 7*32+15)/* "cdp_l2" Code and Data Prioritization L2 */ +#define X86_FEATURE_MSR_SPEC_CTRL ( 7*32+16)/* MSR SPEC_CTRL is implemented */ +#define X86_FEATURE_SSBD ( 7*32+17)/* "ssbd" Speculative Store Bypass Disable */ +#define X86_FEATURE_MBA ( 7*32+18)/* "mba" Memory Bandwidth Allocation */ +#define X86_FEATURE_RSB_CTXSW ( 7*32+19)/* Fill RSB on context switches */ +#define X86_FEATURE_PERFMON_V2 ( 7*32+20)/* "perfmon_v2" AMD Performance Monitoring Version 2 */ +#define X86_FEATURE_USE_IBPB ( 7*32+21)/* Indirect Branch Prediction Barrier enabled */ +#define X86_FEATURE_USE_IBRS_FW ( 7*32+22)/* Use IBRS during runtime firmware calls */ +#define X86_FEATURE_SPEC_STORE_BYPASS_DISABLE ( 7*32+23)/* Disable Speculative Store Bypass. */ +#define X86_FEATURE_LS_CFG_SSBD ( 7*32+24)/* AMD SSBD implementation via LS_CFG MSR */ +#define X86_FEATURE_IBRS ( 7*32+25)/* "ibrs" Indirect Branch Restricted Speculation */ +#define X86_FEATURE_IBPB ( 7*32+26)/* "ibpb" Indirect Branch Prediction Barrier */ +#define X86_FEATURE_STIBP ( 7*32+27)/* "stibp" Single Thread Indirect Branch Predictors */ +#define X86_FEATURE_ZEN ( 7*32+28)/* Generic flag for all Zen and newer */ +#define X86_FEATURE_L1TF_PTEINV ( 7*32+29)/* L1TF workaround PTE inversion */ +#define X86_FEATURE_IBRS_ENHANCED ( 7*32+30)/* "ibrs_enhanced" Enhanced IBRS */ +#define X86_FEATURE_MSR_IA32_FEAT_CTL ( 7*32+31)/* MSR IA32_FEAT_CTL configured */ /* Virtualization flags: Linux defined, word 8 */ -#define X86_FEATURE_TPR_SHADOW ( 8*32+ 0)/* Intel TPR Shadow */ -#define X86_FEATURE_FLEXPRIORITY ( 8*32+ 1)/* Intel FlexPriority */ -#define X86_FEATURE_EPT ( 8*32+ 2)/* Intel Extended Page Table */ -#define X86_FEATURE_VPID ( 8*32+ 3)/* Intel Virtual Processor ID */ +#define X86_FEATURE_TPR_SHADOW ( 8*32+ 0)/* "tpr_shadow" Intel TPR Shadow */ +#define X86_FEATURE_FLEXPRIORITY ( 8*32+ 1)/* "flexpriority" Intel FlexPriority */ +#define X86_FEATURE_EPT ( 8*32+ 2)/* "ept" Intel Extended Page Table */ +#define X86_FEATURE_VPID ( 8*32+ 3)/* "vpid" Intel Virtual Processor ID */ -#define X86_FEATURE_VMMCALL ( 8*32+15)/* Prefer VMMCALL to VMCALL */ -#define X86_FEATURE_XENPV ( 8*32+16)/* "" Xen paravirtual guest */ -#define X86_FEATURE_EPT_AD ( 8*32+17)/* Intel Extended Page Table access-dirty bit */ -#define X86_FEATURE_VMCALL ( 8*32+18)/* "" Hypervisor supports the VMCALL instruction */ -#define X86_FEATURE_VMW_VMMCALL ( 8*32+19)/* "" VMware prefers VMMCALL hypercall instruction */ -#define X86_FEATURE_PVUNLOCK ( 8*32+20)/* "" PV unlock function */ -#define X86_FEATURE_VCPUPREEMPT ( 8*32+21)/* "" PV vcpu_is_preempted function */ -#define X86_FEATURE_TDX_GUEST ( 8*32+22)/* Intel Trust Domain Extensions Guest */ +#define X86_FEATURE_VMMCALL ( 8*32+15)/* "vmmcall" Prefer VMMCALL to VMCALL */ +#define X86_FEATURE_XENPV ( 8*32+16)/* Xen paravirtual guest */ +#define X86_FEATURE_EPT_AD ( 8*32+17)/* "ept_ad" Intel Extended Page Table access-dirty bit */ +#define X86_FEATURE_VMCALL ( 8*32+18)/* Hypervisor supports the VMCALL instruction */ +#define X86_FEATURE_VMW_VMMCALL ( 8*32+19)/* VMware prefers VMMCALL hypercall instruction */ +#define X86_FEATURE_PVUNLOCK ( 8*32+20)/* PV unlock function */ +#define X86_FEATURE_VCPUPREEMPT ( 8*32+21)/* PV vcpu_is_preempted function */ +#define X86_FEATURE_TDX_GUEST ( 8*32+22)/* "tdx_guest" Intel Trust Domain Extensions Guest */ /* Intel-defined CPU features, CPUID level 0x00000007:0 (EBX), word 9 */ -#define X86_FEATURE_FSGSBASE ( 9*32+ 0)/* RDFSBASE, WRFSBASE, RDGSBASE, WRGSBASE instructions*/ -#define X86_FEATURE_TSC_ADJUST ( 9*32+ 1)/* TSC adjustment MSR 0x3B */ -#define X86_FEATURE_SGX ( 9*32+ 2)/* Software Guard Extensions */ -#define X86_FEATURE_BMI1 ( 9*32+ 3)/* 1st group bit manipulation extensions */ -#define X86_FEATURE_HLE ( 9*32+ 4)/* Hardware Lock Elision */ -#define X86_FEATURE_AVX2 ( 9*32+ 5)/* AVX2 instructions */ -#define X86_FEATURE_FDP_EXCPTN_ONLY ( 9*32+ 6)/* "" FPU data pointer updated only on x87 exceptions */ -#define X86_FEATURE_SMEP ( 9*32+ 7)/* Supervisor Mode Execution Protection */ -#define X86_FEATURE_BMI2 ( 9*32+ 8)/* 2nd group bit manipulation extensions */ -#define X86_FEATURE_ERMS ( 9*32+ 9)/* Enhanced REP MOVSB/STOSB instructions */ -#define X86_FEATURE_INVPCID ( 9*32+10)/* Invalidate Processor Context ID */ -#define X86_FEATURE_RTM ( 9*32+11)/* Restricted Transactional Memory */ -#define X86_FEATURE_CQM ( 9*32+12)/* Cache QoS Monitoring */ -#define X86_FEATURE_ZERO_FCS_FDS ( 9*32+13)/* "" Zero out FPU CS and FPU DS */ -#define X86_FEATURE_MPX ( 9*32+14)/* Memory Protection Extension */ -#define X86_FEATURE_RDT_A ( 9*32+15)/* Resource Director Technology Allocation */ -#define X86_FEATURE_AVX512F ( 9*32+16)/* AVX-512 Foundation */ -#define X86_FEATURE_AVX512DQ ( 9*32+17)/* AVX-512 DQ (Double/Quad granular) Instructions */ -#define X86_FEATURE_RDSEED ( 9*32+18)/* RDSEED instruction */ -#define X86_FEATURE_ADX ( 9*32+19)/* ADCX and ADOX instructions */ -#define X86_FEATURE_SMAP ( 9*32+20)/* Supervisor Mode Access Prevention */ -#define X86_FEATURE_AVX512IFMA ( 9*32+21)/* AVX-512 Integer Fused Multiply-Add instructions */ -#define X86_FEATURE_CLFLUSHOPT ( 9*32+23)/* CLFLUSHOPT instruction */ -#define X86_FEATURE_CLWB ( 9*32+24)/* CLWB instruction */ -#define X86_FEATURE_INTEL_PT ( 9*32+25)/* Intel Processor Trace */ -#define X86_FEATURE_AVX512PF ( 9*32+26)/* AVX-512 Prefetch */ -#define X86_FEATURE_AVX512ER ( 9*32+27)/* AVX-512 Exponential and Reciprocal */ -#define X86_FEATURE_AVX512CD ( 9*32+28)/* AVX-512 Conflict Detection */ -#define X86_FEATURE_SHA_NI ( 9*32+29)/* SHA1/SHA256 Instruction Extensions */ -#define X86_FEATURE_AVX512BW ( 9*32+30)/* AVX-512 BW (Byte/Word granular) Instructions */ -#define X86_FEATURE_AVX512VL ( 9*32+31)/* AVX-512 VL (128/256 Vector Length) Extensions */ +#define X86_FEATURE_FSGSBASE ( 9*32+ 0)/* "fsgsbase" RDFSBASE, WRFSBASE, RDGSBASE, WRGSBASE instructions*/ +#define X86_FEATURE_TSC_ADJUST ( 9*32+ 1)/* "tsc_adjust" TSC adjustment MSR 0x3B */ +#define X86_FEATURE_SGX ( 9*32+ 2)/* "sgx" Software Guard Extensions */ +#define X86_FEATURE_BMI1 ( 9*32+ 3)/* "bmi1" 1st group bit manipulation extensions */ +#define X86_FEATURE_HLE ( 9*32+ 4)/* "hle" Hardware Lock Elision */ +#define X86_FEATURE_AVX2 ( 9*32+ 5)/* "avx2" AVX2 instructions */ +#define X86_FEATURE_FDP_EXCPTN_ONLY ( 9*32+ 6)/* FPU data pointer updated only on x87 exceptions */ +#define X86_FEATURE_SMEP ( 9*32+ 7)/* "smep" Supervisor Mode Execution Protection */ +#define X86_FEATURE_BMI2 ( 9*32+ 8)/* "bmi2" 2nd group bit manipulation extensions */ +#define X86_FEATURE_ERMS ( 9*32+ 9)/* "erms" Enhanced REP MOVSB/STOSB instructions */ +#define X86_FEATURE_INVPCID ( 9*32+10)/* "invpcid" Invalidate Processor Context ID */ +#define X86_FEATURE_RTM ( 9*32+11)/* "rtm" Restricted Transactional Memory */ +#define X86_FEATURE_CQM ( 9*32+12)/* "cqm" Cache QoS Monitoring */ +#define X86_FEATURE_ZERO_FCS_FDS ( 9*32+13)/* Zero out FPU CS and FPU DS */ +#define X86_FEATURE_MPX ( 9*32+14)/* "mpx" Memory Protection Extension */ +#define X86_FEATURE_RDT_A ( 9*32+15)/* "rdt_a" Resource Director Technology Allocation */ +#define X86_FEATURE_AVX512F ( 9*32+16)/* "avx512f" AVX-512 Foundation */ +#define X86_FEATURE_AVX512DQ ( 9*32+17)/* "avx512dq" AVX-512 DQ (Double/Quad granular) Instructions */ +#define X86_FEATURE_RDSEED ( 9*32+18)/* "rdseed" RDSEED instruction */ +#define X86_FEATURE_ADX ( 9*32+19)/* "adx" ADCX and ADOX instructions */ +#define X86_FEATURE_SMAP ( 9*32+20)/* "smap" Supervisor Mode Access Prevention */ +#define X86_FEATURE_AVX512IFMA ( 9*32+21)/* "avx512ifma" AVX-512 Integer Fused Multiply-Add instructions */ +#define X86_FEATURE_CLFLUSHOPT ( 9*32+23)/* "clflushopt" CLFLUSHOPT instruction */ +#define X86_FEATURE_CLWB ( 9*32+24)/* "clwb" CLWB instruction */ +#define X86_FEATURE_INTEL_PT ( 9*32+25)/* "intel_pt" Intel Processor Trace */ +#define X86_FEATURE_AVX512PF ( 9*32+26)/* "avx512pf" AVX-512 Prefetch */ +#define X86_FEATURE_AVX512ER ( 9*32+27)/* "avx512er" AVX-512 Exponential and Reciprocal */ +#define X86_FEATURE_AVX512CD ( 9*32+28)/* "avx512cd" AVX-512 Conflict Detection */ +#define X86_FEATURE_SHA_NI ( 9*32+29)/* "sha_ni" SHA1/SHA256 Instruction Extensions */ +#define X86_FEATURE_AVX512BW ( 9*32+30)/* "avx512bw" AVX-512 BW (Byte/Word granular) Instructions */ +#define X86_FEATURE_AVX512VL ( 9*32+31)/* "avx512vl" AVX-512 VL (128/256 Vector Length) Extensions */ /* Extended state features, CPUID level 0x0000000d:1 (EAX), word 10 */ -#define X86_FEATURE_XSAVEOPT (10*32+ 0)/* XSAVEOPT instruction */ -#define X86_FEATURE_XSAVEC (10*32+ 1)/* XSAVEC instruction */ -#define X86_FEATURE_XGETBV1 (10*32+ 2)/* XGETBV with ECX = 1 instruction */ -#define X86_FEATURE_XSAVES (10*32+ 3)/* XSAVES/XRSTORS instructions */ -#define X86_FEATURE_XFD (10*32+ 4)/* "" eXtended Feature Disabling */ +#define X86_FEATURE_XSAVEOPT (10*32+ 0)/* "xsaveopt" XSAVEOPT instruction */ +#define X86_FEATURE_XSAVEC (10*32+ 1)/* "xsavec" XSAVEC instruction */ +#define X86_FEATURE_XGETBV1 (10*32+ 2)/* "xgetbv1" XGETBV with ECX = 1 instruction */ +#define X86_FEATURE_XSAVES (10*32+ 3)/* "xsaves" XSAVES/XRSTORS instructions */ +#define X86_FEATURE_XFD (10*32+ 4)/* eXtended Feature Disabling */ /* * Extended auxiliary flags: Linux defined - for features scattered in various
@@ -283,181 +283,183 @@* * Reuse free bits when adding new feature flags! */ -#define X86_FEATURE_CQM_LLC (11*32+ 0)/* LLC QoS if 1 */ -#define X86_FEATURE_CQM_OCCUP_LLC (11*32+ 1)/* LLC occupancy monitoring */ -#define X86_FEATURE_CQM_MBM_TOTAL (11*32+ 2)/* LLC Total MBM monitoring */ -#define X86_FEATURE_CQM_MBM_LOCAL (11*32+ 3)/* LLC Local MBM monitoring */ -#define X86_FEATURE_FENCE_SWAPGS_USER (11*32+ 4)/* "" LFENCE in user entry SWAPGS path */ -#define X86_FEATURE_FENCE_SWAPGS_KERNEL (11*32+ 5)/* "" LFENCE in kernel entry SWAPGS path */ -#define X86_FEATURE_SPLIT_LOCK_DETECT (11*32+ 6)/* #AC for split lock */ -#define X86_FEATURE_PER_THREAD_MBA (11*32+ 7)/* "" Per-thread Memory Bandwidth Allocation */ -#define X86_FEATURE_SGX1 (11*32+ 8)/* "" Basic SGX */ -#define X86_FEATURE_SGX2 (11*32+ 9)/* "" SGX Enclave Dynamic Memory Management (EDMM) */ -#define X86_FEATURE_ENTRY_IBPB (11*32+10)/* "" Issue an IBPB on kernel entry */ -#define X86_FEATURE_RRSBA_CTRL (11*32+11)/* "" RET prediction control */ -#define X86_FEATURE_RETPOLINE (11*32+12)/* "" Generic Retpoline mitigation for Spectre variant 2 */ -#define X86_FEATURE_RETPOLINE_LFENCE (11*32+13)/* "" Use LFENCE for Spectre variant 2 */ -#define X86_FEATURE_RETHUNK (11*32+14)/* "" Use REturn THUNK */ -#define X86_FEATURE_UNRET (11*32+15)/* "" AMD BTB untrain return */ -#define X86_FEATURE_USE_IBPB_FW (11*32+16)/* "" Use IBPB during runtime firmware calls */ -#define X86_FEATURE_RSB_VMEXIT_LITE (11*32+17)/* "" Fill RSB on VM exit when EIBRS is enabled */ -#define X86_FEATURE_SGX_EDECCSSA (11*32+18)/* "" SGX EDECCSSA user leaf function */ -#define X86_FEATURE_CALL_DEPTH (11*32+19)/* "" Call depth tracking for RSB stuffing */ -#define X86_FEATURE_MSR_TSX_CTRL (11*32+20)/* "" MSR IA32_TSX_CTRL (Intel) implemented */ -#define X86_FEATURE_SMBA (11*32+21)/* "" Slow Memory Bandwidth Allocation */ -#define X86_FEATURE_BMEC (11*32+22)/* "" Bandwidth Monitoring Event Configuration */ -#define X86_FEATURE_USER_SHSTK (11*32+23)/* Shadow stack support for user mode applications */ -#define X86_FEATURE_SRSO (11*32+24)/* "" AMD BTB untrain RETs */ -#define X86_FEATURE_SRSO_ALIAS (11*32+25)/* "" AMD BTB untrain RETs through aliasing */ -#define X86_FEATURE_IBPB_ON_VMEXIT (11*32+26)/* "" Issue an IBPB only on VMEXIT */ -#define X86_FEATURE_APIC_MSRS_FENCE (11*32+27)/* "" IA32_TSC_DEADLINE and X2APIC MSRs need fencing */ -#define X86_FEATURE_ZEN2 (11*32+28)/* "" CPU based on Zen2 microarchitecture */ -#define X86_FEATURE_ZEN3 (11*32+29)/* "" CPU based on Zen3 microarchitecture */ -#define X86_FEATURE_ZEN4 (11*32+30)/* "" CPU based on Zen4 microarchitecture */ -#define X86_FEATURE_ZEN1 (11*32+31)/* "" CPU based on Zen1 microarchitecture */ +#define X86_FEATURE_CQM_LLC (11*32+ 0)/* "cqm_llc" LLC QoS if 1 */ +#define X86_FEATURE_CQM_OCCUP_LLC (11*32+ 1)/* "cqm_occup_llc" LLC occupancy monitoring */ +#define X86_FEATURE_CQM_MBM_TOTAL (11*32+ 2)/* "cqm_mbm_total" LLC Total MBM monitoring */ +#define X86_FEATURE_CQM_MBM_LOCAL (11*32+ 3)/* "cqm_mbm_local" LLC Local MBM monitoring */ +#define X86_FEATURE_FENCE_SWAPGS_USER (11*32+ 4)/* LFENCE in user entry SWAPGS path */ +#define X86_FEATURE_FENCE_SWAPGS_KERNEL (11*32+ 5)/* LFENCE in kernel entry SWAPGS path */ +#define X86_FEATURE_SPLIT_LOCK_DETECT (11*32+ 6)/* "split_lock_detect" #AC for split lock */ +#define X86_FEATURE_PER_THREAD_MBA (11*32+ 7)/* Per-thread Memory Bandwidth Allocation */ +#define X86_FEATURE_SGX1 (11*32+ 8)/* Basic SGX */ +#define X86_FEATURE_SGX2 (11*32+ 9)/* SGX Enclave Dynamic Memory Management (EDMM) */ +#define X86_FEATURE_ENTRY_IBPB (11*32+10)/* Issue an IBPB on kernel entry */ +#define X86_FEATURE_RRSBA_CTRL (11*32+11)/* RET prediction control */ +#define X86_FEATURE_RETPOLINE (11*32+12)/* Generic Retpoline mitigation for Spectre variant 2 */ +#define X86_FEATURE_RETPOLINE_LFENCE (11*32+13)/* Use LFENCE for Spectre variant 2 */ +#define X86_FEATURE_RETHUNK (11*32+14)/* Use REturn THUNK */ +#define X86_FEATURE_UNRET (11*32+15)/* AMD BTB untrain return */ +#define X86_FEATURE_USE_IBPB_FW (11*32+16)/* Use IBPB during runtime firmware calls */ +#define X86_FEATURE_RSB_VMEXIT_LITE (11*32+17)/* Fill RSB on VM exit when EIBRS is enabled */ +#define X86_FEATURE_SGX_EDECCSSA (11*32+18)/* SGX EDECCSSA user leaf function */ +#define X86_FEATURE_CALL_DEPTH (11*32+19)/* Call depth tracking for RSB stuffing */ +#define X86_FEATURE_MSR_TSX_CTRL (11*32+20)/* MSR IA32_TSX_CTRL (Intel) implemented */ +#define X86_FEATURE_SMBA (11*32+21)/* Slow Memory Bandwidth Allocation */ +#define X86_FEATURE_BMEC (11*32+22)/* Bandwidth Monitoring Event Configuration */ +#define X86_FEATURE_USER_SHSTK (11*32+23)/* "user_shstk" Shadow stack support for user mode applications */ +#define X86_FEATURE_SRSO (11*32+24)/* AMD BTB untrain RETs */ +#define X86_FEATURE_SRSO_ALIAS (11*32+25)/* AMD BTB untrain RETs through aliasing */ +#define X86_FEATURE_IBPB_ON_VMEXIT (11*32+26)/* Issue an IBPB only on VMEXIT */ +#define X86_FEATURE_APIC_MSRS_FENCE (11*32+27)/* IA32_TSC_DEADLINE and X2APIC MSRs need fencing */ +#define X86_FEATURE_ZEN2 (11*32+28)/* CPU based on Zen2 microarchitecture */ +#define X86_FEATURE_ZEN3 (11*32+29)/* CPU based on Zen3 microarchitecture */ +#define X86_FEATURE_ZEN4 (11*32+30)/* CPU based on Zen4 microarchitecture */ +#define X86_FEATURE_ZEN1 (11*32+31)/* CPU based on Zen1 microarchitecture */ /* Intel-defined CPU features, CPUID level 0x00000007:1 (EAX), word 12 */ -#define X86_FEATURE_AVX_VNNI (12*32+ 4)/* AVX VNNI instructions */ -#define X86_FEATURE_AVX512_BF16 (12*32+ 5)/* AVX512 BFLOAT16 instructions */ -#define X86_FEATURE_CMPCCXADD (12*32+ 7)/* "" CMPccXADD instructions */ -#define X86_FEATURE_ARCH_PERFMON_EXT (12*32+ 8)/* "" Intel Architectural PerfMon Extension */ -#define X86_FEATURE_FZRM (12*32+10)/* "" Fast zero-length REP MOVSB */ -#define X86_FEATURE_FSRS (12*32+11)/* "" Fast short REP STOSB */ -#define X86_FEATURE_FSRC (12*32+12)/* "" Fast short REP {CMPSB,SCASB} */ -#define X86_FEATURE_FRED (12*32+17)/* Flexible Return and Event Delivery */ -#define X86_FEATURE_LKGS (12*32+18)/* "" Load "kernel" (userspace) GS */ -#define X86_FEATURE_WRMSRNS (12*32+19)/* "" Non-serializing WRMSR */ -#define X86_FEATURE_AMX_FP16 (12*32+21)/* "" AMX fp16 Support */ -#define X86_FEATURE_AVX_IFMA (12*32+23)/* "" Support for VPMADD52[H,L]UQ */ -#define X86_FEATURE_LAM (12*32+26)/* Linear Address Masking */ +#define X86_FEATURE_AVX_VNNI (12*32+ 4)/* "avx_vnni" AVX VNNI instructions */ +#define X86_FEATURE_AVX512_BF16 (12*32+ 5)/* "avx512_bf16" AVX512 BFLOAT16 instructions */ +#define X86_FEATURE_CMPCCXADD (12*32+ 7)/* CMPccXADD instructions */ +#define X86_FEATURE_ARCH_PERFMON_EXT (12*32+ 8)/* Intel Architectural PerfMon Extension */ +#define X86_FEATURE_FZRM (12*32+10)/* Fast zero-length REP MOVSB */ +#define X86_FEATURE_FSRS (12*32+11)/* Fast short REP STOSB */ +#define X86_FEATURE_FSRC (12*32+12)/* Fast short REP {CMPSB,SCASB} */ +#define X86_FEATURE_FRED (12*32+17)/* "fred" Flexible Return and Event Delivery */ +#define X86_FEATURE_LKGS (12*32+18)/* Load "kernel" (userspace) GS */ +#define X86_FEATURE_WRMSRNS (12*32+19)/* Non-serializing WRMSR */ +#define X86_FEATURE_AMX_FP16 (12*32+21)/* AMX fp16 Support */ +#define X86_FEATURE_AVX_IFMA (12*32+23)/* Support for VPMADD52[H,L]UQ */ +#define X86_FEATURE_LAM (12*32+26)/* "lam" Linear Address Masking */ /* AMD-defined CPU features, CPUID level 0x80000008 (EBX), word 13 */ -#define X86_FEATURE_CLZERO (13*32+ 0)/* CLZERO instruction */ -#define X86_FEATURE_IRPERF (13*32+ 1)/* Instructions Retired Count */ -#define X86_FEATURE_XSAVEERPTR (13*32+ 2)/* Always save/restore FP error pointers */ -#define X86_FEATURE_RDPRU (13*32+ 4)/* Read processor register at user level */ -#define X86_FEATURE_WBNOINVD (13*32+ 9)/* WBNOINVD instruction */ -#define X86_FEATURE_AMD_IBPB (13*32+12)/* "" Indirect Branch Prediction Barrier */ -#define X86_FEATURE_AMD_IBRS (13*32+14)/* "" Indirect Branch Restricted Speculation */ -#define X86_FEATURE_AMD_STIBP (13*32+15)/* "" Single Thread Indirect Branch Predictors */ -#define X86_FEATURE_AMD_STIBP_ALWAYS_ON (13*32+17)/* "" Single Thread Indirect Branch Predictors always-on preferred */ -#define X86_FEATURE_AMD_PPIN (13*32+23)/* Protected Processor Inventory Number */ -#define X86_FEATURE_AMD_SSBD (13*32+24)/* "" Speculative Store Bypass Disable */ -#define X86_FEATURE_VIRT_SSBD (13*32+25)/* Virtualized Speculative Store Bypass Disable */ -#define X86_FEATURE_AMD_SSB_NO (13*32+26)/* "" Speculative Store Bypass is fixed in hardware. */ -#define X86_FEATURE_CPPC (13*32+27)/* Collaborative Processor Performance Control */ -#define X86_FEATURE_AMD_PSFD (13*32+28)/* "" Predictive Store Forwarding Disable */ -#define X86_FEATURE_BTC_NO (13*32+29)/* "" Not vulnerable to Branch Type Confusion */ -#define X86_FEATURE_BRS (13*32+31)/* Branch Sampling available */ +#define X86_FEATURE_CLZERO (13*32+ 0)/* "clzero" CLZERO instruction */ +#define X86_FEATURE_IRPERF (13*32+ 1)/* "irperf" Instructions Retired Count */ +#define X86_FEATURE_XSAVEERPTR (13*32+ 2)/* "xsaveerptr" Always save/restore FP error pointers */ +#define X86_FEATURE_RDPRU (13*32+ 4)/* "rdpru" Read processor register at user level */ +#define X86_FEATURE_WBNOINVD (13*32+ 9)/* "wbnoinvd" WBNOINVD instruction */ +#define X86_FEATURE_AMD_IBPB (13*32+12)/* Indirect Branch Prediction Barrier */ +#define X86_FEATURE_AMD_IBRS (13*32+14)/* Indirect Branch Restricted Speculation */ +#define X86_FEATURE_AMD_STIBP (13*32+15)/* Single Thread Indirect Branch Predictors */ +#define X86_FEATURE_AMD_STIBP_ALWAYS_ON (13*32+17)/* Single Thread Indirect Branch Predictors always-on preferred */ +#define X86_FEATURE_AMD_PPIN (13*32+23)/* "amd_ppin" Protected Processor Inventory Number */ +#define X86_FEATURE_AMD_SSBD (13*32+24)/* Speculative Store Bypass Disable */ +#define X86_FEATURE_VIRT_SSBD (13*32+25)/* "virt_ssbd" Virtualized Speculative Store Bypass Disable */ +#define X86_FEATURE_AMD_SSB_NO (13*32+26)/* Speculative Store Bypass is fixed in hardware. */ +#define X86_FEATURE_CPPC (13*32+27)/* "cppc" Collaborative Processor Performance Control */ +#define X86_FEATURE_AMD_PSFD (13*32+28)/* Predictive Store Forwarding Disable */ +#define X86_FEATURE_BTC_NO (13*32+29)/* Not vulnerable to Branch Type Confusion */ +#define X86_FEATURE_BRS (13*32+31)/* "brs" Branch Sampling available */ /* Thermal and Power Management Leaf, CPUID level 0x00000006 (EAX), word 14 */ -#define X86_FEATURE_DTHERM (14*32+ 0)/* Digital Thermal Sensor */ -#define X86_FEATURE_IDA (14*32+ 1)/* Intel Dynamic Acceleration */ -#define X86_FEATURE_ARAT (14*32+ 2)/* Always Running APIC Timer */ -#define X86_FEATURE_PLN (14*32+ 4)/* Intel Power Limit Notification */ -#define X86_FEATURE_PTS (14*32+ 6)/* Intel Package Thermal Status */ -#define X86_FEATURE_HWP (14*32+ 7)/* Intel Hardware P-states */ -#define X86_FEATURE_HWP_NOTIFY (14*32+ 8)/* HWP Notification */ -#define X86_FEATURE_HWP_ACT_WINDOW (14*32+ 9)/* HWP Activity Window */ -#define X86_FEATURE_HWP_EPP (14*32+10)/* HWP Energy Perf. Preference */ -#define X86_FEATURE_HWP_PKG_REQ (14*32+11)/* HWP Package Level Request */ -#define X86_FEATURE_HFI (14*32+19)/* Hardware Feedback Interface */ +#define X86_FEATURE_DTHERM (14*32+ 0)/* "dtherm" Digital Thermal Sensor */ +#define X86_FEATURE_IDA (14*32+ 1)/* "ida" Intel Dynamic Acceleration */ +#define X86_FEATURE_ARAT (14*32+ 2)/* "arat" Always Running APIC Timer */ +#define X86_FEATURE_PLN (14*32+ 4)/* "pln" Intel Power Limit Notification */ +#define X86_FEATURE_PTS (14*32+ 6)/* "pts" Intel Package Thermal Status */ +#define X86_FEATURE_HWP (14*32+ 7)/* "hwp" Intel Hardware P-states */ +#define X86_FEATURE_HWP_NOTIFY (14*32+ 8)/* "hwp_notify" HWP Notification */ +#define X86_FEATURE_HWP_ACT_WINDOW (14*32+ 9)/* "hwp_act_window" HWP Activity Window */ +#define X86_FEATURE_HWP_EPP (14*32+10)/* "hwp_epp" HWP Energy Perf. Preference */ +#define X86_FEATURE_HWP_PKG_REQ (14*32+11)/* "hwp_pkg_req" HWP Package Level Request */ +#define X86_FEATURE_HWP_HIGHEST_PERF_CHANGE (14*32+15)/* HWP Highest perf change */ +#define X86_FEATURE_HFI (14*32+19)/* "hfi" Hardware Feedback Interface */ /* AMD SVM Feature Identification, CPUID level 0x8000000a (EDX), word 15 */ -#define X86_FEATURE_NPT (15*32+ 0)/* Nested Page Table support */ -#define X86_FEATURE_LBRV (15*32+ 1)/* LBR Virtualization support */ +#define X86_FEATURE_NPT (15*32+ 0)/* "npt" Nested Page Table support */ +#define X86_FEATURE_LBRV (15*32+ 1)/* "lbrv" LBR Virtualization support */ #define X86_FEATURE_SVML (15*32+ 2)/* "svm_lock" SVM locking MSR */ #define X86_FEATURE_NRIPS (15*32+ 3)/* "nrip_save" SVM next_rip save */ #define X86_FEATURE_TSCRATEMSR (15*32+ 4)/* "tsc_scale" TSC scaling support */ #define X86_FEATURE_VMCBCLEAN (15*32+ 5)/* "vmcb_clean" VMCB clean bits support */ -#define X86_FEATURE_FLUSHBYASID (15*32+ 6)/* flush-by-ASID support */ -#define X86_FEATURE_DECODEASSISTS (15*32+ 7)/* Decode Assists support */ -#define X86_FEATURE_PAUSEFILTER (15*32+10)/* filtered pause intercept */ -#define X86_FEATURE_PFTHRESHOLD (15*32+12)/* pause filter threshold */ -#define X86_FEATURE_AVIC (15*32+13)/* Virtual Interrupt Controller */ -#define X86_FEATURE_V_VMSAVE_VMLOAD (15*32+15)/* Virtual VMSAVE VMLOAD */ -#define X86_FEATURE_VGIF (15*32+16)/* Virtual GIF */ -#define X86_FEATURE_X2AVIC (15*32+18)/* Virtual x2apic */ -#define X86_FEATURE_V_SPEC_CTRL (15*32+20)/* Virtual SPEC_CTRL */ -#define X86_FEATURE_VNMI (15*32+25)/* Virtual NMI */ -#define X86_FEATURE_SVME_ADDR_CHK (15*32+28)/* "" SVME addr check */ +#define X86_FEATURE_FLUSHBYASID (15*32+ 6)/* "flushbyasid" Flush-by-ASID support */ +#define X86_FEATURE_DECODEASSISTS (15*32+ 7)/* "decodeassists" Decode Assists support */ +#define X86_FEATURE_PAUSEFILTER (15*32+10)/* "pausefilter" Filtered pause intercept */ +#define X86_FEATURE_PFTHRESHOLD (15*32+12)/* "pfthreshold" Pause filter threshold */ +#define X86_FEATURE_AVIC (15*32+13)/* "avic" Virtual Interrupt Controller */ +#define X86_FEATURE_V_VMSAVE_VMLOAD (15*32+15)/* "v_vmsave_vmload" Virtual VMSAVE VMLOAD */ +#define X86_FEATURE_VGIF (15*32+16)/* "vgif" Virtual GIF */ +#define X86_FEATURE_X2AVIC (15*32+18)/* "x2avic" Virtual x2apic */ +#define X86_FEATURE_V_SPEC_CTRL (15*32+20)/* "v_spec_ctrl" Virtual SPEC_CTRL */ +#define X86_FEATURE_VNMI (15*32+25)/* "vnmi" Virtual NMI */ +#define X86_FEATURE_SVME_ADDR_CHK (15*32+28)/* SVME addr check */ /* Intel-defined CPU features, CPUID level 0x00000007:0 (ECX), word 16 */ -#define X86_FEATURE_AVX512VBMI (16*32+ 1)/* AVX512 Vector Bit Manipulation instructions*/ -#define X86_FEATURE_UMIP (16*32+ 2)/* User Mode Instruction Protection */ -#define X86_FEATURE_PKU (16*32+ 3)/* Protection Keys for Userspace */ -#define X86_FEATURE_OSPKE (16*32+ 4)/* OS Protection Keys Enable */ -#define X86_FEATURE_WAITPKG (16*32+ 5)/* UMONITOR/UMWAIT/TPAUSE Instructions */ -#define X86_FEATURE_AVX512_VBMI2 (16*32+ 6)/* Additional AVX512 Vector Bit Manipulation Instructions */ -#define X86_FEATURE_SHSTK (16*32+ 7)/* "" Shadow stack */ -#define X86_FEATURE_GFNI (16*32+ 8)/* Galois Field New Instructions */ -#define X86_FEATURE_VAES (16*32+ 9)/* Vector AES */ -#define X86_FEATURE_VPCLMULQDQ (16*32+10)/* Carry-Less Multiplication Double Quadword */ -#define X86_FEATURE_AVX512_VNNI (16*32+11)/* Vector Neural Network Instructions */ -#define X86_FEATURE_AVX512_BITALG (16*32+12)/* Support for VPOPCNT[B,W] and VPSHUF-BITQMB instructions */ -#define X86_FEATURE_TME (16*32+13)/* Intel Total Memory Encryption */ -#define X86_FEATURE_AVX512_VPOPCNTDQ (16*32+14)/* POPCNT for vectors of DW/QW */ -#define X86_FEATURE_LA57 (16*32+16)/* 5-level page tables */ -#define X86_FEATURE_RDPID (16*32+22)/* RDPID instruction */ -#define X86_FEATURE_BUS_LOCK_DETECT (16*32+24)/* Bus Lock detect */ -#define X86_FEATURE_CLDEMOTE (16*32+25)/* CLDEMOTE instruction */ -#define X86_FEATURE_MOVDIRI (16*32+27)/* MOVDIRI instruction */ -#define X86_FEATURE_MOVDIR64B (16*32+28)/* MOVDIR64B instruction */ -#define X86_FEATURE_ENQCMD (16*32+29)/* ENQCMD and ENQCMDS instructions */ -#define X86_FEATURE_SGX_LC (16*32+30)/* Software Guard Extensions Launch Control */ +#define X86_FEATURE_AVX512VBMI (16*32+ 1)/* "avx512vbmi" AVX512 Vector Bit Manipulation instructions*/ +#define X86_FEATURE_UMIP (16*32+ 2)/* "umip" User Mode Instruction Protection */ +#define X86_FEATURE_PKU (16*32+ 3)/* "pku" Protection Keys for Userspace */ +#define X86_FEATURE_OSPKE (16*32+ 4)/* "ospke" OS Protection Keys Enable */ +#define X86_FEATURE_WAITPKG (16*32+ 5)/* "waitpkg" UMONITOR/UMWAIT/TPAUSE Instructions */ +#define X86_FEATURE_AVX512_VBMI2 (16*32+ 6)/* "avx512_vbmi2" Additional AVX512 Vector Bit Manipulation Instructions */ +#define X86_FEATURE_SHSTK (16*32+ 7)/* Shadow stack */ +#define X86_FEATURE_GFNI (16*32+ 8)/* "gfni" Galois Field New Instructions */ +#define X86_FEATURE_VAES (16*32+ 9)/* "vaes" Vector AES */ +#define X86_FEATURE_VPCLMULQDQ (16*32+10)/* "vpclmulqdq" Carry-Less Multiplication Double Quadword */ +#define X86_FEATURE_AVX512_VNNI (16*32+11)/* "avx512_vnni" Vector Neural Network Instructions */ +#define X86_FEATURE_AVX512_BITALG (16*32+12)/* "avx512_bitalg" Support for VPOPCNT[B,W] and VPSHUF-BITQMB instructions */ +#define X86_FEATURE_TME (16*32+13)/* "tme" Intel Total Memory Encryption */ +#define X86_FEATURE_AVX512_VPOPCNTDQ (16*32+14)/* "avx512_vpopcntdq" POPCNT for vectors of DW/QW */ +#define X86_FEATURE_LA57 (16*32+16)/* "la57" 5-level page tables */ +#define X86_FEATURE_RDPID (16*32+22)/* "rdpid" RDPID instruction */ +#define X86_FEATURE_BUS_LOCK_DETECT (16*32+24)/* "bus_lock_detect" Bus Lock detect */ +#define X86_FEATURE_CLDEMOTE (16*32+25)/* "cldemote" CLDEMOTE instruction */ +#define X86_FEATURE_MOVDIRI (16*32+27)/* "movdiri" MOVDIRI instruction */ +#define X86_FEATURE_MOVDIR64B (16*32+28)/* "movdir64b" MOVDIR64B instruction */ +#define X86_FEATURE_ENQCMD (16*32+29)/* "enqcmd" ENQCMD and ENQCMDS instructions */ +#define X86_FEATURE_SGX_LC (16*32+30)/* "sgx_lc" Software Guard Extensions Launch Control */ /* AMD-defined CPU features, CPUID level 0x80000007 (EBX), word 17 */ -#define X86_FEATURE_OVERFLOW_RECOV (17*32+ 0)/* MCA overflow recovery support */ -#define X86_FEATURE_SUCCOR (17*32+ 1)/* Uncorrectable error containment and recovery */ -#define X86_FEATURE_SMCA (17*32+ 3)/* Scalable MCA */ +#define X86_FEATURE_OVERFLOW_RECOV (17*32+ 0)/* "overflow_recov" MCA overflow recovery support */ +#define X86_FEATURE_SUCCOR (17*32+ 1)/* "succor" Uncorrectable error containment and recovery */ +#define X86_FEATURE_SMCA (17*32+ 3)/* "smca" Scalable MCA */ /* Intel-defined CPU features, CPUID level 0x00000007:0 (EDX), word 18 */ -#define X86_FEATURE_AVX512_4VNNIW (18*32+ 2)/* AVX-512 Neural Network Instructions */ -#define X86_FEATURE_AVX512_4FMAPS (18*32+ 3)/* AVX-512 Multiply Accumulation Single precision */ -#define X86_FEATURE_FSRM (18*32+ 4)/* Fast Short Rep Mov */ -#define X86_FEATURE_AVX512_VP2INTERSECT (18*32+ 8)/* AVX-512 Intersect for D/Q */ -#define X86_FEATURE_SRBDS_CTRL (18*32+ 9)/* "" SRBDS mitigation MSR available */ -#define X86_FEATURE_MD_CLEAR (18*32+10)/* VERW clears CPU buffers */ -#define X86_FEATURE_RTM_ALWAYS_ABORT (18*32+11)/* "" RTM transaction always aborts */ -#define X86_FEATURE_TSX_FORCE_ABORT (18*32+13)/* "" TSX_FORCE_ABORT */ -#define X86_FEATURE_SERIALIZE (18*32+14)/* SERIALIZE instruction */ -#define X86_FEATURE_HYBRID_CPU (18*32+15)/* "" This part has CPUs of more than one type */ -#define X86_FEATURE_TSXLDTRK (18*32+16)/* TSX Suspend Load Address Tracking */ -#define X86_FEATURE_PCONFIG (18*32+18)/* Intel PCONFIG */ -#define X86_FEATURE_ARCH_LBR (18*32+19)/* Intel ARCH LBR */ -#define X86_FEATURE_IBT (18*32+20)/* Indirect Branch Tracking */ -#define X86_FEATURE_AMX_BF16 (18*32+22)/* AMX bf16 Support */ -#define X86_FEATURE_AVX512_FP16 (18*32+23)/* AVX512 FP16 */ -#define X86_FEATURE_AMX_TILE (18*32+24)/* AMX tile Support */ -#define X86_FEATURE_AMX_INT8 (18*32+25)/* AMX int8 Support */ -#define X86_FEATURE_SPEC_CTRL (18*32+26)/* "" Speculation Control (IBRS + IBPB) */ -#define X86_FEATURE_INTEL_STIBP (18*32+27)/* "" Single Thread Indirect Branch Predictors */ -#define X86_FEATURE_FLUSH_L1D (18*32+28)/* Flush L1D cache */ -#define X86_FEATURE_ARCH_CAPABILITIES (18*32+29)/* IA32_ARCH_CAPABILITIES MSR (Intel) */ -#define X86_FEATURE_CORE_CAPABILITIES (18*32+30)/* "" IA32_CORE_CAPABILITIES MSR */ -#define X86_FEATURE_SPEC_CTRL_SSBD (18*32+31)/* "" Speculative Store Bypass Disable */ +#define X86_FEATURE_AVX512_4VNNIW (18*32+ 2)/* "avx512_4vnniw" AVX-512 Neural Network Instructions */ +#define X86_FEATURE_AVX512_4FMAPS (18*32+ 3)/* "avx512_4fmaps" AVX-512 Multiply Accumulation Single precision */ +#define X86_FEATURE_FSRM (18*32+ 4)/* "fsrm" Fast Short Rep Mov */ +#define X86_FEATURE_AVX512_VP2INTERSECT (18*32+ 8)/* "avx512_vp2intersect" AVX-512 Intersect for D/Q */ +#define X86_FEATURE_SRBDS_CTRL (18*32+ 9)/* SRBDS mitigation MSR available */ +#define X86_FEATURE_MD_CLEAR (18*32+10)/* "md_clear" VERW clears CPU buffers */ +#define X86_FEATURE_RTM_ALWAYS_ABORT (18*32+11)/* RTM transaction always aborts */ +#define X86_FEATURE_TSX_FORCE_ABORT (18*32+13)/* TSX_FORCE_ABORT */ +#define X86_FEATURE_SERIALIZE (18*32+14)/* "serialize" SERIALIZE instruction */ +#define X86_FEATURE_HYBRID_CPU (18*32+15)/* This part has CPUs of more than one type */ +#define X86_FEATURE_TSXLDTRK (18*32+16)/* "tsxldtrk" TSX Suspend Load Address Tracking */ +#define X86_FEATURE_PCONFIG (18*32+18)/* "pconfig" Intel PCONFIG */ +#define X86_FEATURE_ARCH_LBR (18*32+19)/* "arch_lbr" Intel ARCH LBR */ +#define X86_FEATURE_IBT (18*32+20)/* "ibt" Indirect Branch Tracking */ +#define X86_FEATURE_AMX_BF16 (18*32+22)/* "amx_bf16" AMX bf16 Support */ +#define X86_FEATURE_AVX512_FP16 (18*32+23)/* "avx512_fp16" AVX512 FP16 */ +#define X86_FEATURE_AMX_TILE (18*32+24)/* "amx_tile" AMX tile Support */ +#define X86_FEATURE_AMX_INT8 (18*32+25)/* "amx_int8" AMX int8 Support */ +#define X86_FEATURE_SPEC_CTRL (18*32+26)/* Speculation Control (IBRS + IBPB) */ +#define X86_FEATURE_INTEL_STIBP (18*32+27)/* Single Thread Indirect Branch Predictors */ +#define X86_FEATURE_FLUSH_L1D (18*32+28)/* "flush_l1d" Flush L1D cache */ +#define X86_FEATURE_ARCH_CAPABILITIES (18*32+29)/* "arch_capabilities" IA32_ARCH_CAPABILITIES MSR (Intel) */ +#define X86_FEATURE_CORE_CAPABILITIES (18*32+30)/* IA32_CORE_CAPABILITIES MSR */ +#define X86_FEATURE_SPEC_CTRL_SSBD (18*32+31)/* Speculative Store Bypass Disable */ /* AMD-defined memory encryption features, CPUID level 0x8000001f (EAX), word 19 */ -#define X86_FEATURE_SME (19*32+ 0)/* AMD Secure Memory Encryption */ -#define X86_FEATURE_SEV (19*32+ 1)/* AMD Secure Encrypted Virtualization */ -#define X86_FEATURE_VM_PAGE_FLUSH (19*32+ 2)/* "" VM Page Flush MSR is supported */ -#define X86_FEATURE_SEV_ES (19*32+ 3)/* AMD Secure Encrypted Virtualization - Encrypted State */ -#define X86_FEATURE_SEV_SNP (19*32+ 4)/* AMD Secure Encrypted Virtualization - Secure Nested Paging */ -#define X86_FEATURE_V_TSC_AUX (19*32+ 9)/* "" Virtual TSC_AUX */ -#define X86_FEATURE_SME_COHERENT (19*32+10)/* "" AMD hardware-enforced cache coherency */ -#define X86_FEATURE_DEBUG_SWAP (19*32+14)/* AMD SEV-ES full debug state swap support */ +#define X86_FEATURE_SME (19*32+ 0)/* "sme" AMD Secure Memory Encryption */ +#define X86_FEATURE_SEV (19*32+ 1)/* "sev" AMD Secure Encrypted Virtualization */ +#define X86_FEATURE_VM_PAGE_FLUSH (19*32+ 2)/* VM Page Flush MSR is supported */ +#define X86_FEATURE_SEV_ES (19*32+ 3)/* "sev_es" AMD Secure Encrypted Virtualization - Encrypted State */ +#define X86_FEATURE_SEV_SNP (19*32+ 4)/* "sev_snp" AMD Secure Encrypted Virtualization - Secure Nested Paging */ +#define X86_FEATURE_V_TSC_AUX (19*32+ 9)/* Virtual TSC_AUX */ +#define X86_FEATURE_SME_COHERENT (19*32+10)/* AMD hardware-enforced cache coherency */ +#define X86_FEATURE_DEBUG_SWAP (19*32+14)/* "debug_swap" AMD SEV-ES full debug state swap support */ +#define X86_FEATURE_SVSM (19*32+28)/* "svsm" SVSM present */ /* AMD-defined Extended Feature 2 EAX, CPUID level 0x80000021 (EAX), word 20 */ -#define X86_FEATURE_NO_NESTED_DATA_BP (20*32+ 0)/* "" No Nested Data Breakpoints */ -#define X86_FEATURE_WRMSR_XX_BASE_NS (20*32+ 1)/* "" WRMSR to {FS,GS,KERNEL_GS}_BASE is non-serializing */ -#define X86_FEATURE_LFENCE_RDTSC (20*32+ 2)/* "" LFENCE always serializing / synchronizes RDTSC */ -#define X86_FEATURE_NULL_SEL_CLR_BASE (20*32+ 6)/* "" Null Selector Clears Base */ -#define X86_FEATURE_AUTOIBRS (20*32+ 8)/* "" Automatic IBRS */ -#define X86_FEATURE_NO_SMM_CTL_MSR (20*32+ 9)/* "" SMM_CTL MSR is not present */ +#define X86_FEATURE_NO_NESTED_DATA_BP (20*32+ 0)/* No Nested Data Breakpoints */ +#define X86_FEATURE_WRMSR_XX_BASE_NS (20*32+ 1)/* WRMSR to {FS,GS,KERNEL_GS}_BASE is non-serializing */ +#define X86_FEATURE_LFENCE_RDTSC (20*32+ 2)/* LFENCE always serializing / synchronizes RDTSC */ +#define X86_FEATURE_NULL_SEL_CLR_BASE (20*32+ 6)/* Null Selector Clears Base */ +#define X86_FEATURE_AUTOIBRS (20*32+ 8)/* Automatic IBRS */ +#define X86_FEATURE_NO_SMM_CTL_MSR (20*32+ 9)/* SMM_CTL MSR is not present */ -#define X86_FEATURE_SBPB (20*32+27)/* "" Selective Branch Prediction Barrier */ -#define X86_FEATURE_IBPB_BRTYPE (20*32+28)/* "" MSR_PRED_CMD[IBPB] flushes all branch type predictions */ -#define X86_FEATURE_SRSO_NO (20*32+29)/* "" CPU is not affected by SRSO */ +#define X86_FEATURE_SBPB (20*32+27)/* Selective Branch Prediction Barrier */ +#define X86_FEATURE_IBPB_BRTYPE (20*32+28)/* MSR_PRED_CMD[IBPB] flushes all branch type predictions */ +#define X86_FEATURE_SRSO_NO (20*32+29)/* CPU is not affected by SRSO */ /* * Extended auxiliary flags: Linux defined - for features scattered in various
@@ -465,59 +467,60 @@* * Reuse free bits when adding new feature flags! */ -#define X86_FEATURE_AMD_LBR_PMC_FREEZE (21*32+ 0)/* AMD LBR and PMC Freeze */ -#define X86_FEATURE_CLEAR_BHB_LOOP (21*32+ 1)/* "" Clear branch history at syscall entry using SW loop */ -#define X86_FEATURE_BHI_CTRL (21*32+ 2)/* "" BHI_DIS_S HW control available */ -#define X86_FEATURE_CLEAR_BHB_HW (21*32+ 3)/* "" BHI_DIS_S HW control enabled */ -#define X86_FEATURE_CLEAR_BHB_LOOP_ON_VMEXIT (21*32+ 4)/* "" Clear branch history at vmexit using SW loop */ +#define X86_FEATURE_AMD_LBR_PMC_FREEZE (21*32+ 0)/* "amd_lbr_pmc_freeze" AMD LBR and PMC Freeze */ +#define X86_FEATURE_CLEAR_BHB_LOOP (21*32+ 1)/* Clear branch history at syscall entry using SW loop */ +#define X86_FEATURE_BHI_CTRL (21*32+ 2)/* BHI_DIS_S HW control available */ +#define X86_FEATURE_CLEAR_BHB_HW (21*32+ 3)/* BHI_DIS_S HW control enabled */ +#define X86_FEATURE_CLEAR_BHB_LOOP_ON_VMEXIT (21*32+ 4)/* Clear branch history at vmexit using SW loop */ +#define X86_FEATURE_FAST_CPPC (21*32 + 5)/* AMD Fast CPPC */ /* * BUG word(s) */ #define X86_BUG (x) (NCAPINTS*32 + (x)) -#define X86_BUG_F00F X86_BUG(0)/* Intel F00F */ -#define X86_BUG_FDIV X86_BUG(1)/* FPU FDIV */ -#define X86_BUG_COMA X86_BUG(2)/* Cyrix 6x86 coma */ +#define X86_BUG_F00F X86_BUG(0)/* "f00f" Intel F00F */ +#define X86_BUG_FDIV X86_BUG(1)/* "fdiv" FPU FDIV */ +#define X86_BUG_COMA X86_BUG(2)/* "coma" Cyrix 6x86 coma */ #define X86_BUG_AMD_TLB_MMATCH X86_BUG(3)/* "tlb_mmatch" AMD Erratum 383 */ #define X86_BUG_AMD_APIC_C1E X86_BUG(4)/* "apic_c1e" AMD Erratum 400 */ -#define X86_BUG_11AP X86_BUG(5)/* Bad local APIC aka 11AP */ -#define X86_BUG_FXSAVE_LEAK X86_BUG(6)/* FXSAVE leaks FOP/FIP/FOP */ -#define X86_BUG_CLFLUSH_MONITOR X86_BUG(7)/* AAI65, CLFLUSH required before MONITOR */ -#define X86_BUG_SYSRET_SS_ATTRS X86_BUG(8)/* SYSRET doesn't fix up SS attrs */ +#define X86_BUG_11AP X86_BUG(5)/* "11ap" Bad local APIC aka 11AP */ +#define X86_BUG_FXSAVE_LEAK X86_BUG(6)/* "fxsave_leak" FXSAVE leaks FOP/FIP/FOP */ +#define X86_BUG_CLFLUSH_MONITOR X86_BUG(7)/* "clflush_monitor" AAI65, CLFLUSH required before MONITOR */ +#define X86_BUG_SYSRET_SS_ATTRS X86_BUG(8)/* "sysret_ss_attrs" SYSRET doesn't fix up SS attrs */ #ifdef CONFIG_X86_32 /* * 64-bit kernels don't use X86_BUG_ESPFIX. Make the define conditional * to avoid confusion. */ -#define X86_BUG_ESPFIX X86_BUG(9)/* "" IRET to 16-bit SS corrupts ESP/RSP high bits */ +#define X86_BUG_ESPFIX X86_BUG(9)/* IRET to 16-bit SS corrupts ESP/RSP high bits */ #endif -#define X86_BUG_NULL_SEG X86_BUG(10)/* Nulling a selector preserves the base */ -#define X86_BUG_SWAPGS_FENCE X86_BUG(11)/* SWAPGS without input dep on GS */ -#define X86_BUG_MONITOR X86_BUG(12)/* IPI required to wake up remote CPU */ -#define X86_BUG_AMD_E400 X86_BUG(13)/* CPU is among the affected by Erratum 400 */ -#define X86_BUG_CPU_MELTDOWN X86_BUG(14)/* CPU is affected by meltdown attack and needs kernel page table isolation */ -#define X86_BUG_SPECTRE_V1 X86_BUG(15)/* CPU is affected by Spectre variant 1 attack with conditional branches */ -#define X86_BUG_SPECTRE_V2 X86_BUG(16)/* CPU is affected by Spectre variant 2 attack with indirect branches */ -#define X86_BUG_SPEC_STORE_BYPASS X86_BUG(17)/* CPU is affected by speculative store bypass attack */ -#define X86_BUG_L1TF X86_BUG(18)/* CPU is affected by L1 Terminal Fault */ -#define X86_BUG_MDS X86_BUG(19)/* CPU is affected by Microarchitectural data sampling */ -#define X86_BUG_MSBDS_ONLY X86_BUG(20)/* CPU is only affected by the MSDBS variant of BUG_MDS */ -#define X86_BUG_SWAPGS X86_BUG(21)/* CPU is affected by speculation through SWAPGS */ -#define X86_BUG_TAA X86_BUG(22)/* CPU is affected by TSX Async Abort(TAA) */ -#define X86_BUG_ITLB_MULTIHIT X86_BUG(23)/* CPU may incur MCE during certain page attribute changes */ -#define X86_BUG_SRBDS X86_BUG(24)/* CPU may leak RNG bits if not mitigated */ -#define X86_BUG_MMIO_STALE_DATA X86_BUG(25)/* CPU is affected by Processor MMIO Stale Data vulnerabilities */ -#define X86_BUG_MMIO_UNKNOWN X86_BUG(26)/* CPU is too old and its MMIO Stale Data status is unknown */ -#define X86_BUG_RETBLEED X86_BUG(27)/* CPU is affected by RETBleed */ -#define X86_BUG_EIBRS_PBRSB X86_BUG(28)/* EIBRS is vulnerable to Post Barrier RSB Predictions */ -#define X86_BUG_SMT_RSB X86_BUG(29)/* CPU is vulnerable to Cross-Thread Return Address Predictions */ -#define X86_BUG_GDS X86_BUG(30)/* CPU is affected by Gather Data Sampling */ -#define X86_BUG_TDX_PW_MCE X86_BUG(31)/* CPU may incur #MC if non-TD software does partial write to TDX private memory */ +#define X86_BUG_NULL_SEG X86_BUG(10)/* "null_seg" Nulling a selector preserves the base */ +#define X86_BUG_SWAPGS_FENCE X86_BUG(11)/* "swapgs_fence" SWAPGS without input dep on GS */ +#define X86_BUG_MONITOR X86_BUG(12)/* "monitor" IPI required to wake up remote CPU */ +#define X86_BUG_AMD_E400 X86_BUG(13)/* "amd_e400" CPU is among the affected by Erratum 400 */ +#define X86_BUG_CPU_MELTDOWN X86_BUG(14)/* "cpu_meltdown" CPU is affected by meltdown attack and needs kernel page table isolation */ +#define X86_BUG_SPECTRE_V1 X86_BUG(15)/* "spectre_v1" CPU is affected by Spectre variant 1 attack with conditional branches */ +#define X86_BUG_SPECTRE_V2 X86_BUG(16)/* "spectre_v2" CPU is affected by Spectre variant 2 attack with indirect branches */ +#define X86_BUG_SPEC_STORE_BYPASS X86_BUG(17)/* "spec_store_bypass" CPU is affected by speculative store bypass attack */ +#define X86_BUG_L1TF X86_BUG(18)/* "l1tf" CPU is affected by L1 Terminal Fault */ +#define X86_BUG_MDS X86_BUG(19)/* "mds" CPU is affected by Microarchitectural data sampling */ +#define X86_BUG_MSBDS_ONLY X86_BUG(20)/* "msbds_only" CPU is only affected by the MSDBS variant of BUG_MDS */ +#define X86_BUG_SWAPGS X86_BUG(21)/* "swapgs" CPU is affected by speculation through SWAPGS */ +#define X86_BUG_TAA X86_BUG(22)/* "taa" CPU is affected by TSX Async Abort(TAA) */ +#define X86_BUG_ITLB_MULTIHIT X86_BUG(23)/* "itlb_multihit" CPU may incur MCE during certain page attribute changes */ +#define X86_BUG_SRBDS X86_BUG(24)/* "srbds" CPU may leak RNG bits if not mitigated */ +#define X86_BUG_MMIO_STALE_DATA X86_BUG(25)/* "mmio_stale_data" CPU is affected by Processor MMIO Stale Data vulnerabilities */ +#define X86_BUG_MMIO_UNKNOWN X86_BUG(26)/* "mmio_unknown" CPU is too old and its MMIO Stale Data status is unknown */ +#define X86_BUG_RETBLEED X86_BUG(27)/* "retbleed" CPU is affected by RETBleed */ +#define X86_BUG_EIBRS_PBRSB X86_BUG(28)/* "eibrs_pbrsb" EIBRS is vulnerable to Post Barrier RSB Predictions */ +#define X86_BUG_SMT_RSB X86_BUG(29)/* "smt_rsb" CPU is vulnerable to Cross-Thread Return Address Predictions */ +#define X86_BUG_GDS X86_BUG(30)/* "gds" CPU is affected by Gather Data Sampling */ +#define X86_BUG_TDX_PW_MCE X86_BUG(31)/* "tdx_pw_mce" CPU may incur #MC if non-TD software does partial write to TDX private memory */ /* BUG word 2 */ -#define X86_BUG_SRSO X86_BUG(1*32 + 0)/* AMD SRSO bug */ -#define X86_BUG_DIV0 X86_BUG(1*32 + 1)/* AMD DIV0 speculation bug */ -#define X86_BUG_RFDS X86_BUG(1*32 + 2)/* CPU is vulnerable to Register File Data Sampling */ -#define X86_BUG_BHI X86_BUG(1*32 + 3)/* CPU is affected by Branch History Injection */ +#define X86_BUG_SRSO X86_BUG(1*32 + 0)/* "srso" AMD SRSO bug */ +#define X86_BUG_DIV0 X86_BUG(1*32 + 1)/* "div0" AMD DIV0 speculation bug */ +#define X86_BUG_RFDS X86_BUG(1*32 + 2)/* "rfds" CPU is vulnerable to Register File Data Sampling */ +#define X86_BUG_BHI X86_BUG(1*32 + 3)/* "bhi" CPU is affected by Branch History Injection */ #endif /* _ASM_X86_CPUFEATURES_H */
tools/arch/x86/include/asm/msr-index.h +11 -0
@@ -566,6 +566,12 @@#define MSR_RELOAD_PMC0 0x000014c1#define MSR_RELOAD_FIXED_CTR0 0x00001309 +/* V6 PMON MSR range */ +#define MSR_IA32_PMC_V6_GP0_CTR 0x1900 +#define MSR_IA32_PMC_V6_GP0_CFG_A 0x1901 +#define MSR_IA32_PMC_V6_FX0_CTR 0x1980 +#define MSR_IA32_PMC_V6_STEP 4 +/* KeyID partitioning between MKTME and TDX */ #define MSR_IA32_MKTME_KEYID_PARTITIONING 0x00000087
@@ -660,6 +666,8 @@#define MSR_AMD64_RMP_BASE 0xc0010132#define MSR_AMD64_RMP_END 0xc0010133 +#define MSR_SVSM_CAA 0xc001f000 +/* AMD Collaborative Processor Performance Control MSRs */ #define MSR_AMD_CPPC_CAP1 0xc00102b0#define MSR_AMD_CPPC_ENABLE 0xc00102b1
@@ -781,6 +789,8 @@#define MSR_K7_HWCR_IRPERF_EN BIT_ULL(MSR_K7_HWCR_IRPERF_EN_BIT)#define MSR_K7_FID_VID_CTL 0xc0010041#define MSR_K7_FID_VID_STATUS 0xc0010042 +#define MSR_K7_HWCR_CPB_DIS_BIT 25 +#define MSR_K7_HWCR_CPB_DIS BIT_ULL(MSR_K7_HWCR_CPB_DIS_BIT)/* K6 MSRs */ #define MSR_K6_WHCR 0xc0000082
@@ -1164,6 +1174,7 @@#define MSR_IA32_QM_CTR 0xc8e#define MSR_IA32_PQR_ASSOC 0xc8f#define MSR_IA32_L3_CBM_BASE 0xc90 +#define MSR_RMID_SNC_CONFIG 0xca0#define MSR_IA32_L2_CBM_BASE 0xd10#define MSR_IA32_MBA_THRTL_BASE 0xd50
Signature · 1 line
2.46.0.rc2.264.g509ed76dc8-goog
Namhyung Kim
maintainerPATCH 10/10 tools/include: Sync arm64 headers with the kernel sources
In reply to Namhyung KimTo pick up changes from:
9ef54a384526 arm64: cputype: Add Cortex-A725 definitions 58d245e03c32 arm64: cputype: Add Cortex-X1C definitions fd2ff5f0b320 arm64: cputype: Add Cortex-X925 definitions add332c40328 arm64: cputype: Add Cortex-A720 definitions be5a6f238700 arm64: cputype: Add Cortex-X3 definitions
This should be used to beautify x86 syscall arguments and it addresses these tools/perf build warnings:
Warning: Kernel ABI header differences:
diff -u tools/arch/arm64/include/asm/cputype.h arch/arm64/include/asm/cputype.h
Please see tools/include/uapi/README for details (it's in the first patch of this series).
--- tools/arch/arm64/include/asm/cputype.h | 10 ++++++++++ 1 file changed, 10 insertions(+)
tools/arch/arm64/include/asm/cputype.h +10 -0
@@ -86,9 +86,14 @@#define ARM_CPU_PART_CORTEX_X2 0xD48#define ARM_CPU_PART_NEOVERSE_N2 0xD49#define ARM_CPU_PART_CORTEX_A78C 0xD4B +#define ARM_CPU_PART_CORTEX_X1C 0xD4C +#define ARM_CPU_PART_CORTEX_X3 0xD4E#define ARM_CPU_PART_NEOVERSE_V2 0xD4F +#define ARM_CPU_PART_CORTEX_A720 0xD81#define ARM_CPU_PART_CORTEX_X4 0xD82#define ARM_CPU_PART_NEOVERSE_V3 0xD84 +#define ARM_CPU_PART_CORTEX_X925 0xD85 +#define ARM_CPU_PART_CORTEX_A725 0xD87#define APM_CPU_PART_XGENE 0x000#define APM_CPU_VAR_POTENZA 0x00
@@ -162,9 +167,14 @@#define MIDR_CORTEX_X2 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X2)#define MIDR_NEOVERSE_N2 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_N2)#define MIDR_CORTEX_A78C MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A78C) +#define MIDR_CORTEX_X1C MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X1C) +#define MIDR_CORTEX_X3 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X3)#define MIDR_NEOVERSE_V2 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_V2) +#define MIDR_CORTEX_A720 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A720)#define MIDR_CORTEX_X4 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X4)#define MIDR_NEOVERSE_V3 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_V3) +#define MIDR_CORTEX_X925 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X925) +#define MIDR_CORTEX_A725 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A725)#define MIDR_THUNDERX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX)#define MIDR_THUNDERX_81XX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX_81XX)#define MIDR_THUNDERX_83XX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX_83XX)
Signature · 1 line
2.46.0.rc2.264.g509ed76dc8-goog
Namhyung Kim
maintainerHello folks,
Quoted 6 lines · Namhyung Kim
Hello,
This is the usual sync up in header files we keep in tools directory. I put a file to give the reason of this work and not to repeat it in every commit message. The changes will be carried in the perf-tools tree.
Could you please double check what's in the tmp.perf-tools branch at the perf-tools tree so I don't break build and perf trace for arm64, powerpc and s390? It has this patchset + arm64 unistd header revert (according to the discussion on patch 6/10) on top of v6.11-rc2.
Thanks,
Namhyung
Quoted 41 lines
Namhyung Kim (10):
perf tools: Addtools/include/uapi/README
tools/include: Syncuapi/drm/i915_drm.hwith the kernel sourcestools/include: Syncuapi/linux/kvm.hwith the kernel sourcestools/include: Syncuapi/linux/perf.hwith the kernel sourcestools/include: Syncuapi/sound/asound.hwith the kernel sourcestools/include: Syncuapi/asm-generic/unistd.hwith the kernel sourcestools/include: Sync network socket headers with the kernel sourcestools/include: Sync filesystem headers with the kernel sourcestools/include: Sync x86 headers with the kernel sourcestools/include: Sync arm64 headers with the kernel sourcestools/arch/arm64/include/asm/cputype.h | 10 + tools/arch/arm64/include/uapi/asm/unistd.h | 24 +- tools/arch/powerpc/include/uapi/asm/kvm.h | 3 + tools/arch/x86/include/asm/cpufeatures.h | 803 +++++++++--------- tools/arch/x86/include/asm/msr-index.h | 11 + tools/arch/x86/include/uapi/asm/kvm.h | 49 ++ tools/arch/x86/include/uapi/asm/svm.h | 1 + tools/include/uapi/README | 73 ++ tools/include/uapi/asm-generic/unistd.h | 2 +- tools/include/uapi/drm/i915_drm.h | 27 + tools/include/uapi/linux/in.h | 2 + tools/include/uapi/linux/kvm.h | 17 +- tools/include/uapi/linux/perf_event.h | 6 +- tools/include/uapi/linux/stat.h | 12 +- .../arch/powerpc/entry/syscalls/syscall.tbl | 6 +- .../perf/arch/s390/entry/syscalls/syscall.tbl | 2 +- .../arch/x86/entry/syscalls/syscall_64.tbl | 8 +- .../perf/trace/beauty/include/linux/socket.h | 5 +- .../perf/trace/beauty/include/uapi/linux/fs.h | 163 +++- .../trace/beauty/include/uapi/linux/mount.h | 10 +- .../trace/beauty/include/uapi/linux/stat.h | 12 +- .../trace/beauty/include/uapi/sound/asound.h | 9 +- 22 files changed, 810 insertions(+), 445 deletions(-) create mode 100644 tools/include/uapi/READMESignature · 1 line
2.46.0.rc2.264.g509ed76dc8-goog
Arnaldo Carvalho de Melo
maintainerQuoted 10 lines · Namhyung Kim
Quoted 4 lines · Namhyung Kim
This is the usual sync up in header files we keep in tools directory. I put a file to give the reason of this work and not to repeat it in every commit message. The changes will be carried in the perf-tools tree.
Could you please double check what's in the tmp.perf-tools branch at the perf-tools tree so I don't break build and perf trace for arm64, powerpc and s390? It has this patchset + arm64 unistd header revert (according to the discussion on patch 6/10) on top of v6.11-rc2.
On arm64:
acme@roc-rk3399-pc:~/git/perf-tools$ git log --oneline -10
d5b854893d27 (HEAD -> perf-tools, perf-tools/tmp.perf-tools) tools/include: Sync arm64 headers with the kernel sources
f6d9883f8e68 tools/include: Sync x86 headers with the kernel sources
845295f4004c tools/include: Sync filesystem headers with the kernel sources
ed86525f1f4b tools/include: Sync network socket headers with the kernel sources
568901e709d7 tools/include: Sync uapi/asm-generic/unistd.h with the kernel sources
b97350067626 tools/include: Sync uapi/sound/asound.h with the kernel sources
8ec9497d3ef3 tools/include: Sync uapi/linux/perf.h with the kernel sources
a625df3995c3 tools/include: Sync uapi/linux/kvm.h with the kernel sources
aef21f6b6a4a tools/include: Sync uapi/drm/i915_drm.h with the kernel sources
fbc05142ccdd perf tools: Add tools/include/uapi/README
acme@roc-rk3399-pc:~/git/perf-tools$
acme@roc-rk3399-pc:~/git/perf-tools$ sudo su -
[sudo] password for acme:
root@roc-rk3399-pc:~# perf -vv
perf version 6.11.rc2.gd5b854893d27
dwarf: [ on ] # HAVE_DWARF_SUPPORT
dwarf_getlocations: [ on ] # HAVE_DWARF_GETLOCATIONS_SUPPORT
syscall_table: [ on ] # HAVE_SYSCALL_TABLE_SUPPORT
libbfd: [ OFF ] # HAVE_LIBBFD_SUPPORT
debuginfod: [ OFF ] # HAVE_DEBUGINFOD_SUPPORT
libelf: [ on ] # HAVE_LIBELF_SUPPORT
libnuma: [ on ] # HAVE_LIBNUMA_SUPPORT
numa_num_possible_cpus: [ on ] # HAVE_LIBNUMA_SUPPORT
libperl: [ on ] # HAVE_LIBPERL_SUPPORT
libpython: [ on ] # HAVE_LIBPYTHON_SUPPORT
libslang: [ on ] # HAVE_SLANG_SUPPORT
libcrypto: [ on ] # HAVE_LIBCRYPTO_SUPPORT
libunwind: [ on ] # HAVE_LIBUNWIND_SUPPORT
libdw-dwarf-unwind: [ on ] # HAVE_DWARF_SUPPORT
libcapstone: [ OFF ] # HAVE_LIBCAPSTONE_SUPPORT
zlib: [ on ] # HAVE_ZLIB_SUPPORT
lzma: [ on ] # HAVE_LZMA_SUPPORT
get_cpuid: [ on ] # HAVE_AUXTRACE_SUPPORT
bpf: [ on ] # HAVE_LIBBPF_SUPPORT
aio: [ on ] # HAVE_AIO_SUPPORT
zstd: [ on ] # HAVE_ZSTD_SUPPORT
libpfm4: [ on ] # HAVE_LIBPFM
libtraceevent: [ on ] # HAVE_LIBTRACEEVENT
bpf_skeletons: [ on ] # HAVE_BPF_SKEL
dwarf-unwind-support: [ on ] # HAVE_DWARF_UNWIND_SUPPORT
libopencsd: [ on ] # HAVE_CSTRACE_SUPPORT
root@roc-rk3399-pc:~# perf trace -e *sleep sleep 1.2345678
0.000 (1235.340 ms): sleep/8628 clock_nanosleep(rqtp: { .tv_sec: 1, .tv_nsec: 234567800 }, rmtp: 0xfffff4ae40d8) = 0
root@roc-rk3399-pc:~# strace -e bpf perf trace -e *sleep sleep 1.2345678 |& head
bpf(0x24 /* BPF_??? */, 0xffffc86fb670, 8) = -1 EINVAL (Invalid argument)
bpf(BPF_PROG_LOAD, {prog_type=BPF_PROG_TYPE_SOCKET_FILTER, insn_cnt=2, insns=0xffffc86fb420, license="GPL", log_level=0, log_size=0, log_buf=NULL, kern_version=KERNEL_VERSION(0, 0, 0), prog_flags=0, prog_name="", prog_ifindex=0, expected_attach_type=BPF_CGROUP_INET_INGRESS, prog_btf_fd=0, func_info_rec_size=0, func_info=NULL, func_info_cnt=0, line_info_rec_size=0, line_info=NULL, line_info_cnt=0, attach_btf_id=0, attach_prog_fd=0, fd_array=NULL}, 148) = 8
bpf(BPF_PROG_LOAD, {prog_type=BPF_PROG_TYPE_SOCKET_FILTER, insn_cnt=2, insns=0xffffc86fb6b8, license="GPL", log_level=0, log_size=0, log_buf=NULL, kern_version=KERNEL_VERSION(0, 0, 0), prog_flags=0, prog_name="", prog_ifindex=0, expected_attach_type=BPF_CGROUP_INET_INGRESS, prog_btf_fd=0, func_info_rec_size=0, func_info=NULL, func_info_cnt=0, line_info_rec_size=0, line_info=NULL, line_info_cnt=0, attach_btf_id=0, attach_prog_fd=0, fd_array=NULL}, 148) = 8
bpf(BPF_BTF_LOAD, {btf="\237\353\1\0\30\0\0\0\0\0\0\0000\0\0\0000\0\0\0\t\0\0\0\1\0\0\0\0\0\0\1"..., btf_log_buf=NULL, btf_size=81, btf_log_size=0, btf_log_level=0}, 40) = 8
bpf(BPF_BTF_LOAD, {btf="\237\353\1\0\30\0\0\0\0\0\0\0000\0\0\0000\0\0\0\5\0\0\0\0\0\0\0\0\0\0\1"..., btf_log_buf=NULL, btf_size=77, btf_log_size=0, btf_log_level=0}, 40) = 8
bpf(BPF_BTF_LOAD, {btf="\237\353\1\0\30\0\0\0\0\0\0\0l\0\0\0l\0\0\0\16\0\0\0\1\0\0\0\0\0\0\1"..., btf_log_buf=NULL, btf_size=146, btf_log_size=0, btf_log_level=0}, 40) = 8
bpf(BPF_PROG_LOAD, {prog_type=BPF_PROG_TYPE_SOCKET_FILTER, insn_cnt=2, insns=0xffffc86fb150, license="GPL", log_level=0, log_size=0, log_buf=NULL, kern_version=KERNEL_VERSION(0, 0, 0), prog_flags=0, prog_name="libbpf_nametest", prog_ifindex=0, expected_attach_type=BPF_CGROUP_INET_INGRESS, prog_btf_fd=0, func_info_rec_size=0, func_info=NULL, func_info_cnt=0, line_info_rec_size=0, line_info=NULL, line_info_cnt=0, attach_btf_id=0, attach_prog_fd=0, fd_array=NULL}, 148) = 9
bpf(BPF_PROG_LOAD, {prog_type=BPF_PROG_TYPE_KPROBE, insn_cnt=4, insns=0xffffc86fb4f8, license="GPL", log_level=0, log_size=0, log_buf=NULL, kern_version=KERNEL_VERSION(0, 0, 0), prog_flags=0, prog_name="det_arg_ctx", prog_ifindex=0, expected_attach_type=BPF_CGROUP_INET_INGRESS, prog_btf_fd=8, func_info_rec_size=8, func_info=0xffffc86fb4e8, func_info_cnt=2, line_info_rec_size=0, line_info=NULL, line_info_cnt=0, attach_btf_id=0, attach_prog_fd=0, fd_array=NULL}, 148) = -1 EINVAL (Invalid argument)
bpf(BPF_BTF_LOAD, {btf="\237\353\1\0\30\0\0\0\0\0\0\0\20\0\0\0\20\0\0\0\5\0\0\0\1\0\0\0\0\0\0\1"..., btf_log_buf=NULL, btf_size=45, btf_log_size=0, btf_log_level=0}, 40) = 8
bpf(BPF_BTF_LOAD, {btf="\237\353\1\0\30\0\0\0\0\0\0\0000\0\0\0000\0\0\0\t\0\0\0\1\0\0\0\0\0\0\1"..., btf_log_buf=NULL, btf_size=81, btf_log_size=0, btf_log_level=0}, 40) = 8
root@roc-rk3399-pc:~# perf trace -e open* sleep 1
0.000 ( 0.078 ms): sleep/8635 openat(dfd: CWD, filename: "/etc/ld.so.cache", flags: RDONLY|CLOEXEC) = 3
0.162 ( 0.031 ms): sleep/8635 openat(dfd: CWD, filename: "/lib/aarch64-linux-gnu/libc.so.6", flags: RDONLY|CLOEXEC) = 3
1.279 ( 0.043 ms): sleep/8635 openat(dfd: CWD, filename: "", flags: RDONLY|CLOEXEC) = -1 ENOENT (No such file or directory)
1.371 ( 0.031 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/share/locale/locale.alias", flags: RDONLY|CLOEXEC) = 3
1.542 ( 0.020 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/lib/locale/C.UTF-8/LC_IDENTIFICATION", flags: RDONLY|CLOEXEC) = -1 ENOENT (No such file or directory)
1.573 ( 0.024 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/lib/locale/C.utf8/LC_IDENTIFICATION", flags: RDONLY|CLOEXEC) = 3
1.664 ( 0.025 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/lib/aarch64-linux-gnu/gconv/gconv-modules.cache") = 3
1.782 ( 0.020 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/lib/locale/C.UTF-8/LC_MEASUREMENT", flags: RDONLY|CLOEXEC) = -1 ENOENT (No such file or directory)
1.821 ( 0.021 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/lib/locale/C.utf8/LC_MEASUREMENT", flags: RDONLY|CLOEXEC) = 3
1.909 ( 0.018 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/lib/locale/C.UTF-8/LC_TELEPHONE", flags: RDONLY|CLOEXEC) = -1 ENOENT (No such file or directory)
1.938 ( 0.019 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/lib/locale/C.utf8/LC_TELEPHONE", flags: RDONLY|CLOEXEC) = 3
2.023 ( 0.024 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/lib/locale/C.UTF-8/LC_ADDRESS", flags: RDONLY|CLOEXEC) = -1 ENOENT (No such file or directory)
2.059 ( 0.020 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/lib/locale/C.utf8/LC_ADDRESS", flags: RDONLY|CLOEXEC) = 3
2.151 ( 0.019 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/lib/locale/C.UTF-8/LC_NAME", flags: RDONLY|CLOEXEC) = -1 ENOENT (No such file or directory)
2.180 ( 0.020 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/lib/locale/C.utf8/LC_NAME", flags: RDONLY|CLOEXEC) = 3
2.279 ( 0.017 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/lib/locale/C.UTF-8/LC_PAPER", flags: RDONLY|CLOEXEC) = -1 ENOENT (No such file or directory)
2.311 ( 0.023 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/lib/locale/C.utf8/LC_PAPER", flags: RDONLY|CLOEXEC) = 3
2.420 ( 0.027 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/lib/locale/C.UTF-8/LC_MESSAGES", flags: RDONLY|CLOEXEC) = -1 ENOENT (No such file or directory)
2.460 ( 0.025 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/lib/locale/C.utf8/LC_MESSAGES", flags: RDONLY|CLOEXEC) = 3
2.514 ( 0.021 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/lib/locale/C.utf8/LC_MESSAGES/SYS_LC_MESSAGES", flags: RDONLY|CLOEXEC) = 3
2.609 ( 0.025 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/lib/locale/C.UTF-8/LC_MONETARY", flags: RDONLY|CLOEXEC) = -1 ENOENT (No such file or directory)
2.646 ( 0.022 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/lib/locale/C.utf8/LC_MONETARY", flags: RDONLY|CLOEXEC) = 3
2.741 ( 0.024 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/lib/locale/C.UTF-8/LC_COLLATE", flags: RDONLY|CLOEXEC) = -1 ENOENT (No such file or directory)
2.778 ( 0.020 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/lib/locale/C.utf8/LC_COLLATE", flags: RDONLY|CLOEXEC) = 3
2.881 ( 0.024 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/lib/locale/C.UTF-8/LC_TIME", flags: RDONLY|CLOEXEC) = -1 ENOENT (No such file or directory)
2.917 ( 0.020 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/lib/locale/C.utf8/LC_TIME", flags: RDONLY|CLOEXEC) = 3
3.013 ( 0.025 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/lib/locale/C.UTF-8/LC_NUMERIC", flags: RDONLY|CLOEXEC) = -1 ENOENT (No such file or directory)
3.050 ( 0.021 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/lib/locale/C.utf8/LC_NUMERIC", flags: RDONLY|CLOEXEC) = 3
3.138 ( 0.024 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/lib/locale/C.UTF-8/LC_CTYPE", flags: RDONLY|CLOEXEC) = -1 ENOENT (No such file or directory)
3.174 ( 0.021 ms): sleep/8635 openat(dfd: CWD, filename: "/usr/lib/locale/C.utf8/LC_CTYPE", flags: RDONLY|CLOEXEC) = 3
root@roc-rk3399-pc:~#The only problem that is outstanding is that one I need to send a patch for, 32-bit build is broken due to some trivial stuff:
18 79.36 debian:experimental : Ok gcc (Debian 14.1.0-5) 14.1.0 , Debian clang version 16.0.6 (27+b1) flex 2.6.4
19 3.96 debian:experimental-x-arm64 : FAIL gcc version 14.1.0 (Debian 14.1.0-5)
from libbpf.c:36:
/git/perf-6.11.0-rc2/tools/include/uapi/asm/bpf_perf_event.h:2:10: fatal error: ../../arch/arm64/include/uapi/asm/bpf_perf_event.h: No such file or directory
2 | #include "../../arch/arm64/include/uapi/asm/bpf_perf_event.h"
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
CC /tmp/build/perf/libbpf/staticobjs/btf_iter.o
CC /tmp/build/perf/libbpf/staticobjs/btf_relocate.o
LD /tmp/build/perf/libapi/fs/libapi-in.o
LD /tmp/build/perf/libapi/libapi-in.o
In file included from /git/perf-6.11.0-rc2/tools/include/uapi/linux/bpf_perf_event.h:11,
from libbpf.c:36:
/git/perf-6.11.0-rc2/tools/include/uapi/asm/bpf_perf_event.h:2:10: fatal error: ../../arch/arm64/include/uapi/asm/bpf_perf_event.h: No such file or directory
2 | #include "../../arch/arm64/include/uapi/asm/bpf_perf_event.h"
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
LD /tmp/build/perf/libperf/libperf-in.o
make[4]: *** [/git/perf-6.11.0-rc2/tools/build/Makefile.build:105: /tmp/build/perf/libbpf/staticobjs/libbpf.o] Error 1
make[4]: *** Waiting for unfinished jobs....
AR /tmp/build/perf/libperf/libperf.a
AR /tmp/build/perf/libapi/libapi.aAlso works on x86_64:
root@number:~# perf -v
perf version 6.11.rc2.gd5b854893d27
root@number:~#
root@number:~#
root@number:~# perf trace -e *sleep sleep 1.92837465
0.000 (1928.436 ms): sleep/158555 clock_nanosleep(rqtp: { .tv_sec: 1, .tv_nsec: 928374651 }, rmtp: 0x7ffd188426d0) = 0
root@number:~# perf trace -e *mmsg --max-events 5
0.000 ( 0.017 ms): NetworkManager/1322 recvmmsg(fd: 22, mmsg: 0x7ffe36cb6380, vlen: 8) = 1
0.048 ( 0.010 ms): NetworkManager/1322 recvmmsg(fd: 26, mmsg: 0x7ffe36cb6380, vlen: 8) = 1
1012.269 ( 0.018 ms): NetworkManager/1322 recvmmsg(fd: 22, mmsg: 0x7ffe36cb6380, vlen: 8) = 1
1012.321 ( 0.005 ms): NetworkManager/1322 recvmmsg(fd: 26, mmsg: 0x7ffe36cb6380, vlen: 8) = 1
2393.486 ( 0.029 ms): dbus-broker/2438 sendmmsg(fd: 31, mmsg: 0x7ffca4625ba0, vlen: 1, flags: DONTWAIT|NOSIGNAL) = 1
root@number:~# perf trace -e *nnect* --max-events 5
0.000 ( 0.047 ms): pool/3064 connect(fd: 7, uservaddr: { .family: LOCAL, path: /var/run/.heim_org.h5l.kcm-socket }, addrlen: 110) = 0
2694.480 ( 0.021 ms): DNS Res~ver #4/2450896 connect(fd: 242, uservaddr: { .family: LOCAL, path: /run/systemd/resolve/io.systemd.Resolve }, addrlen: 42) = 0
2694.906 ( 0.015 ms): systemd-resolv/1185 connect(fd: 25, uservaddr: { .family: INET6, port: 53, addr: fe80::1ae8:29ff:fe4c:90b0, scope_id: 3 }, addrlen: 28) = 0
2694.969 ( 0.005 ms): systemd-resolv/1185 connect(fd: 26, uservaddr: { .family: INET6, port: 53, addr: fe80::1ae8:29ff:fe4c:90b0, scope_id: 6 }, addrlen: 28) = 0
2696.329 ( 0.014 ms): DNS Res~ver #4/2450896 connect(fd: 242, uservaddr: { .family: INET6, port: 0, addr: 2800:3f0:4004:803::200e }, addrlen: 28) = 0
root@number:~# uname -a
Linux number 6.9.10-200.fc40.x86_64 #1 SMP PREEMPT_DYNAMIC Thu Jul 18 21:39:30 UTC 2024 x86_64 GNU/Linux
root@number:~#All the other container builds didn't regress.
Thanks,
- Arnaldo
Quoted 14 lines · Namhyung Kim
Hello folks,
Quoted 6 lines · Namhyung Kim
Hello,
This is the usual sync up in header files we keep in tools directory. I put a file to give the reason of this work and not to repeat it in every commit message. The changes will be carried in the perf-tools tree.
Quoted 7 lines
Could you please double check what's in the tmp.perf-tools branch at the perf-tools tree so I don't break build and perf trace for arm64, powerpc and s390? It has this patchset + arm64 unistd header revert (according to the discussion on patch 6/10) on top of v6.11-rc2.
Thanks,
Namhyung
Hi Namhyung,
Can you please point to the tree. I checked in https://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git as well as https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git , but didn’t find the changes. May be I am missing something. I am trying to check the build in powerpc.
Thanks
Athira
Quoted 42 lines
Quoted 42 lines
Namhyung Kim (10):
perf tools: Addtools/include/uapi/README
tools/include: Syncuapi/drm/i915_drm.hwith the kernel sourcestools/include: Syncuapi/linux/kvm.hwith the kernel sourcestools/include: Syncuapi/linux/perf.hwith the kernel sourcestools/include: Syncuapi/sound/asound.hwith the kernel sourcestools/include: Syncuapi/asm-generic/unistd.hwith the kernel sourcestools/include: Sync network socket headers with the kernel sourcestools/include: Sync filesystem headers with the kernel sourcestools/include: Sync x86 headers with the kernel sourcestools/include: Sync arm64 headers with the kernel sourcestools/arch/arm64/include/asm/cputype.h | 10 + tools/arch/arm64/include/uapi/asm/unistd.h | 24 +- tools/arch/powerpc/include/uapi/asm/kvm.h | 3 + tools/arch/x86/include/asm/cpufeatures.h | 803 +++++++++--------- tools/arch/x86/include/asm/msr-index.h | 11 + tools/arch/x86/include/uapi/asm/kvm.h | 49 ++ tools/arch/x86/include/uapi/asm/svm.h | 1 + tools/include/uapi/README | 73 ++ tools/include/uapi/asm-generic/unistd.h | 2 +- tools/include/uapi/drm/i915_drm.h | 27 + tools/include/uapi/linux/in.h | 2 + tools/include/uapi/linux/kvm.h | 17 +- tools/include/uapi/linux/perf_event.h | 6 +- tools/include/uapi/linux/stat.h | 12 +- .../arch/powerpc/entry/syscalls/syscall.tbl | 6 +- .../perf/arch/s390/entry/syscalls/syscall.tbl | 2 +- .../arch/x86/entry/syscalls/syscall_64.tbl | 8 +- .../perf/trace/beauty/include/linux/socket.h | 5 +- .../perf/trace/beauty/include/uapi/linux/fs.h | 163 +++- .../trace/beauty/include/uapi/linux/mount.h | 10 +- .../trace/beauty/include/uapi/linux/stat.h | 12 +- .../trace/beauty/include/uapi/sound/asound.h | 9 +- 22 files changed, 810 insertions(+), 445 deletions(-)create mode 100644
tools/include/uapi/READMESignature · 1 line
2.46.0.rc2.264.g509ed76dc8-goog
Namhyung Kim
maintainerHello,
Quoted 19 lines · Athira Rajeev
Quoted 19 lines · Namhyung Kim
Hello folks,
Quoted 6 lines · Namhyung Kim
Hello,
This is the usual sync up in header files we keep in tools directory. I put a file to give the reason of this work and not to repeat it in every commit message. The changes will be carried in the perf-tools tree.
Could you please double check what's in the tmp.perf-tools branch at the perf-tools tree so I don't break build and perf trace for arm64, powerpc and s390? It has this patchset + arm64 unistd header revert (according to the discussion on patch 6/10) on top of v6.11-rc2.
Quoted 5 lines
Quoted 2 lines
Thanks,
NamhyungHi Namhyung,
Can you please point to the tree. I checked in https://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git as well as https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git , but didn’t find the changes. May be I am missing something. I am trying to check the build in powerpc.
Oh, sorry about that. It's in:
https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools.git
(no -next at the end)
Thanks,
Namhyung
Athira Rajeev
Tested-byQuoted 28 lines · Namhyung Kim
Hello,
Quoted 21 lines · Athira Rajeev
Quoted 21 lines · Namhyung Kim
Hello folks,
Quoted 6 lines · Namhyung Kim
Hello,
This is the usual sync up in header files we keep in tools directory. I put a file to give the reason of this work and not to repeat it in every commit message. The changes will be carried in the perf-tools tree.
Could you please double check what's in the tmp.perf-tools branch at the perf-tools tree so I don't break build and perf trace for arm64, powerpc and s390? It has this patchset + arm64 unistd header revert (according to the discussion on patch 6/10) on top of v6.11-rc2.
Thanks,
Namhyung
Quoted 8 lines
Quoted 3 lines
Hi Namhyung,
Can you please point to the tree. I checked in https://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git as well as https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git , but didn’t find the changes. May be I am missing something. I am trying to check the build in powerpc.
Oh, sorry about that. It's in:
https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools.git(no -next at the end)
Hi,
I did compile test on powerpc and results are good.
Thanks
Athira
Quoted 3 lines
Thanks,
Namhyung
Namhyung Kim
maintainerQuoted 36 lines · Athira Rajeev
Quoted 36 lines · Namhyung Kim
Hello,
Quoted 19 lines · Athira Rajeev
Quoted 19 lines · Namhyung Kim
Hello folks,
Quoted 6 lines · Namhyung Kim
Hello,
This is the usual sync up in header files we keep in tools directory. I put a file to give the reason of this work and not to repeat it in every commit message. The changes will be carried in the perf-tools tree.
Could you please double check what's in the tmp.perf-tools branch at the perf-tools tree so I don't break build and perf trace for arm64, powerpc and s390? It has this patchset + arm64 unistd header revert (according to the discussion on patch 6/10) on top of v6.11-rc2.
Quoted 5 lines
Quoted 2 lines
Thanks,
NamhyungHi Namhyung,
Can you please point to the tree. I checked in https://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git as well as https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git , but didn’t find the changes. May be I am missing something. I am trying to check the build in powerpc.
Oh, sorry about that. It's in:
https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools.git
Quoted 7 lines
Quoted 1 line
(no -next at the end)
Hi,
I did compile test on powerpc and results are good.
Tested-by Athira Rajeev <[email protected]>
Thanks for doing this!
Namhyung