Skip to content
Snippets Groups Projects

configs: Enable CONFIG_DEBUG_INFO_BTF

Merged configs: Enable CONFIG_DEBUG_INFO_BTF
bpf into os-build
Merged Don Zickus requested to merge bpf into os-build

This option is needed to allow the latest features of bpftool to compile correctly. Currently it was disabled because of a gcc bug around DWARF info. That has been resolved with the latest gcc and/or dwarves package. Re-enable.

Signed-off-by: Don Zickus dzickus@redhat.com

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • CKI Bot added Configuration No CCs labels

    added Configuration No CCs labels

  • CKI ARK Bot
    CKI ARK Bot @cki-ark-bot ·
    Maintainer

    Don Zickus dzickus@redhat.com commented via email:

    forgot to cc Jiri

On Tue, Nov 24, 2020 at 06:11:13PM -0000, GitLab Bridge on behalf of dzickusrh wrote:
> From: Don Zickus <dzickus@redhat.com>
> 
> This option is needed to allow the latest features of bpftool
> to compile correctly.  Currently it was disabled because of
> a gcc bug around DWARF info.  That has been resolved with the
> latest gcc and/or dwarves package.  Re-enable.
> 
> Signed-off-by: Don Zickus <dzickus@redhat.com>
> ---
>  redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF | 2 +-
>  redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF | 1 -
>  2 files changed, 1 insertion(+), 2 deletions(-)
>  delete mode 100644 redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF
> 
> diff --git a/redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF b/redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF
> index 3b5ac748f282..39227b4511af 100644
> --- a/redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF
> +++ b/redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF
> @@ -1 +1 @@
> -# CONFIG_DEBUG_INFO_BTF is not set
> +CONFIG_DEBUG_INFO_BTF=y
> diff --git a/redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF b/redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF
> deleted file mode 100644
> index 39227b4511af..000000000000
> --- a/redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF
> +++ /dev/null
> @@ -1 +0,0 @@
> -CONFIG_DEBUG_INFO_BTF=y
> -- 
> GitLab
> _______________________________________________
> kernel mailing list -- kernel@lists.fedoraproject.org
> To unsubscribe send an email to kernel-leave@lists.fedoraproject.org
> Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
> List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
> List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
  • CKI ARK Bot added Acked-by: jolsa@redhat.com label

    added Acked-by: jolsa@redhat.com label

  • CKI ARK Bot
    CKI ARK Bot @cki-ark-bot ·
    Maintainer

    Jiri Olsa jolsa@redhat.com commented via email:

    On Tue, Nov 24, 2020 at 06:11:13PM -0000, GitLab Bridge on behalf of dzickusrh wrote:
> From: Don Zickus <dzickus@redhat.com>
> 
> This option is needed to allow the latest features of bpftool
> to compile correctly.  Currently it was disabled because of
> a gcc bug around DWARF info.  That has been resolved with the
> latest gcc and/or dwarves package.  Re-enable.
> 
> Signed-off-by: Don Zickus <dzickus@redhat.com>

Acked-by: Jiri Olsa <jolsa@redhat.com>

jirka

> ---
>  redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF | 2 +-
>  redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF | 1 -
>  2 files changed, 1 insertion(+), 2 deletions(-)
>  delete mode 100644 redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF
> 
> diff --git a/redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF b/redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF
> index 3b5ac748f282..39227b4511af 100644
> --- a/redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF
> +++ b/redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF
> @@ -1 +1 @@
> -# CONFIG_DEBUG_INFO_BTF is not set
> +CONFIG_DEBUG_INFO_BTF=y
> diff --git a/redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF b/redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF
> deleted file mode 100644
> index 39227b4511af..000000000000
> --- a/redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF
> +++ /dev/null
> @@ -1 +0,0 @@
> -CONFIG_DEBUG_INFO_BTF=y
> -- 
> GitLab
> _______________________________________________
> kernel mailing list -- kernel@lists.fedoraproject.org
> To unsubscribe send an email to kernel-leave@lists.fedoraproject.org
> Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
> List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
> List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
  • Justin M. Forbes
    Justin M. Forbes @jmflinuxtx ·
    Maintainer

    In order to be successful, this needs:

    diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index 4d16c0005536..dd09b1f8d656 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -501,9 +501,7 @@ BuildRequires: kmod, patch, bash, tar, git-core
 BuildRequires: bzip2, xz, findutils, gzip, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk
 BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex
 BuildRequires: net-tools, hostname, bc, elfutils-devel
-%if 0%{?fedora}
 BuildRequires: dwarves
