AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

tools, bpftool: Clean subcommand help messages

Browse Source 
This is a clean-up for the formatting of the do_help functions for
bpftool's subcommands. The following fixes are included:

- Do not use argv[-2] for "iter" help message, as the help is shown by
  default if no "iter" action is selected, resulting in messages looking
  like "./bpftool bpftool pin...".

- Do not print unused HELP_SPEC_PROGRAM in help message for "bpftool
  link".

- Andrii used argument indexing to avoid having multiple occurrences of
  bin_name and argv[-2] in the fprintf() for the help message, for
  "bpftool gen" and "bpftool link". Let's reuse this for all other help
  functions. We can remove up to thirty arguments for the "bpftool map"
  help message.

- Harmonise all functions, e.g. use ending quotes-comma on a separate
  line.

Signed-off-by: Quentin Monnet <quentin@isovalent.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20200523010751.23465-1-quentin@isovalent.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
This commit is contained in:
Quentin Monnet 2020-05-23 02:07:51 +01:00 committed by Alexei Starovoitov
parent eae9d3c016
commit 90040351a8
11 changed files with 64 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/bpf/bpftool/btf.c
View File

@ -951,9 +951,9 @@ static int do_help(int argc, char **argv)
} }
fprintf(stderr, fprintf(stderr,
"Usage: %s btf { show | list } [id BTF_ID]\n" "Usage: %1$s %2$s { show | list } [id BTF_ID]\n"
" %s btf dump BTF_SRC [format FORMAT]\n" " %1$s %2$s dump BTF_SRC [format FORMAT]\n"
" %s btf help\n" " %1$s %2$s help\n"
"\n" "\n"
" BTF_SRC := { id BTF_ID | prog PROG | map MAP [{key | value | kv | all}] | file FILE }\n" " BTF_SRC := { id BTF_ID | prog PROG | map MAP [{key | value | kv | all}] | file FILE }\n"
" FORMAT := { raw | c }\n" " FORMAT := { raw | c }\n"
@ -961,7 +961,7 @@ static int do_help(int argc, char **argv)
" " HELP_SPEC_PROGRAM "\n" " " HELP_SPEC_PROGRAM "\n"
" " HELP_SPEC_OPTIONS "\n" " " HELP_SPEC_OPTIONS "\n"
"", "",
bin_name, bin_name, bin_name); bin_name, "btf");
return 0; return 0;
} }

14
tools/bpf/bpftool/cgroup.c
View File

@ -491,20 +491,18 @@ static int do_help(int argc, char **argv)
} }
fprintf(stderr, fprintf(stderr,
"Usage: %s %s { show | list } CGROUP [**effective**]\n" "Usage: %1$s %2$s { show | list } CGROUP [**effective**]\n"
" %s %s tree [CGROUP_ROOT] [**effective**]\n" " %1$s %2$s tree [CGROUP_ROOT] [**effective**]\n"
" %s %s attach CGROUP ATTACH_TYPE PROG [ATTACH_FLAGS]\n" " %1$s %2$s attach CGROUP ATTACH_TYPE PROG [ATTACH_FLAGS]\n"
" %s %s detach CGROUP ATTACH_TYPE PROG\n" " %1$s %2$s detach CGROUP ATTACH_TYPE PROG\n"
" %s %s help\n" " %1$s %2$s help\n"
"\n" "\n"
HELP_SPEC_ATTACH_TYPES "\n" HELP_SPEC_ATTACH_TYPES "\n"
" " HELP_SPEC_ATTACH_FLAGS "\n" " " HELP_SPEC_ATTACH_FLAGS "\n"
" " HELP_SPEC_PROGRAM "\n" " " HELP_SPEC_PROGRAM "\n"
" " HELP_SPEC_OPTIONS "\n" " " HELP_SPEC_OPTIONS "\n"
"", "",
bin_name, argv[-2], bin_name, argv[-2]);
bin_name, argv[-2], bin_name, argv[-2],
bin_name, argv[-2], bin_name, argv[-2]);
return 0; return 0;
} }

6
tools/bpf/bpftool/feature.c
View File

