diff mbox series

[SRU,N:raspi] UBUNTU: [Config] raspi: Set DEBUG_INFO_BTF=y

Message ID 20240725110656.533687-1-juerg.haefliger@canonical.com
State New
Headers show
Series [SRU,N:raspi] UBUNTU: [Config] raspi: Set DEBUG_INFO_BTF=y | expand

Commit Message

Juerg Haefliger July 25, 2024, 11:06 a.m. UTC
BugLink: https://bugs.launchpad.net/bugs/2065829

The raspi kernel doesn't have BTF enabled which means advanced BPF
features can't be used. With Pi 4 and 5, more and more users want to
use those, so let's enable BTF. I.e., remove the raspi overrides and
use the master kernel's config options.

The resulting uncompressed kernel image is ~4MB bigger and the
available memory shrinks by ~9MB which should be OK for Pi 4 and 5.

Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
---
 debian.raspi/config/annotations | 4 ----
 1 file changed, 4 deletions(-)

Comments

Manuel Diewald July 25, 2024, 11:20 a.m. UTC | #1
On Thu, Jul 25, 2024 at 01:06:56PM +0200, Juerg Haefliger wrote:
> BugLink: https://bugs.launchpad.net/bugs/2065829
> 
> The raspi kernel doesn't have BTF enabled which means advanced BPF
> features can't be used. With Pi 4 and 5, more and more users want to
> use those, so let's enable BTF. I.e., remove the raspi overrides and
> use the master kernel's config options.
> 
> The resulting uncompressed kernel image is ~4MB bigger and the
> available memory shrinks by ~9MB which should be OK for Pi 4 and 5.
> 
> Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
> ---
>  debian.raspi/config/annotations | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/debian.raspi/config/annotations b/debian.raspi/config/annotations
> index 55b53cd3dd9c..f69c52956c3e 100644
> --- a/debian.raspi/config/annotations
> +++ b/debian.raspi/config/annotations
> @@ -169,7 +169,6 @@ CONFIG_CRYPTO_SHA512_ARM64_CE                   policy<{'arm64': 'm'}> note<'Not
>  CONFIG_CRYPTO_XTS                               policy<{'arm64': 'm'}> note<'Not essential on Pi (different from master)'>
>  CONFIG_CXL_BUS                                  policy<{'arm64': 'n'}> note<'Not desired on Pi (different from master)'>
>  CONFIG_DAX                                      policy<{'arm64': 'm'}> note<'Not essential on Pi (different from master)'>
> -CONFIG_DEBUG_INFO_BTF                           policy<{'arm64': 'n'}> note<'Not desired on Pi (different from master)'>
>  CONFIG_DEBUG_MEMORY_INIT                        policy<{'arm64': 'y'}> note<'Required for Pi (different from master)'>
>  CONFIG_DEVFREQ_GOV_PASSIVE                      policy<{'arm64': 'm'}> note<'Not essential on Pi (different from master)'>
>  CONFIG_DEVFREQ_GOV_PERFORMANCE                  policy<{'arm64': 'm'}> note<'Not essential on Pi (different from master)'>
> @@ -1506,7 +1505,6 @@ CONFIG_DA_MON_EVENTS_ID                         policy<{'arm64': '-'}>
>  CONFIG_DE2104X                                  policy<{'arm64': '-'}>
>  CONFIG_DE2104X_DSL                              policy<{'arm64': '-'}>
>  CONFIG_DEBUG_EFI                                policy<{'arm64': '-'}>
> -CONFIG_DEBUG_INFO_BTF_MODULES                   policy<{'arm64': '-'}>
>  CONFIG_DEBUG_KERNEL_DC                          policy<{'arm64': '-'}>
>  CONFIG_DEFXX                                    policy<{'arm64': '-'}>
>  CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI               policy<{'arm64': '-'}>
> @@ -2207,7 +2205,6 @@ CONFIG_MMC_SDHI_SYS_DMAC                        policy<{'arm64': '-'}>
>  CONFIG_MMC_SH_MMCIF                             policy<{'arm64': '-'}>
>  CONFIG_MMC_SUNXI                                policy<{'arm64': '-'}>
>  CONFIG_MMC_TMIO_CORE                            policy<{'arm64': '-'}>
> -CONFIG_MODULE_ALLOW_BTF_MISMATCH                policy<{'arm64': '-'}>
>  CONFIG_MSM_GCC_8916                             policy<{'arm64': '-'}>
>  CONFIG_MSM_GCC_8917                             policy<{'arm64': '-'}>
>  CONFIG_MSM_GCC_8939                             policy<{'arm64': '-'}>
> @@ -2723,7 +2720,6 @@ CONFIG_POWER_RESET_QCOM_PON                     policy<{'arm64': '-'}>
>  CONFIG_POWER_RESET_SC27XX                       policy<{'arm64': '-'}>
>  CONFIG_POWER_RESET_VEXPRESS                     policy<{'arm64': '-'}>
>  CONFIG_PREEMPTIRQ_TRACEPOINTS                   policy<{'arm64': 'y'}>
> -CONFIG_PROBE_EVENTS_BTF_ARGS                    policy<{'arm64': '-'}>
>  CONFIG_PROC_EVENTS                              policy<{'arm64': '-'}>
>  CONFIG_PRU_REMOTEPROC                           policy<{'arm64': '-'}>
>  CONFIG_PTP_1588_CLOCK_QORIQ                     policy<{'arm64': '-'}>
> -- 
> 2.43.0
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

