From nobody Thu Oct 2 06:14:57 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6015F1D54D8; Fri, 19 Sep 2025 21:07:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758316030; cv=none; b=IKrSiQZ9aHRJ3DC4KfVOxiQFZiKHYrkIQbraV+7X16WSrLzJKF/fisP0fzHUbFtAUS6gXhlAjg4x0Twf3GDvyo331nsF74JmJt0PPR5pgEfrWPP3UtjS1q2yffTBh3/J4d0ouWhVJBbMfXhvb43K/8Gp3DzgkDp0DgtszXU5vZE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758316030; c=relaxed/simple; bh=LYr5OoJe/NOIKdal7VVbiv7OZhCXv4WAjka1k56pzu0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IDp31I4Q93x/229PaFYZp/17o7g88vPqp664YZp2/Xyv1NymvR+7DBOCSWZrMDhzvPzxGYbdlErhahu3N8LiSF9T++6AVBRcbYe/NhgusWTLGjnhZMZMFHJMeC5vhl0mg0DWgXCZ16woUpI9KOxigH2Uvj+yeGp3v0REqVF+Du0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AvFCimQi; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="AvFCimQi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C985CC4CEF0; Fri, 19 Sep 2025 21:07:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1758316030; bh=LYr5OoJe/NOIKdal7VVbiv7OZhCXv4WAjka1k56pzu0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AvFCimQi0hw4GiK3oJyOEVLyCPHHN5dxl5xEQzZfqQdA+VTHL35Xr3lYlYgDWAqa6 S3pyH62Wu4PgFWZ14FO/EUt/MmUIKoGC0eminTMygdknCoxqBW4ZpG3k8Lfwi+W2Aj TpRy4o7Au2cOtyCVajIZfcuaNNI4lm3dpgcLluw4CXVO6JLw13dInotW+xmgSwIs7k uBalNkw2iRYDC2OL/jNCvBXLW/ZJYiFsQyLSjdQNIQrTNgZp+dmmsfC3LNochQmHge x5qnW5oweKcylbw6ztgYDF2t4frQE99W4+6kocgO/Mg4CWrkAIYu7XYSFWxH7/GvCp o8Sm8WWEjWOxQ== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , Andrii Nakryiko Subject: [PATCH 1/2] perf bpf: Move the LIBBPF_CURRENT_VERSION_GEQ macro to bpf-utils.h Date: Fri, 19 Sep 2025 18:06:53 -0300 Message-ID: <20250919210654.317656-2-acme@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250919210654.317656-1-acme@kernel.org> References: <20250919210654.317656-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Arnaldo Carvalho de Melo We need it to fix some other libbpf version dependent issues when building with LIBBPF_DINAMYC=3D1 Cc: Adrian Hunter Cc: Andrii Nakryiko Cc: Ian Rogers Cc: James Clark Cc: Jiri Olsa Cc: Kan Liang Cc: Namhyung Kim Signed-off-by: Arnaldo Carvalho de Melo Acked-by: Namhyung Kim Reviewed-by: Ian Rogers --- tools/perf/util/bpf-filter.c | 5 +---- tools/perf/util/bpf-utils.h | 5 +++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/bpf-filter.c b/tools/perf/util/bpf-filter.c index 92308c38fbb567ba..1a2e7b388d57d367 100644 --- a/tools/perf/util/bpf-filter.c +++ b/tools/perf/util/bpf-filter.c @@ -56,6 +56,7 @@ #include "util/debug.h" #include "util/evsel.h" #include "util/target.h" +#include "util/bpf-utils.h" =20 #include "util/bpf-filter.h" #include @@ -443,10 +444,6 @@ static int create_idx_hash(struct evsel *evsel, struct= perf_bpf_filter_entry *en return -1; } =20 -#define LIBBPF_CURRENT_VERSION_GEQ(major, minor) \ - (LIBBPF_MAJOR_VERSION > (major) || \ - (LIBBPF_MAJOR_VERSION =3D=3D (major) && LIBBPF_MINOR_VERSION >=3D (minor= ))) - int perf_bpf_filter__prepare(struct evsel *evsel, struct target *target) { int i, x, y, fd, ret; diff --git a/tools/perf/util/bpf-utils.h b/tools/perf/util/bpf-utils.h index 86a5055cdfad6689..eafc43b8731f1e31 100644 --- a/tools/perf/util/bpf-utils.h +++ b/tools/perf/util/bpf-utils.h @@ -8,6 +8,11 @@ #ifdef HAVE_LIBBPF_SUPPORT =20 #include +#include + +#define LIBBPF_CURRENT_VERSION_GEQ(major, minor) \ + (LIBBPF_MAJOR_VERSION > (major) || \ + (LIBBPF_MAJOR_VERSION =3D=3D (major) && LIBBPF_MINOR_VERSION >=3D = (minor))) =20 /* * Get bpf_prog_info in continuous memory --=20 2.51.0 From nobody Thu Oct 2 06:14:57 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5FF172BEC5E; Fri, 19 Sep 2025 21:07:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758316034; cv=none; b=mdcgRopDfD4fHM1JGthMgD3oXShnkYBw1Eia9LTy5ZiAyzlicm53rFvH7jphDkVZjPLOGvPMHnAJSLmtvV16MYE8YSE2rSvEGNiYAmNk70IC3EuXSKvB24meiOG2KBkHISjFqycx8rDlPaMLuwDGs+pglbtK0lWAm9goRzW7ljI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758316034; c=relaxed/simple; bh=UR3s4Ebp3EGiQYKXabOa8Z3IzeZesJjuj+BGhfF6Z2g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=X3a1miuicnjwCiwcTjcwkGokylHvLbJ+2j3PNGXaEsuYFKkO8hDu5yDjaE+qD2xYl3326FpBzoSLPwqINURsHovAIhsIIMuHHrri0inJNJUFQmhajDyfO9HhhCS5wMZvu5jXMeNfAd/RWb8wM4OjK5VcRSdpE/X66LThMWJKg2M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CgiQbZlQ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="CgiQbZlQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 81F59C4CEF7; Fri, 19 Sep 2025 21:07:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1758316034; bh=UR3s4Ebp3EGiQYKXabOa8Z3IzeZesJjuj+BGhfF6Z2g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CgiQbZlQBPme+jkZa5Txcm7vvd6tR6oixPn4o9FS3jronEL+OTCRswBkyeFGW6DBC 7G9Q3gZYynxBqFEueIkmPSLFEez8/DLe8aKOsgdjmNIPu9Yu8YMTAjKeMgSr9XVLZa awyrUoNxVcf9LjKukpGolQiK+7RKmHxoLqKMiyUv7Lqsl6zDgTr01K6kTtrQ2lXfU7 Z8CYglfQefXwIlJmMgs6LSNHmo11Q2e9LVXlhp7BJyLqBwuyKWyW0cz3NX4KBvnPiE 0bUzQPxjwvXDCcAbRNvL5/Ww066t//uDXIaQlLoij/+JzuycpQrUP+urTr8GJ1wswN 3wM2qYz1lplfg== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , Andrii Nakryiko Subject: [PATCH 2/2] perf bpf: Check libbpf version to use btf_dump_type_data_opts.emit_strings Date: Fri, 19 Sep 2025 18:06:54 -0300 Message-ID: <20250919210654.317656-3-acme@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250919210654.317656-1-acme@kernel.org> References: <20250919210654.317656-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Arnaldo Carvalho de Melo When building perf with LIBBPF_DINAMIC=3D1 on a fedora system with libbpf-devel 1.5 I it was breaking with: util/bpf-event.c: In function =E2=80=98format_btf_variable=E2=80=99: util/bpf-event.c:291:18: error: =E2=80=98const struct btf_dump_type_data_op= ts=E2=80=99 has no member named =E2=80=98emit_strings=E2=80=99 291 | .emit_strings =3D 1, | ^~~~~~~~~~~~ util/bpf-event.c:291:33: error: initialized field overwritten [-Werror=3Dov= erride-init] 291 | .emit_strings =3D 1, | ^ util/bpf-event.c:291:33: note: (near initialization for =E2=80=98opts.skip_= names=E2=80=99) Check the version before using that feature. Cc: Adrian Hunter Cc: Andrii Nakryiko Cc: Ian Rogers Cc: James Clark Cc: Jiri Olsa Cc: Kan Liang Cc: Namhyung Kim Signed-off-by: Arnaldo Carvalho de Melo Acked-by: Namhyung Kim Reviewed-by: Ian Rogers --- tools/perf/util/bpf-event.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/perf/util/bpf-event.c b/tools/perf/util/bpf-event.c index 2298cd396c4235e2..59f84aef91b4a2ec 100644 --- a/tools/perf/util/bpf-event.c +++ b/tools/perf/util/bpf-event.c @@ -288,7 +288,9 @@ static void format_btf_variable(struct btf *btf, char *= buf, size_t buf_size, .sz =3D sizeof(struct btf_dump_type_data_opts), .skip_names =3D 1, .compact =3D 1, +#if LIBBPF_CURRENT_VERSION_GEQ(1, 7) .emit_strings =3D 1, +#endif }; struct btf_dump *d; size_t btf_size; --=20 2.51.0