Skip to contentSkip to conversation

powerpc/powernv: Return for invalid IMC domain

PATCH Applied Anju T Sudhakar 4 participants 5 messages May 20, 2019 – May 25, 2019 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc/powernv: Return for invalid IMC domain

Currently init_imc_pmu() can be failed either because an IMC unit with invalid domain(i.e an IMC node not supported by the kernel) is attempted a pmu-registration or something went wrong while registering a valid IMC unit. In both the cases kernel provides a 'Registration failed' error message.

Example:
Log message, when trace-imc node is not supported by the kernel, and the skiboot supports trace-imc node.

So for kernel, trace-imc node is now an unknown domain.

[    1.731870] nest_phb5_imc performance monitor hardware support registered
[    1.731944] nest_powerbus0_imc performance monitor hardware support registered
[    1.734458] thread_imc performance monitor hardware support registered
[    1.734460] IMC Unknown Device type
[    1.734462] IMC PMU (null) Register failed
[    1.734558] nest_xlink0_imc performance monitor hardware support registered
[    1.734614] nest_xlink1_imc performance monitor hardware support registered
[    1.734670] nest_xlink2_imc performance monitor hardware support registered
[    1.747043] Initialise system trusted keyrings
[    1.747054] Key type blacklist registered

To avoid ambiguity on the error message, return for invalid domain before attempting a pmu registration.

Fixes 8f95faaac56c1 (`powerpc/powernv: Detect and create IMC device`)
---
 arch/powerpc/platforms/powernv/opal-imc.c | 4 ++++
 1 file changed, 4 insertions(+)
arch/powerpc/platforms/powernv/opal-imc.c +4 -0
index 58a0794..4e8b0e1 100644
@@ -161,6 +161,10 @@ static int imc_pmu_create(struct device_node *parent, int pmu_index, int domain)
 	struct imc_pmu *pmu_ptr;
 	u32 offset;
 
+	/* Return for unknown domain */
+	if (domain < 0)
+		return -EINVAL;
+
 	/* memory for pmu */
 	pmu_ptr = kzalloc(sizeof(*pmu_ptr), GFP_KERNEL);
 	if (!pmu_ptr)
Signature · 1 line
1.8.3.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 25 lines · Anju T Sudhakar

Currently init_imc_pmu() can be failed either because an IMC unit with invalid domain(i.e an IMC node not supported by the kernel) is attempted a pmu-registration or something went wrong while registering a valid IMC unit. In both the cases kernel provides a 'Registration failed' error message.

Example:
Log message, when trace-imc node is not supported by the kernel, and the skiboot supports trace-imc node.

So for kernel, trace-imc node is now an unknown domain.

[    1.731870] nest_phb5_imc performance monitor hardware support registered
[    1.731944] nest_powerbus0_imc performance monitor hardware support registered
[    1.734458] thread_imc performance monitor hardware support registered
[    1.734460] IMC Unknown Device type
[    1.734462] IMC PMU (null) Register failed
[    1.734558] nest_xlink0_imc performance monitor hardware support registered
[    1.734614] nest_xlink1_imc performance monitor hardware support registered
[    1.734670] nest_xlink2_imc performance monitor hardware support registered
[    1.747043] Initialise system trusted keyrings
[    1.747054] Key type blacklist registered
Quoted 2 lines

To avoid ambiguity on the error message, return for invalid domain before attempting a pmu registration.

Quoted 23 lines
Fixes 8f95faaac56c1 (`powerpc/powernv: Detect and create IMC device`)
---
  arch/powerpc/platforms/powernv/opal-imc.c | 4 ++++
  1 file changed, 4 insertions(+)
arch/powerpc/platforms/powernv/opal-imc.c +4 -0
index 58a0794..4e8b0e1 100644
@@ -161,6 +161,10 @@ static int imc_pmu_create(struct device_node *parent, int pmu_index, int domain)
  	struct imc_pmu *pmu_ptr;
  	u32 offset;
 
+	/* Return for unknown domain */
+	if (domain < 0)
+		return -EINVAL;
+
  	/* memory for pmu */
  	pmu_ptr = kzalloc(sizeof(*pmu_ptr), GFP_KERNEL);
  	if (!pmu_ptr)
#2 lore raw
In reply to Anju T Sudhakar
Quoted 25 lines · Anju T Sudhakar

Currently init_imc_pmu() can be failed either because an IMC unit with invalid domain(i.e an IMC node not supported by the kernel) is attempted a pmu-registration or something went wrong while registering a valid IMC unit. In both the cases kernel provides a 'Registration failed' error message.

Example:
Log message, when trace-imc node is not supported by the kernel, and the skiboot supports trace-imc node.

So for kernel, trace-imc node is now an unknown domain.

