selftests/bpf: fix veristat comp mode with new stats
Subsystems (3)
PATCH 1/1 selftests/bpf: fix veristat comp mode with new stats
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.
--- tools/testing/selftests/bpf/veristat.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
tools/testing/selftests/bpf/veristat.c +7 -1
@@ -1672,7 +1672,10 @@ static int parse_stat_value(const char *str, enum stat_id id, struct verif_statscase 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
Quoted 44 lines · Mahe Tardy
Commit
82c1f13de315("selftests/bpf: Add more stats into veristat") introduced new stats, added by default in the CSV output, that were not added toparse_stat_value, used inparse_stats_csvwhich 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_TYPEandATTACH_TYPEhave been transformed to strings usinglibbpf_bpf_prog_type_strandlibbpf_bpf_attach_type_strrespectively. 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 <[email protected]>--- tools/testing/selftests/bpf/veristat.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)tools/testing/selftests/bpf/veristat.c +7
-2@@ -1672,7 +1672,10 @@ static int parse_stat_value(const char *str, enum stat_id id, struct verif_statscase 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 ; --
Quoted 2 lines
2.34.1
Looks good, thanks!
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 6 lines · On Fri, 20 Dec 2024 15:22:18 +0000 you wrote:
Commit
82c1f13de315("selftests/bpf: Add more stats into veristat") introduced new stats, added by default in the CSV output, that were not added toparse_stat_value, used inparse_stats_csvwhich is used in comparison mode. Thus it broke comparison mode altogether making it fail with "Unrecognized stat #7" and EINVAL.
Quoted 7 lines
One quirk is that
PROG_TYPEandATTACH_TYPEhave been transformed to strings usinglibbpf_bpf_prog_type_strandlibbpf_bpf_attach_type_strrespectively. 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.[...]
Here is the summary with links:
- [bpf-next] selftests/bpf: fix veristat comp mode with new stats
https://git.kernel.org/bpf/bpf-next/c/9468f39ba478
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html