| Message ID | 20190520085753.19670-1-anju@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b59bd3527fe3c1939340df558d7f9d568fc9f882 |
| Headers | show |
| Series | powerpc/powernv: Return for invalid IMC domain | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch next (8150a153c013aa2dd1ffae43370b89ac1347a7fb) |
| snowpatch_ozlabs/build-ppc64le | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64be | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
| snowpatch_ozlabs/build-pmac32 | success | Build succeeded |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 10 lines checked |
On 20/05/19 2:27 PM, Anju T Sudhakar wrote: > 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. Reviewed-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com> > Fixes: 8f95faaac56c1 (`powerpc/powernv: Detect and create IMC device`) > Reported-by: Pavaman Subramaniyam <pavsubra@in.ibm.com> > Signed-off-by: Anju T Sudhakar <anju@linux.vnet.ibm.com> > --- > arch/powerpc/platforms/powernv/opal-imc.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/arch/powerpc/platforms/powernv/opal-imc.c b/arch/powerpc/platforms/powernv/opal-imc.c > index 58a0794..4e8b0e1 100644 > --- a/arch/powerpc/platforms/powernv/opal-imc.c > +++ b/arch/powerpc/platforms/powernv/opal-imc.c > @@ -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)
Anju T Sudhakar <anju@linux.vnet.ibm.com> writes: > 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. What do we print once the patch is applied? cheers > Fixes: 8f95faaac56c1 (`powerpc/powernv: Detect and create IMC device`) > Reported-by: Pavaman Subramaniyam <pavsubra@in.ibm.com> > Signed-off-by: Anju T Sudhakar <anju@linux.vnet.ibm.com> > --- > arch/powerpc/platforms/powernv/opal-imc.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/arch/powerpc/platforms/powernv/opal-imc.c b/arch/powerpc/platforms/powernv/opal-imc.c > index 58a0794..4e8b0e1 100644 > --- a/arch/powerpc/platforms/powernv/opal-imc.c > +++ b/arch/powerpc/platforms/powernv/opal-imc.c > @@ -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) > -- > 1.8.3.1
Hi, On 5/21/19 5:18 PM, Michael Ellerman wrote: > Anju T Sudhakar <anju@linux.vnet.ibm.com> writes: >> 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. > 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
diff --git a/arch/powerpc/platforms/powernv/opal-imc.c b/arch/powerpc/platforms/powernv/opal-imc.c index 58a0794..4e8b0e1 100644 --- a/arch/powerpc/platforms/powernv/opal-imc.c +++ b/arch/powerpc/platforms/powernv/opal-imc.c @@ -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)
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`) Reported-by: Pavaman Subramaniyam <pavsubra@in.ibm.com> Signed-off-by: Anju T Sudhakar <anju@linux.vnet.ibm.com> --- arch/powerpc/platforms/powernv/opal-imc.c | 4 ++++ 1 file changed, 4 insertions(+)