diff mbox series

[B,SRU] CONFIG_LOG_BUF_SHIFT set to 14 is too low on arm64

Message ID 20190602141020.10493-1-dan.streetman@canonical.com
State New
Headers show
Series [B,SRU] CONFIG_LOG_BUF_SHIFT set to 14 is too low on arm64 | expand

Commit Message

Dan Streetman June 2, 2019, 2:10 p.m. UTC 
From: Dan Streetman <ddstreet@canonical.com>

BugLink: https://bugs.launchpad.net/bugs/1824864

All other archs have this value set higher, and the low value of 14
results in a log buffer so small it fills up before systemd-journald
can start and read all the boot time kernel log messages.

Increasing this will result in more memory reserved for the log buffer,
but will avoid missed kernel log messages.

This changes all 64 bit archs to use a shift of 18, which is what
amd64 has been using.

Signed-off-by: Dan Streetman <ddstreet@canonical.com>
Cc: Dimitri John Ledkov <xnox@ubuntu.com>
---

@xnox opened this bug and submitted a patch for disco, but not earlier kernels.

 debian.master/config/annotations                   | 2 +-
 debian.master/config/arm64/config.common.arm64     | 2 +-
 debian.master/config/ppc64el/config.common.ppc64el | 2 +-
 debian.master/config/s390x/config.common.s390x     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

Comments

Kleber Sacilotto de Souza June 26, 2019, 4:11 p.m. UTC | #1 
On 6/2/19 4:10 PM, Dan Streetman wrote:
> From: Dan Streetman <ddstreet@canonical.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1824864
> 
> All other archs have this value set higher, and the low value of 14
> results in a log buffer so small it fills up before systemd-journald
> can start and read all the boot time kernel log messages.
> 
> Increasing this will result in more memory reserved for the log buffer,
> but will avoid missed kernel log messages.
> 
> This changes all 64 bit archs to use a shift of 18, which is what
> amd64 has been using.
> 
> Signed-off-by: Dan Streetman <ddstreet@canonical.com>
> Cc: Dimitri John Ledkov <xnox@ubuntu.com>

Already applied to D/E, so it makes sense to bring them in sync.

My only comment is regarding the subject of the patch. For config
changes, we use the prefix "UBUNTU: [Config]" and the subject mentions
only arm64 when in fact the patch changes the value for other arch's
as well. So I would suggest we use the same subject as the patch
applied for D/E:


UBUNTU: [Config] CONFIG_LOG_BUF_SHIFT=18 on all 64bit arches​


Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

Thank you,
Kleber


