Prepare veristat for packaging
Subsystems (3)
Andrii Nakryiko
maintainerv3 cover Prepare veristat for packaging
This patch set relicenses veristat.c to dual GPL-2.0/BSD-2 license and prepares it to be mirrored to Github at libbpf/veristat repo.
Few small issues in the source code are fixed, found during Github sync preparetion.
v2->v3:
- fix few warnings about uninitialized variable uses;v1->v2:
- drop linux/compiler.h and define own ARRAY_SIZE macro;
Andrii Nakryiko (4):
veristat: relicense veristat.c as dual GPL-2.0-only or BSD-2-Clause
licensed
veristat: improve version reporting
veristat: avoid using kernel-internal headers
veristat: small fixed found in -O2 mode
tools/testing/selftests/bpf/veristat.c | 30 +++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-)
Signature · 1 line
2.34.1
Andrii Nakryiko
maintainerPATCH v3 1/4 veristat: relicense veristat.c as dual GPL-2.0-only or BSD-2-Clause licensed
Dual-license veristat.c to dual GPL-2.0-only or BSD-2-Clause license. This is needed to mirror it to Github to make it convenient for distro packagers to package veristat as a separate package.
Veristat grew into a useful tool by itself, and there are already a bunch of users relying on veristat as generic BPF loading and verification helper tool. So making it easy to packagers by providing Github mirror just like we do for bpftool and libbpf is the next step to get veristat into the hands of users.
Apart from few typo fixes, I'm the sole contributor to veristat.c so far, so no extra Acks should be needed for relicensing.
--- tools/testing/selftests/bpf/veristat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/veristat.c +1 -1
@@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) /* Copyright (c) 2022 Meta Platforms, Inc. and affiliates. */ #define _GNU_SOURCE#include <argp.h>
Signature · 1 line
2.34.1
Andrii Nakryiko
maintainerPATCH v3 2/4 veristat: improve version reporting
In reply to Andrii NakryikoFor packaging version of the tool is important, so add a simple way to specify veristat version for upstream mirror at Github.
--- tools/testing/selftests/bpf/veristat.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/veristat.c +17 -2
@@ -140,6 +140,7 @@ static struct env {bool quiet;int log_level;enum resfmt out_fmt; +bool show_version;bool comparison_mode;bool replay_mode;
@@ -176,16 +177,22 @@ static int libbpf_print_fn(enum libbpf_print_level level, const char *format, vareturn vfprintf (stderr, format, args); } -const char *argp_program_version ="veristat" ; +#ifndef VERISTAT_VERSION +#define VERISTAT_VERSION "<kernel>" +#endif + +const char *argp_program_version ="veristat v" VERISTAT_VERSION ;const char *argp_program_bug_address ="<[email protected]>" ;const char argp_program_doc[] ="veristat BPF verifier stats collection and comparison tool.\n" "\n" "USAGE: veristat <obj-file> [<obj-file>...]\n" -" OR: veristat -C <baseline.csv> <comparison.csv>\n" ; +" OR: veristat -C <baseline.csv> <comparison.csv>\n" +" OR: veristat -R <results.csv>\n" ;static const struct argp_option opts[] = { {NULL ,'h' ,NULL ,OPTION_HIDDEN ,"Show the full help" }, + {"version" ,'V' ,NULL ,0 ,"Print version" }, {"verbose" ,'v' ,NULL ,0 ,"Verbose mode" }, {"log-level" ,'l' ,"LEVEL" ,0 ,"Verifier log level (default 0 for normal mode, 1 for verbose mode)" }, {"debug" ,'d' ,NULL ,0 ,"Debug mode (turns on libbpf debug logging)" },
@@ -212,6 +219,9 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)case 'h' :argp_state_help (state, stderr,ARGP_HELP_STD_HELP );break ; +case 'V' : + env.show_version = true; +break ;case 'v' : env.verbose = true;break ;
@@ -1991,6 +2001,11 @@ int main(int argc, char **argv)if (argp_parse (&argp, argc, argv,0 ,NULL ,NULL ))return 1 ; +if (env.show_version) { +printf ("%s\n" , argp_program_version); +return 0 ; + } +if (env.verbose && env.quiet) {fprintf (stderr,"Verbose and quiet modes are incompatible, please specify just one or neither!\n\n" );argp_help (&argp, stderr,ARGP_HELP_USAGE ,"veristat" );
Signature · 1 line
2.34.1
Andrii Nakryiko
maintainerPATCH v3 3/4 veristat: avoid using kernel-internal headers
In reply to Andrii NakryikoDrop linux/compiler.h include, which seems to be needed for ARRAY_SIZE macro only. Redefine own version of ARRAY_SIZE instead.
--- tools/testing/selftests/bpf/veristat.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/testing/selftests/bpf/veristat.c +4 -1
@@ -4,7 +4,6 @@#include <argp.h> #include <string.h> #include <stdlib.h> -#include <linux/compiler.h> #include <sched.h> #include <pthread.h> #include <dirent.h>
@@ -20,6 +19,10 @@#include <gelf.h> #include <float.h> +#ifndef ARRAY_SIZE +#define ARRAY_SIZE (arr) (sizeof(arr) / sizeof((arr)[0])) +#endif +enum stat_id {VERDICT ,DURATION ,
Signature · 1 line
2.34.1
Andrii Nakryiko
maintainerPATCH v3 4/4 veristat: small fixed found in -O2 mode
In reply to Andrii NakryikoFix few potentially unitialized variables uses, found while building veristat.c in release (-O2) mode.
--- tools/testing/selftests/bpf/veristat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/testing/selftests/bpf/veristat.c +3 -1
@@ -810,7 +810,7 @@ static int guess_prog_type_by_ctx_name(const char *ctx_name,enum bpf_prog_type prog_type;enum bpf_attach_type attach_type; } ctx_map[] = { -/* __sk_buff is most ambiguous, for now we assume cgroup_skb */ +/* __sk_buff is most ambiguous, we assume TC program */ { "__sk_buff", "sk_buff", BPF_PROG_TYPE_SCHED_CLS }, { "bpf_sock", "sock", BPF_PROG_TYPE_CGROUP_SOCK, BPF_CGROUP_INET4_POST_BIND }, { "bpf_sock_addr", "bpf_sock_addr_kern", BPF_PROG_TYPE_CGROUP_SOCK_ADDR, BPF_CGROUP_INET4_BIND },
@@ -1045,6 +1045,7 @@ static int process_obj(const char *filename) goto cleanup; } + lprog =NULL ;bpf_object__for_each_program (tprog, tobj) {const char *tprog_name =bpf_program__name (tprog);
@@ -1855,6 +1856,7 @@ static int handle_comparison_mode(void) one_more_time:output_comp_headers (cur_fmt); + last_idx =-1 ;for (i =0 ; i < env.join_stat_cnt; i++) {const struct verif_stats_join *join = &env.join_stats[i];
Signature · 1 line
2.34.1
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 6 lines · On Fri, 31 Mar 2023 15:24:01 -0700 you wrote:
This patch set relicenses
veristat.cto dual GPL-2.0/BSD-2 license and prepares it to be mirrored to Github at libbpf/veristat repo.Few small issues in the source code are fixed, found during Github sync preparetion.
Quoted 6 lines
v2->v3:
- fix few warnings about uninitialized variable uses;v1->v2:
- droplinux/compiler.hand define ownARRAY_SIZEmacro;[...]
Here is the summary with links:
- [v3,bpf-next,1/4] veristat: relicense veristat.c as dual GPL-2.0-only or BSD-2-Clause licensed
https://git.kernel.org/bpf/bpf-next/c/3ed85ae80283 - [v3,bpf-next,2/4] veristat: improve version reporting https://git.kernel.org/bpf/bpf-next/c/71c8c39f5177 - [v3,bpf-next,3/4] veristat: avoid using kernel-internal headers https://git.kernel.org/bpf/bpf-next/c/e3b65c0c1a5b - [v3,bpf-next,4/4] veristat: small fixed found in -O2 mode https://git.kernel.org/bpf/bpf-next/c/ebf390c9d013
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html