-%endif
 BuildRequires: python3-devel
 %if %{with_headers}
 BuildRequires: rsync

    I did build 5.10-rc6 with these to make sure it was working correctly.

    Edited by Justin M. Forbes
  • CKI ARK Bot
    CKI ARK Bot @cki-ark-bot ·
    Maintainer

    Yeah, forgot to update the patch. I kicked off a scratch build to ensure it would work and aarch64 never completed.

    I can update the MR using your build feedback then.

  • Don Zickus added 1 commit

    added 1 commit

    • ea3d1c10 - configs: Enable CONFIG_DEBUG_INFO_BTF

    Compare with previous version

  • CKI Bot removed Acked-by: jolsa@redhat.com label

    removed Acked-by: jolsa@redhat.com label

  • Justin M. Forbes added Include in Releases label

    added Include in Releases label

  • CKI ARK Bot added Acked-by: herton@redhat.com label

    added Acked-by: herton@redhat.com label

  • CKI ARK Bot
    CKI ARK Bot @cki-ark-bot ·
    Maintainer

    Herton R. Krzesinski herton@redhat.com commented via email:

    On Tue, Dec 01, 2020 at 05:27:34PM -0000, GitLab Bridge on behalf of dzickusrh wrote:
> From: Don Zickus <dzickus@redhat.com>
> 
> This option is needed to allow the latest features of bpftool
> to compile correctly.  Currently it was disabled because of
> a gcc bug around DWARF info.  That has been resolved with the
> latest gcc and/or dwarves package.  Re-enable.
> 
> Signed-off-by: Don Zickus <dzickus@redhat.com>
> 
> V2: Add dwarves BuildRequires to eln
> ---
>  redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF | 2 +-
>  redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF | 1 -
>  redhat/kernel.spec.template                         | 4 ----
>  3 files changed, 1 insertion(+), 6 deletions(-)
>  delete mode 100644 redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF
> 
> diff --git a/redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF b/redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF
> index 3b5ac748f282..39227b4511af 100644
> --- a/redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF
> +++ b/redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF
> @@ -1 +1 @@
> -# CONFIG_DEBUG_INFO_BTF is not set
> +CONFIG_DEBUG_INFO_BTF=y
> diff --git a/redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF b/redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF
> deleted file mode 100644
> index 39227b4511af..000000000000
> --- a/redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF
> +++ /dev/null
> @@ -1 +0,0 @@
> -CONFIG_DEBUG_INFO_BTF=y
> diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
> index 4d16c0005536..19ff250bda48 100644
> --- a/redhat/kernel.spec.template
> +++ b/redhat/kernel.spec.template
> @@ -501,9 +501,7 @@ BuildRequires: kmod, patch, bash, tar, git-core
>  BuildRequires: bzip2, xz, findutils, gzip, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk
>  BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex
>  BuildRequires: net-tools, hostname, bc, elfutils-devel
> -%if 0%{?fedora}
>  BuildRequires: dwarves
> -%endif
>  BuildRequires: python3-devel
>  %if %{with_headers}
>  BuildRequires: rsync
> @@ -544,9 +542,7 @@ BuildConflicts: rhbuildsys(DiskFree) < 500Mb
>  %if %{with_debuginfo}
>  BuildRequires: rpm-build, elfutils
>  BuildConflicts: rpm < 4.13.0.1-19
> -%if 0%{?fedora}
>  BuildConflicts: dwarves < 1.13
> -%endif
>  # Most of these should be enabled after more investigation
>  %undefine _include_minidebuginfo
>  %undefine _find_debuginfo_dwz_opts
> -- 
> GitLab

Acked-by: Herton R. Krzesinski <herton@redhat.com>
  • CKI ARK Bot
    CKI ARK Bot @cki-ark-bot ·
    Maintainer

    Patrick Talbert ptalbert@redhat.com commented via email:

    On Tue, Nov 24, 2020 at 7:38 PM Jiri Olsa <jolsa@redhat.com> wrote:
>
> On Tue, Nov 24, 2020 at 06:11:13PM -0000, GitLab Bridge on behalf of dzickusrh wrote:
> > From: Don Zickus <dzickus@redhat.com>
> >
> > This option is needed to allow the latest features of bpftool
> > to compile correctly.  Currently it was disabled because of
> > a gcc bug around DWARF info.  That has been resolved with the
> > latest gcc and/or dwarves package.  Re-enable.
> >
> > Signed-off-by: Don Zickus <dzickus@redhat.com>
>
> Acked-by: Jiri Olsa <jolsa@redhat.com>
>
> jirka

