perf tools fixes for v6.8:
Vendor events:
- Intel Alderlake/Sapphire Rapids metric fixes, the CPU type ("cpu_atom", "cpu_core")
needs to be used as a prefix to be considered on a metric formula, detected via one
of the 'perf test' entries.
'perf test' fixes:
- Fix the creation of event selector lists on 'perf test' entries, by initializing
the sample ID flag, which is done by 'perf record', so this fix only the tests,
the common case isn't affected.
- Make 'perf list' respect debug settings (-v) to fix its 'perf test' entry.
- Fix 'perf script' test when python support isn't enabled.
- Special case 'perf script' tests on s390, where only DWARF call graphs are
supported and only on software events.
- Make 'perf daemon' signal test less racy.
Compiler warnings/errors:
- Remove needless malloc(0) call in 'perf top' that triggers -Walloc-size.
- Fix calloc() argument order to address error introduced in gcc-14.
Build:
- Make minimal shellcheck version to v0.6.0, avoiding the build to fail with older versions.
Sync kernel header copies:
- stat.h to pick STATX_MNT_ID_UNIQUE.
- msr-index.h to pick IA32_MKTME_KEYID_PARTITIONING.
- drm.h to pick DRM_IOCTL_MODE_CLOSEFB.
- unistd.h to pick {list,stat}mount, lsm_{[gs]et_self_attr,list_modules} syscall numbers.
- x86 cpufeatures to pick TDX, Zen, APIC MSR fence changes.
- x86's mem{cpy,set}_64.S used in 'perf bench'.
- Also, without tooling effects: asm-generic/unaligned.h, mount.h, fcntl.h, kvm headers.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-----BEGIN PGP SIGNATURE-----
iHUEABYKAB0WIQR2GiIUctdOfX2qHhGyPKLppCJ+JwUCZbwOmQAKCRCyPKLppCJ+
J/TkAP92DD1ZKmc9WzlJ8vpbz+nXwvMIDTRSSBnvYPiDNSL6xAEAkX92qWUQ35RS
faz2v593RZ4VfthcAEl5P6FXEhHhfAc=
=pDc1
-----END PGP SIGNATURE-----
Merge tag 'perf-tools-fixes-for-v6.8-1-2024-02-01' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools
Pull perf tools fixes from Arnaldo Carvalho de Melo:
"Vendor events:
- Intel Alderlake/Sapphire Rapids metric fixes, the CPU type
("cpu_atom", "cpu_core") needs to be used as a prefix to be
considered on a metric formula, detected via one of the 'perf test'
entries.
'perf test' fixes:
- Fix the creation of event selector lists on 'perf test' entries, by
initializing the sample ID flag, which is done by 'perf record', so
this fix affects only the tests, the common case isn't affected
- Make 'perf list' respect debug settings (-v) to fix its 'perf test'
entry
- Fix 'perf script' test when python support isn't enabled
- Special case 'perf script' tests on s390, where only DWARF call
graphs are supported and only on software events
- Make 'perf daemon' signal test less racy
Compiler warnings/errors:
- Remove needless malloc(0) call in 'perf top' that triggers
-Walloc-size
- Fix calloc() argument order to address error introduced in gcc-14
Build:
- Make minimal shellcheck version to v0.6.0, avoiding the build to
fail with older versions
Sync kernel header copies:
- stat.h to pick STATX_MNT_ID_UNIQUE
- msr-index.h to pick IA32_MKTME_KEYID_PARTITIONING
- drm.h to pick DRM_IOCTL_MODE_CLOSEFB
- unistd.h to pick {list,stat}mount,
lsm_{[gs]et_self_attr,list_modules} syscall numbers
- x86 cpufeatures to pick TDX, Zen, APIC MSR fence changes
- x86's mem{cpy,set}_64.S used in 'perf bench'
- Also, without tooling effects: asm-generic/unaligned.h, mount.h,
fcntl.h, kvm headers"
* tag 'perf-tools-fixes-for-v6.8-1-2024-02-01' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools: (21 commits)
perf tools headers: update the asm-generic/unaligned.h copy with the kernel sources
tools include UAPI: Sync linux/mount.h copy with the kernel sources
perf evlist: Fix evlist__new_default() for > 1 core PMU
tools headers: Update the copy of x86's mem{cpy,set}_64.S used in 'perf bench'
tools headers x86 cpufeatures: Sync with the kernel sources to pick TDX, Zen, APIC MSR fence changes
tools headers UAPI: Sync unistd.h to pick {list,stat}mount, lsm_{[gs]et_self_attr,list_modules} syscall numbers
perf vendor events intel: Alderlake/sapphirerapids metric fixes
tools headers UAPI: Sync kvm headers with the kernel sources
perf tools: Fix calloc() arguments to address error introduced in gcc-14
perf top: Remove needless malloc(0) call that triggers -Walloc-size
perf build: Make minimal shellcheck version to v0.6.0
tools headers UAPI: Update tools's copy of drm.h headers to pick DRM_IOCTL_MODE_CLOSEFB
perf test shell daemon: Make signal test less racy
perf test shell script: Fix test for python being disabled
perf test: Workaround debug output in list test
perf list: Add output file option
perf list: Switch error message to pr_err() to respect debug settings (-v)
perf test: Fix 'perf script' tests on s390
tools headers UAPI: Sync linux/fcntl.h with the kernel sources
tools arch x86: Sync the msr-index.h copy with the kernel sources to pick IA32_MKTME_KEYID_PARTITIONING
...
This commit is contained in:
Linus Torvalds
commit
b555d19156
@ -198,6 +198,7 @@
|
||||
#define X86_FEATURE_CAT_L3 ( 7*32+ 4) /* Cache Allocation Technology L3 */
|
||||
#define X86_FEATURE_CAT_L2 ( 7*32+ 5) /* Cache Allocation Technology L2 */
|
||||
#define X86_FEATURE_CDP_L3 ( 7*32+ 6) /* Code and Data Prioritization L3 */
|
||||
#define X86_FEATURE_TDX_HOST_PLATFORM ( 7*32+ 7) /* Platform supports being a TDX host */
|
||||
#define X86_FEATURE_HW_PSTATE ( 7*32+ 8) /* AMD HW-PState */
|
||||
#define X86_FEATURE_PROC_FEEDBACK ( 7*32+ 9) /* AMD ProcFeedbackInterface */
|
||||
#define X86_FEATURE_XCOMPACTED ( 7*32+10) /* "" Use compacted XSTATE (XSAVES or XSAVEC) */
|
||||
@ -308,10 +309,14 @@
|
||||
#define X86_FEATURE_SMBA (11*32+21) /* "" Slow Memory Bandwidth Allocation */
|
||||
#define X86_FEATURE_BMEC (11*32+22) /* "" Bandwidth Monitoring Event Configuration */
|
||||
#define X86_FEATURE_USER_SHSTK (11*32+23) /* Shadow stack support for user mode applications */
|
||||
|
||||
#define X86_FEATURE_SRSO (11*32+24) /* "" AMD BTB untrain RETs */
|
||||
#define X86_FEATURE_SRSO_ALIAS (11*32+25) /* "" AMD BTB untrain RETs through aliasing */
|
||||
#define X86_FEATURE_IBPB_ON_VMEXIT (11*32+26) /* "" Issue an IBPB only on VMEXIT */
|
||||
#define X86_FEATURE_APIC_MSRS_FENCE (11*32+27) /* "" IA32_TSC_DEADLINE and X2APIC MSRs need fencing */
|
||||
#define X86_FEATURE_ZEN2 (11*32+28) /* "" CPU based on Zen2 microarchitecture */
|
||||
#define X86_FEATURE_ZEN3 (11*32+29) /* "" CPU based on Zen3 microarchitecture */
|
||||
#define X86_FEATURE_ZEN4 (11*32+30) /* "" CPU based on Zen4 microarchitecture */
|
||||
#define X86_FEATURE_ZEN1 (11*32+31) /* "" CPU based on Zen1 microarchitecture */
|
||||
|
||||
/* Intel-defined CPU features, CPUID level 0x00000007:1 (EAX), word 12 */
|
||||
#define X86_FEATURE_AVX_VNNI (12*32+ 4) /* AVX VNNI instructions */
|
||||
@ -495,6 +500,7 @@
|
||||
#define X86_BUG_EIBRS_PBRSB X86_BUG(28) /* EIBRS is vulnerable to Post Barrier RSB Predictions */
|
||||
#define X86_BUG_SMT_RSB X86_BUG(29) /* CPU is vulnerable to Cross-Thread Return Address Predictions */
|
||||
#define X86_BUG_GDS X86_BUG(30) /* CPU is affected by Gather Data Sampling */
|
||||
#define X86_BUG_TDX_PW_MCE X86_BUG(31) /* CPU may incur #MC if non-TD software does partial write to TDX private memory */
|
||||
|
||||
/* BUG word 2 */
|
||||
#define X86_BUG_SRSO X86_BUG(1*32 + 0) /* AMD SRSO bug */
|
||||
|
||||
@ -237,6 +237,11 @@
|
||||
#define LBR_INFO_CYCLES 0xffff
|
||||
#define LBR_INFO_BR_TYPE_OFFSET 56
|
||||
#define LBR_INFO_BR_TYPE (0xfull << LBR_INFO_BR_TYPE_OFFSET)
|
||||
#define LBR_INFO_BR_CNTR_OFFSET 32
|
||||
#define LBR_INFO_BR_CNTR_NUM 4
|
||||
#define LBR_INFO_BR_CNTR_BITS 2
|
||||
#define LBR_INFO_BR_CNTR_MASK GENMASK_ULL(LBR_INFO_BR_CNTR_BITS - 1, 0)
|
||||
#define LBR_INFO_BR_CNTR_FULL_MASK GENMASK_ULL(LBR_INFO_BR_CNTR_NUM * LBR_INFO_BR_CNTR_BITS - 1, 0)
|
||||
|
||||
#define MSR_ARCH_LBR_CTL 0x000014ce
|
||||
#define ARCH_LBR_CTL_LBREN BIT(0)
|
||||
@ -536,6 +541,9 @@
|
||||
#define MSR_RELOAD_PMC0 0x000014c1
|
||||
#define MSR_RELOAD_FIXED_CTR0 0x00001309
|
||||
|
||||
/* KeyID partitioning between MKTME and TDX */
|
||||
#define MSR_IA32_MKTME_KEYID_PARTITIONING 0x00000087
|
||||
|
||||
/*
|
||||
* AMD64 MSRs. Not complete. See the architecture manual for a more
|
||||
* complete list.
|
||||
|
||||
@ -562,4 +562,7 @@ struct kvm_pmu_event_filter {
|
||||
/* x86-specific KVM_EXIT_HYPERCALL flags. */
|
||||
#define KVM_EXIT_HYPERCALL_LONG_MODE BIT(0)
|
||||
|
||||
#define KVM_X86_DEFAULT_VM 0
|
||||
#define KVM_X86_SW_PROTECTED_VM 1
|
||||
|
||||
#endif /* _ASM_X86_KVM_H */
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
/* Copyright 2002 Andi Kleen */
|
||||
|
||||
#include <linux/export.h>
|
||||
#include <linux/linkage.h>
|
||||
#include <asm/errno.h>
|
||||
#include <asm/cpufeatures.h>
|
||||
#include <asm/alternative.h>
|
||||
#include <asm/export.h>
|
||||
|
||||
.section .noinstr.text, "ax"
|
||||
|
||||
@ -39,7 +39,7 @@ SYM_TYPED_FUNC_START(__memcpy)
|
||||
SYM_FUNC_END(__memcpy)
|
||||
EXPORT_SYMBOL(__memcpy)
|
||||
|
||||
SYM_FUNC_ALIAS(memcpy, __memcpy)
|
||||
SYM_FUNC_ALIAS_MEMFUNC(memcpy, __memcpy)
|
||||
EXPORT_SYMBOL(memcpy)
|
||||
|
||||
SYM_FUNC_START_LOCAL(memcpy_orig)
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
/* Copyright 2002 Andi Kleen, SuSE Labs */
|
||||
|
||||
#include <linux/export.h>
|
||||
#include <linux/linkage.h>
|
||||
#include <asm/cpufeatures.h>
|
||||
#include <asm/alternative.h>
|
||||
#include <asm/export.h>
|
||||
|
||||
.section .noinstr.text, "ax"
|
||||
|
||||
@ -40,7 +40,7 @@ SYM_FUNC_START(__memset)
|
||||
SYM_FUNC_END(__memset)
|
||||
EXPORT_SYMBOL(__memset)
|
||||
|
||||
SYM_FUNC_ALIAS(memset, __memset)
|
||||
SYM_FUNC_ALIAS_MEMFUNC(memset, __memset)
|
||||
EXPORT_SYMBOL(memset)
|
||||
|
||||
SYM_FUNC_START_LOCAL(memset_orig)
|
||||
|
||||
@ -105,9 +105,9 @@ static inline u32 get_unaligned_le24(const void *p)
|
||||
|
||||
static inline void __put_unaligned_be24(const u32 val, u8 *p)
|
||||
{
|
||||
*p++ = val >> 16;
|
||||
*p++ = val >> 8;
|
||||
*p++ = val;
|
||||
*p++ = (val >> 16) & 0xff;
|
||||
*p++ = (val >> 8) & 0xff;
|
||||
*p++ = val & 0xff;
|
||||
}
|
||||
|
||||
static inline void put_unaligned_be24(const u32 val, void *p)
|
||||
@ -117,9 +117,9 @@ static inline void put_unaligned_be24(const u32 val, void *p)
|
||||
|
||||
static inline void __put_unaligned_le24(const u32 val, u8 *p)
|
||||
{
|
||||
*p++ = val;
|
||||
*p++ = val >> 8;
|
||||
*p++ = val >> 16;
|
||||
*p++ = val & 0xff;
|
||||
*p++ = (val >> 8) & 0xff;
|
||||
*p++ = (val >> 16) & 0xff;
|
||||
}
|
||||
|
||||
static inline void put_unaligned_le24(const u32 val, void *p)
|
||||
@ -129,12 +129,12 @@ static inline void put_unaligned_le24(const u32 val, void *p)
|
||||
|
||||
static inline void __put_unaligned_be48(const u64 val, u8 *p)
|
||||
{
|
||||
*p++ = val >> 40;
|
||||
*p++ = val >> 32;
|
||||
*p++ = val >> 24;
|
||||
*p++ = val >> 16;
|
||||
*p++ = val >> 8;
|
||||
*p++ = val;
|
||||
*p++ = (val >> 40) & 0xff;
|
||||
*p++ = (val >> 32) & 0xff;
|
||||
*p++ = (val >> 24) & 0xff;
|
||||
*p++ = (val >> 16) & 0xff;
|
||||
*p++ = (val >> 8) & 0xff;
|
||||
*p++ = val & 0xff;
|
||||
}
|
||||
|
||||
static inline void put_unaligned_be48(const u64 val, void *p)
|
||||
|
||||
@ -829,8 +829,21 @@ __SYSCALL(__NR_futex_wait, sys_futex_wait)
|
||||
#define __NR_futex_requeue 456
|
||||
__SYSCALL(__NR_futex_requeue, sys_futex_requeue)
|
||||
|
||||
#define __NR_statmount 457
|
||||
__SYSCALL(__NR_statmount, sys_statmount)
|
||||
|
||||
#define __NR_listmount 458
|
||||
__SYSCALL(__NR_listmount, sys_listmount)
|
||||
|
||||
#define __NR_lsm_get_self_attr 459
|
||||
__SYSCALL(__NR_lsm_get_self_attr, sys_lsm_get_self_attr)
|
||||
#define __NR_lsm_set_self_attr 460
|
||||
__SYSCALL(__NR_lsm_set_self_attr, sys_lsm_set_self_attr)
|
||||
#define __NR_lsm_list_modules 461
|
||||
__SYSCALL(__NR_lsm_list_modules, sys_lsm_list_modules)
|
||||
|
||||
#undef __NR_syscalls
|
||||
#define __NR_syscalls 457
|
||||
#define __NR_syscalls 462
|
||||
|
||||
/*
|
||||
* 32 bit systems traditionally used different
|
||||
|
||||
@ -713,7 +713,8 @@ struct drm_gem_open {
|
||||
/**
|
||||
* DRM_CAP_ASYNC_PAGE_FLIP
|
||||
*
|
||||
* If set to 1, the driver supports &DRM_MODE_PAGE_FLIP_ASYNC.
|
||||
* If set to 1, the driver supports &DRM_MODE_PAGE_FLIP_ASYNC for legacy
|
||||
* page-flips.
|
||||
*/
|
||||
#define DRM_CAP_ASYNC_PAGE_FLIP 0x7
|
||||
/**
|
||||
@ -773,6 +774,13 @@ struct drm_gem_open {
|
||||
* :ref:`drm_sync_objects`.
|
||||
*/
|
||||
#define DRM_CAP_SYNCOBJ_TIMELINE 0x14
|
||||
/**
|
||||
* DRM_CAP_ATOMIC_ASYNC_PAGE_FLIP
|
||||
*
|
||||
* If set to 1, the driver supports &DRM_MODE_PAGE_FLIP_ASYNC for atomic
|
||||
* commits.
|
||||
*/
|
||||
#define DRM_CAP_ATOMIC_ASYNC_PAGE_FLIP 0x15
|
||||
|
||||
/* DRM_IOCTL_GET_CAP ioctl argument type */
|
||||
struct drm_get_cap {
|
||||
@ -842,6 +850,31 @@ struct drm_get_cap {
|
||||
*/
|
||||
#define DRM_CLIENT_CAP_WRITEBACK_CONNECTORS 5
|
||||
|
||||
/**
|
||||
* DRM_CLIENT_CAP_CURSOR_PLANE_HOTSPOT
|
||||
*
|
||||
* Drivers for para-virtualized hardware (e.g. vmwgfx, qxl, virtio and
|
||||
* virtualbox) have additional restrictions for cursor planes (thus
|
||||
* making cursor planes on those drivers not truly universal,) e.g.
|
||||
* they need cursor planes to act like one would expect from a mouse
|
||||
* cursor and have correctly set hotspot properties.
|
||||
* If this client cap is not set the DRM core will hide cursor plane on
|
||||
* those virtualized drivers because not setting it implies that the
|
||||
* client is not capable of dealing with those extra restictions.
|
||||
* Clients which do set cursor hotspot and treat the cursor plane
|
||||
* like a mouse cursor should set this property.
|
||||
* The client must enable &DRM_CLIENT_CAP_ATOMIC first.
|
||||
*
|
||||
* Setting this property on drivers which do not special case
|
||||
* cursor planes (i.e. non-virtualized drivers) will return
|
||||
* EOPNOTSUPP, which can be used by userspace to gauge
|
||||
* requirements of the hardware/drivers they're running on.
|
||||
*
|
||||
* This capability is always supported for atomic-capable virtualized
|
||||
* drivers starting from kernel version 6.6.
|
||||
*/
|
||||
#define DRM_CLIENT_CAP_CURSOR_PLANE_HOTSPOT 6
|
||||
|
||||
/* DRM_IOCTL_SET_CLIENT_CAP ioctl argument type */
|
||||
struct drm_set_client_cap {
|
||||
__u64 capability;
|
||||
@ -893,6 +926,7 @@ struct drm_syncobj_transfer {
|
||||
#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL (1 << 0)
|
||||
#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT (1 << 1)
|
||||
#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE (1 << 2) /* wait for time point to become available */
|
||||
#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_DEADLINE (1 << 3) /* set fence deadline to deadline_nsec */
|
||||
struct drm_syncobj_wait {
|
||||
__u64 handles;
|
||||
/* absolute timeout */
|
||||
@ -901,6 +935,14 @@ struct drm_syncobj_wait {
|
||||
__u32 flags;
|
||||
__u32 first_signaled; /* only valid when not waiting all */
|
||||
__u32 pad;
|
||||
/**
|
||||
* @deadline_nsec - fence deadline hint
|
||||
*
|
||||
* Deadline hint, in absolute CLOCK_MONOTONIC, to set on backing
|
||||
* fence(s) if the DRM_SYNCOBJ_WAIT_FLAGS_WAIT_DEADLINE flag is
|
||||
* set.
|
||||
*/
|
||||
__u64 deadline_nsec;
|
||||
};
|
||||
|
||||
struct drm_syncobj_timeline_wait {
|
||||
@ -913,6 +955,14 @@ struct drm_syncobj_timeline_wait {
|
||||
__u32 flags;
|
||||
__u32 first_signaled; /* only valid when not waiting all */
|
||||
__u32 pad;
|
||||
/**
|
||||
* @deadline_nsec - fence deadline hint
|
||||
*
|
||||
* Deadline hint, in absolute CLOCK_MONOTONIC, to set on backing
|
||||
* fence(s) if the DRM_SYNCOBJ_WAIT_FLAGS_WAIT_DEADLINE flag is
|
||||
* set.
|
||||
*/
|
||||
__u64 deadline_nsec;
|
||||
};
|
||||
|
||||
/**
|
||||
@ -1218,6 +1268,26 @@ extern "C" {
|
||||
|
||||
#define DRM_IOCTL_SYNCOBJ_EVENTFD DRM_IOWR(0xCF, struct drm_syncobj_eventfd)
|
||||
|
||||
/**
|
||||
* DRM_IOCTL_MODE_CLOSEFB - Close a framebuffer.
|
||||
*
|
||||
* This closes a framebuffer previously added via ADDFB/ADDFB2. The IOCTL
|
||||
* argument is a framebuffer object ID.
|
||||
*
|
||||
* This IOCTL is similar to &DRM_IOCTL_MODE_RMFB, except it doesn't disable
|
||||
* planes and CRTCs. As long as the framebuffer is used by a plane, it's kept
|
||||
* alive. When the plane no longer uses the framebuffer (because the
|
||||
* framebuffer is replaced with another one, or the plane is disabled), the
|
||||
* framebuffer is cleaned up.
|
||||
*
|
||||
* This is useful to implement flicker-free transitions between two processes.
|
||||
*
|
||||
* Depending on the threat model, user-space may want to ensure that the
|
||||
* framebuffer doesn't expose any sensitive user information: closed
|
||||
* framebuffers attached to a plane can be read back by the next DRM master.
|
||||
*/
|
||||
#define DRM_IOCTL_MODE_CLOSEFB DRM_IOWR(0xD0, struct drm_mode_closefb)
|
||||
|
||||
/*
|
||||
* Device specific ioctls should only be in their respective headers
|
||||
* The device specific ioctl range is from 0x40 to 0x9f.
|
||||
|
||||
@ -693,7 +693,7 @@ typedef struct drm_i915_irq_wait {
|
||||
#define I915_PARAM_HAS_EXEC_FENCE 44
|
||||
|
||||
/* Query whether DRM_I915_GEM_EXECBUFFER2 supports the ability to capture
|
||||
* user specified bufffers for post-mortem debugging of GPU hangs. See
|
||||
* user-specified buffers for post-mortem debugging of GPU hangs. See
|
||||
* EXEC_OBJECT_CAPTURE.
|
||||
*/
|
||||
#define I915_PARAM_HAS_EXEC_CAPTURE 45
|
||||
@ -1606,7 +1606,7 @@ struct drm_i915_gem_busy {
|
||||
* is accurate.
|
||||
*
|
||||
* The returned dword is split into two fields to indicate both
|
||||
* the engine classess on which the object is being read, and the
|
||||
* the engine classes on which the object is being read, and the
|
||||
* engine class on which it is currently being written (if any).
|
||||
*
|
||||
* The low word (bits 0:15) indicate if the object is being written
|
||||
@ -1815,7 +1815,7 @@ struct drm_i915_gem_madvise {
|
||||
__u32 handle;
|
||||
|
||||
/* Advice: either the buffer will be needed again in the near future,
|
||||
* or wont be and could be discarded under memory pressure.
|
||||
* or won't be and could be discarded under memory pressure.
|
||||
*/
|
||||
__u32 madv;
|
||||
|
||||
@ -3246,7 +3246,7 @@ struct drm_i915_query_topology_info {
|
||||
* // enough to hold our array of engines. The kernel will fill out the
|
||||
* // item.length for us, which is the number of bytes we need.
|
||||
* //
|
||||
* // Alternatively a large buffer can be allocated straight away enabling
|
||||
* // Alternatively a large buffer can be allocated straightaway enabling
|
||||
* // querying in one pass, in which case item.length should contain the
|
||||
* // length of the provided buffer.
|
||||
* err = ioctl(fd, DRM_IOCTL_I915_QUERY, &query);
|
||||
@ -3256,7 +3256,7 @@ struct drm_i915_query_topology_info {
|
||||
* // Now that we allocated the required number of bytes, we call the ioctl
|
||||
* // again, this time with the data_ptr pointing to our newly allocated
|
||||
* // blob, which the kernel can then populate with info on all engines.
|
||||
* item.data_ptr = (uintptr_t)&info,
|
||||
* item.data_ptr = (uintptr_t)&info;
|
||||
*
|
||||
* err = ioctl(fd, DRM_IOCTL_I915_QUERY, &query);
|
||||
* if (err) ...
|
||||
@ -3286,7 +3286,7 @@ struct drm_i915_query_topology_info {
|
||||
/**
|
||||
* struct drm_i915_engine_info
|
||||
*
|
||||
* Describes one engine and it's capabilities as known to the driver.
|
||||
* Describes one engine and its capabilities as known to the driver.
|
||||
*/
|
||||
struct drm_i915_engine_info {
|
||||
/** @engine: Engine class and instance. */
|
||||
|
||||
@ -116,5 +116,8 @@
|
||||
#define AT_HANDLE_FID AT_REMOVEDIR /* file handle is needed to
|
||||
compare object identity and may not
|
||||
be usable to open_by_handle_at(2) */
|
||||
#if defined(__KERNEL__)
|
||||
#define AT_GETATTR_NOSEC 0x80000000
|
||||
#endif
|
||||
|
||||
#endif /* _UAPI_LINUX_FCNTL_H */
|
||||
|
||||
@ -16,76 +16,6 @@
|
||||
|
||||
#define KVM_API_VERSION 12
|
||||
|
||||
/* *** Deprecated interfaces *** */
|
||||
|
||||
#define KVM_TRC_SHIFT 16
|
||||
|
||||
#define KVM_TRC_ENTRYEXIT (1 << KVM_TRC_SHIFT)
|
||||
#define KVM_TRC_HANDLER (1 << (KVM_TRC_SHIFT + 1))
|
||||
|
||||
#define KVM_TRC_VMENTRY (KVM_TRC_ENTRYEXIT + 0x01)
|
||||
#define KVM_TRC_VMEXIT (KVM_TRC_ENTRYEXIT + 0x02)
|
||||
#define KVM_TRC_PAGE_FAULT (KVM_TRC_HANDLER + 0x01)
|
||||
|
||||
#define KVM_TRC_HEAD_SIZE 12
|
||||
#define KVM_TRC_CYCLE_SIZE 8
|
||||
#define KVM_TRC_EXTRA_MAX 7
|
||||
|
||||
#define KVM_TRC_INJ_VIRQ (KVM_TRC_HANDLER + 0x02)
|
||||
#define KVM_TRC_REDELIVER_EVT (KVM_TRC_HANDLER + 0x03)
|
||||
#define KVM_TRC_PEND_INTR (KVM_TRC_HANDLER + 0x04)
|
||||
#define KVM_TRC_IO_READ (KVM_TRC_HANDLER + 0x05)
|
||||
#define KVM_TRC_IO_WRITE (KVM_TRC_HANDLER + 0x06)
|
||||
#define KVM_TRC_CR_READ (KVM_TRC_HANDLER + 0x07)
|
||||
#define KVM_TRC_CR_WRITE (KVM_TRC_HANDLER + 0x08)
|
||||
#define KVM_TRC_DR_READ (KVM_TRC_HANDLER + 0x09)
|
||||
#define KVM_TRC_DR_WRITE (KVM_TRC_HANDLER + 0x0A)
|
||||
#define KVM_TRC_MSR_READ (KVM_TRC_HANDLER + 0x0B)
|
||||
#define KVM_TRC_MSR_WRITE (KVM_TRC_HANDLER + 0x0C)
|
||||
#define KVM_TRC_CPUID (KVM_TRC_HANDLER + 0x0D)
|
||||
#define KVM_TRC_INTR (KVM_TRC_HANDLER + 0x0E)
|
||||
#define KVM_TRC_NMI (KVM_TRC_HANDLER + 0x0F)
|
||||
#define KVM_TRC_VMMCALL (KVM_TRC_HANDLER + 0x10)
|
||||
#define KVM_TRC_HLT (KVM_TRC_HANDLER + 0x11)
|
||||
#define KVM_TRC_CLTS (KVM_TRC_HANDLER + 0x12)
|
||||
#define KVM_TRC_LMSW (KVM_TRC_HANDLER + 0x13)
|
||||
#define KVM_TRC_APIC_ACCESS (KVM_TRC_HANDLER + 0x14)
|
||||
#define KVM_TRC_TDP_FAULT (KVM_TRC_HANDLER + 0x15)
|
||||
#define KVM_TRC_GTLB_WRITE (KVM_TRC_HANDLER + 0x16)
|
||||
#define KVM_TRC_STLB_WRITE (KVM_TRC_HANDLER + 0x17)
|
||||
#define KVM_TRC_STLB_INVAL (KVM_TRC_HANDLER + 0x18)
|
||||
#define KVM_TRC_PPC_INSTR (KVM_TRC_HANDLER + 0x19)
|
||||
|
||||
struct kvm_user_trace_setup {
|
||||
__u32 buf_size;
|
||||
__u32 buf_nr;
|
||||
};
|
||||
|
||||
#define __KVM_DEPRECATED_MAIN_W_0x06 \
|
||||
_IOW(KVMIO, 0x06, struct kvm_user_trace_setup)
|
||||
#define __KVM_DEPRECATED_MAIN_0x07 _IO(KVMIO, 0x07)
|
||||
#define __KVM_DEPRECATED_MAIN_0x08 _IO(KVMIO, 0x08)
|
||||
|
||||
#define __KVM_DEPRECATED_VM_R_0x70 _IOR(KVMIO, 0x70, struct kvm_assigned_irq)
|
||||
|
||||
struct kvm_breakpoint {
|
||||
__u32 enabled;
|
||||
__u32 padding;
|
||||
__u64 address;
|
||||
};
|
||||
|
||||
struct kvm_debug_guest {
|
||||
__u32 enabled;
|
||||
__u32 pad;
|
||||
struct kvm_breakpoint breakpoints[4];
|
||||
__u32 singlestep;
|
||||
};
|
||||
|
||||
#define __KVM_DEPRECATED_VCPU_W_0x87 _IOW(KVMIO, 0x87, struct kvm_debug_guest)
|
||||
|
||||
/* *** End of deprecated interfaces *** */
|
||||
|
||||
|
||||
/* for KVM_SET_USER_MEMORY_REGION */
|
||||
struct kvm_userspace_memory_region {
|
||||
__u32 slot;
|
||||
@ -95,6 +25,19 @@ struct kvm_userspace_memory_region {
|
||||
__u64 userspace_addr; /* start of the userspace allocated memory */
|
||||
};
|
||||
|
||||
/* for KVM_SET_USER_MEMORY_REGION2 */
|
||||
struct kvm_userspace_memory_region2 {
|
||||
__u32 slot;
|
||||
__u32 flags;
|
||||
__u64 guest_phys_addr;
|
||||
__u64 memory_size;
|
||||
__u64 userspace_addr;
|
||||
__u64 guest_memfd_offset;
|
||||
__u32 guest_memfd;
|
||||
__u32 pad1;
|
||||
__u64 pad2[14];
|
||||
};
|
||||
|
||||
/*
|
||||
* The bit 0 ~ bit 15 of kvm_userspace_memory_region::flags are visible for
|
||||
* userspace, other bits are reserved for kvm internal use which are defined
|
||||
@ -102,6 +45,7 @@ struct kvm_userspace_memory_region {
|
||||
*/
|
||||
#define KVM_MEM_LOG_DIRTY_PAGES (1UL << 0)
|
||||
#define KVM_MEM_READONLY (1UL << 1)
|
||||
#define KVM_MEM_GUEST_MEMFD (1UL << 2)
|
||||
|
||||
/* for KVM_IRQ_LINE */
|
||||
struct kvm_irq_level {
|
||||
@ -265,6 +209,7 @@ struct kvm_xen_exit {
|
||||
#define KVM_EXIT_RISCV_CSR 36
|
||||
#define KVM_EXIT_NOTIFY 37
|
||||
#define KVM_EXIT_LOONGARCH_IOCSR 38
|
||||
#define KVM_EXIT_MEMORY_FAULT 39
|
||||
|
||||
/* For KVM_EXIT_INTERNAL_ERROR */
|
||||
/* Emulate instruction failed. */
|
||||
@ -518,6 +463,13 @@ struct kvm_run {
|
||||
#define KVM_NOTIFY_CONTEXT_INVALID (1 << 0)
|
||||
__u32 flags;
|
||||
} notify;
|
||||
/* KVM_EXIT_MEMORY_FAULT */
|
||||
struct {
|
||||
#define KVM_MEMORY_EXIT_FLAG_PRIVATE (1ULL << 3)
|
||||
__u64 flags;
|
||||
__u64 gpa;
|
||||
__u64 size;
|
||||
} memory_fault;
|
||||
/* Fix the size of the union. */
|
||||
char padding[256];
|
||||
};
|
||||
@ -945,9 +897,6 @@ struct kvm_ppc_resize_hpt {
|
||||
*/
|
||||
#define KVM_GET_VCPU_MMAP_SIZE _IO(KVMIO, 0x04) /* in bytes */
|
||||
#define KVM_GET_SUPPORTED_CPUID _IOWR(KVMIO, 0x05, struct kvm_cpuid2)
|
||||
#define KVM_TRACE_ENABLE __KVM_DEPRECATED_MAIN_W_0x06
|
||||
#define KVM_TRACE_PAUSE __KVM_DEPRECATED_MAIN_0x07
|
||||
#define KVM_TRACE_DISABLE __KVM_DEPRECATED_MAIN_0x08
|
||||
#define KVM_GET_EMULATED_CPUID _IOWR(KVMIO, 0x09, struct kvm_cpuid2)
|
||||
#define KVM_GET_MSR_FEATURE_INDEX_LIST _IOWR(KVMIO, 0x0a, struct kvm_msr_list)
|
||||
|
||||
@ -1201,6 +1150,11 @@ struct kvm_ppc_resize_hpt {
|
||||
#define KVM_CAP_ARM_EAGER_SPLIT_CHUNK_SIZE 228
|
||||
#define KVM_CAP_ARM_SUPPORTED_BLOCK_SIZES 229
|
||||
#define KVM_CAP_ARM_SUPPORTED_REG_MASK_RANGES 230
|
||||
#define KVM_CAP_USER_MEMORY2 231
|
||||
#define KVM_CAP_MEMORY_FAULT_INFO 232
|
||||
#define KVM_CAP_MEMORY_ATTRIBUTES 233
|
||||
#define KVM_CAP_GUEST_MEMFD 234
|
||||
#define KVM_CAP_VM_TYPES 235
|
||||
|
||||
#ifdef KVM_CAP_IRQ_ROUTING
|
||||
|
||||
@ -1291,6 +1245,7 @@ struct kvm_x86_mce {
|
||||
#define KVM_XEN_HVM_CONFIG_EVTCHN_2LEVEL (1 << 4)
|
||||
#define KVM_XEN_HVM_CONFIG_EVTCHN_SEND (1 << 5)
|
||||
#define KVM_XEN_HVM_CONFIG_RUNSTATE_UPDATE_FLAG (1 << 6)
|
||||
#define KVM_XEN_HVM_CONFIG_PVCLOCK_TSC_UNSTABLE (1 << 7)
|
||||
|
||||
struct kvm_xen_hvm_config {
|
||||
__u32 flags;
|
||||
@ -1483,6 +1438,8 @@ struct kvm_vfio_spapr_tce {
|
||||
struct kvm_userspace_memory_region)
|
||||
#define KVM_SET_TSS_ADDR _IO(KVMIO, 0x47)
|
||||
#define KVM_SET_IDENTITY_MAP_ADDR _IOW(KVMIO, 0x48, __u64)
|
||||
#define KVM_SET_USER_MEMORY_REGION2 _IOW(KVMIO, 0x49, \
|
||||
struct kvm_userspace_memory_region2)
|
||||
|
||||
/* enable ucontrol for s390 */
|
||||
struct kvm_s390_ucas_mapping {
|
||||
@ -1507,20 +1464,8 @@ struct kvm_s390_ucas_mapping {
|
||||
_IOW(KVMIO, 0x67, struct kvm_coalesced_mmio_zone)
|
||||
#define KVM_UNREGISTER_COALESCED_MMIO \
|
||||
_IOW(KVMIO, 0x68, struct kvm_coalesced_mmio_zone)
|
||||
#define KVM_ASSIGN_PCI_DEVICE _IOR(KVMIO, 0x69, \
|
||||
struct kvm_assigned_pci_dev)
|
||||
#define KVM_SET_GSI_ROUTING _IOW(KVMIO, 0x6a, struct kvm_irq_routing)
|
||||
/* deprecated, replaced by KVM_ASSIGN_DEV_IRQ */
|
||||
#define KVM_ASSIGN_IRQ __KVM_DEPRECATED_VM_R_0x70
|
||||
#define KVM_ASSIGN_DEV_IRQ _IOW(KVMIO, 0x70, struct kvm_assigned_irq)
|
||||
#define KVM_REINJECT_CONTROL _IO(KVMIO, 0x71)
|
||||
#define KVM_DEASSIGN_PCI_DEVICE _IOW(KVMIO, 0x72, \
|
||||
struct kvm_assigned_pci_dev)
|
||||
#define KVM_ASSIGN_SET_MSIX_NR _IOW(KVMIO, 0x73, \
|
||||
struct kvm_assigned_msix_nr)
|
||||
#define KVM_ASSIGN_SET_MSIX_ENTRY _IOW(KVMIO, 0x74, \
|
||||
struct kvm_assigned_msix_entry)
|
||||
#define KVM_DEASSIGN_DEV_IRQ _IOW(KVMIO, 0x75, struct kvm_assigned_irq)
|
||||
#define KVM_IRQFD _IOW(KVMIO, 0x76, struct kvm_irqfd)
|
||||
#define KVM_CREATE_PIT2 _IOW(KVMIO, 0x77, struct kvm_pit_config)
|
||||
#define KVM_SET_BOOT_CPU_ID _IO(KVMIO, 0x78)
|
||||
@ -1537,9 +1482,6 @@ struct kvm_s390_ucas_mapping {
|
||||
* KVM_CAP_VM_TSC_CONTROL to set defaults for a VM */
|
||||
#define KVM_SET_TSC_KHZ _IO(KVMIO, 0xa2)
|
||||
#define KVM_GET_TSC_KHZ _IO(KVMIO, 0xa3)
|
||||
/* Available with KVM_CAP_PCI_2_3 */
|
||||
#define KVM_ASSIGN_SET_INTX_MASK _IOW(KVMIO, 0xa4, \
|
||||
struct kvm_assigned_pci_dev)
|
||||
/* Available with KVM_CAP_SIGNAL_MSI */
|
||||
#define KVM_SIGNAL_MSI _IOW(KVMIO, 0xa5, struct kvm_msi)
|
||||
/* Available with KVM_CAP_PPC_GET_SMMU_INFO */
|
||||
@ -1592,8 +1534,6 @@ struct kvm_s390_ucas_mapping {
|
||||
#define KVM_SET_SREGS _IOW(KVMIO, 0x84, struct kvm_sregs)
|
||||
#define KVM_TRANSLATE _IOWR(KVMIO, 0x85, struct kvm_translation)
|
||||
#define KVM_INTERRUPT _IOW(KVMIO, 0x86, struct kvm_interrupt)
|
||||
/* KVM_DEBUG_GUEST is no longer supported, use KVM_SET_GUEST_DEBUG instead */
|
||||
#define KVM_DEBUG_GUEST __KVM_DEPRECATED_VCPU_W_0x87
|
||||
#define KVM_GET_MSRS _IOWR(KVMIO, 0x88, struct kvm_msrs)
|
||||
#define KVM_SET_MSRS _IOW(KVMIO, 0x89, struct kvm_msrs)
|
||||
#define KVM_SET_CPUID _IOW(KVMIO, 0x8a, struct kvm_cpuid)
|
||||
@ -2267,4 +2207,24 @@ struct kvm_s390_zpci_op {
|
||||
/* flags for kvm_s390_zpci_op->u.reg_aen.flags */
|
||||
#define KVM_S390_ZPCIOP_REGAEN_HOST (1 << 0)
|
||||
|
||||
/* Available with KVM_CAP_MEMORY_ATTRIBUTES */
|
||||
#define KVM_SET_MEMORY_ATTRIBUTES _IOW(KVMIO, 0xd2, struct kvm_memory_attributes)
|
||||
|
||||
struct kvm_memory_attributes {
|
||||
__u64 address;
|
||||
__u64 size;
|
||||
__u64 attributes;
|
||||
__u64 flags;
|
||||
};
|
||||
|
||||
#define KVM_MEMORY_ATTRIBUTE_PRIVATE (1ULL << 3)
|
||||
|
||||
#define KVM_CREATE_GUEST_MEMFD _IOWR(KVMIO, 0xd4, struct kvm_create_guest_memfd)
|
||||
|
||||
struct kvm_create_guest_memfd {
|
||||
__u64 size;
|
||||
__u64 flags;
|
||||
__u64 reserved[6];
|
||||
};
|
||||
|
||||
#endif /* __LINUX_KVM_H */
|
||||
|
||||
@ -138,4 +138,74 @@ struct mount_attr {
|
||||
/* List of all mount_attr versions. */
|
||||
#define MOUNT_ATTR_SIZE_VER0 32 /* sizeof first published struct */
|
||||
|
||||
|
||||
/*
|
||||
* Structure for getting mount/superblock/filesystem info with statmount(2).
|
||||
*
|
||||
* The interface is similar to statx(2): individual fields or groups can be
|
||||
* selected with the @mask argument of statmount(). Kernel will set the @mask
|
||||
* field according to the supported fields.
|
||||
*
|
||||
* If string fields are selected, then the caller needs to pass a buffer that
|
||||
* has space after the fixed part of the structure. Nul terminated strings are
|
||||
* copied there and offsets relative to @str are stored in the relevant fields.
|
||||
* If the buffer is too small, then EOVERFLOW is returned. The actually used
|
||||
* size is returned in @size.
|
||||
*/
|
||||
struct statmount {
|
||||
__u32 size; /* Total size, including strings */
|
||||
__u32 __spare1;
|
||||
__u64 mask; /* What results were written */
|
||||
__u32 sb_dev_major; /* Device ID */
|
||||
__u32 sb_dev_minor;
|
||||
__u64 sb_magic; /* ..._SUPER_MAGIC */
|
||||
__u32 sb_flags; /* SB_{RDONLY,SYNCHRONOUS,DIRSYNC,LAZYTIME} */
|
||||
__u32 fs_type; /* [str] Filesystem type */
|
||||
__u64 mnt_id; /* Unique ID of mount */
|
||||
__u64 mnt_parent_id; /* Unique ID of parent (for root == mnt_id) */
|
||||
__u32 mnt_id_old; /* Reused IDs used in proc/.../mountinfo */
|
||||
__u32 mnt_parent_id_old;
|
||||
__u64 mnt_attr; /* MOUNT_ATTR_... */
|
||||
__u64 mnt_propagation; /* MS_{SHARED,SLAVE,PRIVATE,UNBINDABLE} */
|
||||
__u64 mnt_peer_group; /* ID of shared peer group */
|
||||
__u64 mnt_master; /* Mount receives propagation from this ID */
|
||||
__u64 propagate_from; /* Propagation from in current namespace */
|
||||
__u32 mnt_root; /* [str] Root of mount relative to root of fs */
|
||||
__u32 mnt_point; /* [str] Mountpoint relative to current root */
|
||||
__u64 __spare2[50];
|
||||
char str[]; /* Variable size part containing strings */
|
||||
};
|
||||
|
||||
/*
|
||||
* Structure for passing mount ID and miscellaneous parameters to statmount(2)
|
||||
* and listmount(2).
|
||||
*
|
||||
* For statmount(2) @param represents the request mask.
|
||||
* For listmount(2) @param represents the last listed mount id (or zero).
|
||||
*/
|
||||
struct mnt_id_req {
|
||||
__u32 size;
|
||||
__u32 spare;
|
||||
__u64 mnt_id;
|
||||
__u64 param;
|
||||
};
|
||||
|
||||
/* List of all mnt_id_req versions. */
|
||||
#define MNT_ID_REQ_SIZE_VER0 24 /* sizeof first published struct */
|
||||
|
||||
/*
|
||||
* @mask bits for statmount(2)
|
||||
*/
|
||||
#define STATMOUNT_SB_BASIC 0x00000001U /* Want/got sb_... */
|
||||
#define STATMOUNT_MNT_BASIC 0x00000002U /* Want/got mnt_... */
|
||||
#define STATMOUNT_PROPAGATE_FROM 0x00000004U /* Want/got propagate_from */
|
||||
#define STATMOUNT_MNT_ROOT 0x00000008U /* Want/got mnt_root */
|
||||
#define STATMOUNT_MNT_POINT 0x00000010U /* Want/got mnt_point */
|
||||
#define STATMOUNT_FS_TYPE 0x00000020U /* Want/got fs_type */
|
||||
|
||||
/*
|
||||
* Special @mnt_id values that can be passed to listmount
|
||||
*/
|
||||
#define LSMT_ROOT 0xffffffffffffffff /* root mount */
|
||||
|
||||
#endif /* _UAPI_LINUX_MOUNT_H */
|
||||
|
||||
@ -154,6 +154,7 @@ struct statx {
|
||||
#define STATX_BTIME 0x00000800U /* Want/got stx_btime */
|
||||
#define STATX_MNT_ID 0x00001000U /* Got stx_mnt_id */
|
||||
#define STATX_DIOALIGN 0x00002000U /* Want/got direct I/O alignment info */
|
||||
#define STATX_MNT_ID_UNIQUE 0x00004000U /* Want/got extended stx_mount_id */
|
||||
|
||||
#define STATX__RESERVED 0x80000000U /* Reserved for future struct statx expansion */
|
||||
|
||||
|
||||
@ -47,6 +47,10 @@ Print PMU events and metrics limited to the specific PMU name.
|
||||
--json::
|
||||
Output in JSON format.
|
||||
|
||||
-o::
|
||||
--output=::
|
||||
Output file name. By default output is written to stdout.
|
||||
|
||||
[[EVENT_MODIFIERS]]
|
||||
EVENT MODIFIERS
|
||||
---------------
|
||||
|
||||
@ -236,6 +236,16 @@ else
|
||||
SHELLCHECK := $(shell which shellcheck 2> /dev/null)
|
||||
endif
|
||||
|
||||
# shellcheck is using in tools/perf/tests/Build with option -a/--check-sourced (
|
||||
# introduced in v0.4.7) and -S/--severity (introduced in v0.6.0). So make the
|
||||
# minimal shellcheck version as v0.6.0.
|
||||
ifneq ($(SHELLCHECK),)
|
||||
ifeq ($(shell expr $(shell $(SHELLCHECK) --version | grep version: | \
|
||||
sed -e 's/.\+ \([0-9]\+\).\([0-9]\+\).\([0-9]\+\)/\1\2\3/g') \< 060), 1)
|
||||
SHELLCHECK :=
|
||||
endif
|
||||
endif
|
||||
|
||||
export srctree OUTPUT RM CC CXX LD AR CFLAGS CXXFLAGS V BISON FLEX AWK
|
||||
export HOSTCC HOSTLD HOSTAR HOSTCFLAGS SHELLCHECK
|
||||
|
||||
|
||||
@ -30,6 +30,8 @@
|
||||
* functions.
|
||||
*/
|
||||
struct print_state {
|
||||
/** @fp: File to write output to. */
|
||||
FILE *fp;
|
||||
/**
|
||||
* @pmu_glob: Optionally restrict PMU and metric matching to PMU or
|
||||
* debugfs subsystem name.
|
||||
@ -66,13 +68,15 @@ static void default_print_start(void *ps)
|
||||
{
|
||||
struct print_state *print_state = ps;
|
||||
|
||||
if (!print_state->name_only && pager_in_use())
|
||||
printf("\nList of pre-defined events (to be used in -e or -M):\n\n");
|
||||
if (!print_state->name_only && pager_in_use()) {
|
||||
fprintf(print_state->fp,
|
||||
"\nList of pre-defined events (to be used in -e or -M):\n\n");
|
||||
}
|
||||
}
|
||||
|
||||
static void default_print_end(void *print_state __maybe_unused) {}
|
||||
|
||||
static void wordwrap(const char *s, int start, int max, int corr)
|
||||
static void wordwrap(FILE *fp, const char *s, int start, int max, int corr)
|
||||
{
|
||||
int column = start;
|
||||
int n;
|
||||
@ -82,10 +86,10 @@ static void wordwrap(const char *s, int start, int max, int corr)
|
||||
int wlen = strcspn(s, " \t\n");
|
||||
|
||||
if ((column + wlen >= max && column > start) || saw_newline) {
|
||||
printf("\n%*s", start, "");
|
||||
fprintf(fp, "\n%*s", start, "");
|
||||
column = start + corr;
|
||||
}
|
||||
n = printf("%s%.*s", column > start ? " " : "", wlen, s);
|
||||
n = fprintf(fp, "%s%.*s", column > start ? " " : "", wlen, s);
|
||||
if (n <= 0)
|
||||
break;
|
||||
saw_newline = s[wlen] == '\n';
|
||||
@ -104,6 +108,7 @@ static void default_print_event(void *ps, const char *pmu_name, const char *topi
|
||||
{
|
||||
struct print_state *print_state = ps;
|
||||
int pos;
|
||||
FILE *fp = print_state->fp;
|
||||
|
||||
if (deprecated && !print_state->deprecated)
|
||||
return;
|
||||
@ -119,30 +124,30 @@ static void default_print_event(void *ps, const char *pmu_name, const char *topi
|
||||
|
||||
if (print_state->name_only) {
|
||||
if (event_alias && strlen(event_alias))
|
||||
printf("%s ", event_alias);
|
||||
fprintf(fp, "%s ", event_alias);
|
||||
else
|
||||
printf("%s ", event_name);
|
||||
fprintf(fp, "%s ", event_name);
|
||||
return;
|
||||
}
|
||||
|
||||
if (strcmp(print_state->last_topic, topic ?: "")) {
|
||||
if (topic)
|
||||
printf("\n%s:\n", topic);
|
||||
fprintf(fp, "\n%s:\n", topic);
|
||||
zfree(&print_state->last_topic);
|
||||
print_state->last_topic = strdup(topic ?: "");
|
||||
}
|
||||
|
||||
if (event_alias && strlen(event_alias))
|
||||
pos = printf(" %s OR %s", event_name, event_alias);
|
||||
pos = fprintf(fp, " %s OR %s", event_name, event_alias);
|
||||
else
|
||||
pos = printf(" %s", event_name);
|
||||
pos = fprintf(fp, " %s", event_name);
|
||||
|
||||
if (!topic && event_type_desc) {
|
||||
for (; pos < 53; pos++)
|
||||
putchar(' ');
|
||||
printf("[%s]\n", event_type_desc);
|
||||
fputc(' ', fp);
|
||||
fprintf(fp, "[%s]\n", event_type_desc);
|
||||
} else
|
||||
putchar('\n');
|
||||
fputc('\n', fp);
|
||||
|
||||
if (desc && print_state->desc) {
|
||||
char *desc_with_unit = NULL;
|
||||
@ -155,22 +160,22 @@ static void default_print_event(void *ps, const char *pmu_name, const char *topi
|
||||
? "%s. Unit: %s" : "%s Unit: %s",
|
||||
desc, pmu_name);
|
||||
}
|
||||
printf("%*s", 8, "[");
|
||||
wordwrap(desc_len > 0 ? desc_with_unit : desc, 8, pager_get_columns(), 0);
|
||||
printf("]\n");
|
||||
fprintf(fp, "%*s", 8, "[");
|
||||
wordwrap(fp, desc_len > 0 ? desc_with_unit : desc, 8, pager_get_columns(), 0);
|
||||
fprintf(fp, "]\n");
|
||||
free(desc_with_unit);
|
||||
}
|
||||
long_desc = long_desc ?: desc;
|
||||
if (long_desc && print_state->long_desc) {
|
||||
printf("%*s", 8, "[");
|
||||
wordwrap(long_desc, 8, pager_get_columns(), 0);
|
||||
printf("]\n");
|
||||
fprintf(fp, "%*s", 8, "[");
|
||||
wordwrap(fp, long_desc, 8, pager_get_columns(), 0);
|
||||
fprintf(fp, "]\n");
|
||||
}
|
||||
|
||||
if (print_state->detailed && encoding_desc) {
|
||||
printf("%*s", 8, "");
|
||||
wordwrap(encoding_desc, 8, pager_get_columns(), 0);
|
||||
putchar('\n');
|
||||
fprintf(fp, "%*s", 8, "");
|
||||
wordwrap(fp, encoding_desc, 8, pager_get_columns(), 0);
|
||||
fputc('\n', fp);
|
||||
}
|
||||
}
|
||||
|
||||
@ -184,6 +189,7 @@ static void default_print_metric(void *ps,
|
||||
const char *unit __maybe_unused)
|
||||
{
|
||||
struct print_state *print_state = ps;
|
||||
FILE *fp = print_state->fp;
|
||||
|
||||
if (print_state->event_glob &&
|
||||
(!print_state->metrics || !name || !strglobmatch(name, print_state->event_glob)) &&
|
||||
@ -192,27 +198,27 @@ static void default_print_metric(void *ps,
|
||||
|
||||
if (!print_state->name_only && !print_state->last_metricgroups) {
|
||||
if (print_state->metricgroups) {
|
||||
printf("\nMetric Groups:\n");
|
||||
fprintf(fp, "\nMetric Groups:\n");
|
||||
if (!print_state->metrics)
|
||||
putchar('\n');
|
||||
fputc('\n', fp);
|
||||
} else {
|
||||
printf("\nMetrics:\n\n");
|
||||
fprintf(fp, "\nMetrics:\n\n");
|
||||
}
|
||||
}
|
||||
if (!print_state->last_metricgroups ||
|
||||
strcmp(print_state->last_metricgroups, group ?: "")) {
|
||||
if (group && print_state->metricgroups) {
|
||||
if (print_state->name_only)
|
||||
printf("%s ", group);
|
||||
fprintf(fp, "%s ", group);
|
||||
else if (print_state->metrics) {
|
||||
const char *gdesc = describe_metricgroup(group);
|
||||
|
||||
if (gdesc)
|
||||
printf("\n%s: [%s]\n", group, gdesc);
|
||||
fprintf(fp, "\n%s: [%s]\n", group, gdesc);
|
||||
else
|
||||
printf("\n%s:\n", group);
|
||||
fprintf(fp, "\n%s:\n", group);
|
||||
} else
|
||||
printf("%s\n", group);
|
||||
fprintf(fp, "%s\n", group);
|
||||
}
|
||||
zfree(&print_state->last_metricgroups);
|
||||
print_state->last_metricgroups = strdup(group ?: "");
|
||||
@ -223,53 +229,59 @@ static void default_print_metric(void *ps,
|
||||
if (print_state->name_only) {
|
||||
if (print_state->metrics &&
|
||||
!strlist__has_entry(print_state->visited_metrics, name)) {
|
||||
printf("%s ", name);
|
||||
fprintf(fp, "%s ", name);
|
||||
strlist__add(print_state->visited_metrics, name);
|
||||
}
|
||||
return;
|
||||
}
|
||||
printf(" %s\n", name);
|
||||
fprintf(fp, " %s\n", name);
|
||||
|
||||
if (desc && print_state->desc) {
|
||||
printf("%*s", 8, "[");
|
||||
wordwrap(desc, 8, pager_get_columns(), 0);
|
||||
printf("]\n");
|
||||
fprintf(fp, "%*s", 8, "[");
|
||||
wordwrap(fp, desc, 8, pager_get_columns(), 0);
|
||||
fprintf(fp, "]\n");
|
||||
}
|
||||
if (long_desc && print_state->long_desc) {
|
||||
printf("%*s", 8, "[");
|
||||
wordwrap(long_desc, 8, pager_get_columns(), 0);
|
||||
printf("]\n");
|
||||
fprintf(fp, "%*s", 8, "[");
|
||||
wordwrap(fp, long_desc, 8, pager_get_columns(), 0);
|
||||
fprintf(fp, "]\n");
|
||||
}
|
||||
if (expr && print_state->detailed) {
|
||||
printf("%*s", 8, "[");
|
||||
wordwrap(expr, 8, pager_get_columns(), 0);
|
||||
printf("]\n");
|
||||
fprintf(fp, "%*s", 8, "[");
|
||||
wordwrap(fp, expr, 8, pager_get_columns(), 0);
|
||||
fprintf(fp, "]\n");
|
||||
}
|
||||
if (threshold && print_state->detailed) {
|
||||
printf("%*s", 8, "[");
|
||||
wordwrap(threshold, 8, pager_get_columns(), 0);
|
||||
printf("]\n");
|
||||
fprintf(fp, "%*s", 8, "[");
|
||||
wordwrap(fp, threshold, 8, pager_get_columns(), 0);
|
||||
fprintf(fp, "]\n");
|
||||
}
|
||||
}
|
||||
|
||||
struct json_print_state {
|
||||
/** @fp: File to write output to. */
|
||||
FILE *fp;
|
||||
/** Should a separator be printed prior to the next item? */
|
||||
bool need_sep;
|
||||
};
|
||||
|
||||
static void json_print_start(void *print_state __maybe_unused)
|
||||
static void json_print_start(void *ps)
|
||||
{
|
||||
printf("[\n");
|
||||
struct json_print_state *print_state = ps;
|
||||
FILE *fp = print_state->fp;
|
||||
|
||||
fprintf(fp, "[\n");
|
||||
}
|
||||
|
||||
static void json_print_end(void *ps)
|
||||
{
|
||||
struct json_print_state *print_state = ps;
|
||||
FILE *fp = print_state->fp;
|
||||
|
||||
printf("%s]\n", print_state->need_sep ? "\n" : "");
|
||||
fprintf(fp, "%s]\n", print_state->need_sep ? "\n" : "");
|
||||
}
|
||||
|
||||
static void fix_escape_printf(struct strbuf *buf, const char *fmt, ...)
|
||||
static void fix_escape_fprintf(FILE *fp, struct strbuf *buf, const char *fmt, ...)
|
||||
{
|
||||
va_list args;
|
||||
|
||||
@ -318,7 +330,7 @@ static void fix_escape_printf(struct strbuf *buf, const char *fmt, ...)
|
||||
}
|
||||
}
|
||||
va_end(args);
|
||||
fputs(buf->buf, stdout);
|
||||
fputs(buf->buf, fp);
|
||||
}
|
||||
|
||||
static void json_print_event(void *ps, const char *pmu_name, const char *topic,
|
||||
@ -330,60 +342,71 @@ static void json_print_event(void *ps, const char *pmu_name, const char *topic,
|
||||
{
|
||||
struct json_print_state *print_state = ps;
|
||||
bool need_sep = false;
|
||||
FILE *fp = print_state->fp;
|
||||
struct strbuf buf;
|
||||
|
||||
strbuf_init(&buf, 0);
|
||||
printf("%s{\n", print_state->need_sep ? ",\n" : "");
|
||||
fprintf(fp, "%s{\n", print_state->need_sep ? ",\n" : "");
|
||||
print_state->need_sep = true;
|
||||
if (pmu_name) {
|
||||
fix_escape_printf(&buf, "\t\"Unit\": \"%S\"", pmu_name);
|
||||
fix_escape_fprintf(fp, &buf, "\t\"Unit\": \"%S\"", pmu_name);
|
||||
need_sep = true;
|
||||
}
|
||||
if (topic) {
|
||||
fix_escape_printf(&buf, "%s\t\"Topic\": \"%S\"", need_sep ? ",\n" : "", topic);
|
||||
fix_escape_fprintf(fp, &buf, "%s\t\"Topic\": \"%S\"",
|
||||
need_sep ? ",\n" : "",
|
||||
topic);
|
||||
need_sep = true;
|
||||
}
|
||||
if (event_name) {
|
||||
fix_escape_printf(&buf, "%s\t\"EventName\": \"%S\"", need_sep ? ",\n" : "",
|
||||
event_name);
|
||||
fix_escape_fprintf(fp, &buf, "%s\t\"EventName\": \"%S\"",
|
||||
need_sep ? ",\n" : "",
|
||||
event_name);
|
||||
need_sep = true;
|
||||
}
|
||||
if (event_alias && strlen(event_alias)) {
|
||||
fix_escape_printf(&buf, "%s\t\"EventAlias\": \"%S\"", need_sep ? ",\n" : "",
|
||||
event_alias);
|
||||
fix_escape_fprintf(fp, &buf, "%s\t\"EventAlias\": \"%S\"",
|
||||
need_sep ? ",\n" : "",
|
||||
event_alias);
|
||||
need_sep = true;
|
||||
}
|
||||
if (scale_unit && strlen(scale_unit)) {
|
||||
fix_escape_printf(&buf, "%s\t\"ScaleUnit\": \"%S\"", need_sep ? ",\n" : "",
|
||||
scale_unit);
|
||||
fix_escape_fprintf(fp, &buf, "%s\t\"ScaleUnit\": \"%S\"",
|
||||
need_sep ? ",\n" : "",
|
||||
scale_unit);
|
||||
need_sep = true;
|
||||
}
|
||||
if (event_type_desc) {
|
||||
fix_escape_printf(&buf, "%s\t\"EventType\": \"%S\"", need_sep ? ",\n" : "",
|
||||
event_type_desc);
|
||||
fix_escape_fprintf(fp, &buf, "%s\t\"EventType\": \"%S\"",
|
||||
need_sep ? ",\n" : "",
|
||||
event_type_desc);
|
||||
need_sep = true;
|
||||
}
|
||||
if (deprecated) {
|
||||
fix_escape_printf(&buf, "%s\t\"Deprecated\": \"%S\"", need_sep ? ",\n" : "",
|
||||
deprecated ? "1" : "0");
|
||||
fix_escape_fprintf(fp, &buf, "%s\t\"Deprecated\": \"%S\"",
|
||||
need_sep ? ",\n" : "",
|
||||
deprecated ? "1" : "0");
|
||||
need_sep = true;
|
||||
}
|
||||
if (desc) {
|
||||
fix_escape_printf(&buf, "%s\t\"BriefDescription\": \"%S\"", need_sep ? ",\n" : "",
|
||||
desc);
|
||||
fix_escape_fprintf(fp, &buf, "%s\t\"BriefDescription\": \"%S\"",
|
||||
need_sep ? ",\n" : "",
|
||||
desc);
|
||||
need_sep = true;
|
||||
}
|
||||
if (long_desc) {
|
||||
fix_escape_printf(&buf, "%s\t\"PublicDescription\": \"%S\"", need_sep ? ",\n" : "",
|
||||
long_desc);
|
||||
fix_escape_fprintf(fp, &buf, "%s\t\"PublicDescription\": \"%S\"",
|
||||
need_sep ? ",\n" : "",
|
||||
long_desc);
|
||||
need_sep = true;
|
||||
}
|
||||
if (encoding_desc) {
|
||||
fix_escape_printf(&buf, "%s\t\"Encoding\": \"%S\"", need_sep ? ",\n" : "",
|
||||
encoding_desc);
|
||||
fix_escape_fprintf(fp, &buf, "%s\t\"Encoding\": \"%S\"",
|
||||
need_sep ? ",\n" : "",
|
||||
encoding_desc);
|
||||
need_sep = true;
|
||||
}
|
||||
printf("%s}", need_sep ? "\n" : "");
|
||||
fprintf(fp, "%s}", need_sep ? "\n" : "");
|
||||
strbuf_release(&buf);
|
||||
}
|
||||
|
||||
@ -394,43 +417,53 @@ static void json_print_metric(void *ps __maybe_unused, const char *group,
|
||||
{
|
||||
struct json_print_state *print_state = ps;
|
||||
bool need_sep = false;
|
||||
FILE *fp = print_state->fp;
|
||||
struct strbuf buf;
|
||||
|
||||
strbuf_init(&buf, 0);
|
||||
printf("%s{\n", print_state->need_sep ? ",\n" : "");
|
||||
fprintf(fp, "%s{\n", print_state->need_sep ? ",\n" : "");
|
||||
print_state->need_sep = true;
|
||||
if (group) {
|
||||
fix_escape_printf(&buf, "\t\"MetricGroup\": \"%S\"", group);
|
||||
fix_escape_fprintf(fp, &buf, "\t\"MetricGroup\": \"%S\"", group);
|
||||
need_sep = true;
|
||||
}
|
||||
if (name) {
|
||||
fix_escape_printf(&buf, "%s\t\"MetricName\": \"%S\"", need_sep ? ",\n" : "", name);
|
||||
fix_escape_fprintf(fp, &buf, "%s\t\"MetricName\": \"%S\"",
|
||||
need_sep ? ",\n" : "",
|
||||
name);
|
||||
need_sep = true;
|
||||
}
|
||||
if (expr) {
|
||||
fix_escape_printf(&buf, "%s\t\"MetricExpr\": \"%S\"", need_sep ? ",\n" : "", expr);
|
||||
fix_escape_fprintf(fp, &buf, "%s\t\"MetricExpr\": \"%S\"",
|
||||
need_sep ? ",\n" : "",
|
||||
expr);
|
||||
need_sep = true;
|
||||
}
|
||||
if (threshold) {
|
||||
fix_escape_printf(&buf, "%s\t\"MetricThreshold\": \"%S\"", need_sep ? ",\n" : "",
|
||||
threshold);
|
||||
fix_escape_fprintf(fp, &buf, "%s\t\"MetricThreshold\": \"%S\"",
|
||||
need_sep ? ",\n" : "",
|
||||
threshold);
|
||||
need_sep = true;
|
||||
}
|
||||
if (unit) {
|
||||
fix_escape_printf(&buf, "%s\t\"ScaleUnit\": \"%S\"", need_sep ? ",\n" : "", unit);
|
||||
fix_escape_fprintf(fp, &buf, "%s\t\"ScaleUnit\": \"%S\"",
|
||||
need_sep ? ",\n" : "",
|
||||
unit);
|
||||
need_sep = true;
|
||||
}
|
||||
if (desc) {
|
||||
fix_escape_printf(&buf, "%s\t\"BriefDescription\": \"%S\"", need_sep ? ",\n" : "",
|
||||
desc);
|
||||
fix_escape_fprintf(fp, &buf, "%s\t\"BriefDescription\": \"%S\"",
|
||||
need_sep ? ",\n" : "",
|
||||
desc);
|
||||
need_sep = true;
|
||||
}
|
||||
if (long_desc) {
|
||||
fix_escape_printf(&buf, "%s\t\"PublicDescription\": \"%S\"", need_sep ? ",\n" : "",
|
||||
long_desc);
|
||||
fix_escape_fprintf(fp, &buf, "%s\t\"PublicDescription\": \"%S\"",
|
||||
need_sep ? ",\n" : "",
|
||||
long_desc);
|
||||
need_sep = true;
|
||||
}
|
||||
printf("%s}", need_sep ? "\n" : "");
|
||||
fprintf(fp, "%s}", need_sep ? "\n" : "");
|
||||
strbuf_release(&buf);
|
||||
}
|
||||
|
||||
@ -449,8 +482,12 @@ static bool default_skip_duplicate_pmus(void *ps)
|
||||
int cmd_list(int argc, const char **argv)
|
||||
{
|
||||
int i, ret = 0;
|
||||
struct print_state default_ps = {};
|
||||
struct print_state json_ps = {};
|
||||
struct print_state default_ps = {
|
||||
.fp = stdout,
|
||||
};
|
||||
struct print_state json_ps = {
|
||||
.fp = stdout,
|
||||
};
|
||||
void *ps = &default_ps;
|
||||
struct print_callbacks print_cb = {
|
||||
.print_start = default_print_start,
|
||||
@ -461,6 +498,7 @@ int cmd_list(int argc, const char **argv)
|
||||
};
|
||||
const char *cputype = NULL;
|
||||
const char *unit_name = NULL;
|
||||
const char *output_path = NULL;
|
||||
bool json = false;
|
||||
struct option list_options[] = {
|
||||
OPT_BOOLEAN(0, "raw-dump", &default_ps.name_only, "Dump raw events"),
|
||||
@ -471,6 +509,7 @@ int cmd_list(int argc, const char **argv)
|
||||
"Print longer event descriptions."),
|
||||
OPT_BOOLEAN(0, "details", &default_ps.detailed,
|
||||
"Print information on the perf event names and expressions used internally by events."),
|
||||
OPT_STRING('o', "output", &output_path, "file", "output file name"),
|
||||
OPT_BOOLEAN(0, "deprecated", &default_ps.deprecated,
|
||||
"Print deprecated events."),
|
||||
OPT_STRING(0, "cputype", &cputype, "cpu type",
|
||||
@ -497,6 +536,11 @@ int cmd_list(int argc, const char **argv)
|
||||
argc = parse_options(argc, argv, list_options, list_usage,
|
||||
PARSE_OPT_STOP_AT_NON_OPTION);
|
||||
|
||||
if (output_path) {
|
||||
default_ps.fp = fopen(output_path, "w");
|
||||
json_ps.fp = default_ps.fp;
|
||||
}
|
||||
|
||||
setup_pager();
|
||||
|
||||
if (!default_ps.name_only)
|
||||
@ -618,5 +662,8 @@ out:
|
||||
free(default_ps.last_topic);
|
||||
free(default_ps.last_metricgroups);
|
||||
strlist__delete(default_ps.visited_metrics);
|
||||
if (output_path)
|
||||
fclose(default_ps.fp);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -4080,8 +4080,8 @@ int cmd_record(int argc, const char **argv)
|
||||
}
|
||||
|
||||
if (rec->switch_output.num_files) {
|
||||
rec->switch_output.filenames = calloc(sizeof(char *),
|
||||
rec->switch_output.num_files);
|
||||
rec->switch_output.filenames = calloc(rec->switch_output.num_files,
|
||||
sizeof(char *));
|
||||
if (!rec->switch_output.filenames) {
|
||||
err = -EINVAL;
|
||||
goto out_opts;
|
||||
|
||||
@ -357,7 +357,7 @@ static void perf_top__print_sym_table(struct perf_top *top)
|
||||
|
||||
static void prompt_integer(int *target, const char *msg)
|
||||
{
|
||||
char *buf = malloc(0), *p;
|
||||
char *buf = NULL, *p;
|
||||
size_t dummy = 0;
|
||||
int tmp;
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -195,7 +195,6 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "Counts the number of cycles the core is stalled due to a demand load miss which hit in DRAM or MMIO (Non-DRAM).",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS",
|
||||
"MetricExpr": "MEM_BOUND_STALLS.LOAD_DRAM_HIT / tma_info_core_clks - max((MEM_BOUND_STALLS.LOAD - LD_HEAD.L1_MISS_AT_RET) / tma_info_core_clks, 0) * MEM_BOUND_STALLS.LOAD_DRAM_HIT / MEM_BOUND_STALLS.LOAD",
|
||||
"MetricGroup": "TopdownL3;tma_L3_group;tma_memory_bound_group",
|
||||
"MetricName": "tma_dram_bound",
|
||||
@ -457,7 +456,6 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "Counts the number of cycles a core is stalled due to a demand load which hit in the L2 Cache.",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS",
|
||||
"MetricExpr": "MEM_BOUND_STALLS.LOAD_L2_HIT / tma_info_core_clks - max((MEM_BOUND_STALLS.LOAD - LD_HEAD.L1_MISS_AT_RET) / tma_info_core_clks, 0) * MEM_BOUND_STALLS.LOAD_L2_HIT / MEM_BOUND_STALLS.LOAD",
|
||||
"MetricGroup": "TopdownL3;tma_L3_group;tma_memory_bound_group",
|
||||
"MetricName": "tma_l2_bound",
|
||||
@ -466,7 +464,6 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "Counts the number of cycles a core is stalled due to a demand load which hit in the Last Level Cache (LLC) or other core with HITE/F/M.",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS_NMI",
|
||||
"MetricExpr": "MEM_BOUND_STALLS.LOAD_LLC_HIT / tma_info_core_clks - max((MEM_BOUND_STALLS.LOAD - LD_HEAD.L1_MISS_AT_RET) / tma_info_core_clks, 0) * MEM_BOUND_STALLS.LOAD_LLC_HIT / MEM_BOUND_STALLS.LOAD",
|
||||
"MetricGroup": "TopdownL3;tma_L3_group;tma_memory_bound_group",
|
||||
"MetricName": "tma_l3_bound",
|
||||
@ -683,7 +680,6 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "Counts the number of cycles that the oldest load of the load buffer is stalled at retirement due to a store forward block.",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS_NMI",
|
||||
"MetricExpr": "LD_HEAD.ST_ADDR_AT_RET / tma_info_core_clks",
|
||||
"MetricGroup": "TopdownL4;tma_L4_group;tma_l1_bound_group",
|
||||
"MetricName": "tma_store_fwd_blk",
|
||||
|
||||
@ -400,7 +400,6 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "This metric estimates fraction of cycles while the memory subsystem was handling synchronizations due to contested accesses",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS",
|
||||
"MetricExpr": "(76 * tma_info_system_average_frequency * (MEM_LOAD_L3_HIT_RETIRED.XSNP_FWD * (OCR.DEMAND_DATA_RD.L3_HIT.SNOOP_HITM / (OCR.DEMAND_DATA_RD.L3_HIT.SNOOP_HITM + OCR.DEMAND_DATA_RD.L3_HIT.SNOOP_HIT_WITH_FWD))) + 75.5 * tma_info_system_average_frequency * MEM_LOAD_L3_HIT_RETIRED.XSNP_MISS) * (1 + MEM_LOAD_RETIRED.FB_HIT / MEM_LOAD_RETIRED.L1_MISS / 2) / tma_info_thread_clks",
|
||||
"MetricGroup": "DataSharing;Offcore;Snoop;TopdownL4;tma_L4_group;tma_issueSyncxn;tma_l3_bound_group",
|
||||
"MetricName": "tma_contested_accesses",
|
||||
@ -421,7 +420,6 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "This metric estimates fraction of cycles while the memory subsystem was handling synchronizations due to data-sharing accesses",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS",
|
||||
"MetricExpr": "75.5 * tma_info_system_average_frequency * (MEM_LOAD_L3_HIT_RETIRED.XSNP_NO_FWD + MEM_LOAD_L3_HIT_RETIRED.XSNP_FWD * (1 - OCR.DEMAND_DATA_RD.L3_HIT.SNOOP_HITM / (OCR.DEMAND_DATA_RD.L3_HIT.SNOOP_HITM + OCR.DEMAND_DATA_RD.L3_HIT.SNOOP_HIT_WITH_FWD))) * (1 + MEM_LOAD_RETIRED.FB_HIT / MEM_LOAD_RETIRED.L1_MISS / 2) / tma_info_thread_clks",
|
||||
"MetricGroup": "Offcore;Snoop;TopdownL4;tma_L4_group;tma_issueSyncxn;tma_l3_bound_group",
|
||||
"MetricName": "tma_data_sharing",
|
||||
@ -449,7 +447,6 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "This metric estimates how often the CPU was stalled on accesses to external memory (DRAM) by loads",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS",
|
||||
"MetricExpr": "(MEMORY_ACTIVITY.STALLS_L3_MISS / tma_info_thread_clks - tma_pmm_bound if #has_pmem > 0 else MEMORY_ACTIVITY.STALLS_L3_MISS / tma_info_thread_clks)",
|
||||
"MetricGroup": "MemoryBound;TmaL3mem;TopdownL3;tma_L3_group;tma_memory_bound_group",
|
||||
"MetricName": "tma_dram_bound",
|
||||
@ -656,7 +653,6 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "Branch Misprediction Cost: Fraction of TMA slots wasted per non-speculative branch misprediction (retired JEClear)",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS",
|
||||
"MetricExpr": "(tma_branch_mispredicts + tma_fetch_latency * tma_mispredicts_resteers / (tma_branch_resteers + tma_dsb_switches + tma_icache_misses + tma_itlb_misses + tma_lcp + tma_ms_switches)) * tma_info_thread_slots / BR_MISP_RETIRED.ALL_BRANCHES",
|
||||
"MetricGroup": "Bad;BrMispredicts;tma_issueBM",
|
||||
"MetricName": "tma_info_bad_spec_branch_misprediction_cost",
|
||||
@ -699,7 +695,6 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "Probability of Core Bound bottleneck hidden by SMT-profiling artifacts",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS",
|
||||
"MetricExpr": "(100 * (1 - tma_core_bound / tma_ports_utilization if tma_core_bound < tma_ports_utilization else 1) if tma_info_system_smt_2t_utilization > 0.5 else 0)",
|
||||
"MetricGroup": "Cor;SMT",
|
||||
"MetricName": "tma_info_botlnk_l0_core_bound_likely",
|
||||
@ -707,7 +702,6 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "Total pipeline cost of DSB (uop cache) misses - subset of the Instruction_Fetch_BW Bottleneck",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS",
|
||||
"MetricExpr": "100 * (tma_fetch_latency * tma_dsb_switches / (tma_branch_resteers + tma_dsb_switches + tma_icache_misses + tma_itlb_misses + tma_lcp + tma_ms_switches) + tma_fetch_bandwidth * tma_mite / (tma_dsb + tma_mite))",
|
||||
"MetricGroup": "DSBmiss;Fed;tma_issueFB",
|
||||
"MetricName": "tma_info_botlnk_l2_dsb_misses",
|
||||
@ -716,7 +710,6 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "Total pipeline cost of Instruction Cache misses - subset of the Big_Code Bottleneck",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS",
|
||||
"MetricExpr": "100 * (tma_fetch_latency * tma_icache_misses / (tma_branch_resteers + tma_dsb_switches + tma_icache_misses + tma_itlb_misses + tma_lcp + tma_ms_switches))",
|
||||
"MetricGroup": "Fed;FetchLat;IcMiss;tma_issueFL",
|
||||
"MetricName": "tma_info_botlnk_l2_ic_misses",
|
||||
@ -725,7 +718,6 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "Total pipeline cost of instruction fetch related bottlenecks by large code footprint programs (i-side cache; TLB and BTB misses)",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS",
|
||||
"MetricExpr": "100 * tma_fetch_latency * (tma_itlb_misses + tma_icache_misses + tma_unknown_branches) / (tma_branch_resteers + tma_dsb_switches + tma_icache_misses + tma_itlb_misses + tma_lcp + tma_ms_switches)",
|
||||
"MetricGroup": "BigFoot;Fed;Frontend;IcMiss;MemoryTLB;tma_issueBC",
|
||||
"MetricName": "tma_info_bottleneck_big_code",
|
||||
@ -742,7 +734,6 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "Total pipeline cost of instruction fetch bandwidth related bottlenecks",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS",
|
||||
"MetricExpr": "100 * (tma_frontend_bound - tma_fetch_latency * tma_mispredicts_resteers / (tma_branch_resteers + tma_dsb_switches + tma_icache_misses + tma_itlb_misses + tma_lcp + tma_ms_switches)) - tma_info_bottleneck_big_code",
|
||||
"MetricGroup": "Fed;FetchBW;Frontend",
|
||||
"MetricName": "tma_info_bottleneck_instruction_fetch_bw",
|
||||
@ -750,7 +741,6 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "Total pipeline cost of (external) Memory Bandwidth related bottlenecks",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS",
|
||||
"MetricExpr": "100 * tma_memory_bound * (tma_dram_bound / (tma_dram_bound + tma_l1_bound + tma_l2_bound + tma_l3_bound + tma_pmm_bound + tma_store_bound) * (tma_mem_bandwidth / (tma_mem_bandwidth + tma_mem_latency)) + tma_l3_bound / (tma_dram_bound + tma_l1_bound + tma_l2_bound + tma_l3_bound + tma_pmm_bound + tma_store_bound) * (tma_sq_full / (tma_contested_accesses + tma_data_sharing + tma_l3_hit_latency + tma_sq_full))) + tma_l1_bound / (tma_dram_bound + tma_l1_bound + tma_l2_bound + tma_l3_bound + tma_pmm_bound + tma_store_bound) * (tma_fb_full / (tma_dtlb_load + tma_fb_full + tma_lock_latency + tma_split_loads + tma_store_fwd_blk))",
|
||||
"MetricGroup": "Mem;MemoryBW;Offcore;tma_issueBW",
|
||||
"MetricName": "tma_info_bottleneck_memory_bandwidth",
|
||||
@ -759,7 +749,6 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "Total pipeline cost of Memory Address Translation related bottlenecks (data-side TLBs)",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS",
|
||||
"MetricExpr": "100 * tma_memory_bound * (tma_l1_bound / max(tma_memory_bound, tma_dram_bound + tma_l1_bound + tma_l2_bound + tma_l3_bound + tma_pmm_bound + tma_store_bound) * (tma_dtlb_load / max(tma_l1_bound, tma_dtlb_load + tma_fb_full + tma_lock_latency + tma_split_loads + tma_store_fwd_blk)) + tma_store_bound / (tma_dram_bound + tma_l1_bound + tma_l2_bound + tma_l3_bound + tma_pmm_bound + tma_store_bound) * (tma_dtlb_store / (tma_dtlb_store + tma_false_sharing + tma_split_stores + tma_store_latency + tma_streaming_stores)))",
|
||||
"MetricGroup": "Mem;MemoryTLB;Offcore;tma_issueTLB",
|
||||
"MetricName": "tma_info_bottleneck_memory_data_tlbs",
|
||||
@ -768,7 +757,6 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "Total pipeline cost of Memory Latency related bottlenecks (external memory and off-core caches)",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS",
|
||||
"MetricExpr": "100 * tma_memory_bound * (tma_dram_bound / (tma_dram_bound + tma_l1_bound + tma_l2_bound + tma_l3_bound + tma_pmm_bound + tma_store_bound) * (tma_mem_latency / (tma_mem_bandwidth + tma_mem_latency)) + tma_l3_bound / (tma_dram_bound + tma_l1_bound + tma_l2_bound + tma_l3_bound + tma_pmm_bound + tma_store_bound) * (tma_l3_hit_latency / (tma_contested_accesses + tma_data_sharing + tma_l3_hit_latency + tma_sq_full)) + tma_l2_bound / (tma_dram_bound + tma_l1_bound + tma_l2_bound + tma_l3_bound + tma_pmm_bound + tma_store_bound))",
|
||||
"MetricGroup": "Mem;MemoryLat;Offcore;tma_issueLat",
|
||||
"MetricName": "tma_info_bottleneck_memory_latency",
|
||||
@ -777,7 +765,6 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "Total pipeline cost of Branch Misprediction related bottlenecks",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS",
|
||||
"MetricExpr": "100 * (tma_branch_mispredicts + tma_fetch_latency * tma_mispredicts_resteers / (tma_branch_resteers + tma_dsb_switches + tma_icache_misses + tma_itlb_misses + tma_lcp + tma_ms_switches))",
|
||||
"MetricGroup": "Bad;BadSpec;BrMispredicts;tma_issueBM",
|
||||
"MetricName": "tma_info_bottleneck_mispredictions",
|
||||
@ -1301,6 +1288,7 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "Average latency of data read request to external memory (in nanoseconds)",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS",
|
||||
"MetricExpr": "1e9 * (UNC_CHA_TOR_OCCUPANCY.IA_MISS_DRD / UNC_CHA_TOR_INSERTS.IA_MISS_DRD) / (tma_info_system_socket_clks / duration_time)",
|
||||
"MetricGroup": "Mem;MemoryLat;SoC",
|
||||
"MetricName": "tma_info_system_mem_read_latency",
|
||||
@ -1455,7 +1443,6 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "This metric estimates how often the CPU was stalled due to L2 cache accesses by loads",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS",
|
||||
"MetricExpr": "(MEMORY_ACTIVITY.STALLS_L1D_MISS - MEMORY_ACTIVITY.STALLS_L2_MISS) / tma_info_thread_clks",
|
||||
"MetricGroup": "CacheMisses;MemoryBound;TmaL3mem;TopdownL3;tma_L3_group;tma_memory_bound_group",
|
||||
"MetricName": "tma_l2_bound",
|
||||
@ -1465,7 +1452,6 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "This metric estimates how often the CPU was stalled due to loads accesses to L3 cache or contended with a sibling Core",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS_NMI",
|
||||
"MetricExpr": "(MEMORY_ACTIVITY.STALLS_L2_MISS - MEMORY_ACTIVITY.STALLS_L3_MISS) / tma_info_thread_clks",
|
||||
"MetricGroup": "CacheMisses;MemoryBound;TmaL3mem;TopdownL3;tma_L3_group;tma_memory_bound_group",
|
||||
"MetricName": "tma_l3_bound",
|
||||
@ -1538,7 +1524,6 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "This metric represents fraction of cycles the CPU spent handling cache misses due to lock operations",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS",
|
||||
"MetricExpr": "(16 * max(0, MEM_INST_RETIRED.LOCK_LOADS - L2_RQSTS.ALL_RFO) + MEM_INST_RETIRED.LOCK_LOADS / MEM_INST_RETIRED.ALL_STORES * (10 * L2_RQSTS.RFO_HIT + min(CPU_CLK_UNHALTED.THREAD, OFFCORE_REQUESTS_OUTSTANDING.CYCLES_WITH_DEMAND_RFO))) / tma_info_thread_clks",
|
||||
"MetricGroup": "Offcore;TopdownL4;tma_L4_group;tma_issueRFO;tma_l1_bound_group",
|
||||
"MetricName": "tma_lock_latency",
|
||||
@ -1596,6 +1581,7 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "This metric represents fraction of cycles the CPU was stalled due to LFENCE Instructions.",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS_NMI",
|
||||
"MetricExpr": "13 * MISC2_RETIRED.LFENCE / tma_info_thread_clks",
|
||||
"MetricGroup": "TopdownL6;tma_L6_group;tma_serializing_operation_group",
|
||||
"MetricName": "tma_memory_fence",
|
||||
@ -1604,7 +1590,6 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "This metric represents fraction of slots where the CPU was retiring memory operations -- uops for memory load or store accesses.",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS",
|
||||
"MetricExpr": "tma_light_operations * MEM_UOP_RETIRED.ANY / (tma_retiring * tma_info_thread_slots)",
|
||||
"MetricGroup": "Pipeline;TopdownL3;tma_L3_group;tma_light_operations_group",
|
||||
"MetricName": "tma_memory_operations",
|
||||
@ -1676,7 +1661,6 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "This metric represents the remaining light uops fraction the CPU has executed - remaining means not covered by other sibling nodes",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS",
|
||||
"MetricExpr": "max(0, tma_light_operations - (tma_fp_arith + tma_int_operations + tma_memory_operations + tma_fused_instructions + tma_non_fused_branches + tma_nop_instructions))",
|
||||
"MetricGroup": "Pipeline;TopdownL3;tma_L3_group;tma_light_operations_group",
|
||||
"MetricName": "tma_other_light_ops",
|
||||
@ -1758,6 +1742,7 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "This metric represents fraction of cycles CPU executed total of 2 uops per cycle on all execution ports (Logical Processor cycles since ICL, Physical Core cycles otherwise)",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS_NMI",
|
||||
"MetricExpr": "EXE_ACTIVITY.2_PORTS_UTIL / tma_info_thread_clks",
|
||||
"MetricGroup": "PortsUtil;TopdownL4;tma_L4_group;tma_issue2P;tma_ports_utilization_group",
|
||||
"MetricName": "tma_ports_utilized_2",
|
||||
@ -1767,6 +1752,7 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "This metric represents fraction of cycles CPU executed total of 3 or more uops per cycle on all execution ports (Logical Processor cycles since ICL, Physical Core cycles otherwise)",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS_NMI",
|
||||
"MetricExpr": "UOPS_EXECUTED.CYCLES_GE_3 / tma_info_thread_clks",
|
||||
"MetricGroup": "PortsUtil;TopdownL4;tma_L4_group;tma_ports_utilization_group",
|
||||
"MetricName": "tma_ports_utilized_3m",
|
||||
@ -1822,6 +1808,7 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "This metric represents fraction of cycles the CPU was stalled due to PAUSE Instructions",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS_NMI",
|
||||
"MetricExpr": "CPU_CLK_UNHALTED.PAUSE / tma_info_thread_clks",
|
||||
"MetricGroup": "TopdownL6;tma_L6_group;tma_serializing_operation_group",
|
||||
"MetricName": "tma_slow_pause",
|
||||
@ -1840,7 +1827,6 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "This metric represents rate of split store accesses",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS_NMI",
|
||||
"MetricExpr": "MEM_INST_RETIRED.SPLIT_STORES / tma_info_core_core_clks",
|
||||
"MetricGroup": "TopdownL4;tma_L4_group;tma_issueSpSt;tma_store_bound_group",
|
||||
"MetricName": "tma_split_stores",
|
||||
@ -1868,7 +1854,6 @@
|
||||
},
|
||||
{
|
||||
"BriefDescription": "This metric roughly estimates fraction of cycles when the memory subsystem had loads blocked since they could not forward data from earlier (in program order) overlapping stores",
|
||||
"MetricConstraint": "NO_GROUP_EVENTS_NMI",
|
||||
"MetricExpr": "13 * LD_BLOCKS.STORE_FORWARD / tma_info_thread_clks",
|
||||
"MetricGroup": "TopdownL4;tma_L4_group;tma_l1_bound_group",
|
||||
"MetricName": "tma_store_fwd_blk",
|
||||
|
||||
@ -414,16 +414,30 @@ EOF
|
||||
# start daemon
|
||||
daemon_start ${config} test
|
||||
|
||||
# send 2 signals
|
||||
perf daemon signal --config ${config} --session test
|
||||
perf daemon signal --config ${config}
|
||||
|
||||
# stop daemon
|
||||
daemon_exit ${config}
|
||||
|
||||
# count is 2 perf.data for signals and 1 for perf record finished
|
||||
count=`ls ${base}/session-test/*perf.data* | wc -l`
|
||||
if [ ${count} -ne 3 ]; then
|
||||
# send 2 signals then exit. Do this in a loop watching the number of
|
||||
# files to avoid races. If the loop retries more than 600 times then
|
||||
# give up.
|
||||
local retries=0
|
||||
local signals=0
|
||||
local success=0
|
||||
while [ ${retries} -lt 600 ] && [ ${success} -eq 0 ]; do
|
||||
local files
|
||||
files=`ls ${base}/session-test/*perf.data* 2> /dev/null | wc -l`
|
||||
if [ ${signals} -eq 0 ]; then
|
||||
perf daemon signal --config ${config} --session test
|
||||
signals=1
|
||||
elif [ ${signals} -eq 1 ] && [ $files -ge 1 ]; then
|
||||
perf daemon signal --config ${config}
|
||||
signals=2
|
||||
elif [ ${signals} -eq 2 ] && [ $files -ge 2 ]; then
|
||||
daemon_exit ${config}
|
||||
signals=3
|
||||
elif [ ${signals} -eq 3 ] && [ $files -ge 3 ]; then
|
||||
success=1
|
||||
fi
|
||||
retries=$((${retries} +1))
|
||||
done
|
||||
if [ ${success} -eq 0 ]; then
|
||||
error=1
|
||||
echo "FAILED: perf data no generated"
|
||||
fi
|
||||
|
||||
@ -3,17 +3,32 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
set -e
|
||||
err=0
|
||||
|
||||
shelldir=$(dirname "$0")
|
||||
# shellcheck source=lib/setup_python.sh
|
||||
. "${shelldir}"/lib/setup_python.sh
|
||||
|
||||
list_output=$(mktemp /tmp/__perf_test.list_output.json.XXXXX)
|
||||
|
||||
cleanup() {
|
||||
rm -f "${list_output}"
|
||||
|
||||
trap - EXIT TERM INT
|
||||
}
|
||||
|
||||
trap_cleanup() {
|
||||
cleanup
|
||||
exit 1
|
||||
}
|
||||
trap trap_cleanup EXIT TERM INT
|
||||
|
||||
test_list_json() {
|
||||
echo "Json output test"
|
||||
perf list -j | $PYTHON -m json.tool
|
||||
perf list -j -o "${list_output}"
|
||||
$PYTHON -m json.tool "${list_output}"
|
||||
echo "Json output test [Success]"
|
||||
}
|
||||
|
||||
test_list_json
|
||||
exit $err
|
||||
cleanup
|
||||
exit 0
|
||||
|
||||
@ -36,8 +36,7 @@ test_db()
|
||||
echo "DB test"
|
||||
|
||||
# Check if python script is supported
|
||||
libpython=$(perf version --build-options | grep python | grep -cv OFF)
|
||||
if [ "${libpython}" != "1" ] ; then
|
||||
if perf version --build-options | grep python | grep -q OFF ; then
|
||||
echo "SKIP: python scripting is not supported"
|
||||
err=2
|
||||
return
|
||||
@ -54,7 +53,14 @@ def sample_table(*args):
|
||||
def call_path_table(*args):
|
||||
print(f'call_path_table({args}')
|
||||
_end_of_file_
|
||||
perf record -g -o "${perfdatafile}" true
|
||||
case $(uname -m)
|
||||
in s390x)
|
||||
cmd_flags="--call-graph dwarf -e cpu-clock";;
|
||||
*)
|
||||
cmd_flags="-g";;
|
||||
esac
|
||||
|
||||
perf record $cmd_flags -o "${perfdatafile}" true
|
||||
perf script -i "${perfdatafile}" -s "${db_test}"
|
||||
echo "DB test [Success]"
|
||||
}
|
||||
|
||||
@ -67,6 +67,7 @@ size_t syscall_arg__scnprintf_statx_mask(char *bf, size_t size, struct syscall_a
|
||||
P_FLAG(BTIME);
|
||||
P_FLAG(MNT_ID);
|
||||
P_FLAG(DIOALIGN);
|
||||
P_FLAG(MNT_ID_UNIQUE);
|
||||
|
||||
#undef P_FLAG
|
||||
|
||||
|
||||
@ -103,7 +103,14 @@ struct evlist *evlist__new_default(void)
|
||||
err = parse_event(evlist, can_profile_kernel ? "cycles:P" : "cycles:Pu");
|
||||
if (err) {
|
||||
evlist__delete(evlist);
|
||||
evlist = NULL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (evlist->core.nr_entries > 1) {
|
||||
struct evsel *evsel;
|
||||
|
||||
evlist__for_each_entry(evlist, evsel)
|
||||
evsel__set_sample_id(evsel, /*can_sample_identifier=*/false);
|
||||
}
|
||||
|
||||
return evlist;
|
||||
|
||||
@ -491,8 +491,8 @@ static int hist_entry__init(struct hist_entry *he,
|
||||
}
|
||||
|
||||
if (symbol_conf.res_sample) {
|
||||
he->res_samples = calloc(sizeof(struct res_sample),
|
||||
symbol_conf.res_sample);
|
||||
he->res_samples = calloc(symbol_conf.res_sample,
|
||||
sizeof(struct res_sample));
|
||||
if (!he->res_samples)
|
||||
goto err_srcline;
|
||||
}
|
||||
|
||||
@ -115,6 +115,10 @@
|
||||
SYM_ALIAS(alias, name, SYM_T_FUNC, SYM_L_WEAK)
|
||||
#endif
|
||||
|
||||
#ifndef SYM_FUNC_ALIAS_MEMFUNC
|
||||
#define SYM_FUNC_ALIAS_MEMFUNC SYM_FUNC_ALIAS
|
||||
#endif
|
||||
|
||||
// In the kernel sources (include/linux/cfi_types.h), this has a different
|
||||
// definition when CONFIG_CFI_CLANG is used, for tools/ just use the !clang
|
||||
// definition:
|
||||
|
||||
@ -286,7 +286,7 @@ static int setup_metric_events(const char *pmu, struct hashmap *ids,
|
||||
*out_metric_events = NULL;
|
||||
ids_size = hashmap__size(ids);
|
||||
|
||||
metric_events = calloc(sizeof(void *), ids_size + 1);
|
||||
metric_events = calloc(ids_size + 1, sizeof(void *));
|
||||
if (!metric_events)
|
||||
return -ENOMEM;
|
||||
|
||||
|
||||
@ -66,7 +66,7 @@ void print_tracepoint_events(const struct print_callbacks *print_cb __maybe_unus
|
||||
|
||||
put_tracing_file(events_path);
|
||||
if (events_fd < 0) {
|
||||
printf("Error: failed to open tracing events directory\n");
|
||||
pr_err("Error: failed to open tracing events directory\n");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@ -1055,11 +1055,11 @@ int perf_event__synthesize_threads(struct perf_tool *tool,
|
||||
if (thread_nr > n)
|
||||
thread_nr = n;
|
||||
|
||||
synthesize_threads = calloc(sizeof(pthread_t), thread_nr);
|
||||
synthesize_threads = calloc(thread_nr, sizeof(pthread_t));
|
||||
if (synthesize_threads == NULL)
|
||||
goto free_dirent;
|
||||
|
||||
args = calloc(sizeof(*args), thread_nr);
|
||||
args = calloc(thread_nr, sizeof(*args));
|
||||
if (args == NULL)
|
||||
goto free_threads;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user