On Tue, Nov 10, 2020 at 11:31 AM Lianbo Jiang <lijiang(a)redhat.com> wrote:
Some unused log levels have been removed, and kdump has used the
different options to control the log levels for the first kernel
and the second kernel. Therefore, let's update the kdump sysconfig
accordingly.
Signed-off-by: Lianbo Jiang <lijiang(a)redhat.com>
---
kdump.sysconfig | 21 ++++++++++-----------
kdump.sysconfig.aarch64 | 21 ++++++++++-----------
kdump.sysconfig.i386 | 21 ++++++++++-----------
kdump.sysconfig.ppc64 | 21 ++++++++++-----------
kdump.sysconfig.ppc64le | 21 ++++++++++-----------
kdump.sysconfig.s390x | 21 ++++++++++-----------
kdump.sysconfig.x86_64 | 21 ++++++++++-----------
7 files changed, 70 insertions(+), 77 deletions(-)
diff --git a/kdump.sysconfig b/kdump.sysconfig
index 52a0b9249fe7..d6b54ef489c0 100644
--- a/kdump.sysconfig
+++ b/kdump.sysconfig
@@ -21,7 +21,7 @@ KDUMP_COMMANDLINE_REMOVE="hugepages hugepagesz slub_debug quiet
log_buf_len swio
# This variable lets us append arguments to the current kdump commandline
# after processed by KDUMP_COMMANDLINE_REMOVE
-KDUMP_COMMANDLINE_APPEND="irqpoll maxcpus=1 reset_devices novmcoredd"
+KDUMP_COMMANDLINE_APPEND="irqpoll maxcpus=1 reset_devices novmcoredd
rd.kdumploglvl=3"
# Any additional kexec arguments required. In most situations, this should
# be left empty
@@ -36,18 +36,17 @@ KEXEC_ARGS=""
#What is the image type used for kdump
KDUMP_IMG="vmlinuz"
-# Logging is controlled by following global variables:
+# Logging is controlled by following global variables in the first kernel:
# - @var kdump_stdloglvl - logging level to standard error (console output)
# - @var kdump_sysloglvl - logging level to syslog (by logger command)
# - @var kdump_kmsgloglvl - logging level to /dev/kmsg (only for boot-time)
-# If any of the variables is not set, this function set it to default:
-# - @var kdump_stdloglvl=4 (info)
-# - @var kdump_sysloglvl=4 (info)
-# - @var kdump_kmsgloglvl=0 (no logging)
#
-# Logging levels: fatal(1),error(2),warn(3),info(4),debug(5),trace(6)
+# In the second kernel, kdump will use the rd.kdumploglvl option to set the
+# log level in the above KDUMP_COMMANDLINE_APPEND.
+# - @var rd.kdumploglvl - logging level to syslog (by logger command)
#
-# For example: the following configurations indicate that kdump messages will be
printed
-# to console and journald for debugging case.
-# kdump_sysloglvl=5
-# kdump_stdloglvl=5
+# Logging levels: no logging(0), error(1),warn(2),info(3),debug(4)
+#
+kdump_stdloglvl=3
+kdump_sysloglvl=3
+kdump_kmsgloglvl=0
Hi Lianbo, I thin we can keep this kdump_xxxloglvl=x comment-outed, as
it's the default value, how do you think?
Also, how about we capitalize this config name now? All other kdump_x
configs are in capitalized format.
There ain't any users of this config yet, so we'd better change it
early if you agree on it.
diff --git a/kdump.sysconfig.aarch64 b/kdump.sysconfig.aarch64
index 1d75979df03e..f869e0e7e93d 100644
--- a/kdump.sysconfig.aarch64
+++ b/kdump.sysconfig.aarch64
@@ -21,7 +21,7 @@ KDUMP_COMMANDLINE_REMOVE="hugepages hugepagesz slub_debug quiet
log_buf_len swio
# This variable lets us append arguments to the current kdump commandline
# after processed by KDUMP_COMMANDLINE_REMOVE
-KDUMP_COMMANDLINE_APPEND="irqpoll nr_cpus=1 reset_devices cgroup_disable=memory
udev.children-max=2 panic=10 swiotlb=noforce novmcoredd"
+KDUMP_COMMANDLINE_APPEND="irqpoll nr_cpus=1 reset_devices cgroup_disable=memory
udev.children-max=2 panic=10 swiotlb=noforce novmcoredd rd.kdumploglvl=3"
# Any additional kexec arguments required. In most situations, this should
# be left empty
@@ -36,18 +36,17 @@ KEXEC_ARGS=""
#What is the image type used for kdump
KDUMP_IMG="vmlinuz"
-# Logging is controlled by following global variables:
+# Logging is controlled by following global variables in the first kernel:
# - @var kdump_stdloglvl - logging level to standard error (console output)
# - @var kdump_sysloglvl - logging level to syslog (by logger command)
# - @var kdump_kmsgloglvl - logging level to /dev/kmsg (only for boot-time)
-# If any of the variables is not set, this function set it to default:
-# - @var kdump_stdloglvl=4 (info)
-# - @var kdump_sysloglvl=4 (info)
-# - @var kdump_kmsgloglvl=0 (no logging)
#
-# Logging levels: fatal(1),error(2),warn(3),info(4),debug(5),trace(6)
+# In the second kernel, kdump will use the rd.kdumploglvl option to set the
+# log level in the above KDUMP_COMMANDLINE_APPEND.
+# - @var rd.kdumploglvl - logging level to syslog (by logger command)
#
-# For example: the following configurations indicate that kdump messages will be
printed
-# to console and journald for debugging case.
-# kdump_sysloglvl=5
-# kdump_stdloglvl=5
+# Logging levels: no logging(0), error(1),warn(2),info(3),debug(4)
+#
+kdump_stdloglvl=3
+kdump_sysloglvl=3
+kdump_kmsgloglvl=0
diff --git a/kdump.sysconfig.i386 b/kdump.sysconfig.i386
index 2eb9705e32e9..da37cd90d8a0 100644
--- a/kdump.sysconfig.i386
+++ b/kdump.sysconfig.i386
@@ -21,7 +21,7 @@ KDUMP_COMMANDLINE_REMOVE="hugepages hugepagesz slub_debug quiet
log_buf_len swio
# This variable lets us append arguments to the current kdump commandline
# after processed by KDUMP_COMMANDLINE_REMOVE
-KDUMP_COMMANDLINE_APPEND="irqpoll nr_cpus=1 reset_devices numa=off
udev.children-max=2 panic=10 transparent_hugepage=never novmcoredd"
+KDUMP_COMMANDLINE_APPEND="irqpoll nr_cpus=1 reset_devices numa=off
udev.children-max=2 panic=10 transparent_hugepage=never novmcoredd rd.kdumploglvl=3"
# Any additional kexec arguments required. In most situations, this should
# be left empty
@@ -39,18 +39,17 @@ KDUMP_IMG="vmlinuz"
#What is the images extension. Relocatable kernels don't have one
KDUMP_IMG_EXT=""
-# Logging is controlled by following global variables:
+# Logging is controlled by following global variables in the first kernel:
# - @var kdump_stdloglvl - logging level to standard error (console output)
# - @var kdump_sysloglvl - logging level to syslog (by logger command)
# - @var kdump_kmsgloglvl - logging level to /dev/kmsg (only for boot-time)
-# If any of the variables is not set, this function set it to default:
-# - @var kdump_stdloglvl=4 (info)
-# - @var kdump_sysloglvl=4 (info)
-# - @var kdump_kmsgloglvl=0 (no logging)
#
-# Logging levels: fatal(1),error(2),warn(3),info(4),debug(5),trace(6)
+# In the second kernel, kdump will use the rd.kdumploglvl option to set the
+# log level in the above KDUMP_COMMANDLINE_APPEND.
+# - @var rd.kdumploglvl - logging level to syslog (by logger command)
#
-# For example: the following configurations indicate that kdump messages will be
printed
-# to console and journald for debugging case.
-# kdump_sysloglvl=5
-# kdump_stdloglvl=5
+# Logging levels: no logging(0), error(1),warn(2),info(3),debug(4)
+#
+kdump_stdloglvl=3
+kdump_sysloglvl=3
+kdump_kmsgloglvl=0
diff --git a/kdump.sysconfig.ppc64 b/kdump.sysconfig.ppc64
index 24279ff34211..2c91dcd56461 100644
--- a/kdump.sysconfig.ppc64
+++ b/kdump.sysconfig.ppc64
@@ -21,7 +21,7 @@ KDUMP_COMMANDLINE_REMOVE="hugepages hugepagesz slub_debug quiet
log_buf_len swio
# This variable lets us append arguments to the current kdump commandline
# after processed by KDUMP_COMMANDLINE_REMOVE
-KDUMP_COMMANDLINE_APPEND="irqpoll maxcpus=1 noirqdistrib reset_devices
cgroup_disable=memory numa=off udev.children-max=2 ehea.use_mcs=0 panic=10
kvm_cma_resv_ratio=0 transparent_hugepage=never novmcoredd"
+KDUMP_COMMANDLINE_APPEND="irqpoll maxcpus=1 noirqdistrib reset_devices
cgroup_disable=memory numa=off udev.children-max=2 ehea.use_mcs=0 panic=10
kvm_cma_resv_ratio=0 transparent_hugepage=never novmcoredd rd.kdumploglvl=3"
# Any additional kexec arguments required. In most situations, this should
# be left empty
@@ -41,18 +41,17 @@ KDUMP_IMG_EXT=""
#Specify the action after failure
-# Logging is controlled by following global variables:
+# Logging is controlled by following global variables in the first kernel:
# - @var kdump_stdloglvl - logging level to standard error (console output)
# - @var kdump_sysloglvl - logging level to syslog (by logger command)
# - @var kdump_kmsgloglvl - logging level to /dev/kmsg (only for boot-time)
-# If any of the variables is not set, this function set it to default:
-# - @var kdump_stdloglvl=4 (info)
-# - @var kdump_sysloglvl=4 (info)
-# - @var kdump_kmsgloglvl=0 (no logging)
#
-# Logging levels: fatal(1),error(2),warn(3),info(4),debug(5),trace(6)
+# In the second kernel, kdump will use the rd.kdumploglvl option to set the
+# log level in the above KDUMP_COMMANDLINE_APPEND.
+# - @var rd.kdumploglvl - logging level to syslog (by logger command)
#
-# For example: the following configurations indicate that kdump messages will be
printed
-# to console and journald for debugging case.
-# kdump_sysloglvl=5
-# kdump_stdloglvl=5
+# Logging levels: no logging(0), error(1),warn(2),info(3),debug(4)
+#
+kdump_stdloglvl=3
+kdump_sysloglvl=3
+kdump_kmsgloglvl=0
diff --git a/kdump.sysconfig.ppc64le b/kdump.sysconfig.ppc64le
index 24279ff34211..2c91dcd56461 100644
--- a/kdump.sysconfig.ppc64le
+++ b/kdump.sysconfig.ppc64le
@@ -21,7 +21,7 @@ KDUMP_COMMANDLINE_REMOVE="hugepages hugepagesz slub_debug quiet
log_buf_len swio
# This variable lets us append arguments to the current kdump commandline
# after processed by KDUMP_COMMANDLINE_REMOVE
-KDUMP_COMMANDLINE_APPEND="irqpoll maxcpus=1 noirqdistrib reset_devices
cgroup_disable=memory numa=off udev.children-max=2 ehea.use_mcs=0 panic=10
kvm_cma_resv_ratio=0 transparent_hugepage=never novmcoredd"
+KDUMP_COMMANDLINE_APPEND="irqpoll maxcpus=1 noirqdistrib reset_devices
cgroup_disable=memory numa=off udev.children-max=2 ehea.use_mcs=0 panic=10
kvm_cma_resv_ratio=0 transparent_hugepage=never novmcoredd rd.kdumploglvl=3"
# Any additional kexec arguments required. In most situations, this should
# be left empty
@@ -41,18 +41,17 @@ KDUMP_IMG_EXT=""
#Specify the action after failure
-# Logging is controlled by following global variables:
+# Logging is controlled by following global variables in the first kernel:
# - @var kdump_stdloglvl - logging level to standard error (console output)
# - @var kdump_sysloglvl - logging level to syslog (by logger command)
# - @var kdump_kmsgloglvl - logging level to /dev/kmsg (only for boot-time)
-# If any of the variables is not set, this function set it to default:
-# - @var kdump_stdloglvl=4 (info)
-# - @var kdump_sysloglvl=4 (info)
-# - @var kdump_kmsgloglvl=0 (no logging)
#
-# Logging levels: fatal(1),error(2),warn(3),info(4),debug(5),trace(6)
+# In the second kernel, kdump will use the rd.kdumploglvl option to set the
+# log level in the above KDUMP_COMMANDLINE_APPEND.
+# - @var rd.kdumploglvl - logging level to syslog (by logger command)
#
-# For example: the following configurations indicate that kdump messages will be
printed
-# to console and journald for debugging case.
-# kdump_sysloglvl=5
-# kdump_stdloglvl=5
+# Logging levels: no logging(0), error(1),warn(2),info(3),debug(4)
+#
+kdump_stdloglvl=3
+kdump_sysloglvl=3
+kdump_kmsgloglvl=0
diff --git a/kdump.sysconfig.s390x b/kdump.sysconfig.s390x
index 5e1cb5a7ad89..add43dbc8c34 100644
--- a/kdump.sysconfig.s390x
+++ b/kdump.sysconfig.s390x
@@ -21,7 +21,7 @@ KDUMP_COMMANDLINE_REMOVE="hugepages hugepagesz slub_debug quiet
log_buf_len swio
# This variable lets us append arguments to the current kdump commandline
# after processed by KDUMP_COMMANDLINE_REMOVE
-KDUMP_COMMANDLINE_APPEND="nr_cpus=1 cgroup_disable=memory numa=off
udev.children-max=2 panic=10 transparent_hugepage=never novmcoredd"
+KDUMP_COMMANDLINE_APPEND="nr_cpus=1 cgroup_disable=memory numa=off
udev.children-max=2 panic=10 transparent_hugepage=never novmcoredd rd.kdumploglvl=3"
# Any additional /sbin/mkdumprd arguments required.
MKDUMPRD_ARGS=""
@@ -42,18 +42,17 @@ KDUMP_IMG="vmlinuz"
#What is the images extension. Relocatable kernels don't have one
KDUMP_IMG_EXT=""
-# Logging is controlled by following global variables:
+# Logging is controlled by following global variables in the first kernel:
# - @var kdump_stdloglvl - logging level to standard error (console output)
# - @var kdump_sysloglvl - logging level to syslog (by logger command)
# - @var kdump_kmsgloglvl - logging level to /dev/kmsg (only for boot-time)
-# If any of the variables is not set, this function set it to default:
-# - @var kdump_stdloglvl=4 (info)
-# - @var kdump_sysloglvl=4 (info)
-# - @var kdump_kmsgloglvl=0 (no logging)
#
-# Logging levels: fatal(1),error(2),warn(3),info(4),debug(5),trace(6)
+# In the second kernel, kdump will use the rd.kdumploglvl option to set the
+# log level in the above KDUMP_COMMANDLINE_APPEND.
+# - @var rd.kdumploglvl - logging level to syslog (by logger command)
#
-# For example: the following configurations indicate that kdump messages will be
printed
-# to console and journald for debugging case.
-# kdump_sysloglvl=5
-# kdump_stdloglvl=5
+# Logging levels: no logging(0), error(1),warn(2),info(3),debug(4)
+#
+kdump_stdloglvl=3
+kdump_sysloglvl=3
+kdump_kmsgloglvl=0
diff --git a/kdump.sysconfig.x86_64 b/kdump.sysconfig.x86_64
index eb1c53824241..fb0da9f33cb7 100644
--- a/kdump.sysconfig.x86_64
+++ b/kdump.sysconfig.x86_64
@@ -21,7 +21,7 @@ KDUMP_COMMANDLINE_REMOVE="hugepages hugepagesz slub_debug quiet
log_buf_len swio
# This variable lets us append arguments to the current kdump commandline
# after processed by KDUMP_COMMANDLINE_REMOVE
-KDUMP_COMMANDLINE_APPEND="irqpoll nr_cpus=1 reset_devices cgroup_disable=memory
mce=off numa=off udev.children-max=2 panic=10 acpi_no_memhotplug
transparent_hugepage=never nokaslr hest_disable novmcoredd"
+KDUMP_COMMANDLINE_APPEND="irqpoll nr_cpus=1 reset_devices cgroup_disable=memory
mce=off numa=off udev.children-max=2 panic=10 acpi_no_memhotplug
transparent_hugepage=never nokaslr hest_disable novmcoredd rd.kdumploglvl=3"
# Any additional kexec arguments required. In most situations, this should
# be left empty
@@ -39,18 +39,17 @@ KDUMP_IMG="vmlinuz"
#What is the images extension. Relocatable kernels don't have one
KDUMP_IMG_EXT=""
-# Logging is controlled by following global variables:
+# Logging is controlled by following global variables in the first kernel:
# - @var kdump_stdloglvl - logging level to standard error (console output)
# - @var kdump_sysloglvl - logging level to syslog (by logger command)
# - @var kdump_kmsgloglvl - logging level to /dev/kmsg (only for boot-time)
-# If any of the variables is not set, this function set it to default:
-# - @var kdump_stdloglvl=4 (info)
-# - @var kdump_sysloglvl=4 (info)
-# - @var kdump_kmsgloglvl=0 (no logging)
#
-# Logging levels: fatal(1),error(2),warn(3),info(4),debug(5),trace(6)
+# In the second kernel, kdump will use the rd.kdumploglvl option to set the
+# log level in the above KDUMP_COMMANDLINE_APPEND.
+# - @var rd.kdumploglvl - logging level to syslog (by logger command)
#
-# For example: the following configurations indicate that kdump messages will be
printed
-# to console and journald for debugging case.
-# kdump_sysloglvl=5
-# kdump_stdloglvl=5
+# Logging levels: no logging(0), error(1),warn(2),info(3),debug(4)
+#
+kdump_stdloglvl=3
+kdump_sysloglvl=3
+kdump_kmsgloglvl=0
--
2.17.1
--
Best Regards,
Kairui Song