@ -937,12 +937,12 @@ static int do_help(int argc, char **argv)
} }
fprintf(stderr, fprintf(stderr,
"Usage: %s %s probe [COMPONENT] [full] [unprivileged] [macros [prefix PREFIX]]\n" "Usage: %1$s %2$s probe [COMPONENT] [full] [unprivileged] [macros [prefix PREFIX]]\n"
" %s %s help\n" " %1$s %2$s help\n"
"\n" "\n"
" COMPONENT := { kernel | dev NAME }\n" " COMPONENT := { kernel | dev NAME }\n"
"", "",
bin_name, argv[-2], bin_name, argv[-2]); bin_name, argv[-2]);
return 0; return 0;
} }

6
tools/bpf/bpftool/gen.c
View File

@ -586,12 +586,12 @@ static int do_help(int argc, char **argv)
} }
fprintf(stderr, fprintf(stderr,
"Usage: %1$s gen skeleton FILE\n" "Usage: %1$s %2$s skeleton FILE\n"
" %1$s gen help\n" " %1$s %2$s help\n"
"\n" "\n"
" " HELP_SPEC_OPTIONS "\n" " " HELP_SPEC_OPTIONS "\n"
"", "",
bin_name); bin_name, "gen");
return 0; return 0;
} }

8
tools/bpf/bpftool/iter.c
View File

@ -68,10 +68,10 @@ static int do_pin(int argc, char **argv)
static int do_help(int argc, char **argv) static int do_help(int argc, char **argv)
{ {
fprintf(stderr, fprintf(stderr,
"Usage: %s %s pin OBJ PATH\n" "Usage: %1$s %2$s pin OBJ PATH\n"
" %s %s help\n" " %1$s %2$s help\n"
"\n", "",
bin_name, argv[-2], bin_name, argv[-2]); bin_name, "iter");
return 0; return 0;
} }

1
tools/bpf/bpftool/link.c
View File

@ -312,7 +312,6 @@ static int do_help(int argc, char **argv)
" %1$s %2$s help\n" " %1$s %2$s help\n"
"\n" "\n"
" " HELP_SPEC_LINK "\n" " " HELP_SPEC_LINK "\n"
" " HELP_SPEC_PROGRAM "\n"
" " HELP_SPEC_OPTIONS "\n" " " HELP_SPEC_OPTIONS "\n"
"", "",
bin_name, argv[-2]); bin_name, argv[-2]);

37
tools/bpf/bpftool/map.c
View File

@ -1561,24 +1561,24 @@ static int do_help(int argc, char **argv)
} }
fprintf(stderr, fprintf(stderr,
"Usage: %s %s { show | list } [MAP]\n" "Usage: %1$s %2$s { show | list } [MAP]\n"
" %s %s create FILE type TYPE key KEY_SIZE value VALUE_SIZE \\\n" " %1$s %2$s create FILE type TYPE key KEY_SIZE value VALUE_SIZE \\\n"
" entries MAX_ENTRIES name NAME [flags FLAGS] \\\n" " entries MAX_ENTRIES name NAME [flags FLAGS] \\\n"
" [dev NAME]\n" " [dev NAME]\n"
" %s %s dump MAP\n" " %1$s %2$s dump MAP\n"
" %s %s update MAP [key DATA] [value VALUE] [UPDATE_FLAGS]\n" " %1$s %2$s update MAP [key DATA] [value VALUE] [UPDATE_FLAGS]\n"
" %s %s lookup MAP [key DATA]\n" " %1$s %2$s lookup MAP [key DATA]\n"
" %s %s getnext MAP [key DATA]\n" " %1$s %2$s getnext MAP [key DATA]\n"
" %s %s delete MAP key DATA\n" " %1$s %2$s delete MAP key DATA\n"
" %s %s pin MAP FILE\n" " %1$s %2$s pin MAP FILE\n"
" %s %s event_pipe MAP [cpu N index M]\n" " %1$s %2$s event_pipe MAP [cpu N index M]\n"
" %s %s peek MAP\n" " %1$s %2$s peek MAP\n"
" %s %s push MAP value VALUE\n" " %1$s %2$s push MAP value VALUE\n"
" %s %s pop MAP\n" " %1$s %2$s pop MAP\n"
" %s %s enqueue MAP value VALUE\n" " %1$s %2$s enqueue MAP value VALUE\n"
" %s %s dequeue MAP\n" " %1$s %2$s dequeue MAP\n"
" %s %s freeze MAP\n" " %1$s %2$s freeze MAP\n"
" %s %s help\n" " %1$s %2$s help\n"
"\n" "\n"
" " HELP_SPEC_MAP "\n" " " HELP_SPEC_MAP "\n"
" DATA := { [hex] BYTES }\n" " DATA := { [hex] BYTES }\n"
@ -1593,11 +1593,6 @@ static int do_help(int argc, char **argv)
" queue | stack | sk_storage | struct_ops }\n" " queue | stack | sk_storage | struct_ops }\n"
" " HELP_SPEC_OPTIONS "\n" " " HELP_SPEC_OPTIONS "\n"
"", "",
bin_name, argv[-2], bin_name, argv[-2], bin_name, argv[-2],
bin_name, argv[-2], bin_name, argv[-2], bin_name, argv[-2],
bin_name, argv[-2], bin_name, argv[-2], bin_name, argv[-2],
bin_name, argv[-2], bin_name, argv[-2], bin_name, argv[-2],
bin_name, argv[-2], bin_name, argv[-2], bin_name, argv[-2],
bin_name, argv[-2]); bin_name, argv[-2]);
return 0; return 0;

