perf tools: Sync kernel and tools headers for v6.17
Subsystems (7)
Namhyung Kim
maintainercover perf tools: Sync kernel and tools headers for v6.17
Hello,
I'll carry these changes on the perf-tools tree to update perf tools to understand new syscalls and parameters. You can refer to README file in the tools/include/uapi directory why it's needed.
Thanks,
Namhyung
Namhyung Kim (11):
tools headers: Sync KVM headers with the kernel source tools headers: Sync linux/bits.h with the kernel source tools headers: Sync linux/cfi_types.h with the kernel source tools headers: Sync x86 headers with the kernel source tools headers: Sync arm64 headers with the kernel source tools headers: Sync powerpc headers with the kernel source tools headers: Sync syscall tables with the kernel source tools headers: Sync uapi/linux/fcntl.h with the kernel source tools headers: Sync uapi/linux/fs.h with the kernel source tools headers: Sync uapi/linux/prctl.h with the kernel source tools headers: Sync uapi/linux/vhost.h with the kernel source
tools/arch/arm64/include/asm/cputype.h | 28 ++++++ tools/arch/powerpc/include/uapi/asm/kvm.h | 13 --- tools/arch/x86/include/asm/cpufeatures.h | 10 ++- tools/arch/x86/include/asm/msr-index.h | 7 ++ tools/arch/x86/include/uapi/asm/kvm.h | 8 +- tools/include/linux/bits.h | 29 ++---- tools/include/linux/cfi_types.h | 23 +++++ tools/include/uapi/asm-generic/unistd.h | 8 +- tools/include/uapi/linux/kvm.h | 27 ++++++ .../perf/arch/arm/entry/syscalls/syscall.tbl | 2 + .../arch/mips/entry/syscalls/syscall_n64.tbl | 2 + .../arch/powerpc/entry/syscalls/syscall.tbl | 2 + .../perf/arch/s390/entry/syscalls/syscall.tbl | 2 + tools/perf/arch/sh/entry/syscalls/syscall.tbl | 2 + .../arch/sparc/entry/syscalls/syscall.tbl | 2 + .../arch/x86/entry/syscalls/syscall_32.tbl | 2 + .../arch/x86/entry/syscalls/syscall_64.tbl | 2 + .../arch/xtensa/entry/syscalls/syscall.tbl | 2 + .../trace/beauty/include/uapi/linux/fcntl.h | 18 ++++ .../perf/trace/beauty/include/uapi/linux/fs.h | 88 +++++++++++++++++++ .../trace/beauty/include/uapi/linux/prctl.h | 9 +- .../trace/beauty/include/uapi/linux/vhost.h | 35 ++++++++ tools/scripts/syscall.tbl | 2 + 23 files changed, 283 insertions(+), 40 deletions(-)
Signature · 1 line
2.51.0.261.g7ce5a0a67e-goog
Namhyung Kim
maintainerPATCH 1/11 tools headers: Sync KVM headers with the kernel source
To pick up the changes in this cset:
f55ce5a6cd33211c KVM: arm64: Expose new KVM cap for cacheable PFNMAP 28224ef02b56fcee KVM: TDX: Report supported optional TDVMCALLs in TDX capabilities 4580dbef5ce0f95a KVM: TDX: Exit to userspace for SetupEventNotifyInterrupt 25e8b1dd4883e6c2 KVM: TDX: Exit to userspace for GetTdVmCallInfo cf207eac06f661fb KVM: TDX: Handle TDG.VP.VMCALL<GetQuote>
This addresses these 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
Please see tools/include/uapi/README for further details.
--- tools/arch/x86/include/uapi/asm/kvm.h | 8 +++++++- tools/include/uapi/linux/kvm.h | 27 +++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-)
tools/arch/x86/include/uapi/asm/kvm.h +7 -1
@@ -965,7 +965,13 @@ struct kvm_tdx_cmd {struct kvm_tdx_capabilities {__u64 supported_attrs;__u64 supported_xfam; -__u64 reserved[254 ]; + +__u64 kernel_tdvmcallinfo_1_r11; +__u64 user_tdvmcallinfo_1_r11; +__u64 kernel_tdvmcallinfo_1_r12; +__u64 user_tdvmcallinfo_1_r12; + +__u64 reserved[250 ];/* Configurable CPUID bits for userspace */ struct kvm_cpuid2 cpuid;
tools/include/uapi/linux/kvm.h +27 -0
@@ -178,6 +178,7 @@ struct kvm_xen_exit {#define KVM_EXIT_NOTIFY 37#define KVM_EXIT_LOONGARCH_IOCSR 38#define KVM_EXIT_MEMORY_FAULT 39 +#define KVM_EXIT_TDX 40/* For KVM_EXIT_INTERNAL_ERROR */ /* Emulate instruction failed. */
@@ -447,6 +448,31 @@ struct kvm_run {__u64 gpa;__u64 size; } memory_fault; +/* KVM_EXIT_TDX */ +struct { +__u64 flags; +__u64 nr; +union { +struct { +__u64 ret; +__u64 data[5 ]; + } unknown; +struct { +__u64 ret; +__u64 gpa; +__u64 size; + } get_quote; +struct { +__u64 ret; +__u64 leaf; +__u64 r11, r12, r13, r14; + } get_tdvmcall_info; +struct { +__u64 ret; +__u64 vector; + } setup_event_notify; + }; + } tdx;/* Fix the size of the union. */ char padding[256 ]; };
@@ -935,6 +961,7 @@ struct kvm_enable_cap {#define KVM_CAP_ARM_EL2 240#define KVM_CAP_ARM_EL2_E2H0 241#define KVM_CAP_RISCV_MP_STATE_RESET 242 +#define KVM_CAP_ARM_CACHEABLE_PFNMAP_SUPPORTED 243struct kvm_irq_routing_irqchip {__u32 irqchip;
Signature · 1 line
2.51.0.261.g7ce5a0a67e-goog
Namhyung Kim
maintainerPATCH 2/11 tools headers: Sync linux/bits.h with the kernel source
In reply to Namhyung KimTo pick up the changes in this cset:
104ea1c84b91c9f4 bits: unify the non-asm GENMASK*() 6d4471252ccc1722 bits: split the definition of the asm and non-asm GENMASK*()
This addresses these perf build warnings:
Warning: Kernel ABI header differences:
diff -u tools/include/linux/bits.h include/linux/bits.h
Please see tools/include/uapi/README for further details.
--- tools/include/linux/bits.h | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-)
tools/include/linux/bits.h +6 -23
@@ -2,10 +2,8 @@#ifndef __LINUX_BITS_H#define __LINUX_BITS_H -#include <linux/const.h> #include <vdso/bits.h> #include <uapi/linux/bits.h> -#include <asm/bitsperlong.h> #define BIT_MASK (nr) (UL(1) << ((nr) % BITS_PER_LONG))#define BIT_WORD (nr) ((nr) / BITS_PER_LONG)
@@ -50,10 +48,14 @@ (type_max(t) << (l) & \ type_max(t) >> (BITS_PER_TYPE(t) - 1 - (h))))) +#define GENMASK (h, l) GENMASK_TYPE(unsigned long, h, l) +#define GENMASK_ULL (h, l) GENMASK_TYPE(unsigned long long, h, l) +#define GENMASK_U8 (h, l) GENMASK_TYPE(u8, h, l)#define GENMASK_U16 (h, l) GENMASK_TYPE(u16, h, l)#define GENMASK_U32 (h, l) GENMASK_TYPE(u32, h, l)#define GENMASK_U64 (h, l) GENMASK_TYPE(u64, h, l) +#define GENMASK_U128 (h, l) GENMASK_TYPE(u128, h, l)/* * Fixed-type variants of BIT(), with additional checks like GENMASK_TYPE(). The
@@ -79,28 +81,9 @@* BUILD_BUG_ON_ZERO is not available in h files included from asm files, * disable the input check if that is the case. */ -#define GENMASK_INPUT_CHECK (h, l) 0 +#define GENMASK (h, l) __GENMASK(h, l) +#define GENMASK_ULL (h, l) __GENMASK_ULL(h, l)#endif /* !defined(__ASSEMBLY__) */ -#define GENMASK (h, l) \ - (GENMASK_INPUT_CHECK(h, l) + __GENMASK(h, l)) -#define GENMASK_ULL (h, l) \ - (GENMASK_INPUT_CHECK(h, l) + __GENMASK_ULL(h, l)) - -#if !defined(__ASSEMBLY__) -/* -* Missing asm support -* -* __GENMASK_U128() depends on _BIT128() which would not work -* in the asm code, as it shifts an 'unsigned __int128' data -* type instead of direct representation of 128 bit constants -* such as long and unsigned long. The fundamental problem is -* that a 128 bit constant will get silently truncated by the -* gcc compiler. -*/ -#define GENMASK_U128 (h, l) \ - (GENMASK_INPUT_CHECK(h, l) + __GENMASK_U128(h, l)) -#endif -#endif /* __LINUX_BITS_H */
Signature · 1 line
2.51.0.261.g7ce5a0a67e-goog
Re: [PATCH 02/11] tools headers: Sync linux/bits.h with the kernel source
Quoted 7 lines · Namhyung Kim
To pick up the changes in this cset:
104ea1c84b91c9f4bits: unify the non-asm GENMASK*()6d4471252ccc1722bits: split the definition of the asm and non-asm GENMASK*()This addresses these perf build warnings:
Quoted 7 lines
Warning: Kernel ABI header differences:
diff -utools/include/linux/bits.hinclude/linux/bits.hPlease see
tools/include/uapi/READMEfor further details.Cc Yury Norov <[email protected]>Signed-off-by Namhyung Kim <[email protected]>
Namhyung Kim
maintainerPATCH 3/11 tools headers: Sync linux/cfi_types.h with the kernel source
In reply to Namhyung KimTo pick up the changes in this cset:
5ccaeedb489b41ce cfi: add C CFI type macro
This addresses these perf build warnings:
Warning: Kernel ABI header differences:
diff -u tools/include/linux/cfi_types.h include/linux/cfi_types.h
Please see tools/include/uapi/README for further details.
--- tools/include/linux/cfi_types.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
tools/include/linux/cfi_types.h +23 -0
@@ -41,5 +41,28 @@ SYM_TYPED_START(name, SYM_L_GLOBAL, SYM_A_ALIGN)#endif +#else /* __ASSEMBLY__ */ + +#ifdef CONFIG_CFI_CLANG +#define DEFINE_CFI_TYPE (name, func) \ +/* \ +* Force a reference to the function so the compiler generates \ +* __kcfi_typeid_<func>. \ +*/ \ + __ADDRESSABLE(func); \ +/* u32 name __ro_after_init = __kcfi_typeid_<func> */ \ +extern u32 name; \ + asm ( \ + " .pushsection .data..ro_after_init,\"aw\",\%progbits \n" \ + " .type " #name ",\%object \n" \ + " .globl " #name " \n" \ + " .p2align 2, 0x0 \n" \ + #name ": \n" \ + " .4byte __kcfi_typeid_" #func " \n" \ + " .size " #name ", 4 \n" \ + " .popsection \n" \ + ); +#endif +#endif /* __ASSEMBLY__ */ #endif /* _LINUX_CFI_TYPES_H */
Signature · 1 line
2.51.0.261.g7ce5a0a67e-goog
Namhyung Kim
maintainerPATCH 4/11 tools headers: Sync x86 headers with the kernel source
In reply to Namhyung KimTo pick up the changes in this cset:
7b306dfa326f7011 x86/sev: Evict cache lines during SNP memory validation 65f55a30176662ee x86/CPU/AMD: Add CPUID faulting support d8010d4ba43e9f79 x86/bugs: Add a Transient Scheduler Attacks mitigation a3c4f3396b82849a x86/msr-index: Add AMD workload classification MSRs 17ec2f965344ee3f KVM: VMX: Allow guest to set DEBUGCTL.RTM_DEBUG if RTM is supported
This addresses these 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 further details.
--- tools/arch/x86/include/asm/cpufeatures.h | 10 +++++++++- tools/arch/x86/include/asm/msr-index.h | 7 +++++++ 2 files changed, 16 insertions(+), 1 deletion(-)
tools/arch/x86/include/asm/cpufeatures.h +9 -1
@@ -218,6 +218,7 @@#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_COHERENCY_SFW_NO ( 8*32+ 4)/* SNP cache coherency software work around not needed */ #define X86_FEATURE_VMMCALL ( 8*32+15)/* "vmmcall" Prefer VMMCALL to VMCALL */ #define X86_FEATURE_XENPV ( 8*32+16)/* Xen paravirtual guest */
@@ -456,10 +457,14 @@#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_VERW_CLEAR (20*32+ 5)/* The memory form of VERW mitigates TSA */ #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_GP_ON_USER_CPUID (20*32+17)/* User CPUID faulting */ +#define X86_FEATURE_PREFETCHI (20*32+20)/* Prefetch Data/Instruction to Cache Level */ #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 */
@@ -487,6 +492,9 @@#define X86_FEATURE_PREFER_YMM (21*32+ 8)/* Avoid ZMM registers due to downclocking */ #define X86_FEATURE_APX (21*32+ 9)/* Advanced Performance Extensions */ #define X86_FEATURE_INDIRECT_THUNK_ITS (21*32+10)/* Use thunk for indirect branches in lower half of cacheline */ +#define X86_FEATURE_TSA_SQ_NO (21*32+11)/* AMD CPU not vulnerable to TSA-SQ */ +#define X86_FEATURE_TSA_L1_NO (21*32+12)/* AMD CPU not vulnerable to TSA-L1 */ +#define X86_FEATURE_CLEAR_CPU_BUF_VM (21*32+13)/* Clear CPU buffers using VERW before VMRUN */ /* * BUG word(s)
@@ -542,5 +550,5 @@#define X86_BUG_OLD_MICROCODE X86_BUG( 1*32+ 6)/* "old_microcode" CPU has old microcode, it is surely vulnerable to something */ #define X86_BUG_ITS X86_BUG( 1*32+ 7)/* "its" CPU is affected by Indirect Target Selection */ #define X86_BUG_ITS_NATIVE_ONLY X86_BUG( 1*32+ 8)/* "its_native_only" CPU is affected by ITS, VMX is not affected */ - +#define X86_BUG_TSA X86_BUG( 1*32+ 9)/* "tsa" CPU is affected by Transient Scheduler Attacks */ #endif /* _ASM_X86_CPUFEATURES_H */
tools/arch/x86/include/asm/msr-index.h +7 -0
@@ -419,6 +419,7 @@#define DEBUGCTLMSR_FREEZE_PERFMON_ON_PMI (1UL << 12)#define DEBUGCTLMSR_FREEZE_IN_SMM_BIT 14#define DEBUGCTLMSR_FREEZE_IN_SMM (1UL << DEBUGCTLMSR_FREEZE_IN_SMM_BIT) +#define DEBUGCTLMSR_RTM_DEBUG BIT(15)#define MSR_PEBS_FRONTEND 0x000003f7
@@ -733,6 +734,11 @@#define MSR_AMD64_PERF_CNTR_GLOBAL_CTL 0xc0000301#define MSR_AMD64_PERF_CNTR_GLOBAL_STATUS_CLR 0xc0000302 +/* AMD Hardware Feedback Support MSRs */ +#define MSR_AMD_WORKLOAD_CLASS_CONFIG 0xc0000500 +#define MSR_AMD_WORKLOAD_CLASS_ID 0xc0000501 +#define MSR_AMD_WORKLOAD_HRST 0xc0000502 +/* AMD Last Branch Record MSRs */ #define MSR_AMD64_LBR_SELECT 0xc000010e
@@ -831,6 +837,7 @@#define MSR_K7_HWCR_SMMLOCK BIT_ULL(MSR_K7_HWCR_SMMLOCK_BIT)#define MSR_K7_HWCR_IRPERF_EN_BIT 30#define MSR_K7_HWCR_IRPERF_EN BIT_ULL(MSR_K7_HWCR_IRPERF_EN_BIT) +#define MSR_K7_HWCR_CPUID_USER_DIS_BIT 35#define MSR_K7_FID_VID_CTL 0xc0010041#define MSR_K7_FID_VID_STATUS 0xc0010042#define MSR_K7_HWCR_CPB_DIS_BIT 25
Signature · 1 line
2.51.0.261.g7ce5a0a67e-goog
Namhyung Kim
maintainerPATCH 5/11 tools headers: Sync arm64 headers with the kernel source
In reply to Namhyung KimTo pick up the changes in this cset:
efe676a1a7554219 arm64: proton-pack: Add new CPUs 'k' values for branch mitigation e18c09b204e81702 arm64: Add support for HIP09 Spectre-BHB mitigation a9b5bd81b294d30a arm64: cputype: Add MIDR_CORTEX_A76AE 53a52a0ec7680287 arm64: cputype: Add comments about Qualcomm Kryo 5XX and 6XX cores 401c3333bb2396aa arm64: cputype: Add QCOM_CPU_PART_KRYO_3XX_GOLD 86edf6bdcf0571c0 smccc/kvm_guest: Enable errata based on implementation CPUs 0bc9a9e85fcf4ffb KVM: arm64: Work around x1e's CNTVOFF_EL2 bogosity
This addresses these perf build warnings:
Warning: Kernel ABI header differences:
diff -u tools/arch/arm64/include/asm/cputype.h arch/arm64/include/asm/cputype.h
But the following two changes cannot be applied since they introduced new build errors in util/arm-spe.c. So it still has the warning after this change.
c8c2647e69bedf80 arm64: Make _midr_in_range_list() an exported function e3121298c7fcaf48 arm64: Modify _midr_range() functions to read MIDR/REVIDR internally
Please see tools/include/uapi/README for further details.
perf build: [WIP] Fix arm-spe build errors
--- tools/arch/arm64/include/asm/cputype.h | 28 ++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
tools/arch/arm64/include/asm/cputype.h +28 -0
@@ -75,11 +75,13 @@#define ARM_CPU_PART_CORTEX_A76 0xD0B#define ARM_CPU_PART_NEOVERSE_N1 0xD0C#define ARM_CPU_PART_CORTEX_A77 0xD0D +#define ARM_CPU_PART_CORTEX_A76AE 0xD0E#define ARM_CPU_PART_NEOVERSE_V1 0xD40#define ARM_CPU_PART_CORTEX_A78 0xD41#define ARM_CPU_PART_CORTEX_A78AE 0xD42#define ARM_CPU_PART_CORTEX_X1 0xD44#define ARM_CPU_PART_CORTEX_A510 0xD46 +#define ARM_CPU_PART_CORTEX_X1C 0xD4C#define ARM_CPU_PART_CORTEX_A520 0xD80#define ARM_CPU_PART_CORTEX_A710 0xD47#define ARM_CPU_PART_CORTEX_A715 0xD4D
@@ -119,9 +121,11 @@#define QCOM_CPU_PART_KRYO 0x200#define QCOM_CPU_PART_KRYO_2XX_GOLD 0x800#define QCOM_CPU_PART_KRYO_2XX_SILVER 0x801 +#define QCOM_CPU_PART_KRYO_3XX_GOLD 0x802#define QCOM_CPU_PART_KRYO_3XX_SILVER 0x803#define QCOM_CPU_PART_KRYO_4XX_GOLD 0x804#define QCOM_CPU_PART_KRYO_4XX_SILVER 0x805 +#define QCOM_CPU_PART_ORYON_X1 0x001#define NVIDIA_CPU_PART_DENVER 0x003#define NVIDIA_CPU_PART_CARMEL 0x004
@@ -129,6 +133,7 @@#define FUJITSU_CPU_PART_A64FX 0x001#define HISI_CPU_PART_TSV110 0xD01 +#define HISI_CPU_PART_HIP09 0xD02#define HISI_CPU_PART_HIP12 0xD06#define APPLE_CPU_PART_M1_ICESTORM 0x022
@@ -159,11 +164,13 @@#define MIDR_CORTEX_A76 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A76)#define MIDR_NEOVERSE_N1 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_N1)#define MIDR_CORTEX_A77 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A77) +#define MIDR_CORTEX_A76AE MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A76AE)#define MIDR_NEOVERSE_V1 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_V1)#define MIDR_CORTEX_A78 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A78)#define MIDR_CORTEX_A78AE MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A78AE)#define MIDR_CORTEX_X1 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X1)#define MIDR_CORTEX_A510 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A510) +#define MIDR_CORTEX_X1C MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X1C)#define MIDR_CORTEX_A520 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A520)#define MIDR_CORTEX_A710 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A710)#define MIDR_CORTEX_A715 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A715)
@@ -196,13 +203,26 @@#define MIDR_QCOM_KRYO MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_KRYO)#define MIDR_QCOM_KRYO_2XX_GOLD MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_KRYO_2XX_GOLD)#define MIDR_QCOM_KRYO_2XX_SILVER MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_KRYO_2XX_SILVER) +#define MIDR_QCOM_KRYO_3XX_GOLD MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_KRYO_3XX_GOLD)#define MIDR_QCOM_KRYO_3XX_SILVER MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_KRYO_3XX_SILVER)#define MIDR_QCOM_KRYO_4XX_GOLD MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_KRYO_4XX_GOLD)#define MIDR_QCOM_KRYO_4XX_SILVER MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_KRYO_4XX_SILVER) +#define MIDR_QCOM_ORYON_X1 MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_ORYON_X1) + +/* +* NOTES: +* - Qualcomm Kryo 5XX Prime / Gold ID themselves as MIDR_CORTEX_A77 +* - Qualcomm Kryo 5XX Silver IDs itself as MIDR_QCOM_KRYO_4XX_SILVER +* - Qualcomm Kryo 6XX Prime IDs itself as MIDR_CORTEX_X1 +* - Qualcomm Kryo 6XX Gold IDs itself as ARM_CPU_PART_CORTEX_A78 +* - Qualcomm Kryo 6XX Silver IDs itself as MIDR_CORTEX_A55 +*/ +#define MIDR_NVIDIA_DENVER MIDR_CPU_MODEL(ARM_CPU_IMP_NVIDIA, NVIDIA_CPU_PART_DENVER)#define MIDR_NVIDIA_CARMEL MIDR_CPU_MODEL(ARM_CPU_IMP_NVIDIA, NVIDIA_CPU_PART_CARMEL)#define MIDR_FUJITSU_A64FX MIDR_CPU_MODEL(ARM_CPU_IMP_FUJITSU, FUJITSU_CPU_PART_A64FX)#define MIDR_HISI_TSV110 MIDR_CPU_MODEL(ARM_CPU_IMP_HISI, HISI_CPU_PART_TSV110) +#define MIDR_HISI_HIP09 MIDR_CPU_MODEL(ARM_CPU_IMP_HISI, HISI_CPU_PART_HIP09)#define MIDR_HISI_HIP12 MIDR_CPU_MODEL(ARM_CPU_IMP_HISI, HISI_CPU_PART_HIP12)#define MIDR_APPLE_M1_ICESTORM MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_ICESTORM)#define MIDR_APPLE_M1_FIRESTORM MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM)
@@ -291,6 +311,14 @@ static inline u32 __attribute_const__ read_cpuid_id(void)return read_cpuid (MIDR_EL1 ); } +struct target_impl_cpu { +u64 midr; +u64 revidr; +u64 aidr; +}; + +bool cpu_errata_set_target_impl (u64 num,void *impl_cpus); + static inline u64 __attribute_const__ read_cpuid_mpidr(void) {return read_cpuid (MPIDR_EL1 );
Signature · 1 line
2.51.0.261.g7ce5a0a67e-goog
Re: [PATCH 05/11] tools headers: Sync arm64 headers with the kernel source
On Mon, Aug 25, 2025 at 02:58:57PM -0700, Namhyung Kim wrote:
[...]
Quoted 6 lines
But the following two changes cannot be applied since they introduced new build errors in
util/arm-spe.c. So it still has the warning after this change.
c8c2647e69bedf80arm64: Make _midr_in_range_list() an exported functione3121298c7fcaf48arm64: Modify_midr_range()functions to read MIDR/REVIDR internally
Hi Namhyung,
Thanks for working on this. It is on our todo list for automatic generating MIDR. Sorry for any troubling during the syncing.
Just a minor comment below.
[...]
tools/arch/arm64/include/asm/cputype.h static inline u32 __attribute_const__ read_cpuid_id(void) · line 321
Quoted 8 lines
tools/arch/arm64/include/asm/cputype.h +8
-0+struct target_impl_cpu { +u64 midr; +u64 revidr; +u64 aidr; +}; + +bool cpu_errata_set_target_impl (u64 num,void *impl_cpus); +
Currently, no one uses this API. It seems to me that we don't need to sync this code chunk.
Otherwise, other changes LGTM.
Thanks,
Leo
Namhyung Kim
maintainerRe: [PATCH 05/11] tools headers: Sync arm64 headers with the kernel source
Hi Leo,
Quoted 8 lines · Leo Yan
On Mon, Aug 25, 2025 at 02:58:57PM -0700, Namhyung Kim wrote:
[...]
Quoted 4 lines
But the following two changes cannot be applied since they introduced new build errors in
util/arm-spe.c. So it still has the warning after this change.
Quoted 7 lines
Quoted 2 lines
c8c2647e69bedf80arm64: Make _midr_in_range_list() an exported functione3121298c7fcaf48arm64: Modify_midr_range()functions to read MIDR/REVIDR internallyHi Namhyung,
Thanks for working on this. It is on our todo list for automatic generating MIDR. Sorry for any troubling during the syncing.
No worries, and thanks for your review. I'm glad you noticed the issue and have it in you TODO list. :)
Quoted 5 lines
Just a minor comment below.
[...]
Quoted 11 lines
tools/arch/arm64/include/asm/cputype.h static inline u32 __attribute_const__ read_cpuid_id(void) · line 321
Quoted 8 lines
tools/arch/arm64/include/asm/cputype.h +8
-0+struct target_impl_cpu { +u64 midr; +u64 revidr; +u64 aidr; +}; + +bool cpu_errata_set_target_impl (u64 num,void *impl_cpus); +Currently, no one uses this API. It seems to me that we don't need to sync this code chunk.
Ok, but it'd be easier for me just to have the change anyway.
Quoted 2 lines
Otherwise, other changes LGTM.
Thanks,
Namhyung
Namhyung Kim
maintainerPATCH 6/11 tools headers: Sync powerpc headers with the kernel source
In reply to Namhyung KimTo pick up the changes in this cset:
69bf2053608423cb powerpc: Drop GPL boilerplate text with obsolete FSF address
This addresses these perf build warnings:
Warning: Kernel ABI header differences:
diff -u tools/arch/powerpc/include/uapi/asm/kvm.h arch/powerpc/include/uapi/asm/kvm.h
Please see tools/include/uapi/README for further details.
--- tools/arch/powerpc/include/uapi/asm/kvm.h | 13 ------------- 1 file changed, 13 deletions(-)
tools/arch/powerpc/include/uapi/asm/kvm.h +0 -13
@@ -1,18 +1,5 @@/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* -* 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, write to the Free Software -* Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -* * Copyright IBM Corp. 2007 * * Authors: Hollis Blanchard <[email protected]>
Signature · 1 line
2.51.0.261.g7ce5a0a67e-goog
Re: [PATCH 06/11] tools headers: Sync powerpc headers with the kernel source
Quoted 11 lines · Namhyung Kim
To pick up the changes in this cset:
69bf2053608423cbpowerpc: Drop GPL boilerplate text with obsolete FSF addressThis addresses these perf build warnings:
Warning: Kernel ABI header differences:
diff -utools/arch/powerpc/include/uapi/asm/kvm.harch/powerpc/include/uapi/asm/kvm.hPlease see
tools/include/uapi/READMEfor further details.
Nice catch. I missed to remove in tools side. My bad. Thanks for fixing.
Quoted 30 lines
Cc Madhavan Srinivasan <[email protected]>Signed-off-by Namhyung Kim <[email protected]>--- tools/arch/powerpc/include/uapi/asm/kvm.h | 13 ------------- 1 file changed, 13 deletions(-)tools/arch/powerpc/include/uapi/asm/kvm.h +0
-13@@ -1,18 +1,5 @@/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* -* 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, write to the Free Software -* Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -* * Copyright IBM Corp. 2007 * * Authors: Hollis Blanchard <[email protected]>
Namhyung Kim
maintainerPATCH 7/11 tools headers: Sync syscall tables with the kernel source
In reply to Namhyung KimTo pick up the changes in this cset:
be7efb2d20d67f33 fs: introduce file_getattr and file_setattr syscalls
This addresses these perf build warnings:
Warning: Kernel ABI header differences:
diff -u tools/include/uapi/asm-generic/unistd.h include/uapi/asm-generic/unistd.h diff -u tools/scripts/syscall.tbl scripts/syscall.tbl
diff -u tools/perf/arch/x86/entry/syscalls/syscall_32.tbl arch/x86/entry/syscalls/syscall_32.tbl 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 diff -u tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl arch/mips/kernel/syscalls/syscall_n64.tbl diff -u tools/perf/arch/arm/entry/syscalls/syscall.tbl arch/arm/tools/syscall.tbl diff -u tools/perf/arch/sh/entry/syscalls/syscall.tbl arch/sh/kernel/syscalls/syscall.tbl diff -u tools/perf/arch/sparc/entry/syscalls/syscall.tbl arch/sparc/kernel/syscalls/syscall.tbl diff -u tools/perf/arch/xtensa/entry/syscalls/syscall.tbl arch/xtensa/kernel/syscalls/syscall.tbl
Please see tools/include/uapi/README for further details.
--- tools/include/uapi/asm-generic/unistd.h | 8 +++++++- tools/perf/arch/arm/entry/syscalls/syscall.tbl | 2 ++ tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl | 2 ++ tools/perf/arch/powerpc/entry/syscalls/syscall.tbl | 2 ++ tools/perf/arch/s390/entry/syscalls/syscall.tbl | 2 ++ tools/perf/arch/sh/entry/syscalls/syscall.tbl | 2 ++ tools/perf/arch/sparc/entry/syscalls/syscall.tbl | 2 ++ tools/perf/arch/x86/entry/syscalls/syscall_32.tbl | 2 ++ tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 2 ++ tools/perf/arch/xtensa/entry/syscalls/syscall.tbl | 2 ++ tools/scripts/syscall.tbl | 2 ++ 11 files changed, 27 insertions(+), 1 deletion(-)
tools/include/uapi/asm-generic/unistd.h +7 -1
@@ -852,8 +852,14 @@ __SYSCALL(__NR_removexattrat, sys_removexattrat)#define __NR_open_tree_attr 467__SYSCALL (__NR_open_tree_attr, sys_open_tree_attr) +/* fs/inode.c */ +#define __NR_file_getattr 468 +__SYSCALL(__NR_file_getattr, sys_file_getattr) +#define __NR_file_setattr 469 +__SYSCALL(__NR_file_setattr, sys_file_setattr) +#undef __NR_syscalls -#define __NR_syscalls 468 +#define __NR_syscalls 470/* * 32 bit systems traditionally used different
tools/perf/arch/arm/entry/syscalls/syscall.tbl +2 -0
@@ -482,3 +482,5 @@ 465 common listxattrat sys_listxattrat 466 common removexattrat sys_removexattrat 467 common open_tree_attr sys_open_tree_attr +468 common file_getattr sys_file_getattr +469 common file_setattr sys_file_setattr
tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl +2 -0
@@ -382,3 +382,5 @@ 465 n64 listxattrat sys_listxattrat 466 n64 removexattrat sys_removexattrat 467 n64 open_tree_attr sys_open_tree_attr +468 n64 file_getattr sys_file_getattr +469 n64 file_setattr sys_file_setattr
tools/perf/arch/powerpc/entry/syscalls/syscall.tbl +2 -0
@@ -558,3 +558,5 @@ 465 common listxattrat sys_listxattrat 466 common removexattrat sys_removexattrat 467 common open_tree_attr sys_open_tree_attr +468 common file_getattr sys_file_getattr +469 common file_setattr sys_file_setattr
tools/perf/arch/s390/entry/syscalls/syscall.tbl +2 -0
@@ -470,3 +470,5 @@ 465 common listxattrat sys_listxattrat sys_listxattrat 466 common removexattrat sys_removexattrat sys_removexattrat 467 common open_tree_attr sys_open_tree_attr sys_open_tree_attr +468 common file_getattr sys_file_getattr sys_file_getattr +469 common file_setattr sys_file_setattr sys_file_setattr
tools/perf/arch/sh/entry/syscalls/syscall.tbl +2 -0
@@ -471,3 +471,5 @@ 465 common listxattrat sys_listxattrat 466 common removexattrat sys_removexattrat 467 common open_tree_attr sys_open_tree_attr +468 common file_getattr sys_file_getattr +469 common file_setattr sys_file_setattr
tools/perf/arch/sparc/entry/syscalls/syscall.tbl +2 -0
@@ -513,3 +513,5 @@ 465 common listxattrat sys_listxattrat 466 common removexattrat sys_removexattrat 467 common open_tree_attr sys_open_tree_attr +468 common file_getattr sys_file_getattr +469 common file_setattr sys_file_setattr
tools/perf/arch/x86/entry/syscalls/syscall_32.tbl +2 -0
@@ -473,3 +473,5 @@ 465 i386 listxattrat sys_listxattrat 466 i386 removexattrat sys_removexattrat 467 i386 open_tree_attr sys_open_tree_attr +468 i386 file_getattr sys_file_getattr +469 i386 file_setattr sys_file_setattr
tools/perf/arch/x86/entry/syscalls/syscall_64.tbl +2 -0
@@ -391,6 +391,8 @@ 465 common listxattrat sys_listxattrat 466 common removexattrat sys_removexattrat 467 common open_tree_attr sys_open_tree_attr +468 common file_getattr sys_file_getattr +469 common file_setattr sys_file_setattr # # Due to a historical design error, certain syscalls are numbered differently
tools/perf/arch/xtensa/entry/syscalls/syscall.tbl +2 -0
@@ -438,3 +438,5 @@ 465 common listxattrat sys_listxattrat 466 common removexattrat sys_removexattrat 467 common open_tree_attr sys_open_tree_attr +468 common file_getattr sys_file_getattr +469 common file_setattr sys_file_setattr
tools/scripts/syscall.tbl +2 -0
@@ -408,3 +408,5 @@ 465 common listxattrat sys_listxattrat 466 common removexattrat sys_removexattrat 467 common open_tree_attr sys_open_tree_attr +468 common file_getattr sys_file_getattr +469 common file_setattr sys_file_setattr
Signature · 1 line
2.51.0.261.g7ce5a0a67e-goog
Namhyung Kim
maintainerPATCH 8/11 tools headers: Sync uapi/linux/fcntl.h with the kernel source
In reply to Namhyung KimTo pick up the changes in this cset:
3941e37f62fe2c3c uapi/fcntl: add FD_PIDFS_ROOT cd5d2006327b6d84 uapi/fcntl: add FD_INVALID 67fcec2919e4ed31 fcntl/pidfd: redefine PIDFD_SELF_THREAD_GROUP a4c746f06853f91d uapi/fcntl: mark range as reserved
This addresses these perf build warnings:
Warning: Kernel ABI header differences:
diff -u tools/perf/trace/beauty/include/uapi/linux/fcntl.h include/uapi/linux/fcntl.h
Please see tools/include/uapi/README for further details.
--- .../trace/beauty/include/uapi/linux/fcntl.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
tools/perf/trace/beauty/include/uapi/linux/fcntl.h +18 -0
@@ -90,10 +90,28 @@#define DN_ATTRIB 0x00000020/* File changed attibutes */ #define DN_MULTISHOT 0x80000000/* Don't remove notifier */ +/* Reserved kernel ranges [-100], [-10000, -40000]. */ #define AT_FDCWD -100/* Special value for dirfd used to indicate openat should use the current working directory. */ +/* +* The concept of process and threads in userland and the kernel is a confusing +* one - within the kernel every thread is a 'task' with its own individual PID, +* however from userland's point of view threads are grouped by a single PID, +* which is that of the 'thread group leader', typically the first thread +* spawned. +* +* To cut the Gideon knot, for internal kernel usage, we refer to +* PIDFD_SELF_THREAD to refer to the current thread (or task from a kernel +* perspective), and PIDFD_SELF_THREAD_GROUP to refer to the current thread +* group leader... +*/ +#define PIDFD_SELF_THREAD -10000/* Current thread. */ +#define PIDFD_SELF_THREAD_GROUP -10001/* Current thread group leader. */ + +#define FD_PIDFS_ROOT -10002/* Root of the pidfs filesystem */ +#define FD_INVALID -10009/* Invalid file descriptor: -10000 - EBADF = -10009 */ /* Generic flags for the *at(2) family of syscalls. */
Signature · 1 line
2.51.0.261.g7ce5a0a67e-goog
Namhyung Kim
maintainerPATCH 9/11 tools headers: Sync uapi/linux/fs.h with the kernel source
In reply to Namhyung KimTo pick up the changes in this cset:
76fdb7eb4e1c9108 uapi: export PROCFS_ROOT_INO
ca115d7e754691c0 tree-wide: s/struct fileattr/struct file_kattr/g be7efb2d20d67f33 fs: introduce file_getattr and file_setattr syscalls 9eb22f7fedfc9eb1 fs: add ioctl to query metadata and protection info capabilities
This addresses these perf build warnings:
Warning: Kernel ABI header differences:
diff -u tools/perf/trace/beauty/include/uapi/linux/fs.h include/uapi/linux/fs.h
Please see tools/include/uapi/README for further details.
--- .../perf/trace/beauty/include/uapi/linux/fs.h | 88 +++++++++++++++++++ 1 file changed, 88 insertions(+)
tools/perf/trace/beauty/include/uapi/linux/fs.h +88 -0
@@ -60,6 +60,17 @@#define RENAME_EXCHANGE (1 << 1)/* Exchange source and dest */ #define RENAME_WHITEOUT (1 << 2)/* Whiteout source */ +/* +* The root inode of procfs is guaranteed to always have the same inode number. +* For programs that make heavy use of procfs, verifying that the root is a +* real procfs root and using openat2(RESOLVE_{NO_{XDEV,MAGICLINKS},BENEATH}) +* will allow you to make sure you are never tricked into operating on the +* wrong procfs file. +*/ +enum procfs_ino { +PROCFS_ROOT_INO =1 , +}; +struct file_clone_range {__s64 src_fd;__u64 src_offset;
@@ -91,6 +102,63 @@ struct fs_sysfs_path {__u8 name[128 ]; }; +/* Protection info capability flags */ +#define LBMD_PI_CAP_INTEGRITY (1 << 0) +#define LBMD_PI_CAP_REFTAG (1 << 1) + +/* Checksum types for Protection Information */ +#define LBMD_PI_CSUM_NONE 0 +#define LBMD_PI_CSUM_IP 1 +#define LBMD_PI_CSUM_CRC16_T10DIF 2 +#define LBMD_PI_CSUM_CRC64_NVME 4 + +/* sizeof first published struct */ +#define LBMD_SIZE_VER0 16 + +/* +* Logical block metadata capability descriptor +* If the device does not support metadata, all the fields will be zero. +* Applications must check lbmd_flags to determine whether metadata is +* supported or not. +*/ +struct logical_block_metadata_cap { +/* Bitmask of logical block metadata capability flags */ +__u32 lbmd_flags; +/* +* The amount of data described by each unit of logical block +* metadata +*/ +__u16 lbmd_interval; +/* +* Size in bytes of the logical block metadata associated with each +* interval +*/ +__u8 lbmd_size; +/* +* Size in bytes of the opaque block tag associated with each +* interval +*/ +__u8 lbmd_opaque_size; +/* +* Offset in bytes of the opaque block tag within the logical block +* metadata +*/ +__u8 lbmd_opaque_offset; +/* Size in bytes of the T10 PI tuple associated with each interval */ +__u8 lbmd_pi_size; +/* Offset in bytes of T10 PI tuple within the logical block metadata */ +__u8 lbmd_pi_offset; +/* T10 PI guard tag type */ +__u8 lbmd_guard_tag_type; +/* Size in bytes of the T10 PI application tag */ +__u8 lbmd_app_tag_size; +/* Size in bytes of the T10 PI reference tag */ +__u8 lbmd_ref_tag_size; +/* Size in bytes of the T10 PI storage tag */ +__u8 lbmd_storage_tag_size; +__u8 pad; +}; +/* extent-same (dedupe) ioctls; these MUST match the btrfs ioctl definitions */ #define FILE_DEDUPE_RANGE_SAME 0#define FILE_DEDUPE_RANGE_DIFFERS 1
@@ -148,6 +216,24 @@ struct fsxattr {unsigned char fsx_pad[8 ]; }; +/* +* Variable size structure for file_[sg]et_attr(). +* +* Note. This is alternative to the structure 'struct file_kattr'/'struct fsxattr'. +* As this structure is passed to/from userspace with its size, this can +* be versioned based on the size. +*/ +struct file_attr { +__u64 fa_xflags;/* xflags field value (get/set) */ +__u32 fa_extsize;/* extsize field value (get/set)*/ +__u32 fa_nextents;/* nextents field value (get) */ +__u32 fa_projid;/* project identifier (get/set) */ +__u32 fa_cowextsize;/* CoW extsize field value (get/set) */ +}; + +#define FILE_ATTR_SIZE_VER0 24 +#define FILE_ATTR_SIZE_LATEST FILE_ATTR_SIZE_VER0 +/* * Flags for the fsx_xflags field */
@@ -247,6 +333,8 @@ struct fsxattr {* also /sys/kernel/debug/ for filesystems with debugfs exports */ #define FS_IOC_GETFSSYSFSPATH _IOR(0x15, 1, struct fs_sysfs_path) +/* Get logical block metadata capability details */ +#define FS_IOC_GETLBMD_CAP _IOWR(0x15, 2, struct logical_block_metadata_cap)/* * Inode flags (FS_IOC_GETFLAGS / FS_IOC_SETFLAGS)
Signature · 1 line
2.51.0.261.g7ce5a0a67e-goog
Namhyung Kim
maintainerPATCH 10/11 tools headers: Sync uapi/linux/prctl.h with the kernel source
In reply to Namhyung KimTo pick up the changes in this cset:
b1fabef37bd504f3 prctl: Introduce PR_MTE_STORE_ONLY a2fc422ed75748ee syscall_user_dispatch: Add PR_SYS_DISPATCH_INCLUSIVE_ON
This addresses these perf build warnings:
Warning: Kernel ABI header differences:
diff -u tools/perf/trace/beauty/include/uapi/linux/prctl.h include/uapi/linux/prctl.h
Please see tools/include/uapi/README for further details.
--- tools/perf/trace/beauty/include/uapi/linux/prctl.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
tools/perf/trace/beauty/include/uapi/linux/prctl.h +8 -1
@@ -244,6 +244,8 @@ struct prctl_mm_map {# define PR_MTE_TAG_MASK (0xffffUL << PR_MTE_TAG_SHIFT)/* Unused; kept only for source compatibility */ # define PR_MTE_TCF_SHIFT 1 +/* MTE tag check store only */ +# define PR_MTE_STORE_ONLY (1UL << 19)/* RISC-V pointer masking tag length */ # define PR_PMLEN_SHIFT 24# define PR_PMLEN_MASK (0x7fUL << PR_PMLEN_SHIFT)
@@ -255,7 +257,12 @@ struct prctl_mm_map {/* Dispatch syscalls to a userspace handler */ #define PR_SET_SYSCALL_USER_DISPATCH 59# define PR_SYS_DISPATCH_OFF 0 -# define PR_SYS_DISPATCH_ON 1 +/* Enable dispatch except for the specified range */ +# define PR_SYS_DISPATCH_EXCLUSIVE_ON 1 +/* Enable dispatch for the specified range */ +# define PR_SYS_DISPATCH_INCLUSIVE_ON 2 +/* Legacy name for backwards compatibility */ +# define PR_SYS_DISPATCH_ON PR_SYS_DISPATCH_EXCLUSIVE_ON/* The control values for the user space selector when dispatch is enabled */ # define SYSCALL_DISPATCH_FILTER_ALLOW 0# define SYSCALL_DISPATCH_FILTER_BLOCK 1
Signature · 1 line
2.51.0.261.g7ce5a0a67e-goog
Namhyung Kim
maintainerPATCH 11/11 tools headers: Sync uapi/linux/vhost.h with the kernel source
In reply to Namhyung KimTo pick up the changes in this cset:
7d9896e9f6d02d8a vhost: Reintroduce kthread API and add mode selection 333c515d189657c9 vhost-net: allow configuring extended features
This addresses these perf build warnings:
Warning: Kernel ABI header differences:
diff -u tools/perf/trace/beauty/include/uapi/linux/vhost.h include/uapi/linux/vhost.h
Please see tools/include/uapi/README for further details.
---
* This is on top of the fix below:
https://lore.kernel.org/r/[email protected]
.../trace/beauty/include/uapi/linux/vhost.h | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+)
tools/perf/trace/beauty/include/uapi/linux/vhost.h +35 -0
@@ -235,4 +235,39 @@*/ #define VHOST_VDPA_GET_VRING_SIZE _IOWR(VHOST_VIRTIO, 0x82, \ struct vhost_vring_state) + +/* Extended features manipulation */ +#define VHOST_GET_FEATURES_ARRAY _IOR(VHOST_VIRTIO, 0x83, \ + struct vhost_features_array) +#define VHOST_SET_FEATURES_ARRAY _IOW(VHOST_VIRTIO, 0x83, \ + struct vhost_features_array) + +/* fork_owner values for vhost */ +#define VHOST_FORK_OWNER_KTHREAD 0 +#define VHOST_FORK_OWNER_TASK 1 + +/** +* VHOST_SET_FORK_FROM_OWNER - Set the fork_owner flag for the vhost device, +* This ioctl must called before VHOST_SET_OWNER. +* Only available when CONFIG_VHOST_ENABLE_FORK_OWNER_CONTROL=y +* +* @param fork_owner: An 8-bit value that determines the vhost thread mode +* +* When fork_owner is set to VHOST_FORK_OWNER_TASK(default value): +* - Vhost will create vhost worker as tasks forked from the owner, +* inheriting all of the owner's attributes. +* +* When fork_owner is set to VHOST_FORK_OWNER_KTHREAD: +* - Vhost will create vhost workers as kernel threads. +*/ +#define VHOST_SET_FORK_FROM_OWNER _IOW(VHOST_VIRTIO, 0x84, __u8) + +/** +* VHOST_GET_FORK_OWNER - Get the current fork_owner flag for the vhost device. +* Only available when CONFIG_VHOST_ENABLE_FORK_OWNER_CONTROL=y +* +* @return: An 8-bit value indicating the current thread mode. +*/ +#define VHOST_GET_FORK_FROM_OWNER _IOR(VHOST_VIRTIO, 0x85, __u8) +#endif
Signature · 1 line
2.51.0.261.g7ce5a0a67e-goog
Re: [PATCH 11/11] tools headers: Sync uapi/linux/vhost.h with the kernel source
Quoted 10 lines · Namhyung Kim
To pick up the changes in this cset:
7d9896e9f6d02d8avhost: Reintroduce kthread API and add mode selection333c515d189657c9vhost-net: allow configuring extended featuresThis addresses these perf build warnings:
Warning: Kernel ABI header differences:
diff -utools/perf/trace/beauty/include/uapi/linux/vhost.hinclude/uapi/linux/vhost.h
Quoted 7 lines
Please see
tools/include/uapi/READMEfor further details.Cc "Michael S. Tsirkin" <[email protected]>Cc Jason Wang <[email protected]>Signed-off-by Namhyung Kim <[email protected]>
Should I queue it?
Quoted 53 lines
---
* This is on top of the fix below:
https://lore.kernel.org/r/[email protected].../trace/beauty/include/uapi/linux/vhost.h | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+)tools/perf/trace/beauty/include/uapi/linux/vhost.h +35
-0@@ -235,4 +235,39 @@*/ #define VHOST_VDPA_GET_VRING_SIZE _IOWR(VHOST_VIRTIO, 0x82, \ struct vhost_vring_state) + +/* Extended features manipulation */ +#define VHOST_GET_FEATURES_ARRAY _IOR(VHOST_VIRTIO, 0x83, \ + struct vhost_features_array) +#define VHOST_SET_FEATURES_ARRAY _IOW(VHOST_VIRTIO, 0x83, \ + struct vhost_features_array) + +/* fork_owner values for vhost */ +#define VHOST_FORK_OWNER_KTHREAD 0 +#define VHOST_FORK_OWNER_TASK 1 + +/** +* VHOST_SET_FORK_FROM_OWNER - Set the fork_owner flag for the vhost device, +* This ioctl must called before VHOST_SET_OWNER. +* Only available when CONFIG_VHOST_ENABLE_FORK_OWNER_CONTROL=y +* +* @param fork_owner: An 8-bit value that determines the vhost thread mode +* +* When fork_owner is set to VHOST_FORK_OWNER_TASK(default value): +* - Vhost will create vhost worker as tasks forked from the owner, +* inheriting all of the owner's attributes. +* +* When fork_owner is set to VHOST_FORK_OWNER_KTHREAD: +* - Vhost will create vhost workers as kernel threads. +*/ +#define VHOST_SET_FORK_FROM_OWNER _IOW(VHOST_VIRTIO, 0x84, __u8) + +/** +* VHOST_GET_FORK_OWNER - Get the current fork_owner flag for the vhost device. +* Only available when CONFIG_VHOST_ENABLE_FORK_OWNER_CONTROL=y +* +* @return: An 8-bit value indicating the current thread mode. +*/ +#define VHOST_GET_FORK_FROM_OWNER _IOR(VHOST_VIRTIO, 0x85, __u8) +#endif Signature · 1 line
2.51.0.261.g7ce5a0a67e-goog