From: "tip-bot2 for Alexander Antonov" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Alexander Antonov <alexander.antonov@linux.intel.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Kan Liang <kan.liang@linux.intel.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: perf/urgent] perf/x86/intel/uncore: Fix filter_tid mask for CHA events on Skylake Server
Date: Wed, 17 Nov 2021 13:59:54 -0000 [thread overview]
Message-ID: <163715759422.11128.17773038271358383555.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20211115090334.3789-2-alexander.antonov@linux.intel.com>
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: e324234e0aa881b7841c7c713306403e12b069ff
Gitweb: https://git.kernel.org/tip/e324234e0aa881b7841c7c713306403e12b069ff
Author: Alexander Antonov <alexander.antonov@linux.intel.com>
AuthorDate: Mon, 15 Nov 2021 12:03:32 +03:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Wed, 17 Nov 2021 14:48:43 +01:00
perf/x86/intel/uncore: Fix filter_tid mask for CHA events on Skylake Server
According Uncore Reference Manual: any of the CHA events may be filtered
by Thread/Core-ID by using tid modifier in CHA Filter 0 Register.
Update skx_cha_hw_config() to follow Uncore Guide.
Fixes: cd34cd97b7b4 ("perf/x86/intel/uncore: Add Skylake server uncore support")
Signed-off-by: Alexander Antonov <alexander.antonov@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
Link: https://lore.kernel.org/r/20211115090334.3789-2-alexander.antonov@linux.intel.com
---
arch/x86/events/intel/uncore_snbep.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
index eb2c6ce..e5ee6bb 100644
--- a/arch/x86/events/intel/uncore_snbep.c
+++ b/arch/x86/events/intel/uncore_snbep.c
@@ -3608,6 +3608,9 @@ static int skx_cha_hw_config(struct intel_uncore_box *box, struct perf_event *ev
struct hw_perf_event_extra *reg1 = &event->hw.extra_reg;
struct extra_reg *er;
int idx = 0;
+ /* Any of the CHA events may be filtered by Thread/Core-ID.*/
+ if (event->hw.config & SNBEP_CBO_PMON_CTL_TID_EN)
+ idx = SKX_CHA_MSR_PMON_BOX_FILTER_TID;
for (er = skx_uncore_cha_extra_regs; er->msr; er++) {
if (er->event != (event->hw.config & er->config_mask))
next prev parent reply other threads:[~2021-11-17 14:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-15 9:03 [RESEND PATCH v2 0/3] Several fixes for event constraints on SKX and SNR platforms alexander.antonov
2021-11-15 9:03 ` [RESEND PATCH v2 1/3] Fix filter_tid mask for CHA events on Skylake Server alexander.antonov
2021-11-17 13:59 ` tip-bot2 for Alexander Antonov [this message]
2021-11-15 9:03 ` [RESEND PATCH v2 2/3] Fix IIO event constraints for " alexander.antonov
2021-11-17 13:59 ` [tip: perf/urgent] perf/x86/intel/uncore: " tip-bot2 for Alexander Antonov
2021-11-15 9:03 ` [RESEND PATCH v2 3/3] Fix IIO event constraints for Snowridge alexander.antonov
2021-11-17 13:59 ` [tip: perf/urgent] perf/x86/intel/uncore: " tip-bot2 for Alexander Antonov
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=163715759422.11128.17773038271358383555.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=alexander.antonov@linux.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=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.