Skip to contentSkip to conversation

perf/x86/intel/uncore: Fix invalid unit check

PATCH RESEND In review [email protected] 1 participant 4 messages Jul 19, 2021 – Aug 11, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 perf/x86/intel/uncore: Fix invalid unit check

From: Kan Liang <[email protected]>

The uncore unit with the type ID 0 and the unit ID 0 is missed.

The table3 of the uncore unit maybe 0. The uncore_discovery_invalid_unit() mistakenly treated it as an invalid value.

Remove the !unit.table3 check.

Fixes edae1f06c2cd ("perf/x86/intel/uncore: Parse uncore discovery tables")

---

The patch was posted as a part of the "perf: Add Sapphire Rapids server uncore support" patch set. But it doesn't depend on the other patches in the patch set. The bugfix can be accepted and merged separately.

https://lore.kernel.org/lkml/[email protected]/

 arch/x86/events/intel/uncore_discovery.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/uncore_discovery.h +1 -1
index 1d65293..abfb1e8 100644
@@ -30,7 +30,7 @@
 
 
 #define uncore_discovery_invalid_unit(unit)			\
-	(!unit.table1 || !unit.ctl || !unit.table3 ||	\
+	(!unit.table1 || !unit.ctl || \
 	 unit.table1 == -1ULL || unit.ctl == -1ULL ||	\
 	 unit.table3 == -1ULL)
 
Signature · 1 line
2.7.4
#1 lore raw

PATCH RESEND 1/1 perf/x86/intel/uncore: Support extra IMC channel on Ice Lake server

From: Kan Liang <[email protected]>

There are three channels on a Ice Lake server, but only two channels will ever be active. Current perf only enables two channels.

Support the extra IMC channel, which may be activated on some Ice Lake machines. For a non-activated channel, the SW can still access it. The write will be ignored by the HW. 0 is always returned for the reading.

Fixes 2b3b76b5ec67 ("perf/x86/intel/uncore: Add Ice Lake server uncore support")

---

 arch/x86/events/intel/uncore_snbep.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/events/intel/uncore_snbep.c +2 -2
index 9a178a9..72a4181 100644
@@ -452,7 +452,7 @@
 #define ICX_M3UPI_PCI_PMON_BOX_CTL		0xa0
 
 /* ICX IMC */
-#define ICX_NUMBER_IMC_CHN			2
+#define ICX_NUMBER_IMC_CHN			3
 #define ICX_IMC_MEM_STRIDE			0x4
 
 /* SPR */
@@ -5458,7 +5458,7 @@ static struct intel_uncore_ops icx_uncore_mmio_ops = {
 static struct intel_uncore_type icx_uncore_imc = {
 	.name		= "imc",
 	.num_counters   = 4,
-	.num_boxes	= 8,
+	.num_boxes	= 12,
 	.perf_ctr_bits	= 48,
 	.fixed_ctr_bits	= 48,
 	.fixed_ctr	= SNR_IMC_MMIO_PMON_FIXED_CTR,
Signature · 1 line
2.7.4
author
#2 lore raw

Re: [RESEND PATCH] perf/x86/intel/uncore: Support extra IMC channel on Ice Lake server

Hi Peter,

Could you please pick up the fix?
Please let me know if you have any comments/concerns.

Thanks,
Kan

Quoted 41 lines · On 7/19/2021 8:54 AM, [email protected] wrote:

From: Kan Liang <[email protected]>

There are three channels on a Ice Lake server, but only two channels will ever be active. Current perf only enables two channels.

Support the extra IMC channel, which may be activated on some Ice Lake machines. For a non-activated channel, the SW can still access it. The write will be ignored by the HW. 0 is always returned for the reading.

Fixes 2b3b76b5ec67 ("perf/x86/intel/uncore: Add Ice Lake server uncore support")

---

  arch/x86/events/intel/uncore_snbep.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/events/intel/uncore_snbep.c +2 -2
index 9a178a9..72a4181 100644
@@ -452,7 +452,7 @@
  #define ICX_M3UPI_PCI_PMON_BOX_CTL		0xa0
 
  /* ICX IMC */
-#define ICX_NUMBER_IMC_CHN			2
+#define ICX_NUMBER_IMC_CHN			3
  #define ICX_IMC_MEM_STRIDE			0x4
 
  /* SPR */
@@ -5458,7 +5458,7 @@ static struct intel_uncore_ops icx_uncore_mmio_ops = {
  static struct intel_uncore_type icx_uncore_imc = {
  	.name		= "imc",
  	.num_counters   = 4,
-	.num_boxes	= 8,
+	.num_boxes	= 12,
  	.perf_ctr_bits	= 48,
  	.fixed_ctr_bits	= 48,
  	.fixed_ctr	= SNR_IMC_MMIO_PMON_FIXED_CTR,
author
#3 lore raw
In reply to [email protected]

Hi Peter,

Could you please pick up the fix?
Please let me know if you have any comments/concerns.

Thanks,
Kan

Quoted 39 lines · On 7/19/2021 8:54 AM, [email protected] wrote:

From: Kan Liang <[email protected]>

The uncore unit with the type ID 0 and the unit ID 0 is missed.

The table3 of the uncore unit maybe 0. The uncore_discovery_invalid_unit() mistakenly treated it as an invalid value.

Remove the !unit.table3 check.

Fixes edae1f06c2cd ("perf/x86/intel/uncore: Parse uncore discovery tables")

---

The patch was posted as a part of the "perf: Add Sapphire Rapids server uncore support" patch set. But it doesn't depend on the other patches in the patch set. The bugfix can be accepted and merged separately.

https://lore.kernel.org/lkml/[email protected]/

  arch/x86/events/intel/uncore_discovery.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/uncore_discovery.h +1 -1
index 1d65293..abfb1e8 100644
@@ -30,7 +30,7 @@
 
 
  #define uncore_discovery_invalid_unit(unit)			\
-	(!unit.table1 || !unit.ctl || !unit.table3 ||	\
+	(!unit.table1 || !unit.ctl || \
  	 unit.table1 == -1ULL || unit.ctl == -1ULL ||	\
  	 unit.table3 == -1ULL)