From: "tip-bot2 for Kan Liang" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Yasin, Ahmad" <ahmad.yasin@intel.com>,
Kan Liang <kan.liang@linux.intel.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
stable@vger.kernel.org, x86@kernel.org,
linux-kernel@vger.kernel.org
Subject: [tip: perf/core] perf/x86/intel: Fix instructions:ppp support in Sapphire Rapids
Date: Thu, 24 Jun 2021 07:09:45 -0000 [thread overview]
Message-ID: <162451858575.395.8356666893270560379.tip-bot2@tip-bot2> (raw)
In-Reply-To: <1624029174-122219-4-git-send-email-kan.liang@linux.intel.com>
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 1d5c7880992a06679585e7e568cc679c0c5fd4f2
Gitweb: https://git.kernel.org/tip/1d5c7880992a06679585e7e568cc679c0c5fd4f2
Author: Kan Liang <kan.liang@linux.intel.com>
AuthorDate: Fri, 18 Jun 2021 08:12:54 -07:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Wed, 23 Jun 2021 18:30:55 +02:00
perf/x86/intel: Fix instructions:ppp support in Sapphire Rapids
Perf errors out when sampling instructions:ppp.
$ perf record -e instructions:ppp -- true
Error:
The sys_perf_event_open() syscall returned with 22 (Invalid argument)
for event (instructions:ppp).
The instruction PDIR is only available on the fixed counter 0. The event
constraint has been updated to fixed0_constraint in
icl_get_event_constraints(). The Sapphire Rapids codes unconditionally
error out for the event which is not available on the GP counter 0.
Make the instructions:ppp an exception.
Fixes: 61b985e3e775 ("perf/x86/intel: Add perf core PMU support for Sapphire Rapids")
Reported-by: Yasin, Ahmad <ahmad.yasin@intel.com>
Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/1624029174-122219-4-git-send-email-kan.liang@linux.intel.com
---
arch/x86/events/intel/core.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
index e442b55..e355db5 100644
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@ -4032,8 +4032,10 @@ spr_get_event_constraints(struct cpu_hw_events *cpuc, int idx,
* The :ppp indicates the Precise Distribution (PDist) facility, which
* is only supported on the GP counter 0. If a :ppp event which is not
* available on the GP counter 0, error out.
+ * Exception: Instruction PDIR is only available on the fixed counter 0.
*/
- if (event->attr.precise_ip == 3) {
+ if ((event->attr.precise_ip == 3) &&
+ !constraint_match(&fixed0_constraint, event->hw.config)) {
if (c->idxmsk64 & BIT_ULL(0))
return &counter0_constraint;
next prev parent reply other threads:[~2021-06-24 7:09 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-18 15:12 [PATCH 0/3] Perf: Some fixes for Alder Lake and Sapphire Rapids kan.liang
2021-06-18 15:12 ` [RESEND PATCH 1/3] perf/x86/intel: Fix fixed counter check warning for some Alder Lake kan.liang
2021-06-24 7:09 ` [tip: perf/core] " tip-bot2 for Kan Liang
2021-06-18 15:12 ` [PATCH 2/3] perf/x86/intel: Add more events requires FRONTEND MSR on Sapphire Rapids kan.liang
2021-06-24 7:09 ` [tip: perf/core] " tip-bot2 for Kan Liang
2021-06-18 15:12 ` [PATCH 3/3] perf/x86/intel: Fix instructions:ppp support in " kan.liang
2021-06-24 7:09 ` tip-bot2 for Kan Liang [this message]
2021-06-25 8:27 ` [PATCH 0/3] Perf: Some fixes for Alder Lake and " You-Sheng Yang
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=162451858575.395.8356666893270560379.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=ahmad.yasin@intel.com \
--cc=kan.liang@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=stable@vger.kernel.org \
--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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).