12
tools/bpf/bpftool/net.c
View File

@ -458,10 +458,10 @@ static int do_help(int argc, char **argv)
} }
fprintf(stderr, fprintf(stderr,
"Usage: %s %s { show | list } [dev <devname>]\n" "Usage: %1$s %2$s { show | list } [dev <devname>]\n"
" %s %s attach ATTACH_TYPE PROG dev <devname> [ overwrite ]\n" " %1$s %2$s attach ATTACH_TYPE PROG dev <devname> [ overwrite ]\n"
" %s %s detach ATTACH_TYPE dev <devname>\n" " %1$s %2$s detach ATTACH_TYPE dev <devname>\n"
" %s %s help\n" " %1$s %2$s help\n"
"\n" "\n"
" " HELP_SPEC_PROGRAM "\n" " " HELP_SPEC_PROGRAM "\n"
" ATTACH_TYPE := { xdp | xdpgeneric | xdpdrv | xdpoffload }\n" " ATTACH_TYPE := { xdp | xdpgeneric | xdpdrv | xdpoffload }\n"
@ -470,8 +470,8 @@ static int do_help(int argc, char **argv)
" For progs attached to cgroups, use \"bpftool cgroup\"\n" " For progs attached to cgroups, use \"bpftool cgroup\"\n"
" to dump program attachments. For program types\n" " to dump program attachments. For program types\n"
" sk_{filter,skb,msg,reuseport} and lwt/seg6, please\n" " sk_{filter,skb,msg,reuseport} and lwt/seg6, please\n"
" consult iproute2.\n", " consult iproute2.\n"
bin_name, argv[-2], bin_name, argv[-2], bin_name, argv[-2], "",
bin_name, argv[-2]); bin_name, argv[-2]);
return 0; return 0;

2
tools/bpf/bpftool/perf.c
View File

