From: "tip-bot2 for Ravi Bangoria" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Ravi Bangoria <ravi.bangoria@amd.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Namhyung Kim <namhyung@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: perf/core] perf/amd/ibs: Add ->check_period() callback
Date: Mon, 03 Feb 2025 12:48:18 -0000 [thread overview]
Message-ID: <173858689845.10177.6464269007223759632.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250115054438.1021-8-ravi.bangoria@amd.com>
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 1afbdd970f50f2e0431fae26b25d4e54e561fa7f
Gitweb: https://git.kernel.org/tip/1afbdd970f50f2e0431fae26b25d4e54e561fa7f
Author: Ravi Bangoria <ravi.bangoria@amd.com>
AuthorDate: Wed, 15 Jan 2025 05:44:36
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Mon, 03 Feb 2025 11:46:06 +01:00
perf/amd/ibs: Add ->check_period() callback
IBS Fetch and IBS Op PMUs have constraints on sample period. The sample
period is verified at the time of opening an event but not at the ioctl()
interface. Hence, a user can open an event with valid period but change
it later with ioctl(). Add a ->check_period() callback to verify the
period provided at ioctl() is also valid.
Signed-off-by: Ravi Bangoria <ravi.bangoria@amd.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/r/20250115054438.1021-8-ravi.bangoria@amd.com
---
arch/x86/events/amd/ibs.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/arch/x86/events/amd/ibs.c b/arch/x86/events/amd/ibs.c
index 7b54b76..aea893a 100644
--- a/arch/x86/events/amd/ibs.c
+++ b/arch/x86/events/amd/ibs.c
@@ -564,6 +564,28 @@ static void perf_ibs_del(struct perf_event *event, int flags)
static void perf_ibs_read(struct perf_event *event) { }
+static int perf_ibs_check_period(struct perf_event *event, u64 value)
+{
+ struct perf_ibs *perf_ibs;
+ u64 low_nibble;
+
+ if (event->attr.freq)
+ return 0;
+
+ perf_ibs = container_of(event->pmu, struct perf_ibs, pmu);
+ low_nibble = value & 0xFULL;
+
+ /*
+ * This contradicts with perf_ibs_init() which allows sample period
+ * with lower nibble bits set but silently masks them off. Whereas
+ * this returns error.
+ */
+ if (low_nibble || value < perf_ibs->min_period)
+ return -EINVAL;
+
+ return 0;
+}
+
/*
* We need to initialize with empty group if all attributes in the
* group are dynamic.
@@ -696,6 +718,7 @@ static struct perf_ibs perf_ibs_fetch = {
.start = perf_ibs_start,
.stop = perf_ibs_stop,
.read = perf_ibs_read,
+ .check_period = perf_ibs_check_period,
},
.msr = MSR_AMD64_IBSFETCHCTL,
.config_mask = IBS_FETCH_MAX_CNT | IBS_FETCH_RAND_EN,
@@ -720,6 +743,7 @@ static struct perf_ibs perf_ibs_op = {
.start = perf_ibs_start,
.stop = perf_ibs_stop,
.read = perf_ibs_read,
+ .check_period = perf_ibs_check_period,
},
.msr = MSR_AMD64_IBSOPCTL,
.config_mask = IBS_OP_MAX_CNT,
next prev parent reply other threads:[~2025-02-03 12:48 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-15 5:44 [PATCH v4 0/9] perf/amd/ibs: Fix sample period computations Ravi Bangoria
2025-01-15 5:44 ` [PATCH v4 1/9] perf/amd/ibs: Remove IBS_{FETCH|OP}_CONFIG_MASK macros Ravi Bangoria
2025-02-03 12:48 ` [tip: perf/core] " tip-bot2 for Ravi Bangoria
2025-01-15 5:44 ` [PATCH v4 2/9] perf/amd/ibs: Remove pointless sample period check Ravi Bangoria
2025-02-03 12:48 ` [tip: perf/core] " tip-bot2 for Ravi Bangoria
2025-01-15 5:44 ` [PATCH v4 3/9] perf/amd/ibs: Fix ->config to sample period calculation for OP PMU Ravi Bangoria
2025-02-03 12:48 ` [tip: perf/core] " tip-bot2 for Ravi Bangoria
2025-01-15 5:44 ` [PATCH v4 4/9] perf/amd/ibs: Fix perf_ibs_op.cnt_mask for CurCnt Ravi Bangoria
2025-02-03 12:48 ` [tip: perf/core] " tip-bot2 for Ravi Bangoria
2025-01-15 5:44 ` [PATCH v4 5/9] perf/amd/ibs: Don't allow freq mode event creation through ->config interface Ravi Bangoria
2025-01-16 21:09 ` Peter Zijlstra
2025-01-17 4:51 ` Ravi Bangoria
2025-02-03 12:48 ` [tip: perf/core] " tip-bot2 for Ravi Bangoria
2025-01-15 5:44 ` [PATCH v4 6/9] perf/amd/ibs: Add PMU specific minimum period Ravi Bangoria
2025-02-03 12:48 ` [tip: perf/core] " tip-bot2 for Ravi Bangoria
2025-01-15 5:44 ` [PATCH v4 7/9] perf/amd/ibs: Add ->check_period() callback Ravi Bangoria
2025-02-03 12:48 ` tip-bot2 for Ravi Bangoria [this message]
2025-01-15 5:44 ` [PATCH v4 8/9] perf/amd/ibs: Ceil sample_period to min_period Ravi Bangoria
2025-02-03 12:48 ` [tip: perf/core] " tip-bot2 for Ravi Bangoria
2025-01-15 5:44 ` [PATCH v4 9/9] perf test amd ibs: Add sample period unit test Ravi Bangoria
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=173858689845.10177.6464269007223759632.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=ravi.bangoria@amd.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®