diff options
| author |   Mauricio Vásquez <mauricio@kinvolk.io> | 2022-02-07 09:50:51 -0500 |
|---|---|---|
| committer |   Andrii Nakryiko <andrii@kernel.org> | 2022-02-07 12:12:22 -0800 |
| commit | da7af0aa20f8ad89f09d50d262e44cd5eafab816 (patch) | |
| tree | d5b193dcb48ee5a22d32d70842963e0b2e5bd8ef | |
| parent | libbpf: Remove mode check in libbpf_set_strict_mode() (diff) | |
| download | linux-dev-da7af0aa20f8ad89f09d50d262e44cd5eafab816.tar.xz linux-dev-da7af0aa20f8ad89f09d50d262e44cd5eafab816.zip | |
bpftool: Fix strict mode calculation
"(__LIBBPF_STRICT_LAST - 1) & ~LIBBPF_STRICT_MAP_DEFINITIONS" is wrong
as it is equal to 0 (LIBBPF_STRICT_NONE). Let's use
"LIBBPF_STRICT_ALL & ~LIBBPF_STRICT_MAP_DEFINITIONS" now that the
previous commit makes it possible in libbpf.
Fixes: 93b8952d223a ("libbpf: deprecate legacy BPF map definitions")
Signed-off-by: Mauricio Vásquez <mauricio@kinvolk.io>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20220207145052.124421-3-mauricio@kinvolk.io
| -rw-r--r-- | tools/bpf/bpftool/main.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tools/bpf/bpftool/main.c b/tools/bpf/bpftool/main.c index 9d01fa9de033..490f7bd54e4c 100644 --- a/tools/bpf/bpftool/main.c +++ b/tools/bpf/bpftool/main.c @@ -478,14 +478,11 @@ int main(int argc, char **argv) } if (!legacy_libbpf) { - enum libbpf_strict_mode mode; - /* Allow legacy map definitions for skeleton generation. * It will still be rejected if users use LIBBPF_STRICT_ALL * mode for loading generated skeleton. */ - mode = (__LIBBPF_STRICT_LAST - 1) & ~LIBBPF_STRICT_MAP_DEFINITIONS; - ret = libbpf_set_strict_mode(mode); + ret = libbpf_set_strict_mode(LIBBPF_STRICT_ALL & ~LIBBPF_STRICT_MAP_DEFINITIONS); if (ret) p_err("failed to enable libbpf strict mode: %d", ret); } |