Skip to contentSkip to conversation

perf test: stat metrics cgroup strip possible slash from cgroup name

PATCH Applied Ian Rogers 4 participants 5 messages Sep 17 – Sep 25 perf events

lore
Share & tools
lore

Ian Rogers

author reviewer
#0 lore raw

PATCH 1/1 perf test: stat metrics cgroup strip possible slash from cgroup name

The grep to match cgroup name in metric output assumes no leading / on the cgroup name, however, cgroups in /proc/self/cgroup may have a leading /. Strip the / if it exists to avoid failures to match the cgroup name in the perf stat output.

---
 tools/perf/tests/shell/stat_metrics_cgrp.sh | 7 +++++++
 1 file changed, 7 insertions(+)
tools/perf/tests/shell/stat_metrics_cgrp.sh +7 -0
index d4226ee0ae98..0728f48f21fa 100755
@@ -86,6 +86,13 @@ check_metric_reported()
 
 	for cgrp in "${cgrps[@]}"; do
 		# Find metric lines for this cgroup
+		case "$cgrp" in
+			/)  # The root cgroup, leave unchanged.
+			  ;;
+			/*) # Strip any starting slashes.
+			  cgrp="${cgrp#/}"
+			  ;;
+		esac
 		# We use exact cgroup match with surrounding commas
 		local cgrp_lines
 		cgrp_lines=$(echo "${output}" | grep -F ",${cgrp}," | grep "insn_per_cycle" || true)
Signature · 1 line
2.55.0.1082.g2b9226bbc0-goog
#1 lore raw
Sashiko has reviewed this patch and found no issues. It looks great!
Quoted 6 lines

The grep to match cgroup name in metric output assumes no leading / on the cgroup name, however, cgroups in /proc/self/cgroup may have a leading /. Strip the / if it exists to avoid failures to match the cgroup name in the perf stat output.

Sashiko has reviewed this patch and found no issues. It looks great!

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
author reviewer
#2 lore raw
In reply to Ian Rogers
Quoted 7 lines · Ian Rogers

The grep to match cgroup name in metric output assumes no leading / on the cgroup name, however, cgroups in /proc/self/cgroup may have a leading /. Strip the / if it exists to avoid failures to match the cgroup name in the perf stat output.

Ping.

Thanks,
Ian

Quoted 25 lines
---
 tools/perf/tests/shell/stat_metrics_cgrp.sh | 7 +++++++
 1 file changed, 7 insertions(+)
tools/perf/tests/shell/stat_metrics_cgrp.sh +7 -1
index d4226ee0ae98..0728f48f21fa 100755
@@ -86,6 +86,13 @@ check_metric_reported()
 
        for cgrp in "${cgrps[@]}"; do
                # Find metric lines for this cgroup
+               case "$cgrp" in
+                       /)  # The root cgroup, leave unchanged.
+                         ;;
+                       /*) # Strip any starting slashes.
+                         cgrp="${cgrp#/}"
+                         ;;
+               esac
                # We use exact cgroup match with surrounding commas
                local cgrp_lines
                cgrp_lines=$(echo "${output}" | grep -F ",${cgrp}," | grep "insn_per_cycle" || true)
--

2.55.0.1082.g2b9226bbc0-goog

maintainer Applied
#3 lore raw
Quoted 10 lines · Ian Rogers
Quoted 7 lines · Ian Rogers

The grep to match cgroup name in metric output assumes no leading / on the cgroup name, however, cgroups in /proc/self/cgroup may have a leading /. Strip the / if it exists to avoid failures to match the cgroup name in the perf stat output.

Ping.

Thanks, applied to perf-tools-next, for v7.4.

- Arnaldo

maintainer Acked-by on v1 1/1
#4 lore raw
In reply to Ian Rogers
Quoted 6 lines · Ian Rogers

The grep to match cgroup name in metric output assumes no leading / on the cgroup name, however, cgroups in /proc/self/cgroup may have a leading /. Strip the / if it exists to avoid failures to match the cgroup name in the perf stat output.

Thanks,
Namhyung

Quoted 25 lines
---
 tools/perf/tests/shell/stat_metrics_cgrp.sh | 7 +++++++
 1 file changed, 7 insertions(+)
tools/perf/tests/shell/stat_metrics_cgrp.sh +7 -0
index d4226ee0ae98..0728f48f21fa 100755
@@ -86,6 +86,13 @@ check_metric_reported()
 
 	for cgrp in "${cgrps[@]}"; do
 		# Find metric lines for this cgroup
+		case "$cgrp" in
+			/)  # The root cgroup, leave unchanged.
+			  ;;
+			/*) # Strip any starting slashes.
+			  cgrp="${cgrp#/}"
+			  ;;
+		esac
 		# We use exact cgroup match with surrounding commas
 		local cgrp_lines
 		cgrp_lines=$(echo "${output}" | grep -F ",${cgrp}," | grep "insn_per_cycle" || true)
Signature · 1 line
2.55.0.1082.g2b9226bbc0-goog