* [PATCH 1/1] powerpc/perf/hv-24x7: Check support before registering
@ 2015-05-20 23:34 Sukadev Bhattiprolu
2015-06-04 11:40 ` [1/1] " Michael Ellerman
0 siblings, 1 reply; 2+ messages in thread
From: Sukadev Bhattiprolu @ 2015-05-20 23:34 UTC (permalink / raw)
To: Michael Ellerman; +Cc: linux-kernel, linuxppc-dev
>From 955102eacf035b19080dc659a15d9b8fbd8fae7f Mon Sep 17 00:00:00 2001
From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Date: Tue, 28 Apr 2015 18:47:58 -0400
Subject: [PATCH 1/1] powerpc/perf/hv-24x7: Check support before registering
PMU
We currently try to register the 24x7 PMU unconditionally. Not all
Power systems support 24x7 counters (eg: Power7). On these systems
we get a backtrace during boot when trying to register the 24x7 PMU.
Check if the hypervisor supports 24x7 counters before attempting to
register the 24x7 PMU.
Reported-by: Gustavo Luiz Duarte <gusld@br.ibm.com>
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
---
Changelog[v2]
- [Michael Ellerman] Simplify check with bogus parameters.
---
arch/powerpc/perf/hv-24x7.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/arch/powerpc/perf/hv-24x7.c b/arch/powerpc/perf/hv-24x7.c
index ec2eb20..c04a332 100644
--- a/arch/powerpc/perf/hv-24x7.c
+++ b/arch/powerpc/perf/hv-24x7.c
@@ -1268,12 +1268,33 @@ static struct pmu h_24x7_pmu = {
.read = h_24x7_event_read,
};
+/*
+ * Return 1 if we can access the 24x7 counter catalog from the hypervisor.
+ * Return 0 otherwise.
+ */
+static bool hv_has_24x7(void)
+{
+ unsigned long hret;
+
+ hret = h_get_24x7_catalog_page(0, 0, 0);
+
+ if (hret != H_FUNCTION)
+ pr_err("Error %ld reading catalog, disabling 24x7 PMU\n", hret);
+
+ return hret == 0;
+
+}
+
+
static int hv_24x7_init(void)
{
int r;
unsigned long hret;
struct hv_perf_caps caps;
+ if (!hv_has_24x7())
+ return -ENODEV;
+
if (!firmware_has_feature(FW_FEATURE_LPAR)) {
pr_debug("not a virtualized system, not enabling\n");
return -ENODEV;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [1/1] powerpc/perf/hv-24x7: Check support before registering
2015-05-20 23:34 [PATCH 1/1] powerpc/perf/hv-24x7: Check support before registering Sukadev Bhattiprolu
@ 2015-06-04 11:40 ` Michael Ellerman
0 siblings, 0 replies; 2+ messages in thread
From: Michael Ellerman @ 2015-06-04 11:40 UTC (permalink / raw)
To: Sukadev Bhattiprolu; +Cc: linuxppc-dev, linux-kernel
On Wed, 2015-20-05 at 23:34:16 UTC, Sukadev Bhattiprolu wrote:
> >From 955102eacf035b19080dc659a15d9b8fbd8fae7f Mon Sep 17 00:00:00 2001
> From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
> Date: Tue, 28 Apr 2015 18:47:58 -0400
> Subject: [PATCH 1/1] powerpc/perf/hv-24x7: Check support before registering
> PMU
>
> We currently try to register the 24x7 PMU unconditionally. Not all
> Power systems support 24x7 counters (eg: Power7). On these systems
> we get a backtrace during boot when trying to register the 24x7 PMU.
>
> Check if the hypervisor supports 24x7 counters before attempting to
> register the 24x7 PMU.
>
> Reported-by: Gustavo Luiz Duarte <gusld@br.ibm.com>
> Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
> ---
>
> Changelog[v2]
> - [Michael Ellerman] Simplify check with bogus parameters.
> ---
> arch/powerpc/perf/hv-24x7.c | 21 +++++++++++++++++++++
> 1 file changed, 21 insertions(+)
>
> diff --git a/arch/powerpc/perf/hv-24x7.c b/arch/powerpc/perf/hv-24x7.c
> index ec2eb20..c04a332 100644
> --- a/arch/powerpc/perf/hv-24x7.c
> +++ b/arch/powerpc/perf/hv-24x7.c
> @@ -1268,12 +1268,33 @@ static struct pmu h_24x7_pmu = {
> .read = h_24x7_event_read,
> };
>
> +/*
> + * Return 1 if we can access the 24x7 counter catalog from the hypervisor.
> + * Return 0 otherwise.
Comment is wrong.
> + */
> +static bool hv_has_24x7(void)
> +{
> + unsigned long hret;
ret would be fine.
> +
> + hret = h_get_24x7_catalog_page(0, 0, 0);
> +
> + if (hret != H_FUNCTION)
> + pr_err("Error %ld reading catalog, disabling 24x7 PMU\n", hret);
> +
> + return hret == 0;
I don't get what you're doing here.
You check for something other than H_FUNCTION, and print, and then you just
compare against 0. But I wouldn't ever expect that to return 0, because you
passed it bogus args.
The logic should be:
static bool is_24x7_supported(void)
{
if (h_get_24x7_catalog_page(0, 0, 0) == H_FUNCTION)
return false;
return true;
}
> static int hv_24x7_init(void)
> {
> int r;
> unsigned long hret;
> struct hv_perf_caps caps;
>
> + if (!hv_has_24x7())
> + return -ENODEV;
> +
This is no good. You're doing the check, which involves a hcall, before you
even check if you're running with a hypervisor (below).
> if (!firmware_has_feature(FW_FEATURE_LPAR)) {
> pr_debug("not a virtualized system, not enabling\n");
> return -ENODEV;
cheers
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-06-04 11:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-20 23:34 [PATCH 1/1] powerpc/perf/hv-24x7: Check support before registering Sukadev Bhattiprolu
2015-06-04 11:40 ` [1/1] " Michael Ellerman
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).