[bpf-next] selftests/bpf: handle prog/attach type comparison in veristat

Commit Message

Mykyta Yatsenko Jan. 6, 2025, 2:43 p.m. UTC

From: Mykyta Yatsenko <[e-mail]>

Implemented handling of prog type and attach type stats comparison in
veristat.
To test this change:
```
./veristat pyperf600.bpf.o -o csv > base1.csv
./veristat pyperf600.bpf.o -o csv > base2.csv
./veristat -C base2.csv base1.csv -o csv
...,raw_tracepoint,raw_tracepoint,MATCH,
...,cgroup_inet_ingress,cgroup_inet_ingress,MATCH
```
Signed-off-by: Mykyta Yatsenko <[e-mail]>
---
 tools/testing/selftests/bpf/veristat.c | 37 ++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

Comments

Eduard Zingerman Jan. 6, 2025, 8:57 p.m. UTC | #1

On Mon, 2025-01-06 at 14:43 +0000, Mykyta Yatsenko wrote:
> From: Mykyta Yatsenko <[e-mail]>
> 
> Implemented handling of prog type and attach type stats comparison in
> veristat.
> To test this change:
> ```
> ./veristat pyperf600.bpf.o -o csv > base1.csv
> ./veristat pyperf600.bpf.o -o csv > base2.csv
> ./veristat -C base2.csv base1.csv -o csv
> ...,raw_tracepoint,raw_tracepoint,MATCH,
> ...,cgroup_inet_ingress,cgroup_inet_ingress,MATCH
> ```
> Signed-off-by: Mykyta Yatsenko <[e-mail]>
> ---

Seem to work fine.

Tested-by: Eduard Zingerman <[e-mail]>

[...]

[e-mail] Jan. 8, 2025, 3:10 p.m. UTC | #2

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Andrii Nakryiko <[e-mail]>:

On Mon,  6 Jan 2025 14:43:21 +0000 you wrote:
> From: Mykyta Yatsenko <[e-mail]>
> 
> Implemented handling of prog type and attach type stats comparison in
> veristat.
> To test this change:
> ```
> ./veristat pyperf600.bpf.o -o csv > base1.csv
> ./veristat pyperf600.bpf.o -o csv > base2.csv
> ./veristat -C base2.csv base1.csv -o csv
> ...,raw_tracepoint,raw_tracepoint,MATCH,
> ...,cgroup_inet_ingress,cgroup_inet_ingress,MATCH
> ```
> Signed-off-by: Mykyta Yatsenko <[e-mail]>
> 
> [...]

Here is the summary with links:
  - [bpf-next] selftests/bpf: handle prog/attach type comparison in veristat
    https://git.kernel.org/bpf/bpf-next/c/46c61cbeb82f

You are awesome, thank you!

Patch

diff --git a/tools/testing/selftests/bpf/veristat.c b/tools/testing/selftests/bpf/veristat.c
index 476bf95cf684..974c808f9321 100644
--- a/tools/testing/selftests/bpf/veristat.c
+++ b/tools/testing/selftests/bpf/veristat.c
@@ -1688,9 +1688,42 @@  static int parse_stat_value(const char *str, enum stat_id id, struct verif_stats
 		st->stats[id] = val;
 		break;
 	}
-	case PROG_TYPE:
-	case ATTACH_TYPE:
+	case PROG_TYPE: {
+		enum bpf_prog_type prog_type = 0;
+		const char *type;
+
+		while ((type = libbpf_bpf_prog_type_str(prog_type)))  {
+			if (strcmp(type, str) == 0) {
+				st->stats[id] = prog_type;
+				break;
+			}
+			prog_type++;
+		}
+
+		if (!type) {
+			fprintf(stderr, "Unrecognized prog type %s\n", str);
+			return -EINVAL;
+		}
 		break;
+	}
+	case ATTACH_TYPE: {
+		enum bpf_attach_type attach_type = 0;
+		const char *type;
+
+		while ((type = libbpf_bpf_attach_type_str(attach_type)))  {
+			if (strcmp(type, str) == 0) {
+				st->stats[id] = attach_type;
+				break;
+			}
+			attach_type++;
+		}
+
+		if (!type) {
+			fprintf(stderr, "Unrecognized attach type %s\n", str);
+			return -EINVAL;
+		}
+		break;
+	}
 	default:
 		fprintf(stderr, "Unrecognized stat #%d\n", id);
 		return -EINVAL;