Skip to contentSkip to conversation

powerpc/perf/hv-24x7: Update domain value check

PATCH Applied Kajol Jain 3 participants 3 messages Aug 25, 2023 – Sep 21, 2023 PowerPC

lore
Share & tools
lore

Kajol Jain

author
#0 lore raw

PATCH 1/1 powerpc/perf/hv-24x7: Update domain value check

Valid domain value is in range 1 to HV_PERF_DOMAIN_MAX. Current code has check for domain value greater than or equal to HV_PERF_DOMAIN_MAX. But the check for domain value 0 is missing.
Fix this issue by adding check for domain value 0.

Fixes ebd4a5a3ebd9 ("powerpc/perf/hv-24x7: Minor improvements")
---
 arch/powerpc/perf/hv-24x7.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/perf/hv-24x7.c +1 -1
index 317175791d23..644881cc1c00 100644
@@ -1418,7 +1418,7 @@ static int h_24x7_event_init(struct perf_event *event)
 	}
 
 	domain = event_get_domain(event);
-	if (domain >= HV_PERF_DOMAIN_MAX) {
+	if (domain  == 0 || domain >= HV_PERF_DOMAIN_MAX) {
 		pr_devel("invalid domain %d\n", domain);
 		return -EINVAL;
 	}
Signature · 1 line
2.35.3
Tested-by on v1 1/1
#1 lore raw
Quoted 8 lines · Kajol Jain

Valid domain value is in range 1 to HV_PERF_DOMAIN_MAX. Current code has check for domain value greater than or equal to HV_PERF_DOMAIN_MAX. But the check for domain value 0 is missing.
Fix this issue by adding check for domain value 0.

Fixes ebd4a5a3ebd9 ("powerpc/perf/hv-24x7: Minor improvements")

Tested the patch on power, with domain=0 not getting hcall failure after patch changes.

Before patch changes:

# ./perf stat -v -e hv_24x7/CPM_ADJUNCT_INST,domain=0,core=1/ sleep 1
Using CPUID 00800200
Control descriptor is not initialized
Error:
The sys_perf_event_open() syscall returned with 5 (Input/output error) for
event (hv_24x7/CPM_ADJUNCT_INST,domain=0,core=1/).
/bin/dmesg | grep -i perf may provide additional information.

Result from dmesg:

[   37.819387] hv-24x7: hcall failed: [0 0x60040000 0x100 0] => ret

0xfffffffffffffffc (-4) detail=0x2000000 failing ix=0

After patch changes:

# ./perf stat -v -e hv_24x7/CPM_ADJUNCT_INST,domain=0,core=1/ sleep 1
Using CPUID 00800200
Control descriptor is not initialized
Warning:
hv_24x7/CPM_ADJUNCT_INST,domain=0,core=1/ event is not supported by the kernel.
failed to read counter hv_24x7/CPM_ADJUNCT_INST,domain=0,core=1/

Performance counter stats for 'system wide':

<not supported> hv_24x7/CPM_ADJUNCT_INST,domain=0,core=1/

       1.001352771 seconds time elapsed
Quoted 17 lines
---
  arch/powerpc/perf/hv-24x7.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/perf/hv-24x7.c +1 -1
index 317175791d23..644881cc1c00 100644
@@ -1418,7 +1418,7 @@ static int h_24x7_event_init(struct perf_event *event)
  	}
 
  	domain = event_get_domain(event);
-	if (domain >= HV_PERF_DOMAIN_MAX) {
+	if (domain  == 0 || domain >= HV_PERF_DOMAIN_MAX) {
  		pr_devel("invalid domain %d\n", domain);
  		return -EINVAL;
  	}
#2 lore raw
In reply to Kajol Jain
Quoted 8 lines · Kajol Jain

Valid domain value is in range 1 to HV_PERF_DOMAIN_MAX. Current code has check for domain value greater than or equal to HV_PERF_DOMAIN_MAX. But the check for domain value 0 is missing.
Fix this issue by adding check for domain value 0.

[...]

Applied to powerpc/fixes.

[1/1] powerpc/perf/hv-24x7: Update domain value check

      https://git.kernel.org/powerpc/c/4ff3ba4db5943cac1045e3e4a3c0463ea10f6930

cheers