[    1.731870] nest_phb5_imc performance monitor hardware support registered
[    1.731944] nest_powerbus0_imc performance monitor hardware support registered
[    1.734458] thread_imc performance monitor hardware support registered
[    1.734460] IMC Unknown Device type
[    1.734462] IMC PMU (null) Register failed
[    1.734558] nest_xlink0_imc performance monitor hardware support registered
[    1.734614] nest_xlink1_imc performance monitor hardware support registered
[    1.734670] nest_xlink2_imc performance monitor hardware support registered
[    1.747043] Initialise system trusted keyrings
[    1.747054] Key type blacklist registered
Quoted 2 lines

To avoid ambiguity on the error message, return for invalid domain before attempting a pmu registration.

What do we print once the patch is applied?

cheers

Quoted 24 lines
Fixes 8f95faaac56c1 (`powerpc/powernv: Detect and create IMC device`)
---
 arch/powerpc/platforms/powernv/opal-imc.c | 4 ++++
 1 file changed, 4 insertions(+)
arch/powerpc/platforms/powernv/opal-imc.c +4 -0
index 58a0794..4e8b0e1 100644
@@ -161,6 +161,10 @@ static int imc_pmu_create(struct device_node *parent, int pmu_index, int domain)
 	struct imc_pmu *pmu_ptr;
 	u32 offset;
 
+	/* Return for unknown domain */
+	if (domain < 0)
+		return -EINVAL;
+
 	/* memory for pmu */
 	pmu_ptr = kzalloc(sizeof(*pmu_ptr), GFP_KERNEL);
 	if (!pmu_ptr)
Signature · 1 line
1.8.3.1
#3 lore raw

Hi,

Quoted 26 lines · Michael Ellerman
Quoted 25 lines · Anju T Sudhakar

Currently init_imc_pmu() can be failed either because an IMC unit with invalid domain(i.e an IMC node not supported by the kernel) is attempted a pmu-registration or something went wrong while registering a valid IMC unit. In both the cases kernel provides a 'Registration failed' error message.

Example:
Log message, when trace-imc node is not supported by the kernel, and the skiboot supports trace-imc node.

So for kernel, trace-imc node is now an unknown domain.

[    1.731870] nest_phb5_imc performance monitor hardware support registered
[    1.731944] nest_powerbus0_imc performance monitor hardware support registered
[    1.734458] thread_imc performance monitor hardware support registered
[    1.734460] IMC Unknown Device type
[    1.734462] IMC PMU (null) Register failed
[    1.734558] nest_xlink0_imc performance monitor hardware support registered
[    1.734614] nest_xlink1_imc performance monitor hardware support registered
[    1.734670] nest_xlink2_imc performance monitor hardware support registered
[    1.747043] Initialise system trusted keyrings
[    1.747054] Key type blacklist registered
Quoted 3 lines
Quoted 2 lines

To avoid ambiguity on the error message, return for invalid domain before attempting a pmu registration.

What do we print once the patch is applied?

Once the patch is applied, we return for invalid domains. so we will only have

/IMC Unknown Device type/ message printed for *unknown domains*.

And /IMC PMU (null) Register failed/ message will appear only if the

registration fails for a *known domain*.

Thanks,

Anju

#4 lore raw
In reply to Anju T Sudhakar
Quoted 25 lines · Anju T Sudhakar

Currently init_imc_pmu() can be failed either because an IMC unit with invalid domain(i.e an IMC node not supported by the kernel) is attempted a pmu-registration or something went wrong while registering a valid IMC unit. In both the cases kernel provides a 'Registration failed' error message.

Example:
Log message, when trace-imc node is not supported by the kernel, and the skiboot supports trace-imc node.

So for kernel, trace-imc node is now an unknown domain.

[    1.731870] nest_phb5_imc performance monitor hardware support registered
[    1.731944] nest_powerbus0_imc performance monitor hardware support registered
[    1.734458] thread_imc performance monitor hardware support registered
[    1.734460] IMC Unknown Device type
[    1.734462] IMC PMU (null) Register failed
[    1.734558] nest_xlink0_imc performance monitor hardware support registered
[    1.734614] nest_xlink1_imc performance monitor hardware support registered
[    1.734670] nest_xlink2_imc performance monitor hardware support registered
[    1.747043] Initialise system trusted keyrings
[    1.747054] Key type blacklist registered
Quoted 7 lines

To avoid ambiguity on the error message, return for invalid domain before attempting a pmu registration.

Fixes 8f95faaac56c1 (`powerpc/powernv: Detect and create IMC device`)

Applied to powerpc fixes, thanks.

https://git.kernel.org/powerpc/c/b59bd3527fe3c1939340df558d7f9d56

cheers