| Message ID | 20190602140955.10354-1-dan.streetman@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [C,SRU] CONFIG_LOG_BUF_SHIFT set to 14 is too low on arm64 | expand |
On 6/2/19 7:09 AM, 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> I think it's agreeable to be closer to the defaults here. Already in D/E. Ack'ing for X/B/C in one e-mail though the companion patches are separate. If it's easier for bookkeeping I can go ack the others individually. Acked-by: Connor Kuehl <connor.kuehl@canonical.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(-) > > diff --git a/debian.master/config/annotations b/debian.master/config/annotations > index 7e6b35a739b81..f4f8d60cde91a 100644 > --- a/debian.master/config/annotations > +++ b/debian.master/config/annotations > @@ -9463,7 +9463,7 @@ CONFIG_USELIB policy<{'amd64': 'y', 'arm64': ' > CONFIG_AUDIT policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> > CONFIG_CPU_ISOLATION 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 9e45389b8a81e..0a861940aebca 100644 > --- a/debian.master/config/arm64/config.common.arm64 > +++ b/debian.master/config/arm64/config.common.arm64 > @@ -169,7 +169,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 d117341f298ec..a74f28921a903 100644 > --- a/debian.master/config/ppc64el/config.common.ppc64el > +++ b/debian.master/config/ppc64el/config.common.ppc64el > @@ -165,7 +165,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 443da66f8f646..a97f9f26b3ea7 100644 > --- a/debian.master/config/s390x/config.common.s390x > +++ b/debian.master/config/s390x/config.common.s390x > @@ -136,7 +136,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 >
On 6/2/19 4:09 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> With the same comments I made on the patch for Bionic regarding the subject line: 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 7e6b35a739b81..f4f8d60cde91a 100644 > --- a/debian.master/config/annotations > +++ b/debian.master/config/annotations > @@ -9463,7 +9463,7 @@ CONFIG_USELIB policy<{'amd64': 'y', 'arm64': ' > CONFIG_AUDIT policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> > CONFIG_CPU_ISOLATION 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 9e45389b8a81e..0a861940aebca 100644 > --- a/debian.master/config/arm64/config.common.arm64 > +++ b/debian.master/config/arm64/config.common.arm64 > @@ -169,7 +169,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 d117341f298ec..a74f28921a903 100644 > --- a/debian.master/config/ppc64el/config.common.ppc64el > +++ b/debian.master/config/ppc64el/config.common.ppc64el > @@ -165,7 +165,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 443da66f8f646..a97f9f26b3ea7 100644 > --- a/debian.master/config/s390x/config.common.s390x > +++ b/debian.master/config/s390x/config.common.s390x > @@ -136,7 +136,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 >
On 6/2/19 4:09 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 cosmic/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 7e6b35a739b81..f4f8d60cde91a 100644 > --- a/debian.master/config/annotations > +++ b/debian.master/config/annotations > @@ -9463,7 +9463,7 @@ CONFIG_USELIB policy<{'amd64': 'y', 'arm64': ' > CONFIG_AUDIT policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> > CONFIG_CPU_ISOLATION 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 9e45389b8a81e..0a861940aebca 100644 > --- a/debian.master/config/arm64/config.common.arm64 > +++ b/debian.master/config/arm64/config.common.arm64 > @@ -169,7 +169,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 d117341f298ec..a74f28921a903 100644 > --- a/debian.master/config/ppc64el/config.common.ppc64el > +++ b/debian.master/config/ppc64el/config.common.ppc64el > @@ -165,7 +165,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 443da66f8f646..a97f9f26b3ea7 100644 > --- a/debian.master/config/s390x/config.common.s390x > +++ b/debian.master/config/s390x/config.common.s390x > @@ -136,7 +136,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 --git a/debian.master/config/annotations b/debian.master/config/annotations index 7e6b35a739b81..f4f8d60cde91a 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -9463,7 +9463,7 @@ CONFIG_USELIB policy<{'amd64': 'y', 'arm64': ' CONFIG_AUDIT policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_CPU_ISOLATION 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 9e45389b8a81e..0a861940aebca 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -169,7 +169,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 d117341f298ec..a74f28921a903 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -165,7 +165,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 443da66f8f646..a97f9f26b3ea7 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -136,7 +136,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