[bpf-next] selftests/bpf: fix veristat comp mode with new stats

Commit Message

Mahe Tardy Dec. 20, 2024, 3:22 p.m. UTC

Commit 82c1f13de315 ("selftests/bpf: Add more stats into veristat")
introduced new stats, added by default in the CSV output, that were not
added to parse_stat_value, used in parse_stats_csv which is used in
comparison mode. Thus it broke comparison mode altogether making it fail
with "Unrecognized stat #7" and EINVAL.

One quirk is that PROG_TYPE and ATTACH_TYPE have been transformed to
strings using libbpf_bpf_prog_type_str and libbpf_bpf_attach_type_str
respectively. Since we might not want to compare those string values, we
just skip the parsing in this patch. We might want to translate it back
to the enum value or compare the string value directly.

Signed-off-by: Mahe Tardy <[e-mail]>
---
 tools/testing/selftests/bpf/veristat.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--
2.34.1

Comments

Mykyta Yatsenko Dec. 20, 2024, 3:40 p.m. UTC | #1

On 20/12/2024 15:22, Mahe Tardy wrote:
> Commit 82c1f13de315 ("selftests/bpf: Add more stats into veristat")
> introduced new stats, added by default in the CSV output, that were not
> added to parse_stat_value, used in parse_stats_csv which is used in
> comparison mode. Thus it broke comparison mode altogether making it fail
> with "Unrecognized stat #7" and EINVAL.
>
> One quirk is that PROG_TYPE and ATTACH_TYPE have been transformed to
> strings using libbpf_bpf_prog_type_str and libbpf_bpf_attach_type_str
> respectively. Since we might not want to compare those string values, we
> just skip the parsing in this patch. We might want to translate it back
> to the enum value or compare the string value directly.
>
> Signed-off-by: Mahe Tardy <[e-mail]>
> ---
>   tools/testing/selftests/bpf/veristat.c | 8 +++++++-
>   1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/bpf/veristat.c b/tools/testing/selftests/bpf/veristat.c
> index 9d17b4dfc170..476bf95cf684 100644
> --- a/tools/testing/selftests/bpf/veristat.c
> +++ b/tools/testing/selftests/bpf/veristat.c
> @@ -1672,7 +1672,10 @@ static int parse_stat_value(const char *str, enum stat_id id, struct verif_stats
>   	case TOTAL_STATES:
>   	case PEAK_STATES:
>   	case MAX_STATES_PER_INSN:
> -	case MARK_READ_MAX_LEN: {
> +	case MARK_READ_MAX_LEN:
> +	case SIZE:
> +	case JITED_SIZE:
> +	case STACK: {
>   		long val;
>   		int err, n;
>
> @@ -1685,6 +1688,9 @@ 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:
> +		break;
>   	default:
>   		fprintf(stderr, "Unrecognized stat #%d\n", id);
>   		return -EINVAL;
> --
> 2.34.1
>
Looks good, thanks!

Tested-by: Mykyta Yatsenko<[e-mail]>

Patch

diff --git a/tools/testing/selftests/bpf/veristat.c b/tools/testing/selftests/bpf/veristat.c
index 9d17b4dfc170..476bf95cf684 100644
--- a/tools/testing/selftests/bpf/veristat.c
+++ b/tools/testing/selftests/bpf/veristat.c
@@ -1672,7 +1672,10 @@  static int parse_stat_value(const char *str, enum stat_id id, struct verif_stats
 	case TOTAL_STATES:
 	case PEAK_STATES:
 	case MAX_STATES_PER_INSN:
-	case MARK_READ_MAX_LEN: {
+	case MARK_READ_MAX_LEN:
+	case SIZE:
+	case JITED_SIZE:
+	case STACK: {
 		long val;
 		int err, n;

@@ -1685,6 +1688,9 @@  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:
+		break;
 	default:
 		fprintf(stderr, "Unrecognized stat #%d\n", id);
 		return -EINVAL;