From: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> Instead of the somewhat confusing: --btf_features=all,reproducible_build That means "'all' the standard BTF features plus the 'reproducible_build' extra BTF feature", use + directly, making it more compact: --btf_features=+reproducible_build In the future we may want the '-' counterpart as a way to _remove_ some of the standard set of BTF features. Cc: Alan Maguire <alan.maguire@xxxxxxxxxx> Cc: Andrii Nakryiko <andrii.nakryiko@xxxxxxxxx> Cc: Daniel Xu <dxu@xxxxxxxxx> Cc: Eduard Zingerman <eddyz87@xxxxxxxxx> Cc: Jiri Olsa <jolsa@xxxxxxxxxx> Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> --- man-pages/pahole.1 | 6 ++++++ pahole.c | 6 ++++++ tests/reproducible_build.sh | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/man-pages/pahole.1 b/man-pages/pahole.1 index 64de3438b5f9a77a..2f4f42f8323efd6e 100644 --- a/man-pages/pahole.1 +++ b/man-pages/pahole.1 @@ -320,6 +320,12 @@ Supported non-standard features (not enabled for 'all') So for example, specifying \-\-btf_encode=var,enum64 will result in a BTF encoding that (as well as encoding basic BTF information) will contain variables and enum64 values. +.fi + +If one wants to add an extra feature to the set of standard ones, the '+' prefix can be used, i.e.: +\-\-btf_features=+reproducible_build will add all standard features plus the 'reproducible_build' extra +feature. + .TP .B \-\-btf_features_strict Identical to \-\-btf_features above, but pahole will exit if it encounters an unrecognized feature. diff --git a/pahole.c b/pahole.c index af94d2a45ee96cbe..42c5b03ee1d1a8f8 100644 --- a/pahole.c +++ b/pahole.c @@ -1364,6 +1364,12 @@ static void parse_btf_features(const char *features, bool strict) return; } + // Adding extra features to the set of standard features. + if (strstarts(features, "+")) { + btf_features__enable_for_all(); + ++features; + } + strncpy(f, features, BTF_MAX_FEATURE_STR)[BTF_MAX_FEATURE_STR] = '\0'; s = f; while ((feature_name = strtok_r(s, ",", &saveptr)) != NULL) { diff --git a/tests/reproducible_build.sh b/tests/reproducible_build.sh index e2f836081b125119..1222cb42c6639235 100755 --- a/tests/reproducible_build.sh +++ b/tests/reproducible_build.sh @@ -29,7 +29,7 @@ nr_proc=$(getconf _NPROCESSORS_ONLN) for threads in $(seq $nr_proc) ; do test -n "$VERBOSE" && echo $threads threads encoding - pahole -j$threads --btf_features=all,reproducible_build --btf_encode_detached=$outdir/vmlinux.btf.parallel.reproducible $vmlinux & + pahole -j$threads --btf_features=+reproducible_build --btf_encode_detached=$outdir/vmlinux.btf.parallel.reproducible $vmlinux & pahole=$! # HACK: Wait a bit for pahole to start its threads sleep 0.3s -- 2.44.0