linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [RESEND PATCH] perf/x86/intel/uncore: Fix M2M event umask for Ice Lake server
@ 2021-06-01 13:09 kan.liang
  2021-06-01 13:56 ` Peter Zijlstra
  2021-06-01 14:04 ` [tip: perf/urgent] " tip-bot2 for Kan Liang
  0 siblings, 2 replies; 3+ messages in thread
From: kan.liang @ 2021-06-01 13:09 UTC (permalink / raw)
  To: peterz, mingo, linux-kernel; +Cc: ak, yao.jin, Kan Liang, stable

From: Kan Liang <kan.liang@linux.intel.com>

Perf tool errors out with the latest event list for the Ice Lake server.

event syntax error: 'unc_m2m_imc_reads.to_pmm'
                           \___ value too big for format, maximum is 255

The same as the Snow Ridge server, the M2M uncore unit in the Ice Lake
server has the unit mask extension field as well.

Fixes: 2b3b76b5ec67 ("perf/x86/intel/uncore: Add Ice Lake server uncore support")
Reported-by: Jin Yao <yao.jin@linux.intel.com>
Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
Cc: stable@vger.kernel.org
---
 arch/x86/events/intel/uncore_snbep.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
index acc3c0e5..06c055d 100644
--- a/arch/x86/events/intel/uncore_snbep.c
+++ b/arch/x86/events/intel/uncore_snbep.c
@@ -5106,9 +5106,10 @@ static struct intel_uncore_type icx_uncore_m2m = {
 	.perf_ctr	= SNR_M2M_PCI_PMON_CTR0,
 	.event_ctl	= SNR_M2M_PCI_PMON_CTL0,
 	.event_mask	= SNBEP_PMON_RAW_EVENT_MASK,
+	.event_mask_ext	= SNR_M2M_PCI_PMON_UMASK_EXT,
 	.box_ctl	= SNR_M2M_PCI_PMON_BOX_CTL,
 	.ops		= &snr_m2m_uncore_pci_ops,
-	.format_group	= &skx_uncore_format_group,
+	.format_group	= &snr_m2m_uncore_format_group,
 };
 
 static struct attribute *icx_upi_uncore_formats_attr[] = {
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [RESEND PATCH] perf/x86/intel/uncore: Fix M2M event umask for Ice Lake server
  2021-06-01 13:09 [RESEND PATCH] perf/x86/intel/uncore: Fix M2M event umask for Ice Lake server kan.liang
@ 2021-06-01 13:56 ` Peter Zijlstra
  2021-06-01 14:04 ` [tip: perf/urgent] " tip-bot2 for Kan Liang
  1 sibling, 0 replies; 3+ messages in thread
From: Peter Zijlstra @ 2021-06-01 13:56 UTC (permalink / raw)
  To: kan.liang; +Cc: mingo, linux-kernel, ak, yao.jin, stable

On Tue, Jun 01, 2021 at 06:09:03AM -0700, kan.liang@linux.intel.com wrote:
> From: Kan Liang <kan.liang@linux.intel.com>
> 
> Perf tool errors out with the latest event list for the Ice Lake server.
> 
> event syntax error: 'unc_m2m_imc_reads.to_pmm'
>                            \___ value too big for format, maximum is 255
> 
> The same as the Snow Ridge server, the M2M uncore unit in the Ice Lake
> server has the unit mask extension field as well.
> 
> Fixes: 2b3b76b5ec67 ("perf/x86/intel/uncore: Add Ice Lake server uncore support")
> Reported-by: Jin Yao <yao.jin@linux.intel.com>
> Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
> Cc: stable@vger.kernel.org

Thanks!

^ permalink raw reply	[flat|nested] 3+ messages in thread
* [tip: perf/urgent] perf/x86/intel/uncore: Fix M2M event umask for Ice Lake server
  2021-06-01 13:09 [RESEND PATCH] perf/x86/intel/uncore: Fix M2M event umask for Ice Lake server kan.liang
  2021-06-01 13:56 ` Peter Zijlstra
@ 2021-06-01 14:04 ` tip-bot2 for Kan Liang
  1 sibling, 0 replies; 3+ messages in thread
From: tip-bot2 for Kan Liang @ 2021-06-01 14:04 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: Jin Yao, Kan Liang, Peter Zijlstra (Intel), stable, x86, linux-kernel

The following commit has been merged into the perf/urgent branch of tip:

Commit-ID:     848ff3768684701a4ce73a2ec0e5d438d4e2b0da
Gitweb:        https://git.kernel.org/tip/848ff3768684701a4ce73a2ec0e5d438d4e2b0da
Author:        Kan Liang <kan.liang@linux.intel.com>
AuthorDate:    Tue, 01 Jun 2021 06:09:03 -07:00
Committer:     Peter Zijlstra <peterz@infradead.org>
CommitterDate: Tue, 01 Jun 2021 16:00:05 +02:00

perf/x86/intel/uncore: Fix M2M event umask for Ice Lake server

Perf tool errors out with the latest event list for the Ice Lake server.

event syntax error: 'unc_m2m_imc_reads.to_pmm'
                           \___ value too big for format, maximum is 255

The same as the Snow Ridge server, the M2M uncore unit in the Ice Lake
server has the unit mask extension field as well.

Fixes: 2b3b76b5ec67 ("perf/x86/intel/uncore: Add Ice Lake server uncore support")
Reported-by: Jin Yao <yao.jin@linux.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://lkml.kernel.org/r/1622552943-119174-1-git-send-email-kan.liang@linux.intel.com
---
 arch/x86/events/intel/uncore_snbep.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
index 1587d32..3a75a2c 100644
--- a/arch/x86/events/intel/uncore_snbep.c
+++ b/arch/x86/events/intel/uncore_snbep.c
@@ -5099,9 +5099,10 @@ static struct intel_uncore_type icx_uncore_m2m = {
 	.perf_ctr	= SNR_M2M_PCI_PMON_CTR0,
 	.event_ctl	= SNR_M2M_PCI_PMON_CTL0,
 	.event_mask	= SNBEP_PMON_RAW_EVENT_MASK,
+	.event_mask_ext	= SNR_M2M_PCI_PMON_UMASK_EXT,
 	.box_ctl	= SNR_M2M_PCI_PMON_BOX_CTL,
 	.ops		= &snr_m2m_uncore_pci_ops,
-	.format_group	= &skx_uncore_format_group,
+	.format_group	= &snr_m2m_uncore_format_group,
 };
 
 static struct attribute *icx_upi_uncore_formats_attr[] = {

^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-01 14:05 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-01 13:09 [RESEND PATCH] perf/x86/intel/uncore: Fix M2M event umask for Ice Lake server kan.liang
2021-06-01 13:56 ` Peter Zijlstra
2021-06-01 14:04 ` [tip: perf/urgent] " tip-bot2 for Kan Liang

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 NNTP newsgroup(s).