Acked-by: Manuel Diewald <manuel.diewald@canonical.com>
Kevin Becker July 25, 2024, 2:29 p.m. UTC | #2
On Thu, Jul 25, 2024 at 7:08 AM Juerg Haefliger
<juerg.haefliger@canonical.com> wrote:
>
> BugLink: https://bugs.launchpad.net/bugs/2065829
>
> The raspi kernel doesn't have BTF enabled which means advanced BPF
> features can't be used. With Pi 4 and 5, more and more users want to
> use those, so let's enable BTF. I.e., remove the raspi overrides and
> use the master kernel's config options.
>
> The resulting uncompressed kernel image is ~4MB bigger and the
> available memory shrinks by ~9MB which should be OK for Pi 4 and 5.
>
> Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
> ---
>  debian.raspi/config/annotations | 4 ----
>  1 file changed, 4 deletions(-)
>
> diff --git a/debian.raspi/config/annotations b/debian.raspi/config/annotations
> index 55b53cd3dd9c..f69c52956c3e 100644
> --- a/debian.raspi/config/annotations
> +++ b/debian.raspi/config/annotations
> @@ -169,7 +169,6 @@ CONFIG_CRYPTO_SHA512_ARM64_CE                   policy<{'arm64': 'm'}> note<'Not
>  CONFIG_CRYPTO_XTS                               policy<{'arm64': 'm'}> note<'Not essential on Pi (different from master)'>
>  CONFIG_CXL_BUS                                  policy<{'arm64': 'n'}> note<'Not desired on Pi (different from master)'>
>  CONFIG_DAX                                      policy<{'arm64': 'm'}> note<'Not essential on Pi (different from master)'>
> -CONFIG_DEBUG_INFO_BTF                           policy<{'arm64': 'n'}> note<'Not desired on Pi (different from master)'>
>  CONFIG_DEBUG_MEMORY_INIT                        policy<{'arm64': 'y'}> note<'Required for Pi (different from master)'>
>  CONFIG_DEVFREQ_GOV_PASSIVE                      policy<{'arm64': 'm'}> note<'Not essential on Pi (different from master)'>
>  CONFIG_DEVFREQ_GOV_PERFORMANCE                  policy<{'arm64': 'm'}> note<'Not essential on Pi (different from master)'>
> @@ -1506,7 +1505,6 @@ CONFIG_DA_MON_EVENTS_ID                         policy<{'arm64': '-'}>
>  CONFIG_DE2104X                                  policy<{'arm64': '-'}>
>  CONFIG_DE2104X_DSL                              policy<{'arm64': '-'}>
>  CONFIG_DEBUG_EFI                                policy<{'arm64': '-'}>
> -CONFIG_DEBUG_INFO_BTF_MODULES                   policy<{'arm64': '-'}>
>  CONFIG_DEBUG_KERNEL_DC                          policy<{'arm64': '-'}>
>  CONFIG_DEFXX                                    policy<{'arm64': '-'}>
>  CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI               policy<{'arm64': '-'}>
> @@ -2207,7 +2205,6 @@ CONFIG_MMC_SDHI_SYS_DMAC                        policy<{'arm64': '-'}>
>  CONFIG_MMC_SH_MMCIF                             policy<{'arm64': '-'}>
>  CONFIG_MMC_SUNXI                                policy<{'arm64': '-'}>
>  CONFIG_MMC_TMIO_CORE                            policy<{'arm64': '-'}>
> -CONFIG_MODULE_ALLOW_BTF_MISMATCH                policy<{'arm64': '-'}>
>  CONFIG_MSM_GCC_8916                             policy<{'arm64': '-'}>
>  CONFIG_MSM_GCC_8917                             policy<{'arm64': '-'}>
>  CONFIG_MSM_GCC_8939                             policy<{'arm64': '-'}>
> @@ -2723,7 +2720,6 @@ CONFIG_POWER_RESET_QCOM_PON                     policy<{'arm64': '-'}>
>  CONFIG_POWER_RESET_SC27XX                       policy<{'arm64': '-'}>
>  CONFIG_POWER_RESET_VEXPRESS                     policy<{'arm64': '-'}>
>  CONFIG_PREEMPTIRQ_TRACEPOINTS                   policy<{'arm64': 'y'}>
> -CONFIG_PROBE_EVENTS_BTF_ARGS                    policy<{'arm64': '-'}>
>  CONFIG_PROC_EVENTS                              policy<{'arm64': '-'}>
>  CONFIG_PRU_REMOTEPROC                           policy<{'arm64': '-'}>
>  CONFIG_PTP_1588_CLOCK_QORIQ                     policy<{'arm64': '-'}>
> --
> 2.43.0
>
>
> --
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