@ -231,7 +231,7 @@ static int do_show(int argc, char **argv)
static int do_help(int argc, char **argv) static int do_help(int argc, char **argv)
{ {
fprintf(stderr, fprintf(stderr,
"Usage: %s %s { show | list | help }\n" "Usage: %1$s %2$s { show | list | help }\n"
"", "",
bin_name, argv[-2]); bin_name, argv[-2]);

27
tools/bpf/bpftool/prog.c
View File

@ -1984,24 +1984,24 @@ static int do_help(int argc, char **argv)
} }
fprintf(stderr, fprintf(stderr,
"Usage: %s %s { show | list } [PROG]\n" "Usage: %1$s %2$s { show | list } [PROG]\n"
" %s %s dump xlated PROG [{ file FILE | opcodes | visual | linum }]\n" " %1$s %2$s dump xlated PROG [{ file FILE | opcodes | visual | linum }]\n"
" %s %s dump jited PROG [{ file FILE | opcodes | linum }]\n" " %1$s %2$s dump jited PROG [{ file FILE | opcodes | linum }]\n"
" %s %s pin PROG FILE\n" " %1$s %2$s pin PROG FILE\n"
" %s %s { load | loadall } OBJ PATH \\\n" " %1$s %2$s { load | loadall } OBJ PATH \\\n"
" [type TYPE] [dev NAME] \\\n" " [type TYPE] [dev NAME] \\\n"
" [map { idx IDX | name NAME } MAP]\\\n" " [map { idx IDX | name NAME } MAP]\\\n"
" [pinmaps MAP_DIR]\n" " [pinmaps MAP_DIR]\n"
" %s %s attach PROG ATTACH_TYPE [MAP]\n" " %1$s %2$s attach PROG ATTACH_TYPE [MAP]\n"
" %s %s detach PROG ATTACH_TYPE [MAP]\n" " %1$s %2$s detach PROG ATTACH_TYPE [MAP]\n"
" %s %s run PROG \\\n" " %1$s %2$s run PROG \\\n"
" data_in FILE \\\n" " data_in FILE \\\n"
" [data_out FILE [data_size_out L]] \\\n" " [data_out FILE [data_size_out L]] \\\n"
" [ctx_in FILE [ctx_out FILE [ctx_size_out M]]] \\\n" " [ctx_in FILE [ctx_out FILE [ctx_size_out M]]] \\\n"
" [repeat N]\n" " [repeat N]\n"
" %s %s profile PROG [duration DURATION] METRICs\n" " %1$s %2$s profile PROG [duration DURATION] METRICs\n"
" %s %s tracelog\n" " %1$s %2$s tracelog\n"
" %s %s help\n" " %1$s %2$s help\n"
"\n" "\n"
" " HELP_SPEC_MAP "\n" " " HELP_SPEC_MAP "\n"
" " HELP_SPEC_PROGRAM "\n" " " HELP_SPEC_PROGRAM "\n"
@ -2022,10 +2022,7 @@ static int do_help(int argc, char **argv)
" METRIC := { cycles | instructions | l1d_loads | llc_misses }\n" " METRIC := { cycles | instructions | l1d_loads | llc_misses }\n"
" " HELP_SPEC_OPTIONS "\n" " " HELP_SPEC_OPTIONS "\n"
"", "",
bin_name, argv[-2], bin_name, argv[-2], bin_name, argv[-2], bin_name, argv[-2]);
bin_name, argv[-2], bin_name, argv[-2], bin_name, argv[-2],
bin_name, argv[-2], bin_name, argv[-2], bin_name, argv[-2],
bin_name, argv[-2], bin_name, argv[-2]);
return 0; return 0;
} }

15
tools/bpf/bpftool/struct_ops.c
View File

@ -566,16 +566,15 @@ static int do_help(int argc, char **argv)
} }
fprintf(stderr, fprintf(stderr,
"Usage: %s %s { show | list } [STRUCT_OPS_MAP]\n" "Usage: %1$s %2$s { show | list } [STRUCT_OPS_MAP]\n"
" %s %s dump [STRUCT_OPS_MAP]\n" " %1$s %2$s dump [STRUCT_OPS_MAP]\n"
" %s %s register OBJ\n" " %1$s %2$s register OBJ\n"
" %s %s unregister STRUCT_OPS_MAP\n" " %1$s %2$s unregister STRUCT_OPS_MAP\n"
" %s %s help\n" " %1$s %2$s help\n"
"\n" "\n"
" OPTIONS := { {-j|--json} [{-p|--pretty}] }\n" " OPTIONS := { {-j|--json} [{-p|--pretty}] }\n"
" STRUCT_OPS_MAP := [ id STRUCT_OPS_MAP_ID | name STRUCT_OPS_MAP_NAME ]\n", " STRUCT_OPS_MAP := [ id STRUCT_OPS_MAP_ID | name STRUCT_OPS_MAP_NAME ]\n"
bin_name, argv[-2], bin_name, argv[-2], "",
bin_name, argv[-2], bin_name, argv[-2],
bin_name, argv[-2]); bin_name, argv[-2]);
return 0; return 0;