From 35e77ed0d293f18853031c53e8e7783e5bc3703e Mon Sep 17 00:00:00 2001 From: Dan Streetman Date: Sun, 2 Jun 2019 16:10:00 +0200 Subject: [PATCH] UBUNTU: [Config] CONFIG_LOG_BUF_SHIFT=18 on all 64bit arches 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 Cc: Dimitri John Ledkov Acked-by: Kleber Sacilotto de Souza Acked-by: Stefan Bader [ kleber: fixed subject line. ] Signed-off-by: Kleber Sacilotto de Souza --- 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 ce6eb7e43b92..84c745fd71e8 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -9202,7 +9202,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 a9d728a86b22..fa85762fffe2 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -207,7 +207,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 725593551c1a..92c16ef4df7a 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -186,7 +186,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 6f15e3db9aa3..16d9d67fb217 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 -- 2.39.2