tools perf: fix build warning
cover tools perf: fix build warning
When I try to build perf, a lot of warnings are output, let's fix them.
Yanteng Si (18):
tools headers UAPI: Sync the linux/in.h with the kernel sources tools headers UAPI: Sync the linux/prctl.h with the kernel sources tools headers UAPI: Sync the drm/drm.h with the kernel sources tools headers UAPI: Sync the i915_drm.h with the kernel sources tools headers UAPI: Sync the coresight-pmu headers copy with the
kernel sources
tools headers UAPI: Sync the linux/const.h with the kernel headers tools headers UAPI: Sync the linux/perf_event.h with the kernel
headers
tools include UAPI: Sync the sound/asound.h copy with the kernel
sources
tools headers UAPI: Sync the linux/mman.h with the kernel sources tools headers UAPI: Sync the unistd with the kernel sources tools headers kvm: Sync uapi/{asm/linux} kvm.h headers with the kernel
sources
tools arch x86: Sync the disabled-features with the kernel sources tools arch x86: Sync the memcpy_64 with the kernel sources tools arch x86: Sync the cpufeatures with the kernel sources tools arch x86: Sync the msr-index.h copy with the kernel sources tools arch x86: Sync the prctl headers with the kernel sources tools arch arm64: Sync the perf_regs headers with the kernel sources tools arch s390: Sync the ptrace headers with the kernel sources
tools/arch/arm64/include/uapi/asm/kvm.h | 36 ++ tools/arch/arm64/include/uapi/asm/perf_regs.h | 10 +- tools/arch/s390/include/uapi/asm/ptrace.h | 458 ++++++++++++++++++ tools/arch/x86/include/asm/cpufeatures.h | 28 +- .../arch/x86/include/asm/disabled-features.h | 24 +- tools/arch/x86/include/asm/msr-index.h | 2 + tools/arch/x86/include/uapi/asm/kvm.h | 3 + tools/arch/x86/include/uapi/asm/prctl.h | 20 + tools/arch/x86/lib/memcpy_64.S | 35 +- tools/arch/x86/lib/memset_64.S | 47 +- tools/include/linux/coresight-pmu.h | 13 - tools/include/uapi/asm-generic/unistd.h | 5 +- tools/include/uapi/drm/drm.h | 57 ++- tools/include/uapi/drm/i915_drm.h | 25 +- tools/include/uapi/linux/const.h | 2 +- tools/include/uapi/linux/in.h | 1 + tools/include/uapi/linux/kvm.h | 12 +- tools/include/uapi/linux/mman.h | 14 + tools/include/uapi/linux/perf_event.h | 3 +- tools/include/uapi/linux/prctl.h | 2 + tools/include/uapi/sound/asound.h | 14 +- .../perf/arch/s390/entry/syscalls/syscall.tbl | 2 +- .../arch/x86/entry/syscalls/syscall_64.tbl | 2 + 23 files changed, 716 insertions(+), 99 deletions(-) create mode 100644 tools/arch/s390/include/uapi/asm/ptrace.h
Signature · 1 line
2.31.4
PATCH 1/18 tools headers UAPI: Sync the linux/in.h with the kernel sources
Picking the changes from:
commit 91d0b78c5177f3e4 ("inet: Add IP_LOCAL_PORT_RANGE socket option")
Silencing these perf build warnings:
Warning: Kernel ABI header at 'tools/include/uapi/linux/in.h' differs
from latest version at 'include/uapi/linux/in.h'
diff -u tools/include/uapi/linux/in.h include/uapi/linux/in.h
--- tools/include/uapi/linux/in.h | 1 + 1 file changed, 1 insertion(+)
tools/include/uapi/linux/in.h +1 -0
@@ -162,6 +162,7 @@ struct in_addr {#define MCAST_MSFILTER 48#define IP_MULTICAST_ALL 49#define IP_UNICAST_IF 50 +#define IP_LOCAL_PORT_RANGE 51#define MCAST_EXCLUDE 0#define MCAST_INCLUDE 1
Signature · 1 line
2.31.4
PATCH 2/18 tools headers UAPI: Sync the linux/prctl.h with the kernel sources
In reply to Yanteng SiPicking the changes from:
commit f9c6df5fb149437f ("prctl: add PR_GET_AUXV to copy auxv to
userspace")
Silencing these perf build warnings:
Warning: Kernel ABI header at 'tools/include/uapi/linux/prctl.h'
differs from latest version at 'include/uapi/linux/prctl.h'
diff -u tools/include/uapi/linux/prctl.h include/uapi/linux/prctl.h
--- tools/include/uapi/linux/prctl.h | 2 ++ 1 file changed, 2 insertions(+)
tools/include/uapi/linux/prctl.h +2 -0
@@ -290,6 +290,8 @@ struct prctl_mm_map {#define PR_SET_VMA 0x53564d41# define PR_SET_VMA_ANON_NAME 0 +#define PR_GET_AUXV 0x41555856 +#define PR_SET_MEMORY_MERGE 67#define PR_GET_MEMORY_MERGE 68#endif /* _LINUX_PRCTL_H */
Signature · 1 line
2.31.4
PATCH 3/18 tools headers UAPI: Sync the drm/drm.h with the kernel sources
In reply to Yanteng SiPicking the changes from:
commit 6068771673a38efc ("drm: document DRM_IOCTL_PRIME_HANDLE_TO_FD and
PRIME_FD_TO_HANDLE")
commit 61a55f8b1ebcde68 ("drm: document expectations for GETFB2
handles")
commit 158350aae16a4e66 ("drm: document DRM_IOCTL_GEM_CLOSE")
Silencing these perf build warnings:
Warning: Kernel ABI header at 'tools/include/uapi/drm/drm.h' differs
from latest version at 'include/uapi/drm/drm.h'
diff -u tools/include/uapi/drm/drm.h include/uapi/drm/drm.h
No changes in tooling as these are just C comment documentation changes.
--- tools/include/uapi/drm/drm.h | 57 ++++++++++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 2 deletions(-)
tools/include/uapi/drm/drm.h +55 -2
@@ -972,6 +972,19 @@ extern "C" {#define DRM_IOCTL_GET_STATS DRM_IOR( 0x06, struct drm_stats)#define DRM_IOCTL_SET_VERSION DRM_IOWR(0x07, struct drm_set_version)#define DRM_IOCTL_MODESET_CTL DRM_IOW(0x08, struct drm_modeset_ctl) +/** +* DRM_IOCTL_GEM_CLOSE - Close a GEM handle. +* +* GEM handles are not reference-counted by the kernel. User-space is +* responsible for managing their lifetime. For example, if user-space imports +* the same memory object twice on the same DRM file description, the same GEM +* handle is returned by both imports, and user-space needs to ensure +* &DRM_IOCTL_GEM_CLOSE is performed once only. The same situation can happen +* when a memory object is allocated, then exported and imported again on the +* same DRM file description. The &DRM_IOCTL_MODE_GETFB2 IOCTL is an exception +* and always returns fresh new GEM handles even if an existing GEM handle +* already refers to the same memory object before the IOCTL is performed. +*/ #define DRM_IOCTL_GEM_CLOSE DRM_IOW (0x09, struct drm_gem_close)#define DRM_IOCTL_GEM_FLINK DRM_IOWR(0x0a, struct drm_gem_flink)#define DRM_IOCTL_GEM_OPEN DRM_IOWR(0x0b, struct drm_gem_open)
@@ -1012,7 +1025,37 @@ extern "C" {#define DRM_IOCTL_UNLOCK DRM_IOW( 0x2b, struct drm_lock)#define DRM_IOCTL_FINISH DRM_IOW( 0x2c, struct drm_lock) +/** +* DRM_IOCTL_PRIME_HANDLE_TO_FD - Convert a GEM handle to a DMA-BUF FD. +* +* User-space sets &drm_prime_handle.handle with the GEM handle to export and +* &drm_prime_handle.flags, and gets back a DMA-BUF file descriptor in +* &drm_prime_handle.fd. +* +* The export can fail for any driver-specific reason, e.g. because export is +* not supported for this specific GEM handle (but might be for others). +* +* Support for exporting DMA-BUFs is advertised via &DRM_PRIME_CAP_EXPORT. +*/ #define DRM_IOCTL_PRIME_HANDLE_TO_FD DRM_IOWR(0x2d, struct drm_prime_handle) +/** +* DRM_IOCTL_PRIME_FD_TO_HANDLE - Convert a DMA-BUF FD to a GEM handle. +* +* User-space sets &drm_prime_handle.fd with a DMA-BUF file descriptor to +* import, and gets back a GEM handle in &drm_prime_handle.handle. +* &drm_prime_handle.flags is unused. +* +* If an existing GEM handle refers to the memory object backing the DMA-BUF, +* that GEM handle is returned. Therefore user-space which needs to handle +* arbitrary DMA-BUFs must have a user-space lookup data structure to manually +* reference-count duplicated GEM handles. For more information see +* &DRM_IOCTL_GEM_CLOSE. +* +* The import can fail for any driver-specific reason, e.g. because import is +* only supported for DMA-BUFs allocated on this DRM device. +* +* Support for importing DMA-BUFs is advertised via &DRM_PRIME_CAP_IMPORT. +*/ #define DRM_IOCTL_PRIME_FD_TO_HANDLE DRM_IOWR(0x2e, struct drm_prime_handle)#define DRM_IOCTL_AGP_ACQUIRE DRM_IO( 0x30)
@@ -1104,8 +1147,13 @@ extern "C" {* struct as the output. * * If the client is DRM master or has &CAP_SYS_ADMIN, &drm_mode_fb_cmd2.handles -* will be filled with GEM buffer handles. Planes are valid until one has a -* zero handle -- this can be used to compute the number of planes. +* will be filled with GEM buffer handles. Fresh new GEM handles are always +* returned, even if another GEM handle referring to the same memory object +* already exists on the DRM file description. The caller is responsible for +* removing the new handles, e.g. via the &DRM_IOCTL_GEM_CLOSE IOCTL. The same +* new handle will be returned for multiple planes in case they use the same +* memory object. Planes are valid until one has a zero handle -- this can be +* used to compute the number of planes. * * Otherwise, &drm_mode_fb_cmd2.handles will be zeroed and planes are valid * until one has a zero &drm_mode_fb_cmd2.pitches.
@@ -1113,6 +1161,11 @@ extern "C" {* If the framebuffer has a format modifier, &DRM_MODE_FB_MODIFIERS will be set * in &drm_mode_fb_cmd2.flags and &drm_mode_fb_cmd2.modifier will contain the * modifier. Otherwise, user-space must ignore &drm_mode_fb_cmd2.modifier. +* +* To obtain DMA-BUF FDs for each plane without leaking GEM handles, user-space +* can export each handle via &DRM_IOCTL_PRIME_HANDLE_TO_FD, then immediately +* close each unique handle via &DRM_IOCTL_GEM_CLOSE, making sure to not +* double-close handles which are specified multiple times in the array. */ #define DRM_IOCTL_MODE_GETFB2 DRM_IOWR(0xCE, struct drm_mode_fb_cmd2)
Signature · 1 line
2.31.4
PATCH 4/18 tools headers UAPI: Sync the i915_drm.h with the kernel sources
In reply to Yanteng SiPicking the changes from:
commit 1cc064dce4ed0ff1 ("drm/i915/perf: Add support for OA media
units")
commit c61d04c9eb435498 ("drm/i915/perf: Add engine class instance
parameters to perf")
commit 02abecdeebfcd384 ("drm/i915/uapi: Replace fake flex-array with
flexible-array member")
Silencing these perf build warnings:
Warning: Kernel ABI header at 'tools/include/uapi/drm/i915_drm.h'
differs from latest version at 'include/uapi/drm/i915_drm.h'
diff -u tools/include/uapi/drm/i915_drm.h include/uapi/drm/i915_drm.h
--- tools/include/uapi/drm/i915_drm.h | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-)
tools/include/uapi/drm/i915_drm.h +24 -1
@@ -2491,7 +2491,7 @@ struct i915_context_param_engines {#define I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE 0/* see i915_context_engines_load_balance */ #define I915_CONTEXT_ENGINES_EXT_BOND 1/* see i915_context_engines_bond */ #define I915_CONTEXT_ENGINES_EXT_PARALLEL_SUBMIT 2/* see i915_context_engines_parallel_submit */ -struct i915_engine_class_instance engines[0 ]; +struct i915_engine_class_instance engines[]; } __attribute__((packed));#define I915_DEFINE_CONTEXT_PARAM_ENGINES (name__,N__ ) struct { \
@@ -2676,6 +2676,10 @@ enum drm_i915_oa_format { I915_OAR_FORMAT_A32u40_A4u32_B8_C8, I915_OA_FORMAT_A24u40_A14u32_B8_C8, +/* MTL OAM */ + I915_OAM_FORMAT_MPEC8u64_B8_C8, + I915_OAM_FORMAT_MPEC8u32_B8_C8, + I915_OA_FORMAT_MAX /* non-ABI */ };
@@ -2758,6 +2762,25 @@ enum drm_i915_perf_property_id {*/ DRM_I915_PERF_PROP_POLL_OA_PERIOD , +/** +* Multiple engines may be mapped to the same OA unit. The OA unit is +* identified by class:instance of any engine mapped to it. +* +* This parameter specifies the engine class and must be passed along +* with DRM_I915_PERF_PROP_OA_ENGINE_INSTANCE. +* +* This property is available in perf revision 6. +*/ +DRM_I915_PERF_PROP_OA_ENGINE_CLASS , + +/** +* This parameter specifies the engine instance and must be passed along +* with DRM_I915_PERF_PROP_OA_ENGINE_CLASS. +* +* This property is available in perf revision 6. +*/ +DRM_I915_PERF_PROP_OA_ENGINE_INSTANCE , + DRM_I915_PERF_PROP_MAX /* non-ABI */ };
Signature · 1 line
2.31.4
PATCH 5/18 tools headers UAPI: Sync the coresight-pmu headers copy with the kernel sources
In reply to Yanteng SiRemoving CORESIGHT_TRACE_ID_UNUSED_FLAG and CORESIGHT_TRACE_ID_UNUSED_VAL.
Silencing these perf build warnings:
Warning: Kernel ABI header at 'tools/include/linux/coresight-pmu.h'
differs from latest version at 'include/linux/coresight-pmu.h'
diff -u tools/include/linux/coresight-pmu.h include/linux
/coresight-pmu.h
--- tools/include/linux/coresight-pmu.h | 13 ------------- 1 file changed, 13 deletions(-)
tools/include/linux/coresight-pmu.h +0 -13
@@ -21,19 +21,6 @@*/ #define CORESIGHT_LEGACY_CPU_TRACE_ID (cpu) (0x10 + (cpu * 2)) -/* CoreSight trace ID is currently the bottom 7 bits of the value */ -#define CORESIGHT_TRACE_ID_VAL_MASK GENMASK(6, 0) - -/* -* perf record will set the legacy meta data values as unused initially. -* This allows perf report to manage the decoders created when dynamic -* allocation in operation. -*/ -#define CORESIGHT_TRACE_ID_UNUSED_FLAG BIT(31) - -/* Value to set for unused trace ID values */ -#define CORESIGHT_TRACE_ID_UNUSED_VAL 0x7F -/* * Below are the definition of bit offsets for perf option, and works as * arbitrary values for all ETM versions.
Signature · 1 line
2.31.4
PATCH 6/18 tools headers UAPI: Sync the linux/const.h with the kernel headers
In reply to Yanteng SiPicking the changes from:
commit 31088f6f7906253e ("uapi/linux/const.h: prefer ISO-friendly
__typeof__")
Silencing these perf build warnings::
Warning: Kernel ABI header at 'tools/include/uapi/linux/const.h' differs
from latest version at 'include/uapi/linux/const.h'
diff -u tools/include/uapi/linux/const.h include/uapi/linux/const.h
--- tools/include/uapi/linux/const.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/include/uapi/linux/const.h +1 -1
@@ -28,7 +28,7 @@#define _BITUL (x) (_UL(1) << (x))#define _BITULL (x) (_ULL(1) << (x)) -#define __ALIGN_KERNEL (x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) +#define __ALIGN_KERNEL (x, a) __ALIGN_KERNEL_MASK(x, (__typeof__(x))(a) - 1)#define __ALIGN_KERNEL_MASK (x, mask) (((x) + (mask)) & ~(mask))#define __KERNEL_DIV_ROUND_UP (n, d) (((n) + (d) - 1) / (d))
Signature · 1 line
2.31.4
PATCH 7/18 tools headers UAPI: Sync the linux/perf_event.h with the kernel headers
In reply to Yanteng SiPicking the changes from:
commit 09519ec3b19e4144 ("perf: Add perf_event_attr::config3") commit cb6c18b5a41622c7 ("perf/mem: Rename PERF_MEM_LVLNUM_EXTN_MEM to
PERF_MEM_LVLNUM_CXL")
Silencing these perf build warnings::
Warning: Kernel ABI header at 'tools/include/uapi/linux/perf_event.h'
differs from latest version at 'include/uapi/linux/perf_event.h'
diff -u tools/include/uapi/linux/perf_event.h include/uapi/linux
/perf_event.h
--- tools/include/uapi/linux/perf_event.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
tools/include/uapi/linux/perf_event.h +1 -2
@@ -1339,8 +1339,7 @@ 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_UNC 0x08/* Uncached */ +/* 5-0x8 available */ #define PERF_MEM_LVLNUM_CXL 0x09/* CXL */ #define PERF_MEM_LVLNUM_IO 0x0a/* I/O */ #define PERF_MEM_LVLNUM_ANY_CACHE 0x0b/* Any cache */
Signature · 1 line
2.31.4
PATCH 8/18 tools include UAPI: Sync the sound/asound.h copy with the kernel sources
In reply to Yanteng SiPicking the changes from:
commit 102882b5c62f6bfe ("ALSA: document that struct
__snd_pcm_mmap_control64 is messed up")
commit 9f656705c5faa18a ("ALSA: pcm: rewrite
snd_pcm_playback_silence()")
Silencing these perf build warnings:
Warning: Kernel ABI header at 'tools/include/uapi/sound/asound.h'
differs from latest version at 'include/uapi/sound/asound.h'
diff -u tools/include/uapi/sound/asound.h include/uapi/sound/asound.h
--- tools/include/uapi/sound/asound.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
tools/include/uapi/sound/asound.h +10 -4
@@ -429,9 +429,14 @@ struct snd_pcm_sw_params {snd_pcm_uframes_t avail_min;/* min avail frames for wakeup */ snd_pcm_uframes_t xfer_align;/* obsolete: xfer size need to be a multiple */ snd_pcm_uframes_t start_threshold;/* min hw_avail frames for automatic start */ -snd_pcm_uframes_t stop_threshold;/* min avail frames for automatic stop */ -snd_pcm_uframes_t silence_threshold;/* min distance from noise for silence filling */ -snd_pcm_uframes_t silence_size;/* silence block size */ +/* +* The following two thresholds alleviate playback buffer underruns; when +* hw_avail drops below the threshold, the respective action is triggered: +*/ +snd_pcm_uframes_t stop_threshold;/* - stop playback */ +snd_pcm_uframes_t silence_threshold;/* - pre-fill buffer with silence */ +snd_pcm_uframes_t silence_size;/* max size of silence pre-fill; when >= boundary, +* fill played area with silence immediately */ snd_pcm_uframes_t boundary;/* pointers wrap point */ unsigned int proto;/* protocol version */ unsigned int tstamp_type;/* timestamp type (req. proto >= 2.0.12) */
@@ -570,7 +575,8 @@ struct __snd_pcm_mmap_status64 {struct __snd_pcm_mmap_control64 {__pad_before_uframe __pad1;snd_pcm_uframes_t appl_ptr;/* RW: appl ptr (0...boundary-1) */ -__pad_before_uframe __pad2; +__pad_before_uframe __pad2;// This should be __pad_after_uframe, but binary +// backwards compatibility constraints prevent a fix. __pad_before_uframe __pad3;snd_pcm_uframes_t avail_min;/* RW: min available frames for wakeup */
Signature · 1 line
2.31.4
PATCH 9/18 tools headers UAPI: Sync the linux/mman.h with the kernel sources
In reply to Yanteng SiPicking the changes from:
commit 5c289a59b1d08fd8 ("cachestat: implement cachestat syscall")
Silencing these perf build warnings:
Warning: Kernel ABI header at 'tools/include/uapi/linux/mman.h'
differs from latest version at 'include/uapi/linux/mman.h'
diff -u tools/include/uapi/linux/mman.h include/uapi/linux/mman.h
--- tools/include/uapi/linux/mman.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
tools/include/uapi/linux/mman.h +14 -0
@@ -4,6 +4,7 @@#include <asm/mman.h> #include <asm-generic/hugetlb_encode.h> +#include <linux/types.h> #define MREMAP_MAYMOVE 1#define MREMAP_FIXED 2
@@ -41,4 +42,17 @@#define MAP_HUGE_2GB HUGETLB_FLAG_ENCODE_2GB#define MAP_HUGE_16GB HUGETLB_FLAG_ENCODE_16GB +struct cachestat_range { +__u64 off; +__u64 len; +}; + +struct cachestat { +__u64 nr_cache; +__u64 nr_dirty; +__u64 nr_writeback; +__u64 nr_evicted; +__u64 nr_recently_evicted; +}; +#endif /* _UAPI_LINUX_MMAN_H */
Signature · 1 line
2.31.4
PATCH 10/18 tools headers UAPI: Sync the unistd with the kernel sources
In reply to Yanteng SiPicking the changes from:
commit 7608f70adcb1ea69 ("s390: wire up memfd_secret system call") commit 5c289a59b1d08fd8 ("cachestat: implement cachestat syscall")
Silencing these perf build warnings:
Warning: Kernel ABI header at 'tools/perf/arch/s390/entry/syscalls
/syscall.tbl' differs from latest version at 'arch/s390/kernel
/syscalls/syscall.tbl'
diff -u tools/perf/arch/s390/entry/syscalls/syscall.tbl arch/s390
/kernel/syscalls/syscall.tbl
Warning: Kernel ABI header at 'tools/perf/arch/x86/entry/syscalls
/syscall_64.tbl' differs from latest version at 'arch/x86/entry /syscalls/syscall_64.tbl'
diff -u tools/perf/arch/x86/entry/syscalls/syscall_64.tbl arch/x86 /entry/syscalls/syscall_64.tbl
Warning: Kernel ABI header at 'tools/include/uapi/asm-generic/unistd.h'
differs from latest version at 'include/uapi/asm-generic/unistd.h'
diff -u tools/include/uapi/asm-generic/unistd.h include/uapi
/asm-generic/unistd.h
--- tools/include/uapi/asm-generic/unistd.h | 5 ++++- tools/perf/arch/s390/entry/syscalls/syscall.tbl | 2 +- tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-)
tools/include/uapi/asm-generic/unistd.h +4 -1
@@ -886,8 +886,11 @@ __SYSCALL(__NR_futex_waitv, sys_futex_waitv)#define __NR_set_mempolicy_home_node 450 __SYSCALL(__NR_set_mempolicy_home_node, sys_set_mempolicy_home_node) +#define __NR_cachestat 451 +__SYSCALL(__NR_cachestat, sys_cachestat) +#undef __NR_syscalls -#define __NR_syscalls 451 +#define __NR_syscalls 452/* * 32 bit systems traditionally used different
tools/perf/arch/s390/entry/syscalls/syscall.tbl +1 -1
@@ -449,7 +449,7 @@ 444 common landlock_create_ruleset sys_landlock_create_ruleset sys_landlock_create_ruleset 445 common landlock_add_rule sys_landlock_add_rule sys_landlock_add_rule 446 common landlock_restrict_self sys_landlock_restrict_self sys_landlock_restrict_self -# 447 reserved for memfd_secret +447 common memfd_secret sys_memfd_secret sys_memfd_secret 448 common process_mrelease sys_process_mrelease sys_process_mrelease 449 common futex_waitv sys_futex_waitv sys_futex_waitv 450 common set_mempolicy_home_node sys_set_mempolicy_home_node sys_set_mempolicy_home_node
tools/perf/arch/x86/entry/syscalls/syscall_64.tbl +2 -0
@@ -372,6 +372,8 @@ 448 common process_mrelease sys_process_mrelease 449 common futex_waitv sys_futex_waitv 450 common set_mempolicy_home_node sys_set_mempolicy_home_node +451 common cachestat sys_cachestat +452 64 map_shadow_stack sys_map_shadow_stack # # Due to a historical design error, certain syscalls are numbered differently
Signature · 1 line
2.31.4
PATCH 11/18 tools headers kvm: Sync uapi/{asm/linux} kvm.h headers with the kernel sources
In reply to Yanteng SiPicking the changes from:
commit e65733b5c59a1ea2 ("KVM: x86: Redefine 'longmode' as a flag for
KVM_EXIT_HYPERCALL")
commit 30ec7997d175cd68 ("KVM: arm64: timers: Allow userspace to set
the global counter offset")
commit 821d935c87bc9525 ("KVM: arm64: Introduce support for userspace
SMCCC filtering")
commit 81dc9504a7006b48 ("KVM: arm64: nv: timers: Support hyp timer
emulation")
commit a8308b3fc9494953 ("KVM: arm64: Refactor hvc filtering to support
different actions")
commit 0e5c9a9d6548e9b1 ("KVM: arm64: Expose SMC/HVC width to
userspace")
Silencing these perf build warnings:
Warning: Kernel ABI header at 'tools/include/uapi/linux/kvm.h' differs
from latest version at 'include/uapi/linux/kvm.h'
diff -u tools/include/uapi/linux/kvm.h include/uapi/linux/kvm.h
Warning: Kernel ABI header at 'tools/arch/x86/include/uapi/asm/kvm.h'
differs from latest version at 'arch/x86/include/uapi/asm/kvm.h'
diff -u tools/arch/x86/include/uapi/asm/kvm.h arch/x86/include/uapi
/asm/kvm.h
Warning: Kernel ABI header at 'tools/arch/arm64/include/uapi/asm/kvm.h'
differs from latest version at 'arch/arm64/include/uapi/asm/kvm.h'
diff -u tools/arch/arm64/include/uapi/asm/kvm.h arch/arm64/include/uapi
/asm/kvm.h
--- tools/arch/arm64/include/uapi/asm/kvm.h | 36 +++++++++++++++++++++++++ tools/arch/x86/include/uapi/asm/kvm.h | 3 +++ tools/include/uapi/linux/kvm.h | 12 +++++++-- 3 files changed, 49 insertions(+), 2 deletions(-)
tools/arch/arm64/include/uapi/asm/kvm.h +36 -0
@@ -198,6 +198,15 @@ struct kvm_arm_copy_mte_tags {__u64 reserved[2 ]; }; +/* +* Counter/Timer offset structure. Describe the virtual/physical offset. +* To be used with KVM_ARM_SET_COUNTER_OFFSET. +*/ +struct kvm_arm_counter_offset { +__u64 counter_offset; +__u64 reserved; +}; +#define KVM_ARM_TAGS_TO_GUEST 0#define KVM_ARM_TAGS_FROM_GUEST 1
@@ -372,6 +381,10 @@ enum {#endif }; +/* Device Control API on vm fd */ +#define KVM_ARM_VM_SMCCC_CTRL 0 +#define KVM_ARM_VM_SMCCC_FILTER 0 +/* Device Control API: ARM VGIC */ #define KVM_DEV_ARM_VGIC_GRP_ADDR 0#define KVM_DEV_ARM_VGIC_GRP_DIST_REGS 1
@@ -411,6 +424,8 @@ enum {#define KVM_ARM_VCPU_TIMER_CTRL 1#define KVM_ARM_VCPU_TIMER_IRQ_VTIMER 0#define KVM_ARM_VCPU_TIMER_IRQ_PTIMER 1 +#define KVM_ARM_VCPU_TIMER_IRQ_HVTIMER 2 +#define KVM_ARM_VCPU_TIMER_IRQ_HPTIMER 3#define KVM_ARM_VCPU_PVTIME_CTRL 2#define KVM_ARM_VCPU_PVTIME_IPA 0
@@ -469,6 +484,27 @@ enum {/* run->fail_entry.hardware_entry_failure_reason codes. */ #define KVM_EXIT_FAIL_ENTRY_CPU_UNSUPPORTED (1ULL << 0) +enum kvm_smccc_filter_action { +KVM_SMCCC_FILTER_HANDLE =0 , +KVM_SMCCC_FILTER_DENY , +KVM_SMCCC_FILTER_FWD_TO_USER , + +#ifdef __KERNEL__ +NR_SMCCC_FILTER_ACTIONS +#endif +}; + +struct kvm_smccc_filter { +__u32 base; +__u32 nr_functions; +__u8 action; +__u8 pad[15 ]; +}; + +/* arm64-specific KVM_EXIT_HYPERCALL flags */ +#define KVM_HYPERCALL_EXIT_SMC (1U << 0) +#define KVM_HYPERCALL_EXIT_16BIT (1U << 1) +#endif #endif /* __ARM_KVM_H__ */
tools/arch/x86/include/uapi/asm/kvm.h +3 -0
@@ -559,4 +559,7 @@ struct kvm_pmu_event_filter {#define KVM_VCPU_TSC_CTRL 0/* control group for the timestamp counter (TSC) */ #define KVM_VCPU_TSC_OFFSET 0/* attribute for the TSC offset */ +/* x86-specific KVM_EXIT_HYPERCALL flags. */ +#define KVM_EXIT_HYPERCALL_LONG_MODE BIT(0) +#endif /* _ASM_X86_KVM_H */
tools/include/uapi/linux/kvm.h +10 -2
@@ -341,8 +341,13 @@ struct kvm_run {__u64 nr;__u64 args[6 ];__u64 ret; -__u32 longmode; -__u32 pad; + +union { +#ifndef __KERNEL__ +__u32 longmode; +#endif +__u64 flags; + }; } hypercall;/* KVM_EXIT_TPR_ACCESS */ struct {
@@ -1184,6 +1189,7 @@ struct kvm_ppc_resize_hpt {#define KVM_CAP_S390_PROTECTED_ASYNC_DISABLE 224#define KVM_CAP_DIRTY_LOG_RING_WITH_BITMAP 225#define KVM_CAP_PMU_EVENT_MASKED_EVENTS 226 +#define KVM_CAP_COUNTER_OFFSET 227#ifdef KVM_CAP_IRQ_ROUTING
@@ -1543,6 +1549,8 @@ struct kvm_s390_ucas_mapping {#define KVM_SET_PMU_EVENT_FILTER _IOW(KVMIO, 0xb2, struct kvm_pmu_event_filter)#define KVM_PPC_SVM_OFF _IO(KVMIO, 0xb3)#define KVM_ARM_MTE_COPY_TAGS _IOR(KVMIO, 0xb4, struct kvm_arm_copy_mte_tags) +/* Available with KVM_CAP_COUNTER_OFFSET */ +#define KVM_ARM_SET_COUNTER_OFFSET _IOW(KVMIO, 0xb5, struct kvm_arm_counter_offset)/* ioctl for vm fd */ #define KVM_CREATE_DEVICE _IOWR(KVMIO, 0xe0, struct kvm_create_device)
Signature · 1 line
2.31.4
PATCH 12/18 tools arch x86: Sync the disabled-features with the kernel sources
In reply to Yanteng SiPicking the changes from:
commit ac591488436ec62d ("x86/shstk: Add user control-protection fault
handler")
commit d1b5e84f943c7b5b ("x86/cpufeatures: Add CPU feature flags for
shadow stacks")
commit e0bddc19ba9578bc ("x86/mm: Reduce untagged_addr() overhead for
systems without LAM")
Silencing these perf build warnings:
Warning: Kernel ABI header at 'tools/arch/x86/include/asm
/disabled-features.h' differs from latest version at 'arch/x86/include /asm/disabled-features.h'
diff -u tools/arch/x86/include/asm/disabled-features.h arch/x86/include
/asm/disabled-features.h
--- .../arch/x86/include/asm/disabled-features.h | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)
tools/arch/x86/include/asm/disabled-features.h +21 -3
@@ -75,6 +75,12 @@# define DISABLE_CALL_DEPTH_TRACKING (1 << (X86_FEATURE_CALL_DEPTH & 31))#endif +#ifdef CONFIG_ADDRESS_MASKING +# define DISABLE_LAM 0 +#else +# define DISABLE_LAM (1 << (X86_FEATURE_LAM & 31)) +#endif +#ifdef CONFIG_INTEL_IOMMU_SVM # define DISABLE_ENQCMD 0#else
@@ -99,6 +105,18 @@# define DISABLE_TDX_GUEST (1 << (X86_FEATURE_TDX_GUEST & 31))#endif +#ifdef CONFIG_X86_USER_SHADOW_STACK +#define DISABLE_USER_SHSTK 0 +#else +#define DISABLE_USER_SHSTK (1 << (X86_FEATURE_USER_SHSTK & 31)) +#endif + +#ifdef CONFIG_X86_KERNEL_IBT +#define DISABLE_IBT 0 +#else +#define DISABLE_IBT (1 << (X86_FEATURE_IBT & 31)) +#endif +/* * Make sure to add features to the correct mask */
@@ -114,15 +132,15 @@#define DISABLED_MASK9 (DISABLE_SGX)#define DISABLED_MASK10 0#define DISABLED_MASK11 (DISABLE_RETPOLINE|DISABLE_RETHUNK|DISABLE_UNRET| \ - DISABLE_CALL_DEPTH_TRACKING) -#define DISABLED_MASK12 0 + DISABLE_CALL_DEPTH_TRACKING|DISABLE_USER_SHSTK) +#define DISABLED_MASK12 (DISABLE_LAM)#define DISABLED_MASK13 0#define DISABLED_MASK14 0#define DISABLED_MASK15 0#define DISABLED_MASK16 (DISABLE_PKU|DISABLE_OSPKE|DISABLE_LA57|DISABLE_UMIP| \ DISABLE_ENQCMD)#define DISABLED_MASK17 0 -#define DISABLED_MASK18 0 +#define DISABLED_MASK18 (DISABLE_IBT)#define DISABLED_MASK19 0#define DISABLED_MASK20 0#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 21)
Signature · 1 line
2.31.4
PATCH 13/18 tools arch x86: Sync the memcpy_64 with the kernel sources
In reply to Yanteng SiPicking the changes from:
commit 68674f94ffc9dddc ("x86: don't use REP_GOOD or ERMS for small
memory copies")
Silencing these perf build warnings:
Warning: Kernel ABI header at 'tools/arch/x86/lib/memcpy_64.S' differs
from latest version at 'arch/x86/lib/memcpy_64.S'
diff -u tools/arch/x86/lib/memcpy_64.S arch/x86/lib/memcpy_64.S
Warning: Kernel ABI header at 'tools/arch/x86/lib/memset_64.S' differs
from latest version at 'arch/x86/lib/memset_64.S'
diff -u tools/arch/x86/lib/memset_64.S arch/x86/lib/memset_64.S
--- tools/arch/x86/lib/memcpy_64.S | 35 ++++++++----------------- tools/arch/x86/lib/memset_64.S | 47 ++++++++-------------------------- 2 files changed, 22 insertions(+), 60 deletions(-)
tools/arch/x86/lib/memcpy_64.S +11 -24
@@ -2,6 +2,7 @@ /* Copyright 2002 Andi Kleen */ #include <linux/linkage.h> +#include <linux/cfi_types.h> #include <asm/errno.h> #include <asm/cpufeatures.h> #include <asm/alternative.h>
@@ -9,13 +10,6 @@ .section .noinstr.text, "ax" -/* - * We build a jump to memcpy_orig by default which gets NOPped out on - * the majority of x86 CPUs which set REP_GOOD. In addition, CPUs which - * have the enhanced REP MOVSB/STOSB feature (ERMS), change those NOPs - * to a jmp to memcpy_erms which does the REP; MOVSB mem copy. - */ - /* * memcpy - Copy a memory block. *
@@ -26,17 +20,21 @@ * * Output: * rax original destination + * + * The FSRM alternative should be done inline (avoiding the call and + * the disgusting return handling), but that would require some help + * from the compiler for better calling conventions. + * + * The 'rep movsb' itself is small enough to replace the call, but the + * two register moves blow up the code. And one of them is "needed" + * only for the return value that is the same as the source input, + * which the compiler could/should do much better anyway. */ SYM_TYPED_FUNC_START(__memcpy) - ALTERNATIVE_2 "jmp memcpy_orig", "", X86_FEATURE_REP_GOOD, \ - "jmp memcpy_erms", X86_FEATURE_ERMS + ALTERNATIVE "jmp memcpy_orig", "", X86_FEATURE_FSRM movq %rdi, %rax movq %rdx, %rcx - shrq $3, %rcx - andl $7, %edx - rep movsq - movl %edx, %ecx rep movsb RET SYM_FUNC_END(__memcpy)
@@ -45,17 +43,6 @@ EXPORT_SYMBOL(__memcpy) SYM_FUNC_ALIAS(memcpy, __memcpy) EXPORT_SYMBOL(memcpy) -/* - * memcpy_erms() - enhanced fast string memcpy. This is faster and - * simpler than memcpy. Use memcpy_erms when possible. - */ -SYM_FUNC_START_LOCAL(memcpy_erms) - movq %rdi, %rax - movq %rdx, %rcx - rep movsb - RET -SYM_FUNC_END(memcpy_erms) - SYM_FUNC_START_LOCAL(memcpy_orig) movq %rdi, %rax
tools/arch/x86/lib/memset_64.S +11 -36
64 lines not on this page · raw message
Signature · 1 line
2.31.4
PATCH 14/18 tools arch x86: Sync the cpufeatures with the kernel sources
In reply to Yanteng SiPicking the changes from:
commit 3d8f61bf8bcd69bc ("x86: KVM: Add common feature flag for AMD's
PSFD")
commit 3763bf58029f3459 ("x86/cpufeatures: Redefine synthetic virtual
NMI bit as AMD's "real" vNMI")
commit d1b5e84f943c7b5b ("x86/cpufeatures: Add CPU feature flags for
shadow stacks")
commit 6449dcb0cac73821 ("x86: CPUID and CR3/CR4 flags for Linear
Address Masking")
commit be8de49bea505e77 ("x86/speculation: Identify processors
vulnerable to SMT RSB predictions")
commit e7862eda309ecfcc ("x86/cpu: Support AMD Automatic IBRS") commit faabfcb194a8d068 ("x86/cpu, kvm: Add the SMM_CTL MSR not present
feature")
commit 5b909d4ae59aedc7 ("x86/cpu, kvm: Add the Null Selector Clears
Base feature")
commit 84168ae786f8a15a ("x86/cpu, kvm: Move X86_FEATURE_LFENCE_RDTSC
to its native leaf")
commit a9dc9ec5a1fafc3d ("x86/cpu, kvm: Add the NO_NESTED_DATA_BP
feature")
Silencing these perf build warnings:
Warning: Kernel ABI header at 'tools/arch/x86/include/asm/cpufeatures.h'
differs from latest version at 'arch/x86/include/asm/cpufeatures.h'
diff -u tools/arch/x86/include/asm/cpufeatures.h arch/x86/include/asm
/cpufeatures.h
--- tools/arch/x86/include/asm/cpufeatures.h | 28 +++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-)
tools/arch/x86/include/asm/cpufeatures.h +23 -5
@@ -97,7 +97,7 @@#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_LFENCE_RDTSC ( 3*32+18)/* "" LFENCE synchronizes RDTSC */ +/* FREE, was #define X86_FEATURE_LFENCE_RDTSC ( 3*32+18) "" LFENCE synchronizes RDTSC */ #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 */
@@ -226,10 +226,9 @@/* Virtualization flags: Linux defined, word 8 */ #define X86_FEATURE_TPR_SHADOW ( 8*32+ 0)/* Intel TPR Shadow */ -#define X86_FEATURE_VNMI ( 8*32+ 1)/* Intel Virtual NMI */ -#define X86_FEATURE_FLEXPRIORITY ( 8*32+ 2)/* Intel FlexPriority */ -#define X86_FEATURE_EPT ( 8*32+ 3)/* Intel Extended Page Table */ -#define X86_FEATURE_VPID ( 8*32+ 4)/* Intel Virtual Processor ID */ +#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_VMMCALL ( 8*32+15)/* Prefer VMMCALL to VMCALL */ #define X86_FEATURE_XENPV ( 8*32+16)/* "" Xen paravirtual guest */
@@ -307,14 +306,22 @@#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 */ /* 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_LKGS (12*32+18)/* "" Load "kernel" (userspace) GS */ #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 */ /* AMD-defined CPU features, CPUID level 0x80000008 (EBX), word 13 */ #define X86_FEATURE_CLZERO (13*32+ 0)/* CLZERO instruction */
@@ -331,6 +338,7 @@#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 */
@@ -363,6 +371,7 @@#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 */ /* Intel-defined CPU features, CPUID level 0x00000007:0 (ECX), word 16 */
@@ -372,6 +381,7 @@#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 */
@@ -427,6 +437,13 @@#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 */ +/* 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_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 */ +/* * BUG word(s) */
@@ -467,5 +484,6 @@#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 */ #endif /* _ASM_X86_CPUFEATURES_H */
Signature · 1 line
2.31.4
PATCH 15/18 tools arch x86: Sync the msr-index.h copy with the kernel sources
In reply to Yanteng SiPicking the changes from:
commit c68e3d473988b9af ("x86/include/asm/msr-index.h: Add IFS Array
test bits")
Silencing these perf build warnings:
Warning: Kernel ABI header at 'tools/arch/x86/include/asm/msr-index.h'
differs from latest version at 'arch/x86/include/asm/msr-index.h'
diff -u tools/arch/x86/include/asm/msr-index.h arch/x86/include/asm
/msr-index.h
--- tools/arch/x86/include/asm/msr-index.h | 2 ++ 1 file changed, 2 insertions(+)
tools/arch/x86/include/asm/msr-index.h +2 -0
@@ -206,6 +206,8 @@/* Abbreviated from Intel SDM name IA32_INTEGRITY_CAPABILITIES */ #define MSR_INTEGRITY_CAPS 0x000002d9 +#define MSR_INTEGRITY_CAPS_ARRAY_BIST_BIT 2 +#define MSR_INTEGRITY_CAPS_ARRAY_BIST BIT(MSR_INTEGRITY_CAPS_ARRAY_BIST_BIT)#define MSR_INTEGRITY_CAPS_PERIODIC_BIST_BIT 4#define MSR_INTEGRITY_CAPS_PERIODIC_BIST BIT(MSR_INTEGRITY_CAPS_PERIODIC_BIST_BIT)
Signature · 1 line
2.31.4
PATCH 16/18 tools arch x86: Sync the prctl headers with the kernel sources
In reply to Yanteng SiPicking the changes from:
commit a03c376ebaf38394 ("x86/arch_prctl: Add AMX feature numbers as ABI
constants")
commit b642e9e5f0dc797f ("x86/shstk: Add ARCH_SHSTK_STATUS") commit d30299329def886f ("x86/shstk: Add ARCH_SHSTK_UNLOCK") commit 44600eec3f2b708c ("x86/shstk: Support WRSS for userspace") commit 2e30e007142374b6 ("x86/shstk: Add user-mode shadow stack
support")
commit c40a7569ad82fb47 ("x86: Introduce userspace API for shadow
stack")
commit 23e5d9ec2bab53c4 ("x86/mm/iommu/sva: Make LAM and SVA mutually
exclusive")
commit 2f8794bd087e7958 ("x86/mm: Provide arch_prctl() interface for
LAM")
Silencing these perf build warnings:
Warning: Kernel ABI header at 'tools/arch/x86/include/uapi/asm/prctl.h'
differs from latest version at 'arch/x86/include/uapi/asm/prctl.h'
diff -u tools/arch/x86/include/uapi/asm/prctl.h arch/x86/include/uapi
/asm/prctl.h
--- tools/arch/x86/include/uapi/asm/prctl.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
tools/arch/x86/include/uapi/asm/prctl.h +20 -0
@@ -16,8 +16,28 @@#define ARCH_GET_XCOMP_GUEST_PERM 0x1024#define ARCH_REQ_XCOMP_GUEST_PERM 0x1025 +#define ARCH_XCOMP_TILECFG 17 +#define ARCH_XCOMP_TILEDATA 18 +#define ARCH_MAP_VDSO_X32 0x2001#define ARCH_MAP_VDSO_32 0x2002#define ARCH_MAP_VDSO_64 0x2003 +/* Don't use 0x3001-0x3004 because of old glibcs */ + +#define ARCH_GET_UNTAG_MASK 0x4001 +#define ARCH_ENABLE_TAGGED_ADDR 0x4002 +#define ARCH_GET_MAX_TAG_BITS 0x4003 +#define ARCH_FORCE_TAGGED_SVA 0x4004 + +#define ARCH_SHSTK_ENABLE 0x5001 +#define ARCH_SHSTK_DISABLE 0x5002 +#define ARCH_SHSTK_LOCK 0x5003 +#define ARCH_SHSTK_UNLOCK 0x5004 +#define ARCH_SHSTK_STATUS 0x5005 + +/* ARCH_SHSTK_ features bits */ +#define ARCH_SHSTK_SHSTK (1ULL << 0) +#define ARCH_SHSTK_WRSS (1ULL << 1) +#endif /* _ASM_X86_PRCTL_H */
Signature · 1 line
2.31.4
PATCH 18/18 tools arch s390: Sync the ptrace headers with the kernel sources
In reply to Yanteng SiPicking the changes from:
commit 56e62a7370283601 ("s390: convert to generic entry") commit 62e1dfa3e1e32fbc ("s390/uapi: correct whitespace & coding style
in asm/ptrace.h")
commit 466698e654e89319 ("s390/bpf: correct broken uapi for
BPF_PROG_TYPE_PERF_EVENT program type")
commit 6f52b16c5b29b89d ("License cleanup: add SPDX license identifier
to uapi header files with no license")
commit 25d539c9a958faf0 ("s390/ptrace: clarify bits in the per_struct") commit 818a330c4e1be9c3 ("s390/ptrace: add support for
PTRACE_SINGLEBLOCK")
commit 5ebf250dabbae83a ("s390: fix handling of runtime instrumentation
psw bit")
commit 4725c86055f5bbdc ("s390: fix save and restore of the
floating-point-control register")
commit 64597f9dae1850e0 ("s390/ptrace: PTRACE_TE_ABORT_RAND") commit e4371f602e2fce65 ("s390/compat: remove ptrace compat definitions
from uapi header file")
commit fa968ee215c0ca91 ("s390/signal: set correct address space
control")
commit 9807f75955ea7f18 ("UAPI: (Scripted) Disintegrate
arch/s390/include/asm")
Silencing these perf build warnings:
diff: tools/arch/s390/include/uapi/asm/ptrace.h: No such file or
directory
Warning: Kernel ABI header at 'tools/arch/s390/include/uapi/asm
/ptrace.h' differs from latest version at 'arch/s390/include/uapi
/asm/ptrace.h'
diff -u tools/arch/s390/include/uapi/asm/ptrace.h arch/s390/include
/uapi/asm/ptrace.h
--- tools/arch/s390/include/uapi/asm/ptrace.h | 458 ++++++++++++++++++++++ 1 file changed, 458 insertions(+) create mode 100644 tools/arch/s390/include/uapi/asm/ptrace.h
tools/arch/s390/include/uapi/asm/ptrace.h new file +458 -0
@@ -0,0 +1,458 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* +* S390 version +* Copyright IBM Corp. 1999, 2000 +* Author(s): Denis Joseph Barrow ([email protected],[email protected]) +*/ + +#ifndef _UAPI_S390_PTRACE_H +#define _UAPI_S390_PTRACE_H + +/* +* Offsets in the user_regs_struct. They are used for the ptrace +* system call and in entry.S +*/ +#ifndef __s390x__ + +#define PT_PSWMASK 0x00 +#define PT_PSWADDR 0x04 +#define PT_GPR0 0x08 +#define PT_GPR1 0x0C +#define PT_GPR2 0x10 +#define PT_GPR3 0x14 +#define PT_GPR4 0x18 +#define PT_GPR5 0x1C +#define PT_GPR6 0x20 +#define PT_GPR7 0x24 +#define PT_GPR8 0x28 +#define PT_GPR9 0x2C +#define PT_GPR10 0x30 +#define PT_GPR11 0x34 +#define PT_GPR12 0x38 +#define PT_GPR13 0x3C +#define PT_GPR14 0x40 +#define PT_GPR15 0x44 +#define PT_ACR0 0x48 +#define PT_ACR1 0x4C +#define PT_ACR2 0x50 +#define PT_ACR3 0x54 +#define PT_ACR4 0x58 +#define PT_ACR5 0x5C +#define PT_ACR6 0x60 +#define PT_ACR7 0x64 +#define PT_ACR8 0x68 +#define PT_ACR9 0x6C +#define PT_ACR10 0x70 +#define PT_ACR11 0x74 +#define PT_ACR12 0x78 +#define PT_ACR13 0x7C +#define PT_ACR14 0x80 +#define PT_ACR15 0x84 +#define PT_ORIGGPR2 0x88 +#define PT_FPC 0x90 +/* +* A nasty fact of life that the ptrace api +* only supports passing of longs. +*/ +#define PT_FPR0_HI 0x98 +#define PT_FPR0_LO 0x9C +#define PT_FPR1_HI 0xA0 +#define PT_FPR1_LO 0xA4 +#define PT_FPR2_HI 0xA8 +#define PT_FPR2_LO 0xAC +#define PT_FPR3_HI 0xB0 +#define PT_FPR3_LO 0xB4 +#define PT_FPR4_HI 0xB8 +#define PT_FPR4_LO 0xBC +#define PT_FPR5_HI 0xC0 +#define PT_FPR5_LO 0xC4 +#define PT_FPR6_HI 0xC8 +#define PT_FPR6_LO 0xCC +#define PT_FPR7_HI 0xD0 +#define PT_FPR7_LO 0xD4 +#define PT_FPR8_HI 0xD8 +#define PT_FPR8_LO 0XDC +#define PT_FPR9_HI 0xE0 +#define PT_FPR9_LO 0xE4 +#define PT_FPR10_HI 0xE8 +#define PT_FPR10_LO 0xEC +#define PT_FPR11_HI 0xF0 +#define PT_FPR11_LO 0xF4 +#define PT_FPR12_HI 0xF8 +#define PT_FPR12_LO 0xFC +#define PT_FPR13_HI 0x100 +#define PT_FPR13_LO 0x104 +#define PT_FPR14_HI 0x108 +#define PT_FPR14_LO 0x10C +#define PT_FPR15_HI 0x110 +#define PT_FPR15_LO 0x114 +#define PT_CR_9 0x118 +#define PT_CR_10 0x11C +#define PT_CR_11 0x120 +#define PT_IEEE_IP 0x13C +#define PT_LASTOFF PT_IEEE_IP +#define PT_ENDREGS 0x140-1 + +#define GPR_SIZE 4 +#define CR_SIZE 4 + +#define STACK_FRAME_OVERHEAD 96/* size of minimum stack frame */ + +#else /* __s390x__ */ + +#define PT_PSWMASK 0x00 +#define PT_PSWADDR 0x08 +#define PT_GPR0 0x10 +#define PT_GPR1 0x18 +#define PT_GPR2 0x20 +#define PT_GPR3 0x28 +#define PT_GPR4 0x30 +#define PT_GPR5 0x38 +#define PT_GPR6 0x40 +#define PT_GPR7 0x48 +#define PT_GPR8 0x50 +#define PT_GPR9 0x58 +#define PT_GPR10 0x60 +#define PT_GPR11 0x68 +#define PT_GPR12 0x70 +#define PT_GPR13 0x78 +#define PT_GPR14 0x80 +#define PT_GPR15 0x88 +#define PT_ACR0 0x90 +#define PT_ACR1 0x94 +#define PT_ACR2 0x98 +#define PT_ACR3 0x9C +#define PT_ACR4 0xA0 +#define PT_ACR5 0xA4 +#define PT_ACR6 0xA8 +#define PT_ACR7 0xAC +#define PT_ACR8 0xB0 +#define PT_ACR9 0xB4 +#define PT_ACR10 0xB8 +#define PT_ACR11 0xBC +#define PT_ACR12 0xC0 +#define PT_ACR13 0xC4 +#define PT_ACR14 0xC8 +#define PT_ACR15 0xCC +#define PT_ORIGGPR2 0xD0 +#define PT_FPC 0xD8 +#define PT_FPR0 0xE0 +#define PT_FPR1 0xE8 +#define PT_FPR2 0xF0 +#define PT_FPR3 0xF8 +#define PT_FPR4 0x100 +#define PT_FPR5 0x108 +#define PT_FPR6 0x110 +#define PT_FPR7 0x118 +#define PT_FPR8 0x120 +#define PT_FPR9 0x128 +#define PT_FPR10 0x130 +#define PT_FPR11 0x138 +#define PT_FPR12 0x140 +#define PT_FPR13 0x148 +#define PT_FPR14 0x150 +#define PT_FPR15 0x158 +#define PT_CR_9 0x160 +#define PT_CR_10 0x168 +#define PT_CR_11 0x170 +#define PT_IEEE_IP 0x1A8 +#define PT_LASTOFF PT_IEEE_IP +#define PT_ENDREGS 0x1B0-1 + +#define GPR_SIZE 8 +#define CR_SIZE 8 + +#define STACK_FRAME_OVERHEAD 160/* size of minimum stack frame */ + +#endif /* __s390x__ */ + +#define NUM_GPRS 16 +#define NUM_FPRS 16 +#define NUM_CRS 16 +#define NUM_ACRS 16 + +#define NUM_CR_WORDS 3 + +#define FPR_SIZE 8 +#define FPC_SIZE 4 +#define FPC_PAD_SIZE 4/* gcc insists on aligning the fpregs */ +#define ACR_SIZE 4 + + +#define PTRACE_OLDSETOPTIONS 21 +#define PTRACE_SYSEMU 31 +#define PTRACE_SYSEMU_SINGLESTEP 32 +#ifndef __ASSEMBLY__ +#include <linux/stddef.h> +#include <linux/types.h> + +typedef union { +float f; +double d; +__u64 ui; +struct + { +__u32 hi; +__u32 lo; + } fp; +}freg_t ; + +typedef struct { +__u32 fpc; +__u32 pad; +freg_t fprs[NUM_FPRS ]; +}s390_fp_regs ; + +#define FPC_EXCEPTION_MASK 0xF8000000 +#define FPC_FLAGS_MASK 0x00F80000 +#define FPC_DXC_MASK 0x0000FF00 +#define FPC_RM_MASK 0x00000003 + +/* this typedef defines how a Program Status Word looks like */ +typedef struct { +unsigned long mask; +unsigned long addr; +} __attribute__ ((aligned (8 )))psw_t ; + +#ifndef __s390x__ + +#define PSW_MASK_PER 0x40000000UL +#define PSW_MASK_DAT 0x04000000UL +#define PSW_MASK_IO 0x02000000UL +#define PSW_MASK_EXT 0x01000000UL +#define PSW_MASK_KEY 0x00F00000UL +#define PSW_MASK_BASE 0x00080000UL/* always one */ +#define PSW_MASK_MCHECK 0x00040000UL +#define PSW_MASK_WAIT 0x00020000UL +#define PSW_MASK_PSTATE 0x00010000UL +#define PSW_MASK_ASC 0x0000C000UL +#define PSW_MASK_CC 0x00003000UL +#define PSW_MASK_PM 0x00000F00UL +#define PSW_MASK_RI 0x00000000UL +#define PSW_MASK_EA 0x00000000UL +#define PSW_MASK_BA 0x00000000UL + +#define PSW_MASK_USER 0x0000FF00UL + +#define PSW_ADDR_AMODE 0x80000000UL +#define PSW_ADDR_INSN 0x7FFFFFFFUL + +#define PSW_DEFAULT_KEY (((unsigned long) PAGE_DEFAULT_ACC) << 20) + +#define PSW_ASC_PRIMARY 0x00000000UL +#define PSW_ASC_ACCREG 0x00004000UL +#define PSW_ASC_SECONDARY 0x00008000UL +#define PSW_ASC_HOME 0x0000C000UL + +#else /* __s390x__ */ + +#define PSW_MASK_PER 0x4000000000000000UL +#define PSW_MASK_DAT 0x0400000000000000UL +#define PSW_MASK_IO 0x0200000000000000UL +#define PSW_MASK_EXT 0x0100000000000000UL +#define PSW_MASK_BASE 0x0000000000000000UL +#define PSW_MASK_KEY 0x00F0000000000000UL +#define PSW_MASK_MCHECK 0x0004000000000000UL +#define PSW_MASK_WAIT 0x0002000000000000UL +#define PSW_MASK_PSTATE 0x0001000000000000UL +#define PSW_MASK_ASC 0x0000C00000000000UL +#define PSW_MASK_CC 0x0000300000000000UL +#define PSW_MASK_PM 0x00000F0000000000UL +#define PSW_MASK_RI 0x0000008000000000UL +#define PSW_MASK_EA 0x0000000100000000UL +#define PSW_MASK_BA 0x0000000080000000UL + +#define PSW_MASK_USER 0x0000FF0180000000UL + +#define PSW_ADDR_AMODE 0x0000000000000000UL +#define PSW_ADDR_INSN 0xFFFFFFFFFFFFFFFFUL + +#define PSW_DEFAULT_KEY (((unsigned long) PAGE_DEFAULT_ACC) << 52) + +#define PSW_ASC_PRIMARY 0x0000000000000000UL +#define PSW_ASC_ACCREG 0x0000400000000000UL +#define PSW_ASC_SECONDARY 0x0000800000000000UL +#define PSW_ASC_HOME 0x0000C00000000000UL + +#endif /* __s390x__ */ + + +/* +* The s390_regs structure is used to define the elf_gregset_t. +*/ +typedef struct { +psw_t psw; +unsigned long gprs[NUM_GPRS ]; +unsigned int acrs[NUM_ACRS ]; +unsigned long orig_gpr2; +}s390_regs ; + +/* +* The user_pt_regs structure exports the beginning of +* the in-kernel pt_regs structure to user space. +*/ +typedef struct { +unsigned long args[1 ]; +psw_t psw; +unsigned long gprs[NUM_GPRS ]; +}user_pt_regs ; + +/* +* Now for the user space program event recording (trace) definitions. +* The following structures are used only for the ptrace interface, don't +* touch or even look at it if you don't want to modify the user-space +* ptrace interface. In particular stay away from it for in-kernel PER. +*/ +typedef struct { +unsigned long cr[NUM_CR_WORDS ]; +}per_cr_words ; + +#define PER_EM_MASK 0xE8000000UL + +typedef struct { +#ifdef __s390x__ + unsigned : 32; +#endif /* __s390x__ */ +unsigned em_branching :1 ; +unsigned em_instruction_fetch :1 ; +/* +* Switching on storage alteration automatically fixes +* the storage alteration event bit in the users std. +*/ +unsigned em_storage_alteration :1 ; +unsigned em_gpr_alt_unused :1 ; +unsigned em_store_real_address :1 ; + unsigned : 3; +unsigned branch_addr_ctl :1 ; + unsigned : 1; +unsigned storage_alt_space_ctl :1 ; + unsigned : 21; +unsigned long starting_addr; +unsigned long ending_addr; +}per_cr_bits ; + +typedef struct { +unsigned short perc_atmid; +unsigned long address; +unsigned char access_id; +}per_lowcore_words ; + +typedef struct { +unsigned perc_branching :1 ; +unsigned perc_instruction_fetch :1 ; +unsigned perc_storage_alteration :1 ; +unsigned perc_gpr_alt_unused :1 ; +unsigned perc_store_real_address :1 ; + unsigned : 3; +unsigned atmid_psw_bit_31 :1 ; +unsigned atmid_validity_bit :1 ; +unsigned atmid_psw_bit_32 :1 ; +unsigned atmid_psw_bit_5 :1 ; +unsigned atmid_psw_bit_16 :1 ; +unsigned atmid_psw_bit_17 :1 ; +unsigned si :2 ; +unsigned long address; + unsigned : 4; +unsigned access_id :4 ; +}per_lowcore_bits ; + +typedef struct { +union { +per_cr_words words; +per_cr_bits bits; + } control_regs; +/* +* The single_step and instruction_fetch bits are obsolete, +* the kernel always sets them to zero. To enable single +* stepping use ptrace(PTRACE_SINGLESTEP) instead. +*/ +unsigned single_step :1 ; +unsigned instruction_fetch :1 ; + unsigned : 30; +/* +* These addresses are copied into cr10 & cr11 if single +* stepping is switched off +*/ +unsigned long starting_addr; +unsigned long ending_addr; +union { +per_lowcore_words words; +per_lowcore_bits bits; + } lowcore; +}per_struct ; + +typedef struct { +unsigned int len; +unsigned long kernel_addr; +unsigned long process_addr; +}ptrace_area ; + +/* +* S/390 specific non posix ptrace requests. I chose unusual values so +* they are unlikely to clash with future ptrace definitions. +*/ +#define PTRACE_PEEKUSR_AREA 0x5000 +#define PTRACE_POKEUSR_AREA 0x5001 +#define PTRACE_PEEKTEXT_AREA 0x5002 +#define PTRACE_PEEKDATA_AREA 0x5003 +#define PTRACE_POKETEXT_AREA 0x5004 +#define PTRACE_POKEDATA_AREA 0x5005 +#define PTRACE_GET_LAST_BREAK 0x5006 +#define PTRACE_PEEK_SYSTEM_CALL 0x5007 +#define PTRACE_POKE_SYSTEM_CALL 0x5008 +#define PTRACE_ENABLE_TE 0x5009 +#define PTRACE_DISABLE_TE 0x5010 +#define PTRACE_TE_ABORT_RAND 0x5011 + +/* +* The numbers chosen here are somewhat arbitrary but absolutely MUST +* not overlap with any of the number assigned in <linux/ptrace.h>. +*/ +#define PTRACE_SINGLEBLOCK 12/* resume execution until next branch */ + +/* +* PT_PROT definition is loosely based on hppa bsd definition in +* gdb/hppab-nat.c +*/ +#define PTRACE_PROT 21 + +typedef enum { + ptprot_set_access_watchpoint, + ptprot_set_write_watchpoint, + ptprot_disable_watchpoint +}ptprot_flags ; + +typedef struct { +unsigned long lowaddr; +unsigned long hiaddr; +ptprot_flags prot; +}ptprot_area ; + +/* Sequence of bytes for breakpoint illegal instruction. */ +#define S390_BREAKPOINT {0x0,0x1} +#define S390_BREAKPOINT_U16 ((__u16)0x0001) +#define S390_SYSCALL_OPCODE ((__u16)0x0a00) +#define S390_SYSCALL_SIZE 2 + +/* +* The user_regs_struct defines the way the user registers are +* store on the stack for signal handling. +*/ +struct user_regs_struct { +psw_t psw; +unsigned long gprs[NUM_GPRS ]; +unsigned int acrs[NUM_ACRS ]; +unsigned long orig_gpr2; +s390_fp_regs fp_regs; +/* +* These per registers are in here so that gdb can modify them +* itself as there is no "official" ptrace interface for hardware +* watchpoints. This is the way intel does it. +*/ +per_struct per_info; +unsigned long ieee_instruction_pointer;/* obsolete, always 0 */ +}; + +#endif /* __ASSEMBLY__ */ + +#endif /* _UAPI_S390_PTRACE_H */
Signature · 1 line
2.31.4