> ---
> 
> @xnox opened this bug and submitted a patch for disco, but not earlier kernels.
> 
>  debian.master/config/annotations                   | 2 +-
>  debian.master/config/arm64/config.common.arm64     | 2 +-
>  debian.master/config/ppc64el/config.common.ppc64el | 2 +-
>  debian.master/config/s390x/config.common.s390x     | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/debian.master/config/annotations b/debian.master/config/annotations
> index 52084c16b6053..2f8ad2b79b131 100644
> --- a/debian.master/config/annotations
> +++ b/debian.master/config/annotations
> @@ -9201,7 +9201,7 @@ CONFIG_CROSS_MEMORY_ATTACH                      policy<{'amd64': 'y', 'arm64': '
>  CONFIG_USELIB                                   policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
>  CONFIG_AUDIT                                    policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
>  CONFIG_IKCONFIG                                 policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
> -CONFIG_LOG_BUF_SHIFT                            policy<{'amd64': '18', 'arm64': '14', 'armhf': '17', 'i386': '17', 'ppc64el': '17', 's390x': '17'}>
> +CONFIG_LOG_BUF_SHIFT                            policy<{'amd64': '18', 'arm64': '18', 'armhf': '17', 'i386': '17', 'ppc64el': '18', 's390x': '18'}>
>  CONFIG_LOG_CPU_MAX_BUF_SHIFT                    policy<{'amd64': '12', 'arm64': '12', 'armhf': '12', 'i386': '12', 'ppc64el': '12', 's390x': '12'}>
>  CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT                policy<{'amd64': '13', 'arm64': '13', 'armhf': '13', 'i386': '13', 'ppc64el': '13', 's390x': '13'}>
>  CONFIG_NUMA_BALANCING                           policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 's390x': 'y'}>
> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
> index e5166527b1182..2ad17495592df 100644
> --- a/debian.master/config/arm64/config.common.arm64
> +++ b/debian.master/config/arm64/config.common.arm64
> @@ -206,7 +206,7 @@ CONFIG_LDM_PARTITION=y
>  CONFIG_LIBNVDIMM=y
>  CONFIG_LLC2=m
>  CONFIG_LOCK_DOWN_KERNEL=y
> -CONFIG_LOG_BUF_SHIFT=14
> +CONFIG_LOG_BUF_SHIFT=18
>  CONFIG_LPC_ICH=m
>  CONFIG_LPC_SCH=m
>  CONFIG_MAC_PARTITION=y
> diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
> index e3d18746dbf0b..fed89c6e37536 100644
> --- a/debian.master/config/ppc64el/config.common.ppc64el
> +++ b/debian.master/config/ppc64el/config.common.ppc64el
> @@ -195,7 +195,7 @@ CONFIG_LDM_PARTITION=y
>  CONFIG_LIBNVDIMM=y
>  CONFIG_LLC2=m
>  # CONFIG_LOCK_DOWN_KERNEL is not set
> -CONFIG_LOG_BUF_SHIFT=17
> +CONFIG_LOG_BUF_SHIFT=18
>  CONFIG_LPC_ICH=m
>  CONFIG_LPC_SCH=m
>  CONFIG_MAC_PARTITION=y
> diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
> index 6f15e3db9aa34..16d9d67fb217b 100644
> --- a/debian.master/config/s390x/config.common.s390x
> +++ b/debian.master/config/s390x/config.common.s390x
> @@ -161,7 +161,7 @@ CONFIG_KVM=y
>  # CONFIG_LIBNVDIMM is not set
>  # CONFIG_LLC2 is not set
>  # CONFIG_LOCK_DOWN_KERNEL is not set
> -CONFIG_LOG_BUF_SHIFT=17
> +CONFIG_LOG_BUF_SHIFT=18
>  # CONFIG_LPC_ICH is not set
>  # CONFIG_LPC_SCH is not set
>  # CONFIG_MAC_PARTITION is not set
>
Stefan Bader June 28, 2019, 3:24 p.m. UTC | #2 
On 02.06.19 16:10, Dan Streetman wrote:
> From: Dan Streetman <ddstreet@canonical.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1824864
> 
> All other archs have this value set higher, and the low value of 14
> results in a log buffer so small it fills up before systemd-journald
> can start and read all the boot time kernel log messages.
> 
> Increasing this will result in more memory reserved for the log buffer,
> but will avoid missed kernel log messages.
> 
> This changes all 64 bit archs to use a shift of 18, which is what
> amd64 has been using.
> 
> Signed-off-by: Dan Streetman <ddstreet@canonical.com>
> Cc: Dimitri John Ledkov <xnox@ubuntu.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
> ---