I think this patch should have had a cover letter, but the patch
itself looks ok.

Acked-by: Kevin Becker <kevin.becker@canonical.com>
Juerg Haefliger July 26, 2024, 8:27 a.m. UTC | #3
Applied to noble:linux-raspi master-next branch.

...Juerg


On Thu, 25 Jul 2024 13:06:56 +0200
Juerg Haefliger <juerg.haefliger@canonical.com> wrote:

> BugLink: https://bugs.launchpad.net/bugs/2065829
> 
> The raspi kernel doesn't have BTF enabled which means advanced BPF
> features can't be used. With Pi 4 and 5, more and more users want to
> use those, so let's enable BTF. I.e., remove the raspi overrides and
> use the master kernel's config options.
> 
> The resulting uncompressed kernel image is ~4MB bigger and the
> available memory shrinks by ~9MB which should be OK for Pi 4 and 5.
> 
> Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
> ---
>  debian.raspi/config/annotations | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/debian.raspi/config/annotations b/debian.raspi/config/annotations
> index 55b53cd3dd9c..f69c52956c3e 100644
> --- a/debian.raspi/config/annotations
> +++ b/debian.raspi/config/annotations
> @@ -169,7 +169,6 @@ CONFIG_CRYPTO_SHA512_ARM64_CE                   policy<{'arm64': 'm'}> note<'Not
>  CONFIG_CRYPTO_XTS                               policy<{'arm64': 'm'}> note<'Not essential on Pi (different from master)'>
>  CONFIG_CXL_BUS                                  policy<{'arm64': 'n'}> note<'Not desired on Pi (different from master)'>
>  CONFIG_DAX                                      policy<{'arm64': 'm'}> note<'Not essential on Pi (different from master)'>
> -CONFIG_DEBUG_INFO_BTF                           policy<{'arm64': 'n'}> note<'Not desired on Pi (different from master)'>
>  CONFIG_DEBUG_MEMORY_INIT                        policy<{'arm64': 'y'}> note<'Required for Pi (different from master)'>
>  CONFIG_DEVFREQ_GOV_PASSIVE                      policy<{'arm64': 'm'}> note<'Not essential on Pi (different from master)'>
>  CONFIG_DEVFREQ_GOV_PERFORMANCE                  policy<{'arm64': 'm'}> note<'Not essential on Pi (different from master)'>
> @@ -1506,7 +1505,6 @@ CONFIG_DA_MON_EVENTS_ID                         policy<{'arm64': '-'}>
>  CONFIG_DE2104X                                  policy<{'arm64': '-'}>
>  CONFIG_DE2104X_DSL                              policy<{'arm64': '-'}>
>  CONFIG_DEBUG_EFI                                policy<{'arm64': '-'}>
> -CONFIG_DEBUG_INFO_BTF_MODULES                   policy<{'arm64': '-'}>
>  CONFIG_DEBUG_KERNEL_DC                          policy<{'arm64': '-'}>
>  CONFIG_DEFXX                                    policy<{'arm64': '-'}>
>  CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI               policy<{'arm64': '-'}>
> @@ -2207,7 +2205,6 @@ CONFIG_MMC_SDHI_SYS_DMAC                        policy<{'arm64': '-'}>
>  CONFIG_MMC_SH_MMCIF                             policy<{'arm64': '-'}>
>  CONFIG_MMC_SUNXI                                policy<{'arm64': '-'}>
>  CONFIG_MMC_TMIO_CORE                            policy<{'arm64': '-'}>
> -CONFIG_MODULE_ALLOW_BTF_MISMATCH                policy<{'arm64': '-'}>
>  CONFIG_MSM_GCC_8916                             policy<{'arm64': '-'}>
>  CONFIG_MSM_GCC_8917                             policy<{'arm64': '-'}>
>  CONFIG_MSM_GCC_8939                             policy<{'arm64': '-'}>
> @@ -2723,7 +2720,6 @@ CONFIG_POWER_RESET_QCOM_PON                     policy<{'arm64': '-'}>
>  CONFIG_POWER_RESET_SC27XX                       policy<{'arm64': '-'}>
>  CONFIG_POWER_RESET_VEXPRESS                     policy<{'arm64': '-'}>
>  CONFIG_PREEMPTIRQ_TRACEPOINTS                   policy<{'arm64': 'y'}>
> -CONFIG_PROBE_EVENTS_BTF_ARGS                    policy<{'arm64': '-'}>
>  CONFIG_PROC_EVENTS                              policy<{'arm64': '-'}>
>  CONFIG_PRU_REMOTEPROC                           policy<{'arm64': '-'}>
>  CONFIG_PTP_1588_CLOCK_QORIQ                     policy<{'arm64': '-'}>
diff mbox series

