From: Stefan Mätje Date: Sun, 11 Aug 2024 22:31:35 +0000 (+0200) Subject: ss: fix libbpf version check for ENABLE_BPF_SKSTORAGE_SUPPORT X-Git-Tag: v6.11.0~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9096586e0701d5ae031df2f2708d20d34ae7bd4;p=thirdparty%2Fiproute2.git ss: fix libbpf version check for ENABLE_BPF_SKSTORAGE_SUPPORT This patch fixes a problem with the libbpf version comparison to decide if ENABLE_BPF_SKSTORAGE_SUPPORT could be enabled. - The code enabled by ENABLE_BPF_SKSTORAGE_SUPPORT uses the function btf_dump__new with an API that was introduced in libbpf 0.6.0. So check now against libbpf version to be >= 0.6.x instead of 0.5.x. - This code still depends on the necessity to have LIBBPF_MAJOR_VERSION and LIBBPF_MINOR_VERSION defined, even if libbpf_version.h is not present in the library development package. This was ensured with the previous patch for the configure script. Fixes: e3ecf048 ("ss: pretty-print BPF socket-local storage") Signed-off-by: Stefan Mätje Signed-off-by: Stephen Hemminger --- diff --git a/misc/ss.c b/misc/ss.c index 620f4c8f..aef1a714 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -53,7 +53,7 @@ #include #ifdef HAVE_LIBBPF -/* If libbpf is new enough (0.5+), support for pretty-printing BPF socket-local +/* If libbpf is new enough (0.6+), support for pretty-printing BPF socket-local * storage is enabled, otherwise we emit a warning and disable it. * ENABLE_BPF_SKSTORAGE_SUPPORT is only used to gate the socket-local storage * feature, so this wouldn't prevent any feature relying on HAVE_LIBBPF to be @@ -66,8 +66,8 @@ #include #include -#if (LIBBPF_MAJOR_VERSION == 0) && (LIBBPF_MINOR_VERSION < 5) -#warning "libbpf version 0.5 or later is required, disabling BPF socket-local storage support" +#if ((LIBBPF_MAJOR_VERSION == 0) && (LIBBPF_MINOR_VERSION < 6)) +#warning "libbpf version 0.6 or later is required, disabling BPF socket-local storage support" #undef ENABLE_BPF_SKSTORAGE_SUPPORT #endif #endif