MAINTAINERS | 2 ++ init/Kconfig | 4 ++++ lib/Kconfig.debug | 6 +++--- scripts/pahole-flags.sh | 2 +- scripts/pahole-version.sh | 13 +++++++++++++ 5 files changed, 23 insertions(+), 4 deletions(-) create mode 100755 scripts/pahole-version.sh
Hi all, This series allows CONFIG_DEBUG_INFO_DWARF5 to be selected with CONFIG_DEBUG_INFO_BTF=y by checking the pahole version. The first four patches add CONFIG_PAHOLE_VERSION and scripts/pahole-version.sh to clean up all the places that pahole's version is transformed into a 3-digit form. The fourth patch adds a PAHOLE_VERSION dependency to DEBUG_INFO_DWARF5 so that there are no build errors when it is selected with DEBUG_INFO_BTF. I build tested Fedora's aarch64 and x86_64 config with ToT clang 14.0.0 and GCC 11 with CONFIG_DEBUG_INFO_DWARF5 enabled with both pahole 1.21 and 1.23. Nathan Chancellor (5): MAINTAINERS: Add scripts/pahole-flags.sh to BPF section kbuild: Add CONFIG_PAHOLE_VERSION scripts/pahole-flags.sh: Use pahole-version.sh lib/Kconfig.debug: Use CONFIG_PAHOLE_VERSION lib/Kconfig.debug: Allow BTF + DWARF5 with pahole 1.21+ MAINTAINERS | 2 ++ init/Kconfig | 4 ++++ lib/Kconfig.debug | 6 +++--- scripts/pahole-flags.sh | 2 +- scripts/pahole-version.sh | 13 +++++++++++++ 5 files changed, 23 insertions(+), 4 deletions(-) create mode 100755 scripts/pahole-version.sh base-commit: 533de4aea6a91eb670ff8ff2b082bb34f2c5d6ab -- 2.35.1
Hi! Can we please pick up the essential parts of this series for 5.15? I am particularly interested in the last patch to enable BTF + DWARF5, but the cleanup patches before are a very reasonable choice for stable@ as well as they simplify the pahole version calculation and allow future BTF/pahole related patches to apply cleanly as well. Cheers, Matthias Cc: <stable@vger.kernel.org> # v5.15+ Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Nathan Chancellor <nathan@kernel.org> Cc: Andrii Nakryiko <andrii@kernel.org> Signed-off-by: Matthias Maennich <maennich@google.com> Nathan Chancellor (4): kbuild: Add CONFIG_PAHOLE_VERSION scripts/pahole-flags.sh: Use pahole-version.sh lib/Kconfig.debug: Use CONFIG_PAHOLE_VERSION lib/Kconfig.debug: Allow BTF + DWARF5 with pahole 1.21+ MAINTAINERS | 1 + init/Kconfig | 4 ++++ lib/Kconfig.debug | 4 ++-- scripts/pahole-flags.sh | 2 +- scripts/pahole-version.sh | 13 +++++++++++++ 5 files changed, 21 insertions(+), 3 deletions(-) create mode 100755 scripts/pahole-version.sh -- 2.39.2.637.g21b0678d19-goog
On Thu, Feb 23, 2023 at 11:53:47AM +0000, Matthias Maennich wrote: > Hi! > > Can we please pick up the essential parts of this series for 5.15? I am > particularly interested in the last patch to enable BTF + DWARF5, but > the cleanup patches before are a very reasonable choice for stable@ as > well as they simplify the pahole version calculation and allow future > BTF/pahole related patches to apply cleanly as well. > > Cheers, > Matthias > > Cc: <stable@vger.kernel.org> # v5.15+ > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: Nathan Chancellor <nathan@kernel.org> > Cc: Andrii Nakryiko <andrii@kernel.org> > Signed-off-by: Matthias Maennich <maennich@google.com> > > Nathan Chancellor (4): > kbuild: Add CONFIG_PAHOLE_VERSION > scripts/pahole-flags.sh: Use pahole-version.sh > lib/Kconfig.debug: Use CONFIG_PAHOLE_VERSION > lib/Kconfig.debug: Allow BTF + DWARF5 with pahole 1.21+ > > MAINTAINERS | 1 + > init/Kconfig | 4 ++++ > lib/Kconfig.debug | 4 ++-- > scripts/pahole-flags.sh | 2 +- > scripts/pahole-version.sh | 13 +++++++++++++ > 5 files changed, 21 insertions(+), 3 deletions(-) > create mode 100755 scripts/pahole-version.sh Thanks, all now queued up. Hopefully quilt/git will handle the permission of this file properly, sometimes it gets confused... greg k-h
From: Matthias Maennich <maennich@google.com> Can we please pick this series up for 5.15? I am particularly interested in the last patch to enable BTF + DWARF5, but the cleanup patches before are a very reasonable choice for stable@ as well as they simplify the pahole version calculation and allow future BTF/pahole related patches to apply cleanly as well. I intentionally kept the config PAHOLE_HAS_BTF_TAG and hence its patch complete, even though there is no user for it. Cheers, Matthias Cc: <stable@vger.kernel.org> # v5.15+ Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Nathan Chancellor <nathan@kernel.org> Cc: Andrii Nakryiko <andrii@kernel.org> Signed-off-by: Matthias Maennich <maennich@google.com> Nathan Chancellor (5): MAINTAINERS: Add scripts/pahole-flags.sh to BPF section kbuild: Add CONFIG_PAHOLE_VERSION scripts/pahole-flags.sh: Use pahole-version.sh lib/Kconfig.debug: Use CONFIG_PAHOLE_VERSION lib/Kconfig.debug: Allow BTF + DWARF5 with pahole 1.21+ MAINTAINERS | 2 ++ init/Kconfig | 4 ++++ lib/Kconfig.debug | 12 ++++++++++-- scripts/pahole-flags.sh | 2 +- scripts/pahole-version.sh | 13 +++++++++++++ 5 files changed, 30 insertions(+), 3 deletions(-) create mode 100755 scripts/pahole-version.sh -- 2.39.2.637.g21b0678d19-goog
On Wed, Feb 22, 2023 at 11:21:37AM +0000, maennich@google.com wrote: > From: Matthias Maennich <maennich@google.com> > > Can we please pick this series up for 5.15? I am particularly interested > in the last patch to enable BTF + DWARF5, but the cleanup patches before > are a very reasonable choice for stable@ as well as they simplify the > pahole version calculation and allow future BTF/pahole related patches > to apply cleanly as well. I intentionally kept the config > PAHOLE_HAS_BTF_TAG and hence its patch complete, even though there is no > user for it. What are the upstream git commit ids for these changes? thanks, greg k-h
On Wed, Feb 22, 2023 at 11:26 AM Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
>
> On Wed, Feb 22, 2023 at 11:21:37AM +0000, maennich@google.com wrote:
> > From: Matthias Maennich <maennich@google.com>
> >
> > Can we please pick this series up for 5.15? I am particularly interested
> > in the last patch to enable BTF + DWARF5, but the cleanup patches before
> > are a very reasonable choice for stable@ as well as they simplify the
> > pahole version calculation and allow future BTF/pahole related patches
> > to apply cleanly as well. I intentionally kept the config
> > PAHOLE_HAS_BTF_TAG and hence its patch complete, even though there is no
> > user for it.
>
> What are the upstream git commit ids for these changes?
Sorry, they should have been part of the commit message ... here they are
f67644b4f282d42acf5ad9b0175ef5671314ab12 ("MAINTAINERS: Add
scripts/pahole-flags.sh to BPF section")
613fe169237785a4bb1d06397b52606b2967da53 ("kbuild: Add CONFIG_PAHOLE_VERSION")
2d6c9810eb8915c4ddede707b8e167a1d919e1ca ("scripts/pahole-flags.sh:
Use pahole-version.sh")
6323c81350b73a4569cf52df85f80273faa64071 ("lib/Kconfig.debug: Use
CONFIG_PAHOLE_VERSION")
42d9b379e3e1790eafb87c799c9edfd0b37a37c7 ("lib/Kconfig.debug: Allow
BTF + DWARF5 with pahole 1.21+")
Cheers,
Matthias
>
> thanks,
>
> greg k-h
On Tue, Feb 1, 2022 at 12:56 PM Nathan Chancellor <nathan@kernel.org> wrote: > > Hi all, > > This series allows CONFIG_DEBUG_INFO_DWARF5 to be selected with > CONFIG_DEBUG_INFO_BTF=y by checking the pahole version. > > The first four patches add CONFIG_PAHOLE_VERSION and > scripts/pahole-version.sh to clean up all the places that pahole's > version is transformed into a 3-digit form. > > The fourth patch adds a PAHOLE_VERSION dependency to DEBUG_INFO_DWARF5 > so that there are no build errors when it is selected with > DEBUG_INFO_BTF. > > I build tested Fedora's aarch64 and x86_64 config with ToT clang 14.0.0 > and GCC 11 with CONFIG_DEBUG_INFO_DWARF5 enabled with both pahole 1.21 > and 1.23. > > Nathan Chancellor (5): > MAINTAINERS: Add scripts/pahole-flags.sh to BPF section > kbuild: Add CONFIG_PAHOLE_VERSION > scripts/pahole-flags.sh: Use pahole-version.sh > lib/Kconfig.debug: Use CONFIG_PAHOLE_VERSION > lib/Kconfig.debug: Allow BTF + DWARF5 with pahole 1.21+ > LGTM. I'd probably combine patches 2 and 3, but it's minor. I really like the CONFIG_PAHOLE_VERSION and how much cleaner it makes Kconfig options. Acked-by: Andrii Nakryiko <andrii@kernel.org> > MAINTAINERS | 2 ++ > init/Kconfig | 4 ++++ > lib/Kconfig.debug | 6 +++--- > scripts/pahole-flags.sh | 2 +- > scripts/pahole-version.sh | 13 +++++++++++++ > 5 files changed, 23 insertions(+), 4 deletions(-) > create mode 100755 scripts/pahole-version.sh > > > base-commit: 533de4aea6a91eb670ff8ff2b082bb34f2c5d6ab > -- > 2.35.1 >
On 2/2/22 8:05 AM, Andrii Nakryiko wrote: > On Tue, Feb 1, 2022 at 12:56 PM Nathan Chancellor <nathan@kernel.org> wrote: >> >> This series allows CONFIG_DEBUG_INFO_DWARF5 to be selected with >> CONFIG_DEBUG_INFO_BTF=y by checking the pahole version. >> >> The first four patches add CONFIG_PAHOLE_VERSION and >> scripts/pahole-version.sh to clean up all the places that pahole's >> version is transformed into a 3-digit form. >> >> The fourth patch adds a PAHOLE_VERSION dependency to DEBUG_INFO_DWARF5 >> so that there are no build errors when it is selected with >> DEBUG_INFO_BTF. >> >> I build tested Fedora's aarch64 and x86_64 config with ToT clang 14.0.0 >> and GCC 11 with CONFIG_DEBUG_INFO_DWARF5 enabled with both pahole 1.21 >> and 1.23. >> >> Nathan Chancellor (5): >> MAINTAINERS: Add scripts/pahole-flags.sh to BPF section >> kbuild: Add CONFIG_PAHOLE_VERSION >> scripts/pahole-flags.sh: Use pahole-version.sh >> lib/Kconfig.debug: Use CONFIG_PAHOLE_VERSION >> lib/Kconfig.debug: Allow BTF + DWARF5 with pahole 1.21+ >> > > LGTM. I'd probably combine patches 2 and 3, but it's minor. I really > like the CONFIG_PAHOLE_VERSION and how much cleaner it makes Kconfig > options. +1, thanks for working on getting this enabled! I think patches 2 and 3 are rather logically separate, so as-is is fine as well imho. Applied, thanks!
Hello:
This series was applied to bpf/bpf-next.git (master)
by Daniel Borkmann <daniel@iogearbox.net>:
On Tue, 1 Feb 2022 13:56:19 -0700 you wrote:
> Hi all,
>
> This series allows CONFIG_DEBUG_INFO_DWARF5 to be selected with
> CONFIG_DEBUG_INFO_BTF=y by checking the pahole version.
>
> The first four patches add CONFIG_PAHOLE_VERSION and
> scripts/pahole-version.sh to clean up all the places that pahole's
> version is transformed into a 3-digit form.
>
> [...]
Here is the summary with links:
- [bpf-next,1/5] MAINTAINERS: Add scripts/pahole-flags.sh to BPF section
https://git.kernel.org/bpf/bpf-next/c/f67644b4f282
- [bpf-next,2/5] kbuild: Add CONFIG_PAHOLE_VERSION
https://git.kernel.org/bpf/bpf-next/c/613fe1692377
- [bpf-next,3/5] scripts/pahole-flags.sh: Use pahole-version.sh
https://git.kernel.org/bpf/bpf-next/c/2d6c9810eb89
- [bpf-next,4/5] lib/Kconfig.debug: Use CONFIG_PAHOLE_VERSION
https://git.kernel.org/bpf/bpf-next/c/6323c81350b7
- [bpf-next,5/5] lib/Kconfig.debug: Allow BTF + DWARF5 with pahole 1.21+
https://git.kernel.org/bpf/bpf-next/c/42d9b379e3e1
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
© 2016 - 2025 Red Hat, Inc.