Patch

diff --git a/debian.raspi/config/annotations b/debian.raspi/config/annotations
index 55b53cd3dd9c..f69c52956c3e 100644
--- a/debian.raspi/config/annotations
+++ b/debian.raspi/config/annotations
@@ -169,7 +169,6 @@  CONFIG_CRYPTO_SHA512_ARM64_CE                   policy<{'arm64': 'm'}> note<'Not
 CONFIG_CRYPTO_XTS                               policy<{'arm64': 'm'}> note<'Not essential on Pi (different from master)'>
 CONFIG_CXL_BUS                                  policy<{'arm64': 'n'}> note<'Not desired on Pi (different from master)'>
 CONFIG_DAX                                      policy<{'arm64': 'm'}> note<'Not essential on Pi (different from master)'>
-CONFIG_DEBUG_INFO_BTF                           policy<{'arm64': 'n'}> note<'Not desired on Pi (different from master)'>
 CONFIG_DEBUG_MEMORY_INIT                        policy<{'arm64': 'y'}> note<'Required for Pi (different from master)'>
 CONFIG_DEVFREQ_GOV_PASSIVE                      policy<{'arm64': 'm'}> note<'Not essential on Pi (different from master)'>
 CONFIG_DEVFREQ_GOV_PERFORMANCE                  policy<{'arm64': 'm'}> note<'Not essential on Pi (different from master)'>
@@ -1506,7 +1505,6 @@  CONFIG_DA_MON_EVENTS_ID                         policy<{'arm64': '-'}>
 CONFIG_DE2104X                                  policy<{'arm64': '-'}>
 CONFIG_DE2104X_DSL                              policy<{'arm64': '-'}>
 CONFIG_DEBUG_EFI                                policy<{'arm64': '-'}>
-CONFIG_DEBUG_INFO_BTF_MODULES                   policy<{'arm64': '-'}>
 CONFIG_DEBUG_KERNEL_DC                          policy<{'arm64': '-'}>
 CONFIG_DEFXX                                    policy<{'arm64': '-'}>
 CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI               policy<{'arm64': '-'}>
@@ -2207,7 +2205,6 @@  CONFIG_MMC_SDHI_SYS_DMAC                        policy<{'arm64': '-'}>
 CONFIG_MMC_SH_MMCIF                             policy<{'arm64': '-'}>
 CONFIG_MMC_SUNXI                                policy<{'arm64': '-'}>
 CONFIG_MMC_TMIO_CORE                            policy<{'arm64': '-'}>
-CONFIG_MODULE_ALLOW_BTF_MISMATCH                policy<{'arm64': '-'}>
 CONFIG_MSM_GCC_8916                             policy<{'arm64': '-'}>
 CONFIG_MSM_GCC_8917                             policy<{'arm64': '-'}>
 CONFIG_MSM_GCC_8939                             policy<{'arm64': '-'}>
@@ -2723,7 +2720,6 @@  CONFIG_POWER_RESET_QCOM_PON                     policy<{'arm64': '-'}>
 CONFIG_POWER_RESET_SC27XX                       policy<{'arm64': '-'}>
 CONFIG_POWER_RESET_VEXPRESS                     policy<{'arm64': '-'}>
 CONFIG_PREEMPTIRQ_TRACEPOINTS                   policy<{'arm64': 'y'}>
-CONFIG_PROBE_EVENTS_BTF_ARGS                    policy<{'arm64': '-'}>
 CONFIG_PROC_EVENTS                              policy<{'arm64': '-'}>
 CONFIG_PRU_REMOTEPROC                           policy<{'arm64': '-'}>
 CONFIG_PTP_1588_CLOCK_QORIQ                     policy<{'arm64': '-'}>