With adjusted subject.
> 
> @xnox opened this bug and submitted a patch for disco, but not earlier kernels.
> 
>  debian.master/config/annotations                   | 2 +-
>  debian.master/config/arm64/config.common.arm64     | 2 +-
>  debian.master/config/ppc64el/config.common.ppc64el | 2 +-
>  debian.master/config/s390x/config.common.s390x     | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/debian.master/config/annotations b/debian.master/config/annotations
> index 52084c16b6053..2f8ad2b79b131 100644
> --- a/debian.master/config/annotations
> +++ b/debian.master/config/annotations
> @@ -9201,7 +9201,7 @@ CONFIG_CROSS_MEMORY_ATTACH                      policy<{'amd64': 'y', 'arm64': '
>  CONFIG_USELIB                                   policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
>  CONFIG_AUDIT                                    policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
>  CONFIG_IKCONFIG                                 policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
> -CONFIG_LOG_BUF_SHIFT                            policy<{'amd64': '18', 'arm64': '14', 'armhf': '17', 'i386': '17', 'ppc64el': '17', 's390x': '17'}>
> +CONFIG_LOG_BUF_SHIFT                            policy<{'amd64': '18', 'arm64': '18', 'armhf': '17', 'i386': '17', 'ppc64el': '18', 's390x': '18'}>
>  CONFIG_LOG_CPU_MAX_BUF_SHIFT                    policy<{'amd64': '12', 'arm64': '12', 'armhf': '12', 'i386': '12', 'ppc64el': '12', 's390x': '12'}>
>  CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT                policy<{'amd64': '13', 'arm64': '13', 'armhf': '13', 'i386': '13', 'ppc64el': '13', 's390x': '13'}>
>  CONFIG_NUMA_BALANCING                           policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 's390x': 'y'}>
> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
> index e5166527b1182..2ad17495592df 100644
> --- a/debian.master/config/arm64/config.common.arm64
> +++ b/debian.master/config/arm64/config.common.arm64
> @@ -206,7 +206,7 @@ CONFIG_LDM_PARTITION=y
>  CONFIG_LIBNVDIMM=y
>  CONFIG_LLC2=m
>  CONFIG_LOCK_DOWN_KERNEL=y
> -CONFIG_LOG_BUF_SHIFT=14
> +CONFIG_LOG_BUF_SHIFT=18
>  CONFIG_LPC_ICH=m
>  CONFIG_LPC_SCH=m
>  CONFIG_MAC_PARTITION=y
> diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
> index e3d18746dbf0b..fed89c6e37536 100644
> --- a/debian.master/config/ppc64el/config.common.ppc64el
> +++ b/debian.master/config/ppc64el/config.common.ppc64el
> @@ -195,7 +195,7 @@ CONFIG_LDM_PARTITION=y
>  CONFIG_LIBNVDIMM=y
>  CONFIG_LLC2=m
>  # CONFIG_LOCK_DOWN_KERNEL is not set
> -CONFIG_LOG_BUF_SHIFT=17
> +CONFIG_LOG_BUF_SHIFT=18
>  CONFIG_LPC_ICH=m
>  CONFIG_LPC_SCH=m
>  CONFIG_MAC_PARTITION=y
> diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
> index 6f15e3db9aa34..16d9d67fb217b 100644
> --- a/debian.master/config/s390x/config.common.s390x
> +++ b/debian.master/config/s390x/config.common.s390x
> @@ -161,7 +161,7 @@ CONFIG_KVM=y
>  # CONFIG_LIBNVDIMM is not set
>  # CONFIG_LLC2 is not set
>  # CONFIG_LOCK_DOWN_KERNEL is not set
> -CONFIG_LOG_BUF_SHIFT=17
> +CONFIG_LOG_BUF_SHIFT=18
>  # CONFIG_LPC_ICH is not set
>  # CONFIG_LPC_SCH is not set
>  # CONFIG_MAC_PARTITION is not set
>
Kleber Sacilotto de Souza June 28, 2019, 4:17 p.m. UTC | #3 
On 6/2/19 4:10 PM, Dan Streetman wrote:
> From: Dan Streetman <ddstreet@canonical.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1824864
> 
> All other archs have this value set higher, and the low value of 14
> results in a log buffer so small it fills up before systemd-journald
> can start and read all the boot time kernel log messages.
> 
> Increasing this will result in more memory reserved for the log buffer,
> but will avoid missed kernel log messages.
> 
> This changes all 64 bit archs to use a shift of 18, which is what
> amd64 has been using.
> 
> Signed-off-by: Dan Streetman <ddstreet@canonical.com>
> Cc: Dimitri John Ledkov <xnox@ubuntu.com>

Applied to bionic/master-next branch, with the following subject
line:

"UBUNTU: [Config] CONFIG_LOG_BUF_SHIFT=18 on all 64bit arches"

Thanks,
Kleber

