From: Nathan Chancellor <nathan@kernel.org>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>
Cc: Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
Yonghong Song <yhs@fb.com>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
netdev@vger.kernel.org, bpf@vger.kernel.org,
linux-kernel@vger.kernel.org, llvm@lists.linux.dev,
Nathan Chancellor <nathan@kernel.org>
Subject: [PATCH bpf-next 2/5] kbuild: Add CONFIG_PAHOLE_VERSION
Date: Tue, 1 Feb 2022 13:56:21 -0700 [thread overview]
Message-ID: <20220201205624.652313-3-nathan@kernel.org> (raw)
In-Reply-To: <20220201205624.652313-1-nathan@kernel.org>
There are a few different places where pahole's version is turned into a
three digit form with the exact same command. Move this command into
scripts/pahole-version.sh to reduce the amount of duplication across the
tree.
Create CONFIG_PAHOLE_VERSION so the version code can be used in Kconfig
to enable and disable configuration options based on the pahole version,
which is already done in a couple of places.
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
---
MAINTAINERS | 1 +
init/Kconfig | 4 ++++
scripts/pahole-version.sh | 13 +++++++++++++
3 files changed, 18 insertions(+)
create mode 100755 scripts/pahole-version.sh
diff --git a/MAINTAINERS b/MAINTAINERS
index 0d422452c8ff..d8a66d50f224 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3524,6 +3524,7 @@ F: net/sched/cls_bpf.c
F: samples/bpf/
F: scripts/bpf_doc.py
F: scripts/pahole-flags.sh
+F: scripts/pahole-version.sh
F: tools/bpf/
F: tools/lib/bpf/
F: tools/testing/selftests/bpf/
diff --git a/init/Kconfig b/init/Kconfig
index e9119bf54b1f..7328d4f25370 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -86,6 +86,10 @@ config CC_HAS_ASM_INLINE
config CC_HAS_NO_PROFILE_FN_ATTR
def_bool $(success,echo '__attribute__((no_profile_instrument_function)) int x();' | $(CC) -x c - -c -o /dev/null -Werror)
+config PAHOLE_VERSION
+ int
+ default $(shell,$(srctree)/scripts/pahole-version.sh $(PAHOLE))
+
config CONSTRUCTORS
bool
diff --git a/scripts/pahole-version.sh b/scripts/pahole-version.sh
new file mode 100755
index 000000000000..f8a32ab93ad1
--- /dev/null
+++ b/scripts/pahole-version.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+#
+# Usage: $ ./pahole-version.sh pahole
+#
+# Prints pahole's version in a 3-digit form, such as 119 for v1.19.
+
+if [ ! -x "$(command -v "$@")" ]; then
+ echo 0
+ exit 1
+fi
+
+"$@" --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/'
--
2.35.1
next prev parent reply other threads:[~2022-02-01 20:57 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-01 20:56 [PATCH bpf-next 0/5] Allow CONFIG_DEBUG_INFO_DWARF5=y + CONFIG_DEBUG_INFO_BTF=y Nathan Chancellor
2022-02-01 20:56 ` [PATCH bpf-next 1/5] MAINTAINERS: Add scripts/pahole-flags.sh to BPF section Nathan Chancellor
2022-02-01 20:56 ` Nathan Chancellor [this message]
2022-02-01 20:56 ` [PATCH bpf-next 3/5] scripts/pahole-flags.sh: Use pahole-version.sh Nathan Chancellor
2022-02-01 20:56 ` [PATCH bpf-next 4/5] lib/Kconfig.debug: Use CONFIG_PAHOLE_VERSION Nathan Chancellor
2022-02-01 20:56 ` [PATCH bpf-next 5/5] lib/Kconfig.debug: Allow BTF + DWARF5 with pahole 1.21+ Nathan Chancellor
2022-02-02 7:05 ` [PATCH bpf-next 0/5] Allow CONFIG_DEBUG_INFO_DWARF5=y + CONFIG_DEBUG_INFO_BTF=y Andrii Nakryiko
2022-02-02 10:25 ` Daniel Borkmann
2022-02-02 10:30 ` patchwork-bot+netdevbpf
2023-02-22 11:21 ` [PATCH " maennich
2023-02-22 11:25 ` Greg Kroah-Hartman
2023-02-22 11:37 ` Matthias Männich
2023-02-22 11:21 ` [PATCH 1/5] MAINTAINERS: Add scripts/pahole-flags.sh to BPF section maennich
2023-02-22 11:26 ` Greg Kroah-Hartman
2023-02-22 11:38 ` Matthias Männich
2023-02-22 11:21 ` [PATCH 2/5] kbuild: Add CONFIG_PAHOLE_VERSION maennich
2023-02-22 11:21 ` [PATCH 3/5] scripts/pahole-flags.sh: Use pahole-version.sh maennich
2023-02-22 11:21 ` [PATCH 4/5] lib/Kconfig.debug: Use CONFIG_PAHOLE_VERSION maennich
2023-02-23 9:17 ` Greg Kroah-Hartman
2023-02-22 11:21 ` [PATCH 5/5] lib/Kconfig.debug: Allow BTF + DWARF5 with pahole 1.21+ maennich
2023-02-23 11:53 ` [PATCH v5.15 v2 0/4] Allow CONFIG_DEBUG_INFO_DWARF5=y + CONFIG_DEBUG_INFO_BTF=y Matthias Maennich
2023-02-23 12:36 ` Greg Kroah-Hartman
2023-02-23 11:53 ` [PATCH v5.15 v2 1/4] kbuild: Add CONFIG_PAHOLE_VERSION Matthias Maennich
2023-02-23 11:53 ` [PATCH v5.15 v2 2/4] scripts/pahole-flags.sh: Use pahole-version.sh Matthias Maennich
2023-02-23 11:53 ` [PATCH v5.15 v2 3/4] lib/Kconfig.debug: Use CONFIG_PAHOLE_VERSION Matthias Maennich
2023-02-23 11:53 ` [PATCH v5.15 v2 4/4] lib/Kconfig.debug: Allow BTF + DWARF5 with pahole 1.21+ Matthias Maennich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220201205624.652313-3-nathan@kernel.org \
--to=nathan@kernel.org \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=ndesaulniers@google.com \
--cc=netdev@vger.kernel.org \
--cc=songliubraving@fb.com \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).