Hi Jiri,

Can you please give your input (Ack/Nack) on Don's V2?

Thank you,

Patrick

>
> > ---
> >  redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF | 2 +-
> >  redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF | 1 -
> >  2 files changed, 1 insertion(+), 2 deletions(-)
> >  delete mode 100644 redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF
> >
> > diff --git a/redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF b/redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF
> > index 3b5ac748f282..39227b4511af 100644
> > --- a/redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF
> > +++ b/redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF
> > @@ -1 +1 @@
> > -# CONFIG_DEBUG_INFO_BTF is not set
> > +CONFIG_DEBUG_INFO_BTF=y
> > diff --git a/redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF b/redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF
> > deleted file mode 100644
> > index 39227b4511af..000000000000
> > --- a/redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF
> > +++ /dev/null
> > @@ -1 +0,0 @@
> > -CONFIG_DEBUG_INFO_BTF=y
> > --
> > GitLab
> > _______________________________________________
> > kernel mailing list -- kernel@lists.fedoraproject.org
> > To unsubscribe send an email to kernel-leave@lists.fedoraproject.org
> > Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
> > List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
> > List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
> _______________________________________________
> kernel mailing list -- kernel@lists.fedoraproject.org
> To unsubscribe send an email to kernel-leave@lists.fedoraproject.org
> Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
> List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
> List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
  • CKI ARK Bot added Acked-by: jolsa@redhat.com label

    added Acked-by: jolsa@redhat.com label

  • CKI ARK Bot
    CKI ARK Bot @cki-ark-bot ·
    Maintainer

    Jiri Olsa jolsa@redhat.com commented via email:

    On Tue, Dec 01, 2020 at 05:27:34PM -0000, GitLab Bridge on behalf of dzickusrh wrote:
> From: Don Zickus <dzickus@redhat.com>
> 
> This option is needed to allow the latest features of bpftool
> to compile correctly.  Currently it was disabled because of
> a gcc bug around DWARF info.  That has been resolved with the
> latest gcc and/or dwarves package.  Re-enable.
> 
> Signed-off-by: Don Zickus <dzickus@redhat.com>
> 
> V2: Add dwarves BuildRequires to eln

Acked-by: Jiri Olsa <jolsa@redhat.com>

jirka

> ---
>  redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF | 2 +-
>  redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF | 1 -
>  redhat/kernel.spec.template                         | 4 ----
>  3 files changed, 1 insertion(+), 6 deletions(-)
>  delete mode 100644 redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF
> 
> diff --git a/redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF b/redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF
> index 3b5ac748f282..39227b4511af 100644
> --- a/redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF
> +++ b/redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF
> @@ -1 +1 @@
> -# CONFIG_DEBUG_INFO_BTF is not set
> +CONFIG_DEBUG_INFO_BTF=y
> diff --git a/redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF b/redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF
> deleted file mode 100644
> index 39227b4511af..000000000000
> --- a/redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF
> +++ /dev/null
> @@ -1 +0,0 @@
> -CONFIG_DEBUG_INFO_BTF=y
> diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
> index 4d16c0005536..19ff250bda48 100644
> --- a/redhat/kernel.spec.template
> +++ b/redhat/kernel.spec.template
> @@ -501,9 +501,7 @@ BuildRequires: kmod, patch, bash, tar, git-core
>  BuildRequires: bzip2, xz, findutils, gzip, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk
>  BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex
>  BuildRequires: net-tools, hostname, bc, elfutils-devel
> -%if 0%{?fedora}
>  BuildRequires: dwarves
> -%endif
>  BuildRequires: python3-devel
>  %if %{with_headers}
>  BuildRequires: rsync
> @@ -544,9 +542,7 @@ BuildConflicts: rhbuildsys(DiskFree) < 500Mb
>  %if %{with_debuginfo}
>  BuildRequires: rpm-build, elfutils
>  BuildConflicts: rpm < 4.13.0.1-19
> -%if 0%{?fedora}
>  BuildConflicts: dwarves < 1.13
> -%endif
>  # Most of these should be enabled after more investigation
>  %undefine _include_minidebuginfo
>  %undefine _find_debuginfo_dwz_opts
> -- 
> GitLab
> _______________________________________________
> kernel mailing list -- kernel@lists.fedoraproject.org
> To unsubscribe send an email to kernel-leave@lists.fedoraproject.org
> Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
> List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
> List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
  • Patrick Talbert mentioned in commit 22fc8a49

    mentioned in commit 22fc8a49

  • Patrick Talbert merged

    merged

Please register or sign in to reply