| Message ID | 20220331172846.10229-2-tim.gardner@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [focal/linux-azure-5.13] UBUNTU: [Config] azure-5.13: arm64 CONFIG_HIBERNATION=y | expand |
On Thu, Mar 31, 2022 at 11:28:44AM -0600, Tim Gardner wrote: ... > diff --git a/debian.azure-5.13/config/config.common.ubuntu b/debian.azure-5.13/config/config.common.ubuntu > index 76daf1430ee01..df91a08550f48 100644 > --- a/debian.azure-5.13/config/config.common.ubuntu > +++ b/debian.azure-5.13/config/config.common.ubuntu > @@ -1670,7 +1670,6 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y > # CONFIG_DEBUG_HOTPLUG_CPU0 is not set > CONFIG_DEBUG_INFO=y > CONFIG_DEBUG_INFO_BTF=y > -CONFIG_DEBUG_INFO_BTF_MODULES=y We definitely don't want to disable BTF for modules. > # CONFIG_DEBUG_INFO_COMPRESSED is not set > CONFIG_DEBUG_INFO_DWARF4=y > # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set > @@ -2864,6 +2863,7 @@ CONFIG_HI13X1_GMAC=y > CONFIG_HI3660_MBOX=m > CONFIG_HI6220_MBOX=m > CONFIG_HIBERNATE_CALLBACKS=y > +CONFIG_HIBERNATION=y > CONFIG_HIBERNATION_SNAPSHOT_DEV=y > CONFIG_HID=m > CONFIG_HIDRAW=y > @@ -5183,7 +5183,6 @@ CONFIG_PAGE_POISONING=y > CONFIG_PAGE_POOL=y > CONFIG_PAGE_REPORTING=y > CONFIG_PAGE_TABLE_ISOLATION=y > -CONFIG_PAHOLE_HAS_SPLIT_BTF=y ^ This is the reason why CONFIG_DEBUG_INFO_BTF_MODULES was disabled above. Maybe you need to update your local chroot. Make sure you get a more recent version of pahole in the build chroot, so this option won't be disabled. Thanks, -Andrea
On 4/1/22 00:45, Andrea Righi wrote: > On Thu, Mar 31, 2022 at 11:28:44AM -0600, Tim Gardner wrote: > ... >> diff --git a/debian.azure-5.13/config/config.common.ubuntu b/debian.azure-5.13/config/config.common.ubuntu >> index 76daf1430ee01..df91a08550f48 100644 >> --- a/debian.azure-5.13/config/config.common.ubuntu >> +++ b/debian.azure-5.13/config/config.common.ubuntu >> @@ -1670,7 +1670,6 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y >> # CONFIG_DEBUG_HOTPLUG_CPU0 is not set >> CONFIG_DEBUG_INFO=y >> CONFIG_DEBUG_INFO_BTF=y >> -CONFIG_DEBUG_INFO_BTF_MODULES=y > > We definitely don't want to disable BTF for modules. > >> # CONFIG_DEBUG_INFO_COMPRESSED is not set >> CONFIG_DEBUG_INFO_DWARF4=y >> # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set >> @@ -2864,6 +2863,7 @@ CONFIG_HI13X1_GMAC=y >> CONFIG_HI3660_MBOX=m >> CONFIG_HI6220_MBOX=m >> CONFIG_HIBERNATE_CALLBACKS=y >> +CONFIG_HIBERNATION=y >> CONFIG_HIBERNATION_SNAPSHOT_DEV=y >> CONFIG_HID=m >> CONFIG_HIDRAW=y >> @@ -5183,7 +5183,6 @@ CONFIG_PAGE_POISONING=y >> CONFIG_PAGE_POOL=y >> CONFIG_PAGE_REPORTING=y >> CONFIG_PAGE_TABLE_ISOLATION=y >> -CONFIG_PAHOLE_HAS_SPLIT_BTF=y > > ^ This is the reason why CONFIG_DEBUG_INFO_BTF_MODULES was disabled > above. Maybe you need to update your local chroot. Make sure you get a > more recent version of pahole in the build chroot, so this option won't > be disabled. > Huh. I update my chroot every day. There must be some other reason, but I'll dig into it. rtg > Thanks, > -Andrea
On Fri, 1 Apr 2022 at 13:53, Tim Gardner <tim.gardner@canonical.com> wrote: > > > > On 4/1/22 00:45, Andrea Righi wrote: > > On Thu, Mar 31, 2022 at 11:28:44AM -0600, Tim Gardner wrote: > > ... > >> diff --git a/debian.azure-5.13/config/config.common.ubuntu b/debian.azure-5.13/config/config.common.ubuntu > >> index 76daf1430ee01..df91a08550f48 100644 > >> --- a/debian.azure-5.13/config/config.common.ubuntu > >> +++ b/debian.azure-5.13/config/config.common.ubuntu > >> @@ -1670,7 +1670,6 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y > >> # CONFIG_DEBUG_HOTPLUG_CPU0 is not set > >> CONFIG_DEBUG_INFO=y > >> CONFIG_DEBUG_INFO_BTF=y > >> -CONFIG_DEBUG_INFO_BTF_MODULES=y > > > > We definitely don't want to disable BTF for modules. > > > >> # CONFIG_DEBUG_INFO_COMPRESSED is not set > >> CONFIG_DEBUG_INFO_DWARF4=y > >> # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set > >> @@ -2864,6 +2863,7 @@ CONFIG_HI13X1_GMAC=y > >> CONFIG_HI3660_MBOX=m > >> CONFIG_HI6220_MBOX=m > >> CONFIG_HIBERNATE_CALLBACKS=y > >> +CONFIG_HIBERNATION=y > >> CONFIG_HIBERNATION_SNAPSHOT_DEV=y > >> CONFIG_HID=m > >> CONFIG_HIDRAW=y > >> @@ -5183,7 +5183,6 @@ CONFIG_PAGE_POISONING=y > >> CONFIG_PAGE_POOL=y > >> CONFIG_PAGE_REPORTING=y > >> CONFIG_PAGE_TABLE_ISOLATION=y > >> -CONFIG_PAHOLE_HAS_SPLIT_BTF=y > > > > ^ This is the reason why CONFIG_DEBUG_INFO_BTF_MODULES was disabled > > above. Maybe you need to update your local chroot. Make sure you get a > > more recent version of pahole in the build chroot, so this option won't > > be disabled. > > > > Huh. I update my chroot every day. There must be some other reason, but > I'll dig into it. do you have correct pockets enabled; and correct builder pppa enabled? I.e. Sometimes either -updates _or_ https://launchpad.net/~canonical-kernel-team/+archive/ubuntu/builder-extra PPA is needed. Regards, Dimitri.
diff --git a/debian.azure-5.13/config/amd64/config.common.amd64 b/debian.azure-5.13/config/amd64/config.common.amd64 index 306da5ca657c2..843cf5c657cab 100644 --- a/debian.azure-5.13/config/amd64/config.common.amd64 +++ b/debian.azure-5.13/config/amd64/config.common.amd64 @@ -29,7 +29,6 @@ CONFIG_DW_XDATA_PCIE=m CONFIG_GPIO_GENERIC=m CONFIG_GPIO_GENERIC_PLATFORM=m # CONFIG_HARDENED_USERCOPY_FALLBACK is not set -CONFIG_HIBERNATION=y CONFIG_HID_PLAYSTATION=m CONFIG_HID_SEMITEK=m CONFIG_I2C_CP2615=m diff --git a/debian.azure-5.13/config/annotations b/debian.azure-5.13/config/annotations index 4a2a1cd9b69ed..bbc9949648373 100644 --- a/debian.azure-5.13/config/annotations +++ b/debian.azure-5.13/config/annotations @@ -4,6 +4,9 @@ include "../../debian.master/config/annotations" +CONFIG_HIBERNATION policy<{'amd64': 'y', 'arm64': 'y'}> +CONFIG_HIBERNATION mark<ENFORCED> note<LP:1967336> + CONFIG_FB_EFI policy<{'amd64': 'y', 'arm64': 'y'}> CONFIG_FB_EFI mark<ENFORCED> note<LP:1959216> diff --git a/debian.azure-5.13/config/arm64/config.common.arm64 b/debian.azure-5.13/config/arm64/config.common.arm64 index c509e0f20e079..326278b644941 100644 --- a/debian.azure-5.13/config/arm64/config.common.arm64 +++ b/debian.azure-5.13/config/arm64/config.common.arm64 @@ -29,7 +29,6 @@ CONFIG_EXTCON=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_GENERIC_PLATFORM=y CONFIG_HARDENED_USERCOPY_FALLBACK=y -# CONFIG_HIBERNATION is not set # CONFIG_HID_PLAYSTATION is not set # CONFIG_HID_SEMITEK is not set # CONFIG_I2C_CP2615 is not set diff --git a/debian.azure-5.13/config/config.common.ubuntu b/debian.azure-5.13/config/config.common.ubuntu index 76daf1430ee01..df91a08550f48 100644 --- a/debian.azure-5.13/config/config.common.ubuntu +++ b/debian.azure-5.13/config/config.common.ubuntu @@ -1670,7 +1670,6 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO=y CONFIG_DEBUG_INFO_BTF=y -CONFIG_DEBUG_INFO_BTF_MODULES=y # CONFIG_DEBUG_INFO_COMPRESSED is not set CONFIG_DEBUG_INFO_DWARF4=y # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set @@ -2864,6 +2863,7 @@ CONFIG_HI13X1_GMAC=y CONFIG_HI3660_MBOX=m CONFIG_HI6220_MBOX=m CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_HIBERNATION=y CONFIG_HIBERNATION_SNAPSHOT_DEV=y CONFIG_HID=m CONFIG_HIDRAW=y @@ -5183,7 +5183,6 @@ CONFIG_PAGE_POISONING=y CONFIG_PAGE_POOL=y CONFIG_PAGE_REPORTING=y CONFIG_PAGE_TABLE_ISOLATION=y -CONFIG_PAHOLE_HAS_SPLIT_BTF=y # CONFIG_PANASONIC_LAPTOP is not set CONFIG_PANEL=m # CONFIG_PANEL_CHANGE_MESSAGE is not set @@ -7296,6 +7295,7 @@ CONFIG_TRACING_SUPPORT=y CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set +CONFIG_TRANS_TABLE=y CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y # CONFIG_TRIM_UNUSED_KSYMS is not set
BugLink: https://bugs.launchpad.net/bugs/1967336 Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- debian.azure-5.13/config/amd64/config.common.amd64 | 3 +-- debian.azure-5.13/config/annotations | 3 +++ debian.azure-5.13/config/arm64/config.common.arm64 | 3 +-- debian.azure-5.13/config/config.common.ubuntu | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-)