| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20250815213435.1702022-11-kan.liang@linux.intel.com>
Date: Fri, 15 Aug 2025 14:34:28 -0700
From: kan.liang@...ux.intel.com
To: peterz@...radead.org,
mingo@...hat.com,
acme@...nel.org,
namhyung@...nel.org,
tglx@...utronix.de,
dave.hansen@...ux.intel.com,
irogers@...gle.com,
adrian.hunter@...el.com,
jolsa@...nel.org,
alexander.shishkin@...ux.intel.com,
linux-kernel@...r.kernel.org
Cc: dapeng1.mi@...ux.intel.com,
ak@...ux.intel.com,
zide.chen@...el.com,
mark.rutland@....com,
broonie@...nel.org,
ravi.bangoria@....com,
eranian@...gle.com,
Kan Liang <kan.liang@...ux.intel.com>
Subject: [PATCH V3 10/17] perf/x86: Add OPMASK into sample_simd_pred_reg
From: Kan Liang <kan.liang@...ux.intel.com>
The OPMASK is the SIMD's predicate registers. Add them into
sample_simd_pred_reg. The qwords of OPMASK is 1. There are 8 registers.
Signed-off-by: Kan Liang <kan.liang@...ux.intel.com>
---
arch/x86/events/core.c | 13 +++++++++++++
arch/x86/include/asm/perf_event.h | 4 ++++
arch/x86/include/uapi/asm/perf_regs.h | 3 +++
arch/x86/kernel/perf_regs.c | 18 ++++++++++++++----
4 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
index 85b739fe1693..1fa550efcdfa 100644
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
@@ -430,6 +430,8 @@ static void x86_pmu_get_ext_regs(struct x86_perf_regs *perf_regs, u64 mask)
perf_regs->zmmh = get_xsave_addr(xsave, XFEATURE_ZMM_Hi256);
if (valid_mask & XFEATURE_MASK_Hi16_ZMM)
perf_regs->h16zmm = get_xsave_addr(xsave, XFEATURE_Hi16_ZMM);
+ if (valid_mask & XFEATURE_MASK_OPMASK)
+ perf_regs->opmask = get_xsave_addr(xsave, XFEATURE_OPMASK);
}
static void release_ext_regs_buffers(void)
@@ -1824,6 +1826,9 @@ void x86_pmu_setup_regs_data(struct perf_event *event,
data->dyn_size += hweight64(attr->sample_simd_vec_reg_user) *
sizeof(u64) *
attr->sample_simd_vec_reg_qwords;
+ data->dyn_size += hweight32(attr->sample_simd_pred_reg_user) *
+ sizeof(u64) *
+ attr->sample_simd_pred_reg_qwords;
data->regs_user.abi |= PERF_SAMPLE_REGS_ABI_SIMD;
}
perf_regs->abi = data->regs_user.abi;
@@ -1843,6 +1848,9 @@ void x86_pmu_setup_regs_data(struct perf_event *event,
data->dyn_size += hweight64(attr->sample_simd_vec_reg_intr) *
sizeof(u64) *
attr->sample_simd_vec_reg_qwords;
+ data->dyn_size += hweight32(attr->sample_simd_pred_reg_intr) *
+ sizeof(u64) *
+ attr->sample_simd_pred_reg_qwords;
data->regs_intr.abi |= PERF_SAMPLE_REGS_ABI_SIMD;
}
perf_regs->abi = data->regs_intr.abi;
@@ -1868,6 +1876,11 @@ void x86_pmu_setup_regs_data(struct perf_event *event,
perf_regs->h16zmm_regs = NULL;
mask |= XFEATURE_MASK_Hi16_ZMM;
}
+ if (attr->sample_simd_pred_reg_intr ||
+ attr->sample_simd_pred_reg_user) {
+ perf_regs->opmask_regs = NULL;
+ mask |= XFEATURE_MASK_OPMASK;
+ }
}
mask &= ~ignore_mask;
diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h
index 2d78bd9649bd..dda677022882 100644
--- a/arch/x86/include/asm/perf_event.h
+++ b/arch/x86/include/asm/perf_event.h
@@ -609,6 +609,10 @@ struct x86_perf_regs {
u64 *h16zmm_regs;
struct avx_512_hi16_state *h16zmm;
};
+ union {
+ u64 *opmask_regs;
+ struct avx_512_opmask_state *opmask;
+ };
};
extern unsigned long perf_arch_instruction_pointer(struct pt_regs *regs);
diff --git a/arch/x86/include/uapi/asm/perf_regs.h b/arch/x86/include/uapi/asm/perf_regs.h
index f74e3ba65be2..dd7bd1dd8d39 100644
--- a/arch/x86/include/uapi/asm/perf_regs.h
+++ b/arch/x86/include/uapi/asm/perf_regs.h
@@ -55,11 +55,14 @@ enum perf_event_x86_regs {
#define PERF_REG_EXTENDED_MASK (~((1ULL << PERF_REG_X86_XMM0) - 1))
+#define PERF_X86_SIMD_PRED_REGS_MAX 8
+#define PERF_X86_SIMD_PRED_MASK GENMASK(PERF_X86_SIMD_PRED_REGS_MAX - 1, 0)
#define PERF_X86_SIMD_VEC_REGS_MAX 32
#define PERF_X86_SIMD_VEC_MASK GENMASK_ULL(PERF_X86_SIMD_VEC_REGS_MAX - 1, 0)
#define PERF_X86_H16ZMM_BASE 16
+#define PERF_X86_OPMASK_QWORDS 1
#define PERF_X86_XMM_QWORDS 2
#define PERF_X86_YMM_QWORDS 4
#define PERF_X86_YMMH_QWORDS (PERF_X86_YMM_QWORDS / 2)
diff --git a/arch/x86/kernel/perf_regs.c b/arch/x86/kernel/perf_regs.c
index f04c44d3d356..5e815f806605 100644
--- a/arch/x86/kernel/perf_regs.c
+++ b/arch/x86/kernel/perf_regs.c
@@ -75,7 +75,8 @@ void perf_simd_reg_check(struct pt_regs *regs,
if (*nr_vectors > PERF_X86_H16ZMM_BASE && !perf_regs->h16zmm_regs)
*nr_vectors = PERF_X86_H16ZMM_BASE;
- *nr_pred = 0;
+ if (*nr_pred && !perf_regs->opmask_regs)
+ *nr_pred = 0;
}
u64 perf_reg_value(struct pt_regs *regs, int idx)
@@ -103,8 +104,14 @@ u64 perf_simd_reg_value(struct pt_regs *regs, int idx,
{
struct x86_perf_regs *perf_regs = container_of(regs, struct x86_perf_regs, regs);
- if (pred)
- return 0;
+ if (pred) {
+ if (WARN_ON_ONCE(idx >= PERF_X86_SIMD_PRED_REGS_MAX ||
+ qwords_idx >= PERF_X86_OPMASK_QWORDS))
+ return 0;
+ if (!perf_regs->opmask_regs)
+ return 0;
+ return perf_regs->opmask_regs[idx];
+ }
if (WARN_ON_ONCE(idx >= PERF_X86_SIMD_VEC_REGS_MAX ||
qwords_idx >= PERF_X86_SIMD_QWORDS_MAX))
@@ -151,7 +158,10 @@ int perf_simd_reg_validate(u16 vec_qwords, u64 vec_mask,
if (vec_mask & ~PERF_X86_SIMD_VEC_MASK)
return -EINVAL;
}
- if (pred_mask)
+
+ if (pred_qwords != PERF_X86_OPMASK_QWORDS)
+ return -EINVAL;
+ if (pred_mask & ~PERF_X86_SIMD_PRED_MASK)
return -EINVAL;
return 0;
--
2.38.1
Powered by blists - more mailing lists