Kdump service starts too late, so early crashes will have no chance to get kdump kernel booting, this will cause crash information to be lost. It is necessary to add a dracut module in order to load crash kernel and initramfs as early as possible. You can provide "rd.early kdump" in grub commandline to enable, then the early kdump will load those files like the normal kdump, which is disabled by default.
For the normal kdump service, it can check whether the early kdump has loaded the crash kernel and initramfs. It has no conflict with the early kdump.
If you rebuild the new initramfs for early kdump, the new initramfs size will become large, because it will put the vmlinuz and kdump initramfs into the new initramfs.
In addition, early kdump doesn't support fadump.
Finally, we move some common functions from kdumpctl to kdump-lib.sh, the functions could be used in other modules, such as early kdump. It has no bad effect.
Some changes based the patch v3&v4: 1.dracut-early-kdump-module-setup.sh -Introduce some variables to parse parameters for kernel commandline and initrd. -It will use "dracut --add earlykdump --force" to rebuild the new initramfs for the early kdump. 2.early-kdump-howto.txt -update the usage about the early kdump. 3.kdump-lib.sh -add comment for some functions. -modify check_boot_dir() function. (*) 4.dracut-early-kdump.sh (*) -modify prepare_parameters() function and handle the case with a "KDUMP_KERNELVER" setting.
Lianbo Jiang (2): move some common functions from kdumpctl to kdump-lib.sh Add early kdump support in initramfs.
dracut-early-kdump-module-setup.sh | 42 +++++++ dracut-early-kdump.sh | 84 ++++++++++++++ early-kdump-howto.txt | 50 +++++++++ kdump-lib.sh | 217 +++++++++++++++++++++++++++++++++++++ kdumpctl | 206 +---------------------------------- kexec-tools.spec | 11 ++ 6 files changed, 407 insertions(+), 203 deletions(-) create mode 100755 dracut-early-kdump-module-setup.sh create mode 100755 dracut-early-kdump.sh create mode 100644 early-kdump-howto.txt
we move some common functions from kdumpctl to kdump-lib.sh, the functions could be used in other modules, such as early kdump. It has no bad effect.
Signed-off-by: Lianbo Jiang lijiang@redhat.com --- Some changes based the patch v3&v4: -1.kdump-lib.sh -add comment for some functions. -modify check_boot_dir() function.
kdump-lib.sh | 217 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ kdumpctl | 206 +------------------------------------------------------- 2 files changed, 220 insertions(+), 203 deletions(-)
diff --git a/kdump-lib.sh b/kdump-lib.sh index d981c4f..544a6ae 100755 --- a/kdump-lib.sh +++ b/kdump-lib.sh @@ -485,3 +485,220 @@ get_dracut_args_target() { echo $1 | grep "--mount" | sed "s/.*--mount .(.*)/\1/" | cut -d' ' -f1 } + +check_crash_mem_reserved() +{ + local mem_reserved + + mem_reserved=$(cat /sys/kernel/kexec_crash_size) + if [ $mem_reserved -eq 0 ]; then + echo "No memory reserved for crash kernel" + return 1 + fi + + return 0 +} + +check_kdump_feasibility() +{ + if [ ! -e /sys/kernel/kexec_crash_loaded ]; then + echo "Kdump is not supported on this kernel" + return 1 + fi + check_crash_mem_reserved + return $? +} + +check_current_kdump_status() +{ + if [ ! -f /sys/kernel/kexec_crash_loaded ];then + echo "Perhaps CONFIG_CRASH_DUMP is not enabled in kernel" + return 1 + fi + + rc=`cat /sys/kernel/kexec_crash_loaded` + if [ $rc == 1 ]; then + return 0 + else + return 1 + fi +} + +# remove_cmdline_param <kernel cmdline> <param1> [<param2>] ... [<paramN>] +# Remove a list of kernel parameters from a given kernel cmdline and print the result. +# For each "arg" in the removing params list, "arg" and "arg=xxx" will be removed if exists. +remove_cmdline_param() +{ + local cmdline=$1 + shift + + for arg in $@; do + cmdline=`echo $cmdline | \ + sed -e "s/\b$arg=[^ ]*//g" \ + -e "s/^$arg\b//g" \ + -e "s/[[:space:]]$arg\b//g" \ + -e "s/\s+/ /g"` + done + echo $cmdline +} + +# +# This function returns the "apicid" of the boot +# cpu (cpu 0) if present. +# +get_bootcpu_apicid() +{ + awk ' \ + BEGIN { CPU = "-1"; } \ + $1=="processor" && $2==":" { CPU = $NF; } \ + CPU=="0" && /^apicid/ { print $NF; } \ + ' \ + /proc/cpuinfo +} + +# +# append_cmdline <kernel cmdline> <parameter name> <parameter value> +# This function appends argument "$2=$3" to string ($1) if not already present. +# +append_cmdline() +{ + local cmdline=$1 + local newstr=${cmdline/$2/""} + + # unchanged str implies argument wasn't there + if [ "$cmdline" == "$newstr" ]; then + cmdline="${cmdline} ${2}=${3}" + fi + + echo $cmdline +} + +# This function check iomem and determines if we have more than +# 4GB of ram available. Returns 1 if we do, 0 if we dont +need_64bit_headers() +{ + return `tail -n 1 /proc/iomem | awk '{ split ($1, r, "-"); \ + print (strtonum("0x" r[2]) > strtonum("0xffffffff")); }'` +} + +# Check if secure boot is being enforced. +# +# Per Peter Jones, we need check efivar SecureBoot-$(the UUID) and +# SetupMode-$(the UUID), they are both 5 bytes binary data. The first four +# bytes are the attributes associated with the variable and can safely be +# ignored, the last bytes are one-byte true-or-false variables. If SecureBoot +# is 1 and SetupMode is 0, then secure boot is being enforced. +# +# Assume efivars is mounted at /sys/firmware/efi/efivars. +is_secure_boot_enforced() +{ + local secure_boot_file setup_mode_file + local secure_boot_byte setup_mode_byte + + secure_boot_file=$(find /sys/firmware/efi/efivars -name SecureBoot-* 2>/dev/null) + setup_mode_file=$(find /sys/firmware/efi/efivars -name SetupMode-* 2>/dev/null) + + if [ -f "$secure_boot_file" ] && [ -f "$setup_mode_file" ]; then + secure_boot_byte=$(hexdump -v -e '/1 "%d\ "' $secure_boot_file|cut -d' ' -f 5) + setup_mode_byte=$(hexdump -v -e '/1 "%d\ "' $setup_mode_file|cut -d' ' -f 5) + + if [ "$secure_boot_byte" = "1" ] && [ "$setup_mode_byte" = "0" ]; then + return 0 + fi + fi + + return 1 +} + +# +# prepare_kexec_args <kexec args> +# This function prepares kexec argument. +# +prepare_kexec_args() +{ + local kexec_args=$1 + local found_elf_args + + ARCH=`uname -m` + if [ "$ARCH" == "i686" -o "$ARCH" == "i386" ] + then + need_64bit_headers + if [ $? == 1 ] + then + found_elf_args=`echo $kexec_args | grep elf32-core-headers` + if [ -n "$found_elf_args" ] + then + echo -n "Warning: elf32-core-headers overrides correct elf64 setting" + echo + else + kexec_args="$kexec_args --elf64-core-headers" + fi + else + found_elf_args=`echo $kexec_args | grep elf64-core-headers` + if [ -z "$found_elf_args" ] + then + kexec_args="$kexec_args --elf32-core-headers" + fi + fi + fi + echo $kexec_args +} + +check_boot_dir() +{ + local kdump_bootdir=$1 + #If user specify a boot dir for kdump kernel, let's use it. Otherwise + #check whether it's a atomic host. If yes parse the subdirectory under + #/boot; If not just find it under /boot. + if [ -n "$kdump_bootdir" ]; then + echo "$kdump_bootdir" + return + fi + + if ! is_atomic || [ "$(uname -m)" = "s390x" ]; then + kdump_bootdir="/boot" + else + eval $(cat /proc/cmdline| grep "BOOT_IMAGE" | cut -d' ' -f1) + kdump_bootdir="/boot"$(dirname $BOOT_IMAGE) + fi + echo $kdump_bootdir +} + +# +# prepare_cmdline <commandline> <commandline remove> <commandline append> +# This function performs a series of edits on the command line. +# Store the final result in global $KDUMP_COMMANDLINE. +prepare_cmdline() +{ + local cmdline id + + if [ -z "$1" ]; then + cmdline=$(cat /proc/cmdline) + else + cmdline="$1" + fi + + # These params should always be removed + cmdline=$(remove_cmdline_param "$cmdline" crashkernel panic_on_warn) + # These params can be removed configurably + cmdline=$(remove_cmdline_param "$cmdline" "$2") + + # Always remove "root=X", as we now explicitly generate all kinds + # of dump target mount information including root fs. + # + # We do this before KDUMP_COMMANDLINE_APPEND, if one really cares + # about it(e.g. for debug purpose), then can pass "root=X" using + # KDUMP_COMMANDLINE_APPEND. + cmdline=$(remove_cmdline_param "$cmdline" root) + + # With the help of "--hostonly-cmdline", we can avoid some interitage. + cmdline=$(remove_cmdline_param "$cmdline" rd.lvm.lv rd.luks.uuid rd.dm.uuid rd.md.uuid fcoe) + + cmdline="${cmdline} $3" + + id=$(get_bootcpu_apicid) + if [ ! -z ${id} ] ; then + cmdline=$(append_cmdline "${cmdline}" disable_cpu_apicid ${id}) + fi + echo ${cmdline} +} diff --git a/kdumpctl b/kdumpctl index 4280e7e..afbe96e 100755 --- a/kdumpctl +++ b/kdumpctl @@ -62,93 +62,6 @@ determine_dump_mode() fi }
-# remove_cmdline_param <kernel cmdline> <param1> [<param2>] ... [<paramN>] -# Remove a list of kernel parameters from a given kernel cmdline and print the result. -# For each "arg" in the removing params list, "arg" and "arg=xxx" will be removed if exists. -remove_cmdline_param() -{ - local cmdline=$1 - shift - - for arg in $@; do - cmdline=`echo $cmdline | \ - sed -e "s/\b$arg=[^ ]*//g" \ - -e "s/^$arg\b//g" \ - -e "s/[[:space:]]$arg\b//g" \ - -e "s/\s+/ /g"` - done - echo $cmdline -} - -# -# This function returns the "apicid" of the boot -# cpu (cpu 0) if present. -# -get_bootcpu_apicid() -{ - awk ' \ - BEGIN { CPU = "-1"; } \ - $1=="processor" && $2==":" { CPU = $NF; } \ - CPU=="0" && /^apicid/ { print $NF; } \ - ' \ - /proc/cpuinfo -} - -# -# This function appends argument "$2=$3" to string ($1) if not already present. -# -append_cmdline() -{ - local cmdline=$1 - local newstr=${cmdline/$2/""} - - # unchanged str implies argument wasn't there - if [ "$cmdline" == "$newstr" ]; then - cmdline="${cmdline} ${2}=${3}" - fi - - echo $cmdline -} - -# This function performs a series of edits on the command line. -# Store the final result in global $KDUMP_COMMANDLINE. -prepare_cmdline() -{ - local cmdline id - - if [ -z "$KDUMP_COMMANDLINE" ]; then - cmdline=$(cat /proc/cmdline) - else - cmdline=${KDUMP_COMMANDLINE} - fi - - # These params should always be removed - cmdline=$(remove_cmdline_param "$cmdline" crashkernel panic_on_warn) - # These params can be removed configurably - cmdline=$(remove_cmdline_param "$cmdline" ${KDUMP_COMMANDLINE_REMOVE}) - - # Always remove "root=X", as we now explicitly generate all kinds - # of dump target mount information including root fs. - # - # We do this before KDUMP_COMMANDLINE_APPEND, if one really cares - # about it(e.g. for debug purpose), then can pass "root=X" using - # KDUMP_COMMANDLINE_APPEND. - cmdline=$(remove_cmdline_param "$cmdline" root) - - # With the help of "--hostonly-cmdline", we can avoid some interitage. - cmdline=$(remove_cmdline_param "$cmdline" rd.lvm.lv rd.luks.uuid rd.dm.uuid rd.md.uuid fcoe) - - cmdline="${cmdline} ${KDUMP_COMMANDLINE_APPEND}" - - id=$(get_bootcpu_apicid) - if [ ! -z ${id} ] ; then - cmdline=$(append_cmdline "${cmdline}" disable_cpu_apicid ${id}) - fi - - KDUMP_COMMANDLINE=$cmdline -} - - save_core() { coredir="/var/crash/`date +"%Y-%m-%d-%H:%M"`" @@ -361,21 +274,6 @@ get_pcs_cluster_modified_files() echo $modified_files }
-check_boot_dir() -{ - #If user specify a boot dir for kdump kernel, let's use it. Otherwise - #check whether it's a atomic host. If yes parse the subdirectory under - #/boot; If not just find it under /boot. - [ -n "$KDUMP_BOOTDIR" ] && return - - if ! is_atomic || [ "$(uname -m)" = "s390x" ]; then - KDUMP_BOOTDIR="/boot" - else - eval $(cat /proc/cmdline| grep "BOOT_IMAGE" | cut -d' ' -f1) - KDUMP_BOOTDIR="/boot"$(dirname $BOOT_IMAGE) - fi -} - setup_initrd() { DEFAULT_INITRD="${KDUMP_BOOTDIR}/initramfs-`uname -r`.img" @@ -596,7 +494,7 @@ check_rebuild() local _force_no_rebuild force_no_rebuild="0" local ret system_modified="0"
- check_boot_dir + KDUMP_BOOTDIR=$(check_boot_dir "${KDUMP_BOOTDIR}")
if [ -z "$KDUMP_KERNELVER" ]; then kdump_kver=`uname -r` @@ -686,44 +584,13 @@ check_rebuild() return $? }
-# This function check iomem and determines if we have more than -# 4GB of ram available. Returns 1 if we do, 0 if we dont -need_64bit_headers() -{ - return `tail -n 1 /proc/iomem | awk '{ split ($1, r, "-"); \ - print (strtonum("0x" r[2]) > strtonum("0xffffffff")); }'` -} - # Load the kdump kernel specified in /etc/sysconfig/kdump # If none is specified, try to load a kdump kernel with the same version # as the currently running kernel. load_kdump() { - ARCH=`uname -m` - if [ "$ARCH" == "i686" -o "$ARCH" == "i386" ] - then - - need_64bit_headers - if [ $? == 1 ] - then - FOUND_ELF_ARGS=`echo $KEXEC_ARGS | grep elf32-core-headers` - if [ -n "$FOUND_ELF_ARGS" ] - then - echo -n "Warning: elf32-core-headers overrides correct elf64 setting" - echo - else - KEXEC_ARGS="$KEXEC_ARGS --elf64-core-headers" - fi - else - FOUND_ELF_ARGS=`echo $KEXEC_ARGS | grep elf64-core-headers` - if [ -z "$FOUND_ELF_ARGS" ] - then - KEXEC_ARGS="$KEXEC_ARGS --elf32-core-headers" - fi - fi - fi - - prepare_cmdline + KEXEC_ARGS=$(prepare_kexec_args "${KEXEC_ARGS}") + KDUMP_COMMANDLINE=$(prepare_cmdline "${KDUMP_COMMANDLINE}" "${KDUMP_COMMANDLINE_REMOVE}" "${KDUMP_COMMANDLINE_APPEND}")
# For secureboot enabled machines, use new kexec file based syscall. # Old syscall will always fail as it does not have capability to @@ -850,21 +717,6 @@ check_current_fadump_status() return 1 }
-check_current_kdump_status() -{ - if [ ! -f /sys/kernel/kexec_crash_loaded ];then - echo "Perhaps CONFIG_CRASH_DUMP is not enabled in kernel" - return 1 - fi - - rc=`cat /sys/kernel/kexec_crash_loaded` - if [ $rc == 1 ]; then - return 0 - else - return 1 - fi -} - check_current_status() { if [ $DEFAULT_DUMP_MODE == "fadump" ]; then @@ -974,58 +826,6 @@ selinux_relabel() done }
-# Check if secure boot is being enforced. -# -# Per Peter Jones, we need check efivar SecureBoot-$(the UUID) and -# SetupMode-$(the UUID), they are both 5 bytes binary data. The first four -# bytes are the attributes associated with the variable and can safely be -# ignored, the last bytes are one-byte true-or-false variables. If SecureBoot -# is 1 and SetupMode is 0, then secure boot is being enforced. -# -# Assume efivars is mounted at /sys/firmware/efi/efivars. -is_secure_boot_enforced() -{ - local secure_boot_file setup_mode_file - local secure_boot_byte setup_mode_byte - - secure_boot_file=$(find /sys/firmware/efi/efivars -name SecureBoot-* 2>/dev/null) - setup_mode_file=$(find /sys/firmware/efi/efivars -name SetupMode-* 2>/dev/null) - - if [ -f "$secure_boot_file" ] && [ -f "$setup_mode_file" ]; then - secure_boot_byte=$(hexdump -v -e '/1 "%d\ "' $secure_boot_file|cut -d' ' -f 5) - setup_mode_byte=$(hexdump -v -e '/1 "%d\ "' $setup_mode_file|cut -d' ' -f 5) - - if [ "$secure_boot_byte" = "1" ] && [ "$setup_mode_byte" = "0" ]; then - return 0 - fi - fi - - return 1 -} - -check_crash_mem_reserved() -{ - local mem_reserved - - mem_reserved=$(cat /sys/kernel/kexec_crash_size) - if [ $mem_reserved -eq 0 ]; then - echo "No memory reserved for crash kernel" - return 1 - fi - - return 0 -} - -check_kdump_feasibility() -{ - if [ ! -e /sys/kernel/kexec_crash_loaded ]; then - echo "Kdump is not supported on this kernel" - return 1 - fi - check_crash_mem_reserved - return $? -} - check_fence_kdump_config() { local hostname=`hostname`
Hi Lianbo,
Thank you for the update! but I noticed that the early kdump initramfs with this patchset doesn't have several commands which are used in kdump-lib.sh. I'm sorry I could not comment about it at once..
I think that we can replace them with commands it already has (except for hexdump), but it might be safer to install them, because of code consistency and the less amount of changes.
On 5/1/2018 4:34 AM, Lianbo Jiang wrote:
we move some common functions from kdumpctl to kdump-lib.sh, the functions could be used in other modules, such as early kdump. It has no bad effect.
Signed-off-by: Lianbo Jiang lijiang@redhat.com
Some changes based the patch v3&v4: -1.kdump-lib.sh -add comment for some functions. -modify check_boot_dir() function.
kdump-lib.sh | 217 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ kdumpctl | 206 +------------------------------------------------------- 2 files changed, 220 insertions(+), 203 deletions(-)
diff --git a/kdump-lib.sh b/kdump-lib.sh index d981c4f..544a6ae 100755 --- a/kdump-lib.sh +++ b/kdump-lib.sh @@ -485,3 +485,220 @@ get_dracut_args_target() { echo $1 | grep "--mount" | sed "s/.*--mount .(.*)/\1/" | cut -d' ' -f1 }
+check_crash_mem_reserved() +{
local mem_reservedmem_reserved=$(cat /sys/kernel/kexec_crash_size)if [ $mem_reserved -eq 0 ]; thenecho "No memory reserved for crash kernel"return 1fireturn 0+}
+check_kdump_feasibility() +{
if [ ! -e /sys/kernel/kexec_crash_loaded ]; thenecho "Kdump is not supported on this kernel"return 1ficheck_crash_mem_reservedreturn $?+}
+check_current_kdump_status() +{
if [ ! -f /sys/kernel/kexec_crash_loaded ];thenecho "Perhaps CONFIG_CRASH_DUMP is not enabled in kernel"return 1firc=`cat /sys/kernel/kexec_crash_loaded`if [ $rc == 1 ]; thenreturn 0elsereturn 1fi+}
+# remove_cmdline_param <kernel cmdline> <param1> [<param2>] ... [<paramN>] +# Remove a list of kernel parameters from a given kernel cmdline and print the result. +# For each "arg" in the removing params list, "arg" and "arg=xxx" will be removed if exists. +remove_cmdline_param() +{
local cmdline=$1shiftfor arg in $@; docmdline=`echo $cmdline | \sed -e "s/\b$arg=[^ ]*//g" \-e "s/^$arg\b//g" \-e "s/[[:space:]]$arg\b//g" \-e "s/\s\+/ /g"`doneecho $cmdline+}
+# +# This function returns the "apicid" of the boot +# cpu (cpu 0) if present. +# +get_bootcpu_apicid() +{
- awk ' \
BEGIN { CPU = "-1"; } \$1=="processor" && $2==":" { CPU = $NF; } \CPU=="0" && /^apicid/ { print $NF; } \' \/proc/cpuinfo+}
+# +# append_cmdline <kernel cmdline> <parameter name> <parameter value> +# This function appends argument "$2=$3" to string ($1) if not already present. +# +append_cmdline() +{
local cmdline=$1local newstr=${cmdline/$2/""}# unchanged str implies argument wasn't thereif [ "$cmdline" == "$newstr" ]; thencmdline="${cmdline} ${2}=${3}"fiecho $cmdline+}
+# This function check iomem and determines if we have more than +# 4GB of ram available. Returns 1 if we do, 0 if we dont +need_64bit_headers() +{
return `tail -n 1 /proc/iomem | awk '{ split ($1, r, "-"); \print (strtonum("0x" r[2]) > strtonum("0xffffffff")); }'`
since it doesn't have "tail", I saw this on an i686 system:
dracut-cmdline[173]: /lib/kdump-lib.sh: line 593: tail: command not found
+}
+# Check if secure boot is being enforced. +# +# Per Peter Jones, we need check efivar SecureBoot-$(the UUID) and +# SetupMode-$(the UUID), they are both 5 bytes binary data. The first four +# bytes are the attributes associated with the variable and can safely be +# ignored, the last bytes are one-byte true-or-false variables. If SecureBoot +# is 1 and SetupMode is 0, then secure boot is being enforced. +# +# Assume efivars is mounted at /sys/firmware/efi/efivars. +is_secure_boot_enforced() +{
local secure_boot_file setup_mode_filelocal secure_boot_byte setup_mode_byte
secure_boot_file=$(find /sys/firmware/efi/efivars -name SecureBoot-* 2>/dev/null)setup_mode_file=$(find /sys/firmware/efi/efivars -name SetupMode-* 2>/dev/null)
same as above, it doesn't have "find".
if [ -f "$secure_boot_file" ] && [ -f "$setup_mode_file" ]; thensecure_boot_byte=$(hexdump -v -e '/1 "%d\ "' $secure_boot_file|cut -d' ' -f 5)setup_mode_byte=$(hexdump -v -e '/1 "%d\ "' $setup_mode_file|cut -d' ' -f 5)
same as above, it doesn't have "hexdump" and "cut".
if [ "$secure_boot_byte" = "1" ] && [ "$setup_mode_byte" = "0" ]; thenreturn 0fifireturn 1+}
+# +# prepare_kexec_args <kexec args> +# This function prepares kexec argument. +# +prepare_kexec_args() +{
local kexec_args=$1local found_elf_argsARCH=`uname -m`if [ "$ARCH" == "i686" -o "$ARCH" == "i386" ]then
need_64bit_headersif [ $? == 1 ]
lost an indent here?
BTW, without this patch, the kdump-lib.sh mostly has 4 spaces for an indent. I think it would be better to have the same style in a file if possible.
thenfound_elf_args=`echo $kexec_args | grep elf32-core-headers`if [ -n "$found_elf_args" ]thenecho -n "Warning: elf32-core-headers overrides correct elf64 setting"echoelsekexec_args="$kexec_args --elf64-core-headers"fielsefound_elf_args=`echo $kexec_args | grep elf64-core-headers`if [ -z "$found_elf_args" ]thenkexec_args="$kexec_args --elf32-core-headers"fififiecho $kexec_args+}
+check_boot_dir() +{
local kdump_bootdir=$1#If user specify a boot dir for kdump kernel, let's use it. Otherwise#check whether it's a atomic host. If yes parse the subdirectory under#/boot; If not just find it under /boot.if [ -n "$kdump_bootdir" ]; thenecho "$kdump_bootdir"returnfiif ! is_atomic || [ "$(uname -m)" = "s390x" ]; thenkdump_bootdir="/boot"else
eval $(cat /proc/cmdline| grep "BOOT_IMAGE" | cut -d' ' -f1)kdump_bootdir="/boot"$(dirname $BOOT_IMAGE)
also here, it doesn't have "cut" and "dirname".
As far as I've reviewed this, the above commands are missing in the initramfs on my test systems.
Thanks, Kazu
fiecho $kdump_bootdir+}
+# +# prepare_cmdline <commandline> <commandline remove> <commandline append> +# This function performs a series of edits on the command line. +# Store the final result in global $KDUMP_COMMANDLINE. +prepare_cmdline() +{
local cmdline idif [ -z "$1" ]; thencmdline=$(cat /proc/cmdline)elsecmdline="$1"fi# These params should always be removedcmdline=$(remove_cmdline_param "$cmdline" crashkernel panic_on_warn)# These params can be removed configurablycmdline=$(remove_cmdline_param "$cmdline" "$2")# Always remove "root=X", as we now explicitly generate all kinds# of dump target mount information including root fs.## We do this before KDUMP_COMMANDLINE_APPEND, if one really cares# about it(e.g. for debug purpose), then can pass "root=X" using# KDUMP_COMMANDLINE_APPEND.cmdline=$(remove_cmdline_param "$cmdline" root)# With the help of "--hostonly-cmdline", we can avoid some interitage.cmdline=$(remove_cmdline_param "$cmdline" rd.lvm.lv rd.luks.uuid rd.dm.uuid rd.md.uuid fcoe)cmdline="${cmdline} $3"id=$(get_bootcpu_apicid)if [ ! -z ${id} ] ; thencmdline=$(append_cmdline "${cmdline}" disable_cpu_apicid ${id})fiecho ${cmdline}+} diff --git a/kdumpctl b/kdumpctl index 4280e7e..afbe96e 100755 --- a/kdumpctl +++ b/kdumpctl @@ -62,93 +62,6 @@ determine_dump_mode() fi }
-# remove_cmdline_param <kernel cmdline> <param1> [<param2>] ... [<paramN>] -# Remove a list of kernel parameters from a given kernel cmdline and print the result. -# For each "arg" in the removing params list, "arg" and "arg=xxx" will be removed if exists. -remove_cmdline_param() -{
- local cmdline=$1
- shift
- for arg in $@; do
cmdline=`echo $cmdline | \sed -e "s/\b$arg=[^ ]*//g" \-e "s/^$arg\b//g" \-e "s/[[:space:]]$arg\b//g" \-e "s/\s\+/ /g"`- done
- echo $cmdline
-}
-# -# This function returns the "apicid" of the boot -# cpu (cpu 0) if present. -# -get_bootcpu_apicid() -{
- awk ' \
- BEGIN { CPU = "-1"; } \
- $1=="processor" && $2==":" { CPU = $NF; } \
- CPU=="0" && /^apicid/ { print $NF; } \
- ' \
- /proc/cpuinfo
-}
-# -# This function appends argument "$2=$3" to string ($1) if not already present. -# -append_cmdline() -{
- local cmdline=$1
- local newstr=${cmdline/$2/""}
- # unchanged str implies argument wasn't there
- if [ "$cmdline" == "$newstr" ]; then
cmdline="${cmdline} ${2}=${3}"- fi
- echo $cmdline
-}
-# This function performs a series of edits on the command line. -# Store the final result in global $KDUMP_COMMANDLINE. -prepare_cmdline() -{
- local cmdline id
- if [ -z "$KDUMP_COMMANDLINE" ]; then
cmdline=$(cat /proc/cmdline)- else
cmdline=${KDUMP_COMMANDLINE}- fi
- # These params should always be removed
- cmdline=$(remove_cmdline_param "$cmdline" crashkernel panic_on_warn)
- # These params can be removed configurably
- cmdline=$(remove_cmdline_param "$cmdline" ${KDUMP_COMMANDLINE_REMOVE})
- # Always remove "root=X", as we now explicitly generate all kinds
- # of dump target mount information including root fs.
- #
- # We do this before KDUMP_COMMANDLINE_APPEND, if one really cares
- # about it(e.g. for debug purpose), then can pass "root=X" using
- # KDUMP_COMMANDLINE_APPEND.
- cmdline=$(remove_cmdline_param "$cmdline" root)
- # With the help of "--hostonly-cmdline", we can avoid some interitage.
- cmdline=$(remove_cmdline_param "$cmdline" rd.lvm.lv rd.luks.uuid rd.dm.uuid rd.md.uuid fcoe)
- cmdline="${cmdline} ${KDUMP_COMMANDLINE_APPEND}"
- id=$(get_bootcpu_apicid)
- if [ ! -z ${id} ] ; then
cmdline=$(append_cmdline "${cmdline}" disable_cpu_apicid ${id})- fi
- KDUMP_COMMANDLINE=$cmdline
-}
save_core() { coredir="/var/crash/`date +"%Y-%m-%d-%H:%M"`" @@ -361,21 +274,6 @@ get_pcs_cluster_modified_files() echo $modified_files }
-check_boot_dir() -{
- #If user specify a boot dir for kdump kernel, let's use it. Otherwise
- #check whether it's a atomic host. If yes parse the subdirectory under
- #/boot; If not just find it under /boot.
- [ -n "$KDUMP_BOOTDIR" ] && return
- if ! is_atomic || [ "$(uname -m)" = "s390x" ]; then
KDUMP_BOOTDIR="/boot"- else
eval $(cat /proc/cmdline| grep "BOOT_IMAGE" | cut -d' ' -f1)KDUMP_BOOTDIR="/boot"$(dirname $BOOT_IMAGE)- fi
-}
setup_initrd() { DEFAULT_INITRD="${KDUMP_BOOTDIR}/initramfs-`uname -r`.img" @@ -596,7 +494,7 @@ check_rebuild() local _force_no_rebuild force_no_rebuild="0" local ret system_modified="0"
- check_boot_dir
KDUMP_BOOTDIR=$(check_boot_dir "${KDUMP_BOOTDIR}")
if [ -z "$KDUMP_KERNELVER" ]; then kdump_kver=`uname -r`
@@ -686,44 +584,13 @@ check_rebuild() return $? }
-# This function check iomem and determines if we have more than -# 4GB of ram available. Returns 1 if we do, 0 if we dont -need_64bit_headers() -{
- return `tail -n 1 /proc/iomem | awk '{ split ($1, r, "-"); \
- print (strtonum("0x" r[2]) > strtonum("0xffffffff")); }'`
-}
# Load the kdump kernel specified in /etc/sysconfig/kdump # If none is specified, try to load a kdump kernel with the same version # as the currently running kernel. load_kdump() {
- ARCH=`uname -m`
- if [ "$ARCH" == "i686" -o "$ARCH" == "i386" ]
- then
need_64bit_headersif [ $? == 1 ]thenFOUND_ELF_ARGS=`echo $KEXEC_ARGS | grep elf32-core-headers`if [ -n "$FOUND_ELF_ARGS" ]thenecho -n "Warning: elf32-core-headers overrides correct elf64 setting"echoelseKEXEC_ARGS="$KEXEC_ARGS --elf64-core-headers"fielseFOUND_ELF_ARGS=`echo $KEXEC_ARGS | grep elf64-core-headers`if [ -z "$FOUND_ELF_ARGS" ]thenKEXEC_ARGS="$KEXEC_ARGS --elf32-core-headers"fifi- fi
- prepare_cmdline
KEXEC_ARGS=$(prepare_kexec_args "${KEXEC_ARGS}")
KDUMP_COMMANDLINE=$(prepare_cmdline "${KDUMP_COMMANDLINE}" "${KDUMP_COMMANDLINE_REMOVE}" "${KDUMP_COMMANDLINE_APPEND}")
# For secureboot enabled machines, use new kexec file based syscall. # Old syscall will always fail as it does not have capability to
@@ -850,21 +717,6 @@ check_current_fadump_status() return 1 }
-check_current_kdump_status() -{
- if [ ! -f /sys/kernel/kexec_crash_loaded ];then
echo "Perhaps CONFIG_CRASH_DUMP is not enabled in kernel"return 1- fi
- rc=`cat /sys/kernel/kexec_crash_loaded`
- if [ $rc == 1 ]; then
return 0- else
return 1- fi
-}
check_current_status() { if [ $DEFAULT_DUMP_MODE == "fadump" ]; then @@ -974,58 +826,6 @@ selinux_relabel() done }
-# Check if secure boot is being enforced. -# -# Per Peter Jones, we need check efivar SecureBoot-$(the UUID) and -# SetupMode-$(the UUID), they are both 5 bytes binary data. The first four -# bytes are the attributes associated with the variable and can safely be -# ignored, the last bytes are one-byte true-or-false variables. If SecureBoot -# is 1 and SetupMode is 0, then secure boot is being enforced. -# -# Assume efivars is mounted at /sys/firmware/efi/efivars. -is_secure_boot_enforced() -{
- local secure_boot_file setup_mode_file
- local secure_boot_byte setup_mode_byte
- secure_boot_file=$(find /sys/firmware/efi/efivars -name SecureBoot-* 2>/dev/null)
- setup_mode_file=$(find /sys/firmware/efi/efivars -name SetupMode-* 2>/dev/null)
- if [ -f "$secure_boot_file" ] && [ -f "$setup_mode_file" ]; then
secure_boot_byte=$(hexdump -v -e '/1 "%d\ "' $secure_boot_file|cut -d' ' -f 5)setup_mode_byte=$(hexdump -v -e '/1 "%d\ "' $setup_mode_file|cut -d' ' -f 5)if [ "$secure_boot_byte" = "1" ] && [ "$setup_mode_byte" = "0" ]; thenreturn 0fi- fi
- return 1
-}
-check_crash_mem_reserved() -{
- local mem_reserved
- mem_reserved=$(cat /sys/kernel/kexec_crash_size)
- if [ $mem_reserved -eq 0 ]; then
echo "No memory reserved for crash kernel"return 1- fi
- return 0
-}
-check_kdump_feasibility() -{
- if [ ! -e /sys/kernel/kexec_crash_loaded ]; then
echo "Kdump is not supported on this kernel"return 1- fi
- check_crash_mem_reserved
- return $?
-}
check_fence_kdump_config() { local hostname=`hostname`
在 2018年05月04日 04:18, Kazuhito Hagio 写道:
Hi Lianbo,
Thank you for the update! but I noticed that the early kdump initramfs with this patchset doesn't have several commands which are used in kdump-lib.sh. I'm sorry I could not comment about it at once..
I think that we can replace them with commands it already has (except for hexdump), but it might be safer to install them, because of code consistency and the less amount of changes.
On 5/1/2018 4:34 AM, Lianbo Jiang wrote:
we move some common functions from kdumpctl to kdump-lib.sh, the functions could be used in other modules, such as early kdump. It has no bad effect.
Signed-off-by: Lianbo Jiang lijiang@redhat.com
Some changes based the patch v3&v4: -1.kdump-lib.sh -add comment for some functions. -modify check_boot_dir() function.
kdump-lib.sh | 217 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ kdumpctl | 206 +------------------------------------------------------- 2 files changed, 220 insertions(+), 203 deletions(-)
diff --git a/kdump-lib.sh b/kdump-lib.sh index d981c4f..544a6ae 100755 --- a/kdump-lib.sh +++ b/kdump-lib.sh @@ -485,3 +485,220 @@ get_dracut_args_target() { echo $1 | grep "--mount" | sed "s/.*--mount .(.*)/\1/" | cut -d' ' -f1 }
+check_crash_mem_reserved() +{
local mem_reservedmem_reserved=$(cat /sys/kernel/kexec_crash_size)if [ $mem_reserved -eq 0 ]; thenecho "No memory reserved for crash kernel"return 1fireturn 0+}
+check_kdump_feasibility() +{
if [ ! -e /sys/kernel/kexec_crash_loaded ]; thenecho "Kdump is not supported on this kernel"return 1ficheck_crash_mem_reservedreturn $?+}
+check_current_kdump_status() +{
if [ ! -f /sys/kernel/kexec_crash_loaded ];thenecho "Perhaps CONFIG_CRASH_DUMP is not enabled in kernel"return 1firc=`cat /sys/kernel/kexec_crash_loaded`if [ $rc == 1 ]; thenreturn 0elsereturn 1fi+}
+# remove_cmdline_param <kernel cmdline> <param1> [<param2>] ... [<paramN>] +# Remove a list of kernel parameters from a given kernel cmdline and print the result. +# For each "arg" in the removing params list, "arg" and "arg=xxx" will be removed if exists. +remove_cmdline_param() +{
local cmdline=$1shiftfor arg in $@; docmdline=`echo $cmdline | \sed -e "s/\b$arg=[^ ]*//g" \-e "s/^$arg\b//g" \-e "s/[[:space:]]$arg\b//g" \-e "s/\s\+/ /g"`doneecho $cmdline+}
+# +# This function returns the "apicid" of the boot +# cpu (cpu 0) if present. +# +get_bootcpu_apicid() +{
- awk ' \
BEGIN { CPU = "-1"; } \$1=="processor" && $2==":" { CPU = $NF; } \CPU=="0" && /^apicid/ { print $NF; } \' \/proc/cpuinfo+}
+# +# append_cmdline <kernel cmdline> <parameter name> <parameter value> +# This function appends argument "$2=$3" to string ($1) if not already present. +# +append_cmdline() +{
local cmdline=$1local newstr=${cmdline/$2/""}# unchanged str implies argument wasn't thereif [ "$cmdline" == "$newstr" ]; thencmdline="${cmdline} ${2}=${3}"fiecho $cmdline+}
+# This function check iomem and determines if we have more than +# 4GB of ram available. Returns 1 if we do, 0 if we dont +need_64bit_headers() +{
return `tail -n 1 /proc/iomem | awk '{ split ($1, r, "-"); \print (strtonum("0x" r[2]) > strtonum("0xffffffff")); }'`since it doesn't have "tail", I saw this on an i686 system:
dracut-cmdline[173]: /lib/kdump-lib.sh: line 593: tail: command not found
+}
+# Check if secure boot is being enforced. +# +# Per Peter Jones, we need check efivar SecureBoot-$(the UUID) and +# SetupMode-$(the UUID), they are both 5 bytes binary data. The first four +# bytes are the attributes associated with the variable and can safely be +# ignored, the last bytes are one-byte true-or-false variables. If SecureBoot +# is 1 and SetupMode is 0, then secure boot is being enforced. +# +# Assume efivars is mounted at /sys/firmware/efi/efivars. +is_secure_boot_enforced() +{
local secure_boot_file setup_mode_filelocal secure_boot_byte setup_mode_byte
secure_boot_file=$(find /sys/firmware/efi/efivars -name SecureBoot-* 2>/dev/null)setup_mode_file=$(find /sys/firmware/efi/efivars -name SetupMode-* 2>/dev/null)same as above, it doesn't have "find".
if [ -f "$secure_boot_file" ] && [ -f "$setup_mode_file" ]; thensecure_boot_byte=$(hexdump -v -e '/1 "%d\ "' $secure_boot_file|cut -d' ' -f 5)setup_mode_byte=$(hexdump -v -e '/1 "%d\ "' $setup_mode_file|cut -d' ' -f 5)same as above, it doesn't have "hexdump" and "cut".
if [ "$secure_boot_byte" = "1" ] && [ "$setup_mode_byte" = "0" ]; thenreturn 0fifireturn 1+}
+# +# prepare_kexec_args <kexec args> +# This function prepares kexec argument. +# +prepare_kexec_args() +{
local kexec_args=$1local found_elf_argsARCH=`uname -m`if [ "$ARCH" == "i686" -o "$ARCH" == "i386" ]then
need_64bit_headersif [ $? == 1 ]lost an indent here?
BTW, without this patch, the kdump-lib.sh mostly has 4 spaces for an indent. I think it would be better to have the same style in a file if possible.
thenfound_elf_args=`echo $kexec_args | grep elf32-core-headers`if [ -n "$found_elf_args" ]thenecho -n "Warning: elf32-core-headers overrides correct elf64 setting"echoelsekexec_args="$kexec_args --elf64-core-headers"fielsefound_elf_args=`echo $kexec_args | grep elf64-core-headers`if [ -z "$found_elf_args" ]thenkexec_args="$kexec_args --elf32-core-headers"fififiecho $kexec_args+}
+check_boot_dir() +{
local kdump_bootdir=$1#If user specify a boot dir for kdump kernel, let's use it. Otherwise#check whether it's a atomic host. If yes parse the subdirectory under#/boot; If not just find it under /boot.if [ -n "$kdump_bootdir" ]; thenecho "$kdump_bootdir"returnfiif ! is_atomic || [ "$(uname -m)" = "s390x" ]; thenkdump_bootdir="/boot"else
eval $(cat /proc/cmdline| grep "BOOT_IMAGE" | cut -d' ' -f1)kdump_bootdir="/boot"$(dirname $BOOT_IMAGE)also here, it doesn't have "cut" and "dirname".
As far as I've reviewed this, the above commands are missing in the initramfs on my test systems.
Thanks, Kazu I am glad that you help me review this patch. I will check the code style and fix the problem that some commands can not be found.
Thanks Lianbo
Thanks, Kazu
fiecho $kdump_bootdir+}
+# +# prepare_cmdline <commandline> <commandline remove> <commandline append> +# This function performs a series of edits on the command line. +# Store the final result in global $KDUMP_COMMANDLINE. +prepare_cmdline() +{
local cmdline idif [ -z "$1" ]; thencmdline=$(cat /proc/cmdline)elsecmdline="$1"fi# These params should always be removedcmdline=$(remove_cmdline_param "$cmdline" crashkernel panic_on_warn)# These params can be removed configurablycmdline=$(remove_cmdline_param "$cmdline" "$2")# Always remove "root=X", as we now explicitly generate all kinds# of dump target mount information including root fs.## We do this before KDUMP_COMMANDLINE_APPEND, if one really cares# about it(e.g. for debug purpose), then can pass "root=X" using# KDUMP_COMMANDLINE_APPEND.cmdline=$(remove_cmdline_param "$cmdline" root)# With the help of "--hostonly-cmdline", we can avoid some interitage.cmdline=$(remove_cmdline_param "$cmdline" rd.lvm.lv rd.luks.uuid rd.dm.uuid rd.md.uuid fcoe)cmdline="${cmdline} $3"id=$(get_bootcpu_apicid)if [ ! -z ${id} ] ; thencmdline=$(append_cmdline "${cmdline}" disable_cpu_apicid ${id})fiecho ${cmdline}+} diff --git a/kdumpctl b/kdumpctl index 4280e7e..afbe96e 100755 --- a/kdumpctl +++ b/kdumpctl @@ -62,93 +62,6 @@ determine_dump_mode() fi }
-# remove_cmdline_param <kernel cmdline> <param1> [<param2>] ... [<paramN>] -# Remove a list of kernel parameters from a given kernel cmdline and print the result. -# For each "arg" in the removing params list, "arg" and "arg=xxx" will be removed if exists. -remove_cmdline_param() -{
- local cmdline=$1
- shift
- for arg in $@; do
cmdline=`echo $cmdline | \sed -e "s/\b$arg=[^ ]*//g" \-e "s/^$arg\b//g" \-e "s/[[:space:]]$arg\b//g" \-e "s/\s\+/ /g"`- done
- echo $cmdline
-}
-# -# This function returns the "apicid" of the boot -# cpu (cpu 0) if present. -# -get_bootcpu_apicid() -{
- awk ' \
- BEGIN { CPU = "-1"; } \
- $1=="processor" && $2==":" { CPU = $NF; } \
- CPU=="0" && /^apicid/ { print $NF; } \
- ' \
- /proc/cpuinfo
-}
-# -# This function appends argument "$2=$3" to string ($1) if not already present. -# -append_cmdline() -{
- local cmdline=$1
- local newstr=${cmdline/$2/""}
- # unchanged str implies argument wasn't there
- if [ "$cmdline" == "$newstr" ]; then
cmdline="${cmdline} ${2}=${3}"- fi
- echo $cmdline
-}
-# This function performs a series of edits on the command line. -# Store the final result in global $KDUMP_COMMANDLINE. -prepare_cmdline() -{
- local cmdline id
- if [ -z "$KDUMP_COMMANDLINE" ]; then
cmdline=$(cat /proc/cmdline)- else
cmdline=${KDUMP_COMMANDLINE}- fi
- # These params should always be removed
- cmdline=$(remove_cmdline_param "$cmdline" crashkernel panic_on_warn)
- # These params can be removed configurably
- cmdline=$(remove_cmdline_param "$cmdline" ${KDUMP_COMMANDLINE_REMOVE})
- # Always remove "root=X", as we now explicitly generate all kinds
- # of dump target mount information including root fs.
- #
- # We do this before KDUMP_COMMANDLINE_APPEND, if one really cares
- # about it(e.g. for debug purpose), then can pass "root=X" using
- # KDUMP_COMMANDLINE_APPEND.
- cmdline=$(remove_cmdline_param "$cmdline" root)
- # With the help of "--hostonly-cmdline", we can avoid some interitage.
- cmdline=$(remove_cmdline_param "$cmdline" rd.lvm.lv rd.luks.uuid rd.dm.uuid rd.md.uuid fcoe)
- cmdline="${cmdline} ${KDUMP_COMMANDLINE_APPEND}"
- id=$(get_bootcpu_apicid)
- if [ ! -z ${id} ] ; then
cmdline=$(append_cmdline "${cmdline}" disable_cpu_apicid ${id})- fi
- KDUMP_COMMANDLINE=$cmdline
-}
save_core() { coredir="/var/crash/`date +"%Y-%m-%d-%H:%M"`" @@ -361,21 +274,6 @@ get_pcs_cluster_modified_files() echo $modified_files }
-check_boot_dir() -{
- #If user specify a boot dir for kdump kernel, let's use it. Otherwise
- #check whether it's a atomic host. If yes parse the subdirectory under
- #/boot; If not just find it under /boot.
- [ -n "$KDUMP_BOOTDIR" ] && return
- if ! is_atomic || [ "$(uname -m)" = "s390x" ]; then
KDUMP_BOOTDIR="/boot"- else
eval $(cat /proc/cmdline| grep "BOOT_IMAGE" | cut -d' ' -f1)KDUMP_BOOTDIR="/boot"$(dirname $BOOT_IMAGE)- fi
-}
setup_initrd() { DEFAULT_INITRD="${KDUMP_BOOTDIR}/initramfs-`uname -r`.img" @@ -596,7 +494,7 @@ check_rebuild() local _force_no_rebuild force_no_rebuild="0" local ret system_modified="0"
- check_boot_dir
KDUMP_BOOTDIR=$(check_boot_dir "${KDUMP_BOOTDIR}")
if [ -z "$KDUMP_KERNELVER" ]; then kdump_kver=`uname -r`
@@ -686,44 +584,13 @@ check_rebuild() return $? }
-# This function check iomem and determines if we have more than -# 4GB of ram available. Returns 1 if we do, 0 if we dont -need_64bit_headers() -{
- return `tail -n 1 /proc/iomem | awk '{ split ($1, r, "-"); \
- print (strtonum("0x" r[2]) > strtonum("0xffffffff")); }'`
-}
# Load the kdump kernel specified in /etc/sysconfig/kdump # If none is specified, try to load a kdump kernel with the same version # as the currently running kernel. load_kdump() {
- ARCH=`uname -m`
- if [ "$ARCH" == "i686" -o "$ARCH" == "i386" ]
- then
need_64bit_headersif [ $? == 1 ]thenFOUND_ELF_ARGS=`echo $KEXEC_ARGS | grep elf32-core-headers`if [ -n "$FOUND_ELF_ARGS" ]thenecho -n "Warning: elf32-core-headers overrides correct elf64 setting"echoelseKEXEC_ARGS="$KEXEC_ARGS --elf64-core-headers"fielseFOUND_ELF_ARGS=`echo $KEXEC_ARGS | grep elf64-core-headers`if [ -z "$FOUND_ELF_ARGS" ]thenKEXEC_ARGS="$KEXEC_ARGS --elf32-core-headers"fifi- fi
- prepare_cmdline
KEXEC_ARGS=$(prepare_kexec_args "${KEXEC_ARGS}")
KDUMP_COMMANDLINE=$(prepare_cmdline "${KDUMP_COMMANDLINE}" "${KDUMP_COMMANDLINE_REMOVE}" "${KDUMP_COMMANDLINE_APPEND}")
# For secureboot enabled machines, use new kexec file based syscall. # Old syscall will always fail as it does not have capability to
@@ -850,21 +717,6 @@ check_current_fadump_status() return 1 }
-check_current_kdump_status() -{
- if [ ! -f /sys/kernel/kexec_crash_loaded ];then
echo "Perhaps CONFIG_CRASH_DUMP is not enabled in kernel"return 1- fi
- rc=`cat /sys/kernel/kexec_crash_loaded`
- if [ $rc == 1 ]; then
return 0- else
return 1- fi
-}
check_current_status() { if [ $DEFAULT_DUMP_MODE == "fadump" ]; then @@ -974,58 +826,6 @@ selinux_relabel() done }
-# Check if secure boot is being enforced. -# -# Per Peter Jones, we need check efivar SecureBoot-$(the UUID) and -# SetupMode-$(the UUID), they are both 5 bytes binary data. The first four -# bytes are the attributes associated with the variable and can safely be -# ignored, the last bytes are one-byte true-or-false variables. If SecureBoot -# is 1 and SetupMode is 0, then secure boot is being enforced. -# -# Assume efivars is mounted at /sys/firmware/efi/efivars. -is_secure_boot_enforced() -{
- local secure_boot_file setup_mode_file
- local secure_boot_byte setup_mode_byte
- secure_boot_file=$(find /sys/firmware/efi/efivars -name SecureBoot-* 2>/dev/null)
- setup_mode_file=$(find /sys/firmware/efi/efivars -name SetupMode-* 2>/dev/null)
- if [ -f "$secure_boot_file" ] && [ -f "$setup_mode_file" ]; then
secure_boot_byte=$(hexdump -v -e '/1 "%d\ "' $secure_boot_file|cut -d' ' -f 5)setup_mode_byte=$(hexdump -v -e '/1 "%d\ "' $setup_mode_file|cut -d' ' -f 5)if [ "$secure_boot_byte" = "1" ] && [ "$setup_mode_byte" = "0" ]; thenreturn 0fi- fi
- return 1
-}
-check_crash_mem_reserved() -{
- local mem_reserved
- mem_reserved=$(cat /sys/kernel/kexec_crash_size)
- if [ $mem_reserved -eq 0 ]; then
echo "No memory reserved for crash kernel"return 1- fi
- return 0
-}
-check_kdump_feasibility() -{
- if [ ! -e /sys/kernel/kexec_crash_loaded ]; then
echo "Kdump is not supported on this kernel"return 1- fi
- check_crash_mem_reserved
- return $?
-}
check_fence_kdump_config() { local hostname=`hostname`
On 05/03/18 at 04:18pm, Kazuhito Hagio wrote:
Hi Lianbo,
Thank you for the update! but I noticed that the early kdump initramfs with this patchset doesn't have several commands which are used in kdump-lib.sh. I'm sorry I could not comment about it at once..
I think that we can replace them with commands it already has (except for hexdump), but it might be safer to install them, because of code consistency and the less amount of changes.
Kazu, good catch. I was curious why 'cut' is not in initramfs, but later I realized in kdump initramfs we have 'cut', but this earlydump module is for 1st kernel initramfs, so it is reasonable.
And installing missing commands is good because in 1st kernel we have no memory limitation like we have in kdump kernel.
Thanks Dave
Kdump service starts too late, so early crashes will have no chance to get kdump kernel booting, this will cause crash information to be lost. It is necessary to add a dracut module in order to load crash kernel and initramfs as early as possible. You can provide "rd.early kdump" in grub commandline to enable, then the early kdump will load those files like the normal kdump, which is disabled by default.
For the normal kdump service, it can check whether the early kdump has loaded the crash kernel and initramfs. It has no conflict with the early kdump.
If you rebuild the new initramfs for early kdump, the new initramfs size will become large, because it will put the vmlinuz and kdump initramfs into the new initramfs.
In addition, early kdump doesn't support fadump.
Signed-off-by: Lianbo Jiang lijiang@redhat.com --- Some changes based the patch v3&v4: 1.dracut-early-kdump-module-setup.sh -Introduce some variables to parse parameters for kernel commandline and initrd. -It will use "dracut --add earlykdump --force" to rebuild the new initramfs for the early kdump. 2.early-kdump-howto.txt -update the usage about the early kdump. 3.dracut-early-kdump.sh -modify prepare_parameters() function and handle the case with a "KDUMP_KERNELVER" setting.
dracut-early-kdump-module-setup.sh | 42 +++++++++++++++++++ dracut-early-kdump.sh | 84 ++++++++++++++++++++++++++++++++++++++ early-kdump-howto.txt | 50 +++++++++++++++++++++++ kexec-tools.spec | 11 +++++ 4 files changed, 187 insertions(+) create mode 100755 dracut-early-kdump-module-setup.sh create mode 100755 dracut-early-kdump.sh create mode 100644 early-kdump-howto.txt
diff --git a/dracut-early-kdump-module-setup.sh b/dracut-early-kdump-module-setup.sh new file mode 100755 index 0000000..5872305 --- /dev/null +++ b/dracut-early-kdump-module-setup.sh @@ -0,0 +1,42 @@ +#!/bin/bash + +. /etc/sysconfig/kdump +. /lib/kdump/kdump-lib.sh + +KDUMP_KERNEL="" +KDUMP_INITRD="" + +check() { + if [ ! -f /etc/sysconfig/kdump ] || [ ! -f /lib/kdump/kdump-lib.sh ]\ + || [ -n "${IN_KDUMP}" ] + then + return 1 + fi + return 255 +} + +depends() { + echo "base shutdown" + return 0 +} + +prepare_kernel_initrd() { + KDUMP_BOOTDIR=$(check_boot_dir "${KDUMP_BOOTDIR}") + if [ -z "$KDUMP_KERNELVER" ]; then + kdump_kver=`uname -r` + else + kdump_kver=$KDUMP_KERNELVER + fi + KDUMP_KERNEL="${KDUMP_BOOTDIR}/${KDUMP_IMG}-${kdump_kver}${KDUMP_IMG_EXT}" + KDUMP_INITRD="${KDUMP_BOOTDIR}/initramfs-${kdump_kver}kdump.img" +} + +install() { + inst_simple "/etc/sysconfig/kdump" "/etc/sysconfig/kdump" + inst_simple "/usr/sbin/kexec" "/usr/sbin/kexec" + inst_script "/lib/kdump/kdump-lib.sh" "/lib/kdump-lib.sh" + inst_hook cmdline 00 "$moddir/early-kdump.sh" + prepare_kernel_initrd + inst_simple "$KDUMP_KERNEL" + inst_simple "$KDUMP_INITRD" +} diff --git a/dracut-early-kdump.sh b/dracut-early-kdump.sh new file mode 100755 index 0000000..34a9909 --- /dev/null +++ b/dracut-early-kdump.sh @@ -0,0 +1,84 @@ +#! /bin/sh + +KEXEC=/sbin/kexec +standard_kexec_args="-p" + +EARLY_KDUMP_INITRD="" +EARLY_KDUMP_KERNEL="" +EARLY_KDUMP_CMDLINE="" +EARLY_KDUMP_KERNELVER="" +EARLY_KEXEC_ARGS="" + +. /etc/sysconfig/kdump +. /lib/dracut-lib.sh +. /lib/kdump-lib.sh + +prepare_parameters() +{ + EARLY_KDUMP_CMDLINE=$(prepare_cmdline "${KDUMP_COMMANDLINE}" "${KDUMP_COMMANDLINE_REMOVE}" "${KDUMP_COMMANDLINE_APPEND}") + KDUMP_BOOTDIR=$(check_boot_dir "${KDUMP_BOOTDIR}") + + #make early-kdump kernel string + if [ -z "$KDUMP_KERNELVER" ]; then + EARLY_KDUMP_KERNELVER=`uname -r` + else + EARLY_KDUMP_KERNELVER=$KDUMP_KERNELVER + fi + + EARLY_KDUMP_KERNEL="${KDUMP_BOOTDIR}/${KDUMP_IMG}-${EARLY_KDUMP_KERNELVER}${KDUMP_IMG_EXT}" + + #make early-kdump initrd string + EARLY_KDUMP_INITRD="${KDUMP_BOOTDIR}/initramfs-${EARLY_KDUMP_KERNELVER}kdump.img" +} + +early_kdump_load() +{ + check_kdump_feasibility + if [ $? -ne 0 ]; then + return 1 + fi + + if is_fadump_capable; then + echo "WARNING: early kdump doesn't support fadump." + return 1 + fi + + check_current_kdump_status + if [ $? == 0 ]; then + return 1 + fi + + prepare_parameters + + EARLY_KEXEC_ARGS=$(prepare_kexec_args "${KEXEC_ARGS}") + + if is_secure_boot_enforced; then + echo "Secure Boot is enabled. Using kexec file based syscall." + EARLY_KEXEC_ARGS="$EARLY_KEXEC_ARGS -s" + fi + + $KEXEC ${EARLY_KEXEC_ARGS} $standard_kexec_args \ + --command-line="$EARLY_KDUMP_CMDLINE" \ + --initrd=$EARLY_KDUMP_INITRD $EARLY_KDUMP_KERNEL + if [ $? == 0 ]; then + echo "kexec: loaded early-kdump kernel" + return 0 + else + echo "kexec: failed to load early-kdump kernel" + return 1 + fi +} + +set_early_kdump() +{ + if getargbool 0 rd.earlykdump; then + echo "early-kdump is enabled." + early_kdump_load + else + echo "early-kdump is disabled." + fi + + return 0 +} + +set_early_kdump diff --git a/early-kdump-howto.txt b/early-kdump-howto.txt new file mode 100644 index 0000000..07da8eb --- /dev/null +++ b/early-kdump-howto.txt @@ -0,0 +1,50 @@ +Early Kdump HOWTO + +Introduction + +Kdump service starts too late, so early crashes will have no chance to get +kdump kernel booting, this will cause crash information to be lost. It is +necessary to add a dracut module in order to load crash kernel and initramfs +as early as possible. You can provide "rd.earlykdump" in grub commandline +to enable, then the early kdump will load those files like the normal kdump, +which is disabled by default. + +For the normal kdump service, it can check whether the early kdump has loaded +the crash kernel and initramfs. It has no conflict with the early kdump. + +How to configure early kdump: + +We assume if you're reading this document, you should already have kexec-tools +installed. + +For early kdump, if you need to rebuild the initramfs, please manually execute +dracut command: + # dracut --add earlykdump --force + +By the way, if you rebuild the new initramfs for early kdump, the new initramfs +size will become large, because it will put the vmlinuz and kdump initramfs into +the new initramfs. + +Next up, we need to add "rd.earlykdump" to enable early kdump in grub. After +making said changes, reboot your system to take effect. Of course, if you want +to disable early kdump, you can simply remove "rd.earlykdump" from kernel boot +parameters in grub, and reboot system like above. + +Once the boot is completed, you can check the status of the early kdump support +on the command prompt: + + # journalctl -x|grep early-kdump + +Then, you will see some useful logs, for exapmle: + +1. if early kdump is successful. +Mar 09 09:57:56 localhost.localdomain dracut-cmdline[190]: early-kdump is enabled. +Mar 09 09:57:56 localhost.localdomain dracut-cmdline[190]: kexec: loaded early- +kdump kernel + +2. if early kdump is disabled. +Mar 09 10:02:47 localhost.localdomain dracut-cmdline[189]: early-kdump is disabled. + +Limitation + +At present, early kdump doesn't support fadump. diff --git a/kexec-tools.spec b/kexec-tools.spec index f04527c..303b971 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -29,6 +29,7 @@ Source24: kdump-lib-initramfs.sh Source25: kdump.sysconfig.ppc64le Source26: kdumpctl.8 Source27: live-image-kdump-howto.txt +Source28: early-kdump-howto.txt
####################################### # These are sources for mkdumpramfs @@ -42,6 +43,8 @@ Source104: dracut-kdump-emergency.service Source105: dracut-kdump-error-handler.service Source106: dracut-kdump-capture.service Source107: dracut-kdump-emergency.target +Source108: dracut-early-kdump.sh +Source109: dracut-early-kdump-module-setup.sh
Requires(post): systemd-units Requires(preun): systemd-units @@ -136,6 +139,7 @@ rm -f kexec-tools.spec.in cp %{SOURCE10} . cp %{SOURCE21} . cp %{SOURCE27} . +cp %{SOURCE28} .
make %ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64 @@ -194,6 +198,7 @@ make -C kdump-anaconda-addon install DESTDIR=$RPM_BUILD_ROOT %find_lang kdump-anaconda-addon
%define remove_dracut_prefix() %(echo -n %1|sed 's/.*dracut-//g') +%define remove_dracut_early_kdump_prefix() %(echo -n %1|sed 's/.*dracut-early-kdump-//g')
# deal with dracut modules mkdir -p -m755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase @@ -207,6 +212,11 @@ cp %{SOURCE106} $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpb cp %{SOURCE107} $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix %{SOURCE107}} chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix %{SOURCE100}} chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix %{SOURCE101}} +mkdir -p -m755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99earlykdump +cp %{SOURCE108} $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99earlykdump/%{remove_dracut_prefix %{SOURCE108}} +cp %{SOURCE109} $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99earlykdump/%{remove_dracut_early_kdump_prefix %{SOURCE109}} +chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99earlykdump/%{remove_dracut_prefix %{SOURCE108}} +chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99earlykdump/%{remove_dracut_early_kdump_prefix %{SOURCE109}}
%define dracutlibdir %{_prefix}/lib/dracut @@ -305,6 +315,7 @@ done %license COPYING %doc TODO %doc kexec-kdump-howto.txt +%doc early-kdump-howto.txt %doc kdump-in-cluster-environment.txt %doc live-image-kdump-howto.txt %ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64
On 5/1/2018 4:34 AM, Lianbo Jiang wrote:
Kdump service starts too late, so early crashes will have no chance to get kdump kernel booting, this will cause crash information to be lost. It is necessary to add a dracut module in order to load crash kernel and initramfs as early as possible. You can provide "rd.early kdump" in grub commandline to enable, then the early kdump will load those files like the normal kdump, which is disabled by default.
For the normal kdump service, it can check whether the early kdump has loaded the crash kernel and initramfs. It has no conflict with the early kdump.
If you rebuild the new initramfs for early kdump, the new initramfs size will become large, because it will put the vmlinuz and kdump initramfs into the new initramfs.
In addition, early kdump doesn't support fadump.
Signed-off-by: Lianbo Jiang lijiang@redhat.com
Some changes based the patch v3&v4: 1.dracut-early-kdump-module-setup.sh -Introduce some variables to parse parameters for kernel commandline and initrd. -It will use "dracut --add earlykdump --force" to rebuild the new initramfs for the early kdump. 2.early-kdump-howto.txt -update the usage about the early kdump. 3.dracut-early-kdump.sh -modify prepare_parameters() function and handle the case with a "KDUMP_KERNELVER" setting.
dracut-early-kdump-module-setup.sh | 42 +++++++++++++++++++ dracut-early-kdump.sh | 84 ++++++++++++++++++++++++++++++++++++++ early-kdump-howto.txt | 50 +++++++++++++++++++++++ kexec-tools.spec | 11 +++++ 4 files changed, 187 insertions(+) create mode 100755 dracut-early-kdump-module-setup.sh create mode 100755 dracut-early-kdump.sh create mode 100644 early-kdump-howto.txt
diff --git a/dracut-early-kdump-module-setup.sh b/dracut-early-kdump-module-setup.sh new file mode 100755 index 0000000..5872305 --- /dev/null +++ b/dracut-early-kdump-module-setup.sh @@ -0,0 +1,42 @@ +#!/bin/bash
+. /etc/sysconfig/kdump +. /lib/kdump/kdump-lib.sh
+KDUMP_KERNEL="" +KDUMP_INITRD=""
+check() {
- if [ ! -f /etc/sysconfig/kdump ] || [ ! -f /lib/kdump/kdump-lib.sh ]\
|| [ -n "${IN_KDUMP}" ]- then
return 1- fi
- return 255
+}
+depends() {
- echo "base shutdown"
- return 0
+}
+prepare_kernel_initrd() {
KDUMP_BOOTDIR=$(check_boot_dir "${KDUMP_BOOTDIR}")if [ -z "$KDUMP_KERNELVER" ]; thenkdump_kver=`uname -r`elsekdump_kver=$KDUMP_KERNELVERfiKDUMP_KERNEL="${KDUMP_BOOTDIR}/${KDUMP_IMG}-${kdump_kver}${KDUMP_IMG_EXT}"KDUMP_INITRD="${KDUMP_BOOTDIR}/initramfs-${kdump_kver}kdump.img"+}
There are 8-space indents only here in this file.
+install() {
- inst_simple "/etc/sysconfig/kdump" "/etc/sysconfig/kdump"
- inst_simple "/usr/sbin/kexec" "/usr/sbin/kexec"
I have not had any problem with this, but according to dracut and its modules, I think that it should be "inst" or "inst_multiple" instead of "inst_simple" for executables. Am I right?
And, there are the missing commands as I mentioned in another reply, so we can use the following? or a series of "inst".
inst_multiple kexec tail find hexdump cut dirname
Thanks a lot! Kazu
- inst_script "/lib/kdump/kdump-lib.sh" "/lib/kdump-lib.sh"
- inst_hook cmdline 00 "$moddir/early-kdump.sh"
- prepare_kernel_initrd
- inst_simple "$KDUMP_KERNEL"
- inst_simple "$KDUMP_INITRD"
+} diff --git a/dracut-early-kdump.sh b/dracut-early-kdump.sh new file mode 100755 index 0000000..34a9909 --- /dev/null +++ b/dracut-early-kdump.sh @@ -0,0 +1,84 @@ +#! /bin/sh
+KEXEC=/sbin/kexec +standard_kexec_args="-p"
+EARLY_KDUMP_INITRD="" +EARLY_KDUMP_KERNEL="" +EARLY_KDUMP_CMDLINE="" +EARLY_KDUMP_KERNELVER="" +EARLY_KEXEC_ARGS=""
+. /etc/sysconfig/kdump +. /lib/dracut-lib.sh +. /lib/kdump-lib.sh
+prepare_parameters() +{
- EARLY_KDUMP_CMDLINE=$(prepare_cmdline "${KDUMP_COMMANDLINE}" "${KDUMP_COMMANDLINE_REMOVE}" "${KDUMP_COMMANDLINE_APPEND}")
- KDUMP_BOOTDIR=$(check_boot_dir "${KDUMP_BOOTDIR}")
- #make early-kdump kernel string
- if [ -z "$KDUMP_KERNELVER" ]; then
EARLY_KDUMP_KERNELVER=`uname -r`- else
EARLY_KDUMP_KERNELVER=$KDUMP_KERNELVER- fi
- EARLY_KDUMP_KERNEL="${KDUMP_BOOTDIR}/${KDUMP_IMG}-${EARLY_KDUMP_KERNELVER}${KDUMP_IMG_EXT}"
- #make early-kdump initrd string
- EARLY_KDUMP_INITRD="${KDUMP_BOOTDIR}/initramfs-${EARLY_KDUMP_KERNELVER}kdump.img"
+}
+early_kdump_load() +{
- check_kdump_feasibility
- if [ $? -ne 0 ]; then
return 1- fi
- if is_fadump_capable; then
echo "WARNING: early kdump doesn't support fadump."return 1- fi
- check_current_kdump_status
- if [ $? == 0 ]; then
return 1- fi
- prepare_parameters
- EARLY_KEXEC_ARGS=$(prepare_kexec_args "${KEXEC_ARGS}")
- if is_secure_boot_enforced; then
echo "Secure Boot is enabled. Using kexec file based syscall."EARLY_KEXEC_ARGS="$EARLY_KEXEC_ARGS -s"- fi
- $KEXEC ${EARLY_KEXEC_ARGS} $standard_kexec_args \
--command-line="$EARLY_KDUMP_CMDLINE" \--initrd=$EARLY_KDUMP_INITRD $EARLY_KDUMP_KERNEL- if [ $? == 0 ]; then
echo "kexec: loaded early-kdump kernel"return 0- else
echo "kexec: failed to load early-kdump kernel"return 1- fi
+}
+set_early_kdump() +{
- if getargbool 0 rd.earlykdump; then
echo "early-kdump is enabled."early_kdump_load- else
echo "early-kdump is disabled."- fi
- return 0
+}
+set_early_kdump diff --git a/early-kdump-howto.txt b/early-kdump-howto.txt new file mode 100644 index 0000000..07da8eb --- /dev/null +++ b/early-kdump-howto.txt @@ -0,0 +1,50 @@ +Early Kdump HOWTO
+Introduction
+Kdump service starts too late, so early crashes will have no chance to get +kdump kernel booting, this will cause crash information to be lost. It is +necessary to add a dracut module in order to load crash kernel and initramfs +as early as possible. You can provide "rd.earlykdump" in grub commandline +to enable, then the early kdump will load those files like the normal kdump, +which is disabled by default.
+For the normal kdump service, it can check whether the early kdump has loaded +the crash kernel and initramfs. It has no conflict with the early kdump.
+How to configure early kdump:
+We assume if you're reading this document, you should already have kexec-tools +installed.
+For early kdump, if you need to rebuild the initramfs, please manually execute +dracut command:
- # dracut --add earlykdump --force
+By the way, if you rebuild the new initramfs for early kdump, the new initramfs +size will become large, because it will put the vmlinuz and kdump initramfs into +the new initramfs.
+Next up, we need to add "rd.earlykdump" to enable early kdump in grub. After +making said changes, reboot your system to take effect. Of course, if you want +to disable early kdump, you can simply remove "rd.earlykdump" from kernel boot +parameters in grub, and reboot system like above.
+Once the boot is completed, you can check the status of the early kdump support +on the command prompt:
- # journalctl -x|grep early-kdump
+Then, you will see some useful logs, for exapmle:
+1. if early kdump is successful. +Mar 09 09:57:56 localhost.localdomain dracut-cmdline[190]: early-kdump is enabled. +Mar 09 09:57:56 localhost.localdomain dracut-cmdline[190]: kexec: loaded early- +kdump kernel
+2. if early kdump is disabled. +Mar 09 10:02:47 localhost.localdomain dracut-cmdline[189]: early-kdump is disabled.
+Limitation
+At present, early kdump doesn't support fadump. diff --git a/kexec-tools.spec b/kexec-tools.spec index f04527c..303b971 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -29,6 +29,7 @@ Source24: kdump-lib-initramfs.sh Source25: kdump.sysconfig.ppc64le Source26: kdumpctl.8 Source27: live-image-kdump-howto.txt +Source28: early-kdump-howto.txt
####################################### # These are sources for mkdumpramfs @@ -42,6 +43,8 @@ Source104: dracut-kdump-emergency.service Source105: dracut-kdump-error-handler.service Source106: dracut-kdump-capture.service Source107: dracut-kdump-emergency.target +Source108: dracut-early-kdump.sh +Source109: dracut-early-kdump-module-setup.sh
Requires(post): systemd-units Requires(preun): systemd-units @@ -136,6 +139,7 @@ rm -f kexec-tools.spec.in cp %{SOURCE10} . cp %{SOURCE21} . cp %{SOURCE27} . +cp %{SOURCE28} .
make %ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64 @@ -194,6 +198,7 @@ make -C kdump-anaconda-addon install DESTDIR=$RPM_BUILD_ROOT %find_lang kdump-anaconda-addon
%define remove_dracut_prefix() %(echo -n %1|sed 's/.*dracut-//g') +%define remove_dracut_early_kdump_prefix() %(echo -n %1|sed 's/.*dracut-early-kdump-//g')
# deal with dracut modules mkdir -p -m755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase @@ -207,6 +212,11 @@ cp %{SOURCE106} $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpb cp %{SOURCE107} $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix %{SOURCE107}} chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix %{SOURCE100}} chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix %{SOURCE101}} +mkdir -p -m755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99earlykdump +cp %{SOURCE108} $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99earlykdump/%{remove_dracut_prefix %{SOURCE108}} +cp %{SOURCE109} $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99earlykdump/%{remove_dracut_early_kdump_prefix %{SOURCE109}} +chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99earlykdump/%{remove_dracut_prefix %{SOURCE108}} +chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99earlykdump/%{remove_dracut_early_kdump_prefix %{SOURCE109}}
%define dracutlibdir %{_prefix}/lib/dracut @@ -305,6 +315,7 @@ done %license COPYING %doc TODO %doc kexec-kdump-howto.txt +%doc early-kdump-howto.txt %doc kdump-in-cluster-environment.txt %doc live-image-kdump-howto.txt %ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64
在 2018年05月04日 04:25, Kazuhito Hagio 写道:
On 5/1/2018 4:34 AM, Lianbo Jiang wrote:
Kdump service starts too late, so early crashes will have no chance to get kdump kernel booting, this will cause crash information to be lost. It is necessary to add a dracut module in order to load crash kernel and initramfs as early as possible. You can provide "rd.early kdump" in grub commandline to enable, then the early kdump will load those files like the normal kdump, which is disabled by default.
For the normal kdump service, it can check whether the early kdump has loaded the crash kernel and initramfs. It has no conflict with the early kdump.
If you rebuild the new initramfs for early kdump, the new initramfs size will become large, because it will put the vmlinuz and kdump initramfs into the new initramfs.
In addition, early kdump doesn't support fadump.
Signed-off-by: Lianbo Jiang lijiang@redhat.com
Some changes based the patch v3&v4: 1.dracut-early-kdump-module-setup.sh -Introduce some variables to parse parameters for kernel commandline and initrd. -It will use "dracut --add earlykdump --force" to rebuild the new initramfs for the early kdump. 2.early-kdump-howto.txt -update the usage about the early kdump. 3.dracut-early-kdump.sh -modify prepare_parameters() function and handle the case with a "KDUMP_KERNELVER" setting.
dracut-early-kdump-module-setup.sh | 42 +++++++++++++++++++ dracut-early-kdump.sh | 84 ++++++++++++++++++++++++++++++++++++++ early-kdump-howto.txt | 50 +++++++++++++++++++++++ kexec-tools.spec | 11 +++++ 4 files changed, 187 insertions(+) create mode 100755 dracut-early-kdump-module-setup.sh create mode 100755 dracut-early-kdump.sh create mode 100644 early-kdump-howto.txt
diff --git a/dracut-early-kdump-module-setup.sh b/dracut-early-kdump-module-setup.sh new file mode 100755 index 0000000..5872305 --- /dev/null +++ b/dracut-early-kdump-module-setup.sh @@ -0,0 +1,42 @@ +#!/bin/bash
+. /etc/sysconfig/kdump +. /lib/kdump/kdump-lib.sh
+KDUMP_KERNEL="" +KDUMP_INITRD=""
+check() {
- if [ ! -f /etc/sysconfig/kdump ] || [ ! -f /lib/kdump/kdump-lib.sh ]\
|| [ -n "${IN_KDUMP}" ]- then
return 1- fi
- return 255
+}
+depends() {
- echo "base shutdown"
- return 0
+}
+prepare_kernel_initrd() {
KDUMP_BOOTDIR=$(check_boot_dir "${KDUMP_BOOTDIR}")if [ -z "$KDUMP_KERNELVER" ]; thenkdump_kver=`uname -r`elsekdump_kver=$KDUMP_KERNELVERfiKDUMP_KERNEL="${KDUMP_BOOTDIR}/${KDUMP_IMG}-${kdump_kver}${KDUMP_IMG_EXT}"KDUMP_INITRD="${KDUMP_BOOTDIR}/initramfs-${kdump_kver}kdump.img"+}
There are 8-space indents only here in this file.
+install() {
- inst_simple "/etc/sysconfig/kdump" "/etc/sysconfig/kdump"
- inst_simple "/usr/sbin/kexec" "/usr/sbin/kexec"
I have not had any problem with this, but according to dracut and its modules, I think that it should be "inst" or "inst_multiple" instead of "inst_simple" for executables. Am I right?
Thank you, Kazu. That is a good idea. Dracut has a series of function(inst_xxx) to handle different files, it is a very good way of programming. It will be improved in the next patch(V6).
Lianbo
And, there are the missing commands as I mentioned in another reply, so we can use the following? or a series of "inst".
inst_multiple kexec tail find hexdump cut dirname
It looks like that is a good solution for this issue.
Thanks. Lianbo
Thanks a lot! Kazu
- inst_script "/lib/kdump/kdump-lib.sh" "/lib/kdump-lib.sh"
- inst_hook cmdline 00 "$moddir/early-kdump.sh"
- prepare_kernel_initrd
- inst_simple "$KDUMP_KERNEL"
- inst_simple "$KDUMP_INITRD"
+} diff --git a/dracut-early-kdump.sh b/dracut-early-kdump.sh new file mode 100755 index 0000000..34a9909 --- /dev/null +++ b/dracut-early-kdump.sh @@ -0,0 +1,84 @@ +#! /bin/sh
+KEXEC=/sbin/kexec +standard_kexec_args="-p"
+EARLY_KDUMP_INITRD="" +EARLY_KDUMP_KERNEL="" +EARLY_KDUMP_CMDLINE="" +EARLY_KDUMP_KERNELVER="" +EARLY_KEXEC_ARGS=""
+. /etc/sysconfig/kdump +. /lib/dracut-lib.sh +. /lib/kdump-lib.sh
+prepare_parameters() +{
- EARLY_KDUMP_CMDLINE=$(prepare_cmdline "${KDUMP_COMMANDLINE}" "${KDUMP_COMMANDLINE_REMOVE}" "${KDUMP_COMMANDLINE_APPEND}")
- KDUMP_BOOTDIR=$(check_boot_dir "${KDUMP_BOOTDIR}")
- #make early-kdump kernel string
- if [ -z "$KDUMP_KERNELVER" ]; then
EARLY_KDUMP_KERNELVER=`uname -r`- else
EARLY_KDUMP_KERNELVER=$KDUMP_KERNELVER- fi
- EARLY_KDUMP_KERNEL="${KDUMP_BOOTDIR}/${KDUMP_IMG}-${EARLY_KDUMP_KERNELVER}${KDUMP_IMG_EXT}"
- #make early-kdump initrd string
- EARLY_KDUMP_INITRD="${KDUMP_BOOTDIR}/initramfs-${EARLY_KDUMP_KERNELVER}kdump.img"
+}
+early_kdump_load() +{
- check_kdump_feasibility
- if [ $? -ne 0 ]; then
return 1- fi
- if is_fadump_capable; then
echo "WARNING: early kdump doesn't support fadump."return 1- fi
- check_current_kdump_status
- if [ $? == 0 ]; then
return 1- fi
- prepare_parameters
- EARLY_KEXEC_ARGS=$(prepare_kexec_args "${KEXEC_ARGS}")
- if is_secure_boot_enforced; then
echo "Secure Boot is enabled. Using kexec file based syscall."EARLY_KEXEC_ARGS="$EARLY_KEXEC_ARGS -s"- fi
- $KEXEC ${EARLY_KEXEC_ARGS} $standard_kexec_args \
--command-line="$EARLY_KDUMP_CMDLINE" \--initrd=$EARLY_KDUMP_INITRD $EARLY_KDUMP_KERNEL- if [ $? == 0 ]; then
echo "kexec: loaded early-kdump kernel"return 0- else
echo "kexec: failed to load early-kdump kernel"return 1- fi
+}
+set_early_kdump() +{
- if getargbool 0 rd.earlykdump; then
echo "early-kdump is enabled."early_kdump_load- else
echo "early-kdump is disabled."- fi
- return 0
+}
+set_early_kdump diff --git a/early-kdump-howto.txt b/early-kdump-howto.txt new file mode 100644 index 0000000..07da8eb --- /dev/null +++ b/early-kdump-howto.txt @@ -0,0 +1,50 @@ +Early Kdump HOWTO
+Introduction
+Kdump service starts too late, so early crashes will have no chance to get +kdump kernel booting, this will cause crash information to be lost. It is +necessary to add a dracut module in order to load crash kernel and initramfs +as early as possible. You can provide "rd.earlykdump" in grub commandline +to enable, then the early kdump will load those files like the normal kdump, +which is disabled by default.
+For the normal kdump service, it can check whether the early kdump has loaded +the crash kernel and initramfs. It has no conflict with the early kdump.
+How to configure early kdump:
+We assume if you're reading this document, you should already have kexec-tools +installed.
+For early kdump, if you need to rebuild the initramfs, please manually execute +dracut command:
- # dracut --add earlykdump --force
+By the way, if you rebuild the new initramfs for early kdump, the new initramfs +size will become large, because it will put the vmlinuz and kdump initramfs into +the new initramfs.
+Next up, we need to add "rd.earlykdump" to enable early kdump in grub. After +making said changes, reboot your system to take effect. Of course, if you want +to disable early kdump, you can simply remove "rd.earlykdump" from kernel boot +parameters in grub, and reboot system like above.
+Once the boot is completed, you can check the status of the early kdump support +on the command prompt:
- # journalctl -x|grep early-kdump
+Then, you will see some useful logs, for exapmle:
+1. if early kdump is successful. +Mar 09 09:57:56 localhost.localdomain dracut-cmdline[190]: early-kdump is enabled. +Mar 09 09:57:56 localhost.localdomain dracut-cmdline[190]: kexec: loaded early- +kdump kernel
+2. if early kdump is disabled. +Mar 09 10:02:47 localhost.localdomain dracut-cmdline[189]: early-kdump is disabled.
+Limitation
+At present, early kdump doesn't support fadump. diff --git a/kexec-tools.spec b/kexec-tools.spec index f04527c..303b971 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -29,6 +29,7 @@ Source24: kdump-lib-initramfs.sh Source25: kdump.sysconfig.ppc64le Source26: kdumpctl.8 Source27: live-image-kdump-howto.txt +Source28: early-kdump-howto.txt
####################################### # These are sources for mkdumpramfs @@ -42,6 +43,8 @@ Source104: dracut-kdump-emergency.service Source105: dracut-kdump-error-handler.service Source106: dracut-kdump-capture.service Source107: dracut-kdump-emergency.target +Source108: dracut-early-kdump.sh +Source109: dracut-early-kdump-module-setup.sh
Requires(post): systemd-units Requires(preun): systemd-units @@ -136,6 +139,7 @@ rm -f kexec-tools.spec.in cp %{SOURCE10} . cp %{SOURCE21} . cp %{SOURCE27} . +cp %{SOURCE28} .
make %ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64 @@ -194,6 +198,7 @@ make -C kdump-anaconda-addon install DESTDIR=$RPM_BUILD_ROOT %find_lang kdump-anaconda-addon
%define remove_dracut_prefix() %(echo -n %1|sed 's/.*dracut-//g') +%define remove_dracut_early_kdump_prefix() %(echo -n %1|sed 's/.*dracut-early-kdump-//g')
# deal with dracut modules mkdir -p -m755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase @@ -207,6 +212,11 @@ cp %{SOURCE106} $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpb cp %{SOURCE107} $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix %{SOURCE107}} chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix %{SOURCE100}} chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix %{SOURCE101}} +mkdir -p -m755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99earlykdump +cp %{SOURCE108} $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99earlykdump/%{remove_dracut_prefix %{SOURCE108}} +cp %{SOURCE109} $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99earlykdump/%{remove_dracut_early_kdump_prefix %{SOURCE109}} +chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99earlykdump/%{remove_dracut_prefix %{SOURCE108}} +chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99earlykdump/%{remove_dracut_early_kdump_prefix %{SOURCE109}}
%define dracutlibdir %{_prefix}/lib/dracut @@ -305,6 +315,7 @@ done %license COPYING %doc TODO %doc kexec-kdump-howto.txt +%doc early-kdump-howto.txt %doc kdump-in-cluster-environment.txt %doc live-image-kdump-howto.txt %ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64
CC Kazuhito Hagio.
Thanks. Lianbo 在 2018年05月01日 16:34, Lianbo Jiang 写道:
Kdump service starts too late, so early crashes will have no chance to get kdump kernel booting, this will cause crash information to be lost. It is necessary to add a dracut module in order to load crash kernel and initramfs as early as possible. You can provide "rd.early kdump" in grub commandline to enable, then the early kdump will load those files like the normal kdump, which is disabled by default.
For the normal kdump service, it can check whether the early kdump has loaded the crash kernel and initramfs. It has no conflict with the early kdump.
If you rebuild the new initramfs for early kdump, the new initramfs size will become large, because it will put the vmlinuz and kdump initramfs into the new initramfs.
In addition, early kdump doesn't support fadump.
Finally, we move some common functions from kdumpctl to kdump-lib.sh, the functions could be used in other modules, such as early kdump. It has no bad effect.
Some changes based the patch v3&v4: 1.dracut-early-kdump-module-setup.sh -Introduce some variables to parse parameters for kernel commandline and initrd. -It will use "dracut --add earlykdump --force" to rebuild the new initramfs for the early kdump. 2.early-kdump-howto.txt -update the usage about the early kdump. 3.kdump-lib.sh -add comment for some functions. -modify check_boot_dir() function. (*) 4.dracut-early-kdump.sh (*) -modify prepare_parameters() function and handle the case with a "KDUMP_KERNELVER" setting.
Lianbo Jiang (2): move some common functions from kdumpctl to kdump-lib.sh Add early kdump support in initramfs.
dracut-early-kdump-module-setup.sh | 42 +++++++ dracut-early-kdump.sh | 84 ++++++++++++++ early-kdump-howto.txt | 50 +++++++++ kdump-lib.sh | 217 +++++++++++++++++++++++++++++++++++++ kdumpctl | 206 +---------------------------------- kexec-tools.spec | 11 ++ 6 files changed, 407 insertions(+), 203 deletions(-) create mode 100755 dracut-early-kdump-module-setup.sh create mode 100755 dracut-early-kdump.sh create mode 100644 early-kdump-howto.txt
-
Dave Young -
Kazuhito Hagio -
Lianbo Jiang -
lijiang