> ---
> 
> @xnox opened this bug and submitted a patch for disco, but not earlier kernels.
> 
>  debian.master/config/annotations                   | 2 +-
>  debian.master/config/arm64/config.common.arm64     | 2 +-
>  debian.master/config/ppc64el/config.common.ppc64el | 2 +-
>  debian.master/config/s390x/config.common.s390x     | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/debian.master/config/annotations b/debian.master/config/annotations
> index 52084c16b6053..2f8ad2b79b131 100644
> --- a/debian.master/config/annotations
> +++ b/debian.master/config/annotations
> @@ -9201,7 +9201,7 @@ CONFIG_CROSS_MEMORY_ATTACH                      policy<{'amd64': 'y', 'arm64': '
>  CONFIG_USELIB                                   policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
>  CONFIG_AUDIT                                    policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
>  CONFIG_IKCONFIG                                 policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
> -CONFIG_LOG_BUF_SHIFT                            policy<{'amd64': '18', 'arm64': '14', 'armhf': '17', 'i386': '17', 'ppc64el': '17', 's390x': '17'}>
> +CONFIG_LOG_BUF_SHIFT                            policy<{'amd64': '18', 'arm64': '18', 'armhf': '17', 'i386': '17', 'ppc64el': '18', 's390x': '18'}>
>  CONFIG_LOG_CPU_MAX_BUF_SHIFT                    policy<{'amd64': '12', 'arm64': '12', 'armhf': '12', 'i386': '12', 'ppc64el': '12', 's390x': '12'}>
>  CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT                policy<{'amd64': '13', 'arm64': '13', 'armhf': '13', 'i386': '13', 'ppc64el': '13', 's390x': '13'}>
>  CONFIG_NUMA_BALANCING                           policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 's390x': 'y'}>
> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
> index e5166527b1182..2ad17495592df 100644
> --- a/debian.master/config/arm64/config.common.arm64
> +++ b/debian.master/config/arm64/config.common.arm64
> @@ -206,7 +206,7 @@ CONFIG_LDM_PARTITION=y
>  CONFIG_LIBNVDIMM=y
>  CONFIG_LLC2=m
>  CONFIG_LOCK_DOWN_KERNEL=y
> -CONFIG_LOG_BUF_SHIFT=14
> +CONFIG_LOG_BUF_SHIFT=18
>  CONFIG_LPC_ICH=m
>  CONFIG_LPC_SCH=m
>  CONFIG_MAC_PARTITION=y
> diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
> index e3d18746dbf0b..fed89c6e37536 100644
> --- a/debian.master/config/ppc64el/config.common.ppc64el
> +++ b/debian.master/config/ppc64el/config.common.ppc64el
> @@ -195,7 +195,7 @@ CONFIG_LDM_PARTITION=y
>  CONFIG_LIBNVDIMM=y
>  CONFIG_LLC2=m
>  # CONFIG_LOCK_DOWN_KERNEL is not set
> -CONFIG_LOG_BUF_SHIFT=17
> +CONFIG_LOG_BUF_SHIFT=18
>  CONFIG_LPC_ICH=m
>  CONFIG_LPC_SCH=m
>  CONFIG_MAC_PARTITION=y
> diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
> index 6f15e3db9aa34..16d9d67fb217b 100644
> --- a/debian.master/config/s390x/config.common.s390x
> +++ b/debian.master/config/s390x/config.common.s390x
> @@ -161,7 +161,7 @@ CONFIG_KVM=y
>  # CONFIG_LIBNVDIMM is not set
>  # CONFIG_LLC2 is not set
>  # CONFIG_LOCK_DOWN_KERNEL is not set
> -CONFIG_LOG_BUF_SHIFT=17
> +CONFIG_LOG_BUF_SHIFT=18
>  # CONFIG_LPC_ICH is not set
>  # CONFIG_LPC_SCH is not set
>  # CONFIG_MAC_PARTITION is not set
>
diff mbox series

Patch

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 52084c16b6053..2f8ad2b79b131 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -9201,7 +9201,7 @@  CONFIG_CROSS_MEMORY_ATTACH                      policy<{'amd64': 'y', 'arm64': '
 CONFIG_USELIB                                   policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_AUDIT                                    policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_IKCONFIG                                 policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
-CONFIG_LOG_BUF_SHIFT                            policy<{'amd64': '18', 'arm64': '14', 'armhf': '17', 'i386': '17', 'ppc64el': '17', 's390x': '17'}>
+CONFIG_LOG_BUF_SHIFT                            policy<{'amd64': '18', 'arm64': '18', 'armhf': '17', 'i386': '17', 'ppc64el': '18', 's390x': '18'}>
 CONFIG_LOG_CPU_MAX_BUF_SHIFT                    policy<{'amd64': '12', 'arm64': '12', 'armhf': '12', 'i386': '12', 'ppc64el': '12', 's390x': '12'}>
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT                policy<{'amd64': '13', 'arm64': '13', 'armhf': '13', 'i386': '13', 'ppc64el': '13', 's390x': '13'}>
 CONFIG_NUMA_BALANCING                           policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 's390x': 'y'}>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index e5166527b1182..2ad17495592df 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -206,7 +206,7 @@  CONFIG_LDM_PARTITION=y
 CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m
 CONFIG_LOCK_DOWN_KERNEL=y
-CONFIG_LOG_BUF_SHIFT=14
+CONFIG_LOG_BUF_SHIFT=18
 CONFIG_LPC_ICH=m
 CONFIG_LPC_SCH=m
 CONFIG_MAC_PARTITION=y
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index e3d18746dbf0b..fed89c6e37536 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -195,7 +195,7 @@  CONFIG_LDM_PARTITION=y
 CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m
 # CONFIG_LOCK_DOWN_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=17
+CONFIG_LOG_BUF_SHIFT=18
 CONFIG_LPC_ICH=m
 CONFIG_LPC_SCH=m
 CONFIG_MAC_PARTITION=y
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 6f15e3db9aa34..16d9d67fb217b 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -161,7 +161,7 @@  CONFIG_KVM=y
 # CONFIG_LIBNVDIMM is not set
 # CONFIG_LLC2 is not set
 # CONFIG_LOCK_DOWN_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=17
+CONFIG_LOG_BUF_SHIFT=18
 # CONFIG_LPC_ICH is not set
 # CONFIG_LPC_SCH is not set
 # CONFIG_MAC_PARTITION is not set