March 2014 - kexec - Fedora mailing-lists

Question: is there any automated way of building rpm package?
by HATAYAMA Daisuke 04 Jun '15

04 Jun '15

Hello, Is there any automated way of building rpm package? That is, installing files such eppic, kexec-tools-po, makedumpfile and kexec-tools with expected file names necessary for installation, place them proper file path location and then execute rpmbuild command. I first found out there's no Makefile and INSTALL file, and then I tried preparing them manually in an ad-hoc way, but faced build failure several times and gave up. -- Thanks. HATAYAMA, Daisuke

2 2

[PATCH] dracut-module-setup.sh: recognize the IPADDR[0-3] in ifcfg-xx
by Baoquan He 12 May '14

12 May '14

User complained they set static ip address in ifcfg-xx with IPADDR0, but that ip address is not set successfully. That's because the IPADDRn can not be recognized by dracut-module-setup.sh. Even though in initscript, ifup-eth can recognize IPADDDR[0-255], and if 2 IPADDRxx missed the latter will be skipped, that's enough to only respect IPADDR[0-3]. Signed-off-by: Baoquan He <bhe(a)redhat.com> --- dracut-module-setup.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh index bdadf7c..738d304 100755 --- a/dracut-module-setup.sh +++ b/dracut-module-setup.sh @@ -70,11 +70,18 @@ kdump_setup_dns() { #checking /etc/sysconfig/network-scripts/ifcfg-$1, #if it use static ip echo it, or echo null kdump_static_ip() { + local _ipaddr + . /etc/sysconfig/network-scripts/ifcfg-$1 - if [ -n "$IPADDR" ]; then + _ipaddr=${IPADDR:-$IPADDR0} + _ipaddr=${_ipaddr:-$IPADDR1} + _ipaddr=${_ipaddr:-$IPADDR2} + _ipaddr=${_ipaddr:-$IPADDR3} + + if [ -n "$_ipaddr" ]; then [ -z "$NETMASK" -a -n "$PREFIX" ] && \ - NETMASK=$(ipcalc -m $IPADDR/$PREFIX | cut -d'=' -f2) - echo -n "${IPADDR}::${GATEWAY}:${NETMASK}::" + NETMASK=$(ipcalc -m $_ipaddr/$PREFIX | cut -d'=' -f2) + echo -n "${_ipaddr}::${GATEWAY}:${NETMASK}::" fi } -- 1.8.5.3

2 4

[PATCH] Add some missing variables to default sysconfig and kdumpctl
by Dave Young 04 May '14

04 May '14

When I testing arm kdump, the kdump start failed with several missing variables Copy them from x86 sysconfig to general sysconfig so at least user can set the right value in sysconfig Also It's better to add them to the beggining of kdumpctl and initilize them as nul, later sourcing sysconfig will overwite them. Signed-off-by: Dave Young <dyoung(a)redhat.com> --- kdump.sysconfig | 9 +++++++++ kdumpctl | 3 +++ 2 files changed, 12 insertions(+) --- kexec-tools.orig/kdump.sysconfig +++ kexec-tools/kdump.sysconfig @@ -24,3 +24,12 @@ KDUMP_COMMANDLINE_APPEND="irqpoll maxcpu # Example: # KEXEC_ARGS="--elf32-core-headers" KEXEC_ARGS="" + +#Where to find the boot image +KDUMP_BOOTDIR="/boot" + +#What is the image type used for kdump +KDUMP_IMG="" + +#What is the images extension. Relocatable kernels don't have one +KDUMP_IMG_EXT="" --- kexec-tools.orig/kdumpctl +++ kexec-tools/kdumpctl @@ -9,6 +9,9 @@ MKDUMPRD="/sbin/mkdumprd -f" SAVE_PATH=/var/crash SSH_KEY_LOCATION="/root/.ssh/kdump_id_rsa" DUMP_TARGET="" +KDUMP_BOOTDIR="" +KDUMP_IMG="" +KDUMP_IMG_EXT="" . /lib/kdump/kdump-lib.sh

2 1

[PATCH v3 0/8] kdump: Modify kdump init script to support firmware-assisted dump
by Hari Bathini 29 Apr '14

29 Apr '14

This patch set implements firmware-assisted dump support for kdump service. Firmware-assisted dump support depends on existing kdump infrastructure (kdump scripts) present in userland to save dump to the disk. Though existing kdump script will work seemlessly, it still needs to modified to make it aware of presense of firmware- assisted dump feature during service start and stop. These changes are tested successfully on a power box with fedora19. Changes in v3: 1. Split few functions for readability. 2. Added a cleanup patch to remove unnecessay "function" keyword. --- Hari Bathini (8): kdump: Modify status routine to check for firmware-assisted dump kdump: Modify kdump script to start the firmware assisted dump. kdump: Modify kdump script to stop firmware assisted dump kdump: Take a backup of original default initrd before rebuilding. kdump: Rebuild default initrd for firmware assisted dump kdump: Get rid of "function" keyword from all functions kdump: Check for /proc/vmcore existence before capturing the vmcore. kdump: Add firmware-assisted dump howto document dracut-kdump.sh | 3 fadump-howto.txt | 428 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ kdumpctl | 308 +++++++++++++++++++++++++++++++++------ 3 files changed, 691 insertions(+), 48 deletions(-) create mode 100644 fadump-howto.txt -- - Hari

4 18

[Patch v5 1/6] introduce several basic utility function
by Baoquan He 12 Apr '14

12 Apr '14

These utility function will be shared by several files, they are all operation related to mount stuff. Meantime define DEFAULT_PATH="/var/crash". Signed-off-by: Baoquan He <bhe(a)redhat.com> Acked-by: Vivek Goyal <vgoyal(a)redhat.com> --- kdump-lib.sh | 21 +++++++++++++++++++++ mkdumprd | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/kdump-lib.sh b/kdump-lib.sh index de32650..bf57a91 100755 --- a/kdump-lib.sh +++ b/kdump-lib.sh @@ -3,6 +3,7 @@ # Kdump common variables and functions # +DEFAULT_PATH="/var/crash/" FENCE_KDUMP_CONFIG="/etc/sysconfig/fence_kdump" FENCE_KDUMP_SEND="/usr/libexec/fence_kdump_send" FENCE_KDUMP_NODES="/etc/fence_kdump_nodes" @@ -75,3 +76,23 @@ get_root_fs_device() return } +get_mntpoint_from_path() +{ + echo $(df $1 | tail -1 | awk '{print $NF}') +} + +get_target_from_path() +{ + echo $(df $1 | tail -1 | awk '{print $1}') +} + +get_fs_type_from_target() +{ + echo $(findmnt -k -f -n -r -o FSTYPE $1) +} + +get_mntpoint_from_target() +{ + echo $(findmnt -k -f -n -r -o TARGET $1) +} + diff --git a/mkdumprd b/mkdumprd index 84f1e18..3849866 100644 --- a/mkdumprd +++ b/mkdumprd @@ -12,7 +12,7 @@ export IN_KDUMP=1 conf_file="/etc/kdump.conf" SSH_KEY_LOCATION="/root/.ssh/kdump_id_rsa" SAVE_PATH=$(grep ^path $conf_file| cut -d' ' -f2) -[ -z "$SAVE_PATH" ] && SAVE_PATH="/var/crash" +[ -z "$SAVE_PATH" ] && SAVE_PATH=$DEFAULT_PATH extra_modules="" dracut_args=("--hostonly" "-o" "plymouth dash resume") OVERRIDE_RESETTABLE=0 -- 1.8.5.3

5 23

[RFC][PATCH] Add --split support for dump on filesystem
by HATAYAMA Daisuke 11 Apr '14

11 Apr '14

Hello, This is an RFC patch intended to first review basic design of --split option support. This version automatically appends --split option if more than 1 cpu is available on kdump 2nd kernel. I guess someone propably doesn't like the situation that multiple vmcores are generated implicitly without any explicit user operation. So, I'd like comments on this design first. Another idea is to introduce a new directive to specify the number of vmcores into which we split /proc/vmcore, and then we append --split option if and only if the directive is specified with the value more than 1 cpu. >From e6afa242829768ee0b9e58637444acf3fed4b442 Mon Sep 17 00:00:00 2001 From: HATAYAMA Daisuke <d.hatayama(a)jp.fujitsu.com> Date: Tue, 25 Mar 2014 17:09:42 +0900 Subject: [PATCH] Add --split support for dump on filesystem This commit implement makedumpfile --split option support, allowing filtering and compression in paralell. In this design, --split option is automatically appended if more than 1 cpu is available. Also, the number of generated dump files are automatically decided to the number of online cpus. To support --split option for dump on network, it's necessary to add new feature in makedumpfile to make it possible to specify --split option and -F option at the same time. This is going to be done separately. Signed-off-by: HATAYAMA Daisuke <d.hatayama(a)jp.fujitsu.com> --- dracut-kdump.sh | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dracut-kdump.sh b/dracut-kdump.sh index d9e65ac..76494ab 100755 --- a/dracut-kdump.sh +++ b/dracut-kdump.sh @@ -88,6 +88,8 @@ dump_fs() { local _dev=$(findmnt -k -f -n -r -o SOURCE $1) local _mp=$(findmnt -k -f -n -r -o TARGET $1) + local _savedir="$_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR" + local _nr_cpus=$(grep processor /proc/cpuinfo | wc -l) echo "kdump: dump target is $_dev" @@ -100,16 +102,23 @@ dump_fs() # Remove -F in makedumpfile case. We don't want a flat format dump here. [[ $CORE_COLLECTOR = *makedumpfile* ]] && CORE_COLLECTOR=`echo $CORE_COLLECTOR | sed -e "s/-F//g"` - echo "kdump: saving to $_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR/" + echo "kdump: saving to $_savedir" mount -o remount,rw $_mp || return 1 - mkdir -p $_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR || return 1 + mkdir -p $_savedir || return 1 - save_vmcore_dmesg_fs ${DMESG_COLLECTOR} "$_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR/" + save_vmcore_dmesg_fs ${DMESG_COLLECTOR} "$_savedir" echo "kdump: saving vmcore" - $CORE_COLLECTOR /proc/vmcore $_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR/vmcore-incomplete || return 1 - mv $_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR/vmcore-incomplete $_mp/$KDUMP_PATH/$HOST_IP-$DATEDIR/vmcore + if [[ $CORE_COLLECTOR = *makedumpfile* && $_nr_cpus > 1 ]] ; then + $CORE_COLLECTOR --split /proc/vmcore $(seq -s " " -f "$_savedir/vmcore-incomplete-%g" $_nr_cpus) || return 1 + for i in $(seq $_nr_cpus); do + mv $_savedir/vmcore-incomplete-$i $_savedir/vmcore-$i + done + else + $CORE_COLLECTOR /proc/vmcore $_savedir/vmcore-incomplete || return 1 + mv $_savedir/vmcore-incomplete $_savedir/vmcore + fi sync echo "kdump: saving vmcore complete" -- 1.8.5.3

2 11

[PATCH] README: Add a README file
by Vivek Goyal 01 Apr '14

01 Apr '14

Add a README file which explains what's the process for kexec-tools patch inclusion and where one should post patches for review. This should help with removing some confusion. Signed-off-by: Vivek Goyal <vgoyal(a)redhat.com> --- README | 12 ++++++++++++ 1 file changed, 12 insertions(+) Index: kexec-tools-fedora/README =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ kexec-tools-fedora/README 2014-03-27 14:44:38.210938613 -0400 @@ -0,0 +1,12 @@ +Adding a patch to kexec-tools +============================= +There is a mailing list kexec(a)lists.fedoraproject.org where all the dicussion +related to fedora kexec-tools happen. All the patches are posted there for +inclusion and committed to kexec-tools after review. + +So if you want your patches to be included in fedora kexec-tools package, +post these to kexec(a)lists.fedoraproject.org. + +One can subscribe to list and browse through archives here. + +https://admin.fedoraproject.org/mailman/listinfo/kexec

4 6

[PATCH 1/6] fence_kdump for generic clusters v3: Rename FENCE_KDUMP_CONFIG to FENCE_KDUMP_CONFIG_FILE
by mperina＠redhat.com 01 Apr '14

01 Apr '14

Bug-Url: https://bugzilla.redhat.com/1079821 Signed-off-by: Martin Perina <mperina(a)redhat.com> --- dracut-kdump.sh | 4 ++-- dracut-module-setup.sh | 2 +- kdump-lib.sh | 2 +- kdumpctl | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dracut-kdump.sh b/dracut-kdump.sh index d9e65ac..06e41bc 100755 --- a/dracut-kdump.sh +++ b/dracut-kdump.sh @@ -292,8 +292,8 @@ fence_kdump_notify() local nodes if [ -f $FENCE_KDUMP_NODES ]; then - if [ -f $FENCE_KDUMP_CONFIG ]; then - . $FENCE_KDUMP_CONFIG + if [ -f $FENCE_KDUMP_CONFIG_FILE ]; then + . $FENCE_KDUMP_CONFIG_FILE fi read nodes < $FENCE_KDUMP_NODES diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh index bdadf7c..cd60cf1 100755 --- a/dracut-module-setup.sh +++ b/dracut-module-setup.sh @@ -444,7 +444,7 @@ kdump_check_fence_kdump () { echo "$nodes" > ${initdir}/$FENCE_KDUMP_NODES dracut_install $FENCE_KDUMP_SEND - dracut_install -o $FENCE_KDUMP_CONFIG + dracut_install -o $FENCE_KDUMP_CONFIG_FILE } # Install a random seed used to feed /dev/urandom diff --git a/kdump-lib.sh b/kdump-lib.sh index 384f7b4..db0615f 100755 --- a/kdump-lib.sh +++ b/kdump-lib.sh @@ -3,7 +3,7 @@ # Kdump common variables and functions # -FENCE_KDUMP_CONFIG="/etc/sysconfig/fence_kdump" +FENCE_KDUMP_CONFIG_FILE="/etc/sysconfig/fence_kdump" FENCE_KDUMP_SEND="/usr/libexec/fence_kdump_send" FENCE_KDUMP_NODES="/etc/fence_kdump_nodes" diff --git a/kdumpctl b/kdumpctl index 8d5498a..24fb988 100755 --- a/kdumpctl +++ b/kdumpctl @@ -249,8 +249,8 @@ function check_rebuild() EXTRA_BINS="$EXTRA_BINS $CHECK_FILES" files="$KDUMP_CONFIG_FILE $kdump_kernel $EXTRA_BINS" - if [ -f $FENCE_KDUMP_CONFIG ]; then - files="$files $FENCE_KDUMP_CONFIG" + if [ -f $FENCE_KDUMP_CONFIG_FILE ]; then + files="$files $FENCE_KDUMP_CONFIG_FILE" fi check_exist "$files" && check_executable "$EXTRA_BINS" -- 1.8.3.1

3 21

[Patch v4 1/6] introduce several basic utility function
by Baoquan He 31 Mar '14

31 Mar '14

These utility function will be shared by several files, they are all operation related to mount stuff. Meantime define DEFAULT_PATH="/var/crash". Signed-off-by: Baoquan He <bhe(a)redhat.com> Acked-by: Vivek Goyal <vgoyal(a)redhat.com> --- kdump-lib.sh | 21 +++++++++++++++++++++ mkdumprd | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/kdump-lib.sh b/kdump-lib.sh index 384f7b4..fdcde83 100755 --- a/kdump-lib.sh +++ b/kdump-lib.sh @@ -3,6 +3,7 @@ # Kdump common variables and functions # +DEFAULT_PATH="/var/crash/" FENCE_KDUMP_CONFIG="/etc/sysconfig/fence_kdump" FENCE_KDUMP_SEND="/usr/libexec/fence_kdump_send" FENCE_KDUMP_NODES="/etc/fence_kdump_nodes" @@ -61,3 +62,23 @@ get_root_fs_device() return } +get_mntpoint_from_path() +{ + echo $(df $1 | tail -1 | awk '{print $NF}') +} + +get_target_from_path() +{ + echo $(df $1 | tail -1 | awk '{print $1}') +} + +get_fs_type_from_target() +{ + echo $(findmnt -k -f -n -r -o FSTYPE $1) +} + +get_mntpoint_from_target() +{ + echo $(findmnt -k -f -n -r -o TARGET $1) +} + diff --git a/mkdumprd b/mkdumprd index bb1e01e..0295009 100644 --- a/mkdumprd +++ b/mkdumprd @@ -12,7 +12,7 @@ export IN_KDUMP=1 conf_file="/etc/kdump.conf" SSH_KEY_LOCATION="/root/.ssh/kdump_id_rsa" SAVE_PATH=$(grep ^path $conf_file| cut -d' ' -f2) -[ -z "$SAVE_PATH" ] && SAVE_PATH="/var/crash" +[ -z "$SAVE_PATH" ] && SAVE_PATH=$DEFAULT_PATH extra_modules="" dracut_args=("--hostonly" "-o" "plymouth dash resume") OVERRIDE_RESETTABLE=0 -- 1.8.5.3

3 15

Add fence_kdump support for generic cluster v3
by mperina＠redhat.com 26 Mar '14

26 Mar '14

Hi, After long discussion about fence_kdump config files (where those files should be located and which packages should own them) I propose this solution to support fence_kdump configuration for generic clusters: - Add two new options to kdump.conf fence_kdump_nodes - List of hosts separated by space to send fence_kdump notification to (this option is mandatory to enable fence_kdump) fence_kdump_args - Command line arguments for fence_kdump_send (it can contain all valid arguments except hosts to send notification to) - Modify kdump behavior due to new options 1) If fence_kdump_nodes option is set and fence_kdump_send is found and executable -> configure network for kdump and execute fence_kdump_send with those nodes (and also with args specified in fence_kdump_args if not empty) 2) If fence_kdump_nodes is not set, try to configure fence_kdump using cluster settings (current behavior). This should stay in kexec-tools not to break compatibility and can be removed after Pacemaker will start using new options. Do you agree? Martin Perina

2 3

[PATCH] mkdumprd fail if target is NFS and mounted on /var/crash
by Baoquan He 25 Mar '14

25 Mar '14

Now when dump target is not specified, separate disk can't be mounted on "path", e.g /var/crash. However if target is specified, whatever the default fail action is set, mkdumprd should go ahead and not be failed. In check_block_dump_target(), the check only on disk is not complete, NFS and ssh need be filtered too. So introduce is_user_configured_dump_target to check this. Signed-off-by: Baoquan He <bhe(a)redhat.com> --- kdump-lib.sh | 14 ++++++++++++++ mkdumprd | 3 +-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/kdump-lib.sh b/kdump-lib.sh index 384f7b4..de32650 100755 --- a/kdump-lib.sh +++ b/kdump-lib.sh @@ -52,6 +52,20 @@ get_user_configured_dump_disk() return } +is_user_configured_dump_target() +{ + local _target + + if is_ssh_dump_target || is_nfs_dump_target; then + return 0 + fi + + _target=$(egrep "^ext[234]|^xfs|^btrfs|^minix|^raw" /etc/kdump.conf 2>/dev/null |awk '{print $2}') + [ -n "$_target" ] && return 0 + + return 1 +} + get_root_fs_device() { local _target diff --git a/mkdumprd b/mkdumprd index bb1e01e..84f1e18 100644 --- a/mkdumprd +++ b/mkdumprd @@ -363,8 +363,7 @@ check_block_dump_target() local _target local _mntpoint - _target=$(get_user_configured_dump_disk) - [ -n "$_target" ] && return + is_user_configured_dump_target && return _target=$(get_root_fs_device) if [ -b "$_target" ]; then -- 1.8.5.3

2 4

[PATCH 1/5] fence_kdump configuration should be in one directory
by mperina＠redhat.com 21 Mar '14

21 Mar '14

fence_kdump configuration and list of nodes should be in the same directory: /etc/sysconfig/fence_kdump /etc/sysconfig/fence_kdump_nodes Signed-off-by: Martin Perina <mperina(a)redhat.com> --- dracut-module-setup.sh | 5 +++-- kdump-lib.sh | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh index bdadf7c..eae7cc4 100755 --- a/dracut-module-setup.sh +++ b/dracut-module-setup.sh @@ -418,7 +418,7 @@ kdump_check_iscsi_targets () { # setup fence_kdump in cluster # setup proper network and install needed files -# also preserve '[node list]' for 2nd kernel /etc/fence_kdump_nodes +# also preserve '[node list]' for 2nd kerneli in $FENCE_KDUMP_NODES kdump_check_fence_kdump () { local nodes is_fence_kdump || return 1 @@ -442,7 +442,8 @@ kdump_check_fence_kdump () { done echo - echo "$nodes" > ${initdir}/$FENCE_KDUMP_NODES + mkdir -p ${initdir}$FENCE_KDUMP_CFG_DIR + echo "$nodes" > ${initdir}$FENCE_KDUMP_NODES dracut_install $FENCE_KDUMP_SEND dracut_install -o $FENCE_KDUMP_CONFIG } diff --git a/kdump-lib.sh b/kdump-lib.sh index 384f7b4..cdffe35 100755 --- a/kdump-lib.sh +++ b/kdump-lib.sh @@ -3,9 +3,10 @@ # Kdump common variables and functions # -FENCE_KDUMP_CONFIG="/etc/sysconfig/fence_kdump" +FENCE_KDUMP_CFG_DIR="/etc/sysconfig" +FENCE_KDUMP_CONFIG="$FENCE_KDUMP_CFG_DIR/fence_kdump" FENCE_KDUMP_SEND="/usr/libexec/fence_kdump_send" -FENCE_KDUMP_NODES="/etc/fence_kdump_nodes" +FENCE_KDUMP_NODES="$FENCE_KDUMP_CFG_DIR/fence_kdump_nodes" is_ssh_dump_target() { -- 1.8.3.1

3 9

[Patch v3 1/6] introduce several basic utility function
by Baoquan He 21 Mar '14

21 Mar '14

These utility function will be shared by several files, they are all operation related to mount stuff. Meantime define DEFAULT_PATH="/var/crash". Signed-off-by: Baoquan He <bhe(a)redhat.com> --- kdump-lib.sh | 21 +++++++++++++++++++++ mkdumprd | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/kdump-lib.sh b/kdump-lib.sh index 384f7b4..fdcde83 100755 --- a/kdump-lib.sh +++ b/kdump-lib.sh @@ -3,6 +3,7 @@ # Kdump common variables and functions # +DEFAULT_PATH="/var/crash/" FENCE_KDUMP_CONFIG="/etc/sysconfig/fence_kdump" FENCE_KDUMP_SEND="/usr/libexec/fence_kdump_send" FENCE_KDUMP_NODES="/etc/fence_kdump_nodes" @@ -61,3 +62,23 @@ get_root_fs_device() return } +get_mntpoint_from_path() +{ + echo $(df $1 | tail -1 | awk '{print $NF}') +} + +get_target_from_path() +{ + echo $(df $1 | tail -1 | awk '{print $1}') +} + +get_fs_type_from_target() +{ + echo $(findmnt -k -f -n -r -o FSTYPE $1) +} + +get_mntpoint_from_target() +{ + echo $(findmnt -k -f -n -r -o TARGET $1) +} + diff --git a/mkdumprd b/mkdumprd index bb1e01e..0295009 100644 --- a/mkdumprd +++ b/mkdumprd @@ -12,7 +12,7 @@ export IN_KDUMP=1 conf_file="/etc/kdump.conf" SSH_KEY_LOCATION="/root/.ssh/kdump_id_rsa" SAVE_PATH=$(grep ^path $conf_file| cut -d' ' -f2) -[ -z "$SAVE_PATH" ] && SAVE_PATH="/var/crash" +[ -z "$SAVE_PATH" ] && SAVE_PATH=$DEFAULT_PATH extra_modules="" dracut_args=("--hostonly" "-o" "plymouth dash resume") OVERRIDE_RESETTABLE=0 -- 1.8.5.3

2 16

[Patch v2 1/4] user need make sure "path" on mounted fs has been created
by Baoquan He 20 Mar '14

20 Mar '14

kdump need create the dir specified in "path" formerly if it does not exist. Now change the behavior to be that ueser takes charge of the "path", make sure "path" has been created, especially when separate disk is mounted on this "path". Signed-off-by: Baoquan He <bhe(a)redhat.com> --- mkdumprd | 38 ++++++++------------------------------ 1 file changed, 8 insertions(+), 30 deletions(-) diff --git a/mkdumprd b/mkdumprd index bb1e01e..93fc7fe 100644 --- a/mkdumprd +++ b/mkdumprd @@ -174,34 +174,13 @@ mkdir_save_path_ssh() } -#mkdir if save path does not exist on dump target filesystem -#$1=dump target -#caller should ensure $1 is mounted -mkdir_save_path_fs() { +#check whether $SAVE_PATH has been created. +check_save_path_fs() { local _mnt=$(to_mount_point $1) - local _remount="no" - local _ret - - [ ! -d ${_mnt}/$SAVE_PATH ] && { - if is_readonly_mount $1; then - echo "Mounting $1 as read-write for creating dump directory.." - mount -o remount,rw $1 || { - perror_exit "Mounting $1 as read-write failed." - } - _remount="yes" - fi - mkdir -p ${_mnt}/$SAVE_PATH - _ret=$? - [ "$_remount" = "yes" ] && { - echo "Remounting $1 as read-only." - mount -o remount,ro $1 || { - perror_exit "Remounting $1 as read-only failed." - } - } - [ $_ret -ne 0 ] && { - perror_exit "Creating ${_mnt}/$SAVE_PATH failed." - } - } + + if [ ! -d ${_mnt}/$SAVE_PATH ]; then + perror_exit "Please check if path:$SAVE_PATH has been created." + fi } #Function: get_fs_size @@ -347,7 +326,6 @@ get_block_dump_target() { local _target - _target=$(get_user_configured_dump_disk) [ -n "$_target" ] && echo $(to_dev_name $_target) && return @@ -539,7 +517,7 @@ do add_dracut_module "nfs" fi add_mount "$config_val" - mkdir_save_path_fs $config_val + check_save_path_fs $config_val check_size fs $config_val ;; raw) @@ -560,7 +538,7 @@ do check_size ssh $config_val mkdir_save_path_ssh $config_val add_dracut_module "ssh-client" - add_dracut_sshkey "$SSH_KEY_LOCATION" + add_dracut_sshkey "$SSH_KEY_LOCATION" else perror_exit "Bad ssh dump target $config_val" fi -- 1.8.5.3

3 20

[PATCH 1/5] fence_kdump configuration should be in one directory
by mperina＠redhat.com 19 Mar '14

19 Mar '14

fence_kdump configuration and list of nodes should be in the same directory: /etc/fence_kdump /etc/fence_kdump_nodes Bug-Url: https://bugzilla.redhat.com/1078134 Signed-off-by: Martin Perina <mperina(a)redhat.com> --- dracut-module-setup.sh | 5 +++-- kdump-lib.sh | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh index bdadf7c..2777c75 100755 --- a/dracut-module-setup.sh +++ b/dracut-module-setup.sh @@ -418,7 +418,7 @@ kdump_check_iscsi_targets () { # setup fence_kdump in cluster # setup proper network and install needed files -# also preserve '[node list]' for 2nd kernel /etc/fence_kdump_nodes +# also preserve '[node list]' for 2nd kernel in $FENCE_KDUMP_NODES kdump_check_fence_kdump () { local nodes is_fence_kdump || return 1 @@ -442,7 +442,8 @@ kdump_check_fence_kdump () { done echo - echo "$nodes" > ${initdir}/$FENCE_KDUMP_NODES + mkdir -p ${initdir}$FENCE_KDUMP_CFG_DIR + echo "$nodes" > ${initdir}$FENCE_KDUMP_NODES dracut_install $FENCE_KDUMP_SEND dracut_install -o $FENCE_KDUMP_CONFIG } diff --git a/kdump-lib.sh b/kdump-lib.sh index 384f7b4..19389a6 100755 --- a/kdump-lib.sh +++ b/kdump-lib.sh @@ -3,9 +3,10 @@ # Kdump common variables and functions # -FENCE_KDUMP_CONFIG="/etc/sysconfig/fence_kdump" +FENCE_KDUMP_CFG_DIR="/etc" +FENCE_KDUMP_CONFIG="$FENCE_KDUMP_CFG_DIR/fence_kdump" FENCE_KDUMP_SEND="/usr/libexec/fence_kdump_send" -FENCE_KDUMP_NODES="/etc/fence_kdump_nodes" +FENCE_KDUMP_NODES="$FENCE_KDUMP_CFG_DIR/fence_kdump_nodes" is_ssh_dump_target() { -- 1.8.3.1

1 4

Adding support for manually configured fence_kdump v2
by mperina＠redhat.com 17 Mar '14

17 Mar '14

Hi, I changed this from initial patch: 1) /etc/sysconfig/fence_kdump is optional, only following two files are mandatory: /usr/libexec/fence_kdump_send /etc/sysconfig/fence_kdump_nodes 2) Nodes read from /etc/sysconfig/fence_kdump_nodes are filtered not to contain hostname 3) Patch is created against master on http://pkgs.fedoraproject.org/cgit/kexec-tools.git/ Thanks Martin Perina >From 48f09ed8cda2c1fe52b0a48eb501373cd40d6b8f Mon Sep 17 00:00:00 2001 From: Martin Perina <mperina(a)redhat.com> Date: Thu, 13 Mar 2014 14:59:08 +0100 Subject: [PATCH] fence_kdump manual configuration support Adds ability to configure fence_kdump without Pacemaker. If following files exist: /usr/libexec/fence_kdump_send /etc/sysconfig/fence_kdump_nodes it's supposed that fence_kdump is configured manually. Signed-off-by: Martin Perina <mperina(a)redhat.com> --- dracut-module-setup.sh | 37 +++++++++++++++++++++++++------------ kdump-lib.sh | 20 +++++++++++++++----- kdumpctl | 5 +++++ 3 files changed, 45 insertions(+), 17 deletions(-) diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh index bdadf7c..103a84e 100755 --- a/dracut-module-setup.sh +++ b/dracut-module-setup.sh @@ -421,28 +421,41 @@ kdump_check_iscsi_targets () { # also preserve '[node list]' for 2nd kernel /etc/fence_kdump_nodes kdump_check_fence_kdump () { local nodes + local xnodes is_fence_kdump || return 1 - # get cluster nodes from cluster cib, get interface and ip address - nodelist=`pcs cluster cib | xmllint --xpath "/cib/status/node_state/@uname" -` + if is_cluster; then + # get cluster nodes from cluster cib, get interface and ip address + nodelist=`pcs cluster cib | xmllint --xpath "/cib/status/node_state/@uname" -` - # nodelist is formed as 'uname="node1" uname="node2" ... uname="nodeX"' - # we need to convert each to node1, node2 ... nodeX in each iteration - for node in ${nodelist}; do - # convert $node from 'uname="nodeX"' to 'nodeX' - eval $node - nodename=$uname + # nodelist is formed as 'uname="node1" uname="node2" ... uname="nodeX"' + # we need to convert each to node1, node2 ... nodeX in each iteration + for node in ${nodelist}; do + # convert $node from 'uname="nodeX"' to 'nodeX' + eval $node + xnodes="$xnodes $uname" + done + else + # fence_kdump configured manually + read xnodes < $FENCE_KDUMP_NODES + fi + + # install network for each node + for node in ${xnodes}; do # Skip its own node name if [ "$nodename" = `hostname` ]; then continue fi - nodes="$nodes $nodename" - - kdump_install_net $nodename + kdump_install_net $node + nodes="$nodes $node" done + echo - echo "$nodes" > ${initdir}/$FENCE_KDUMP_NODES + mkdir -p ${initdir}$FENCE_KDUMP_NODES + rmdir ${initdir}$FENCE_KDUMP_NODES + echo "$nodes" > ${initdir}$FENCE_KDUMP_NODES + dracut_install $FENCE_KDUMP_SEND dracut_install -o $FENCE_KDUMP_CONFIG } diff --git a/kdump-lib.sh b/kdump-lib.sh index 384f7b4..089d40b 100755 --- a/kdump-lib.sh +++ b/kdump-lib.sh @@ -5,7 +5,7 @@ FENCE_KDUMP_CONFIG="/etc/sysconfig/fence_kdump" FENCE_KDUMP_SEND="/usr/libexec/fence_kdump_send" -FENCE_KDUMP_NODES="/etc/fence_kdump_nodes" +FENCE_KDUMP_NODES="/etc/sysconfig/fence_kdump_nodes" is_ssh_dump_target() { @@ -27,15 +27,25 @@ strip_comments() echo $@ | sed -e 's/$.*$#.*/\1/' } +# Check if cluster environment is present +is_cluster() +{ + # no pcs executable installed + type -P pcs > /dev/null || return 1 +} + # Check if fence kdump is configured in cluster is_fence_kdump() { - # no pcs or fence_kdump_send executables installed? - type -P pcs > /dev/null || return 1 [ -x $FENCE_KDUMP_SEND ] || return 1 - # fence kdump not configured? - (pcs cluster cib | grep -q 'type="fence_kdump"') &> /dev/null || return 1 + if is_cluster; then + # fence kdump configured in cluster? + (pcs cluster cib | grep -q 'type="fence_kdump"') &> /dev/null || return 1 + else + # fence kdump configured manually? + [ -f $FENCE_KDUMP_NODES ] || return 1 + fi } get_user_configured_dump_disk() diff --git a/kdumpctl b/kdumpctl index 8d5498a..c310904 100755 --- a/kdumpctl +++ b/kdumpctl @@ -193,6 +193,7 @@ function check_fence_kdump() local cib_time is_fence_kdump || return 1 + is_cluster || return 1 cib_time=`pcs cluster cib | xmllint --xpath 'string(/cib/@cib-last-written)' - | \ xargs -0 date +%s --date` @@ -253,6 +254,10 @@ function check_rebuild() files="$files $FENCE_KDUMP_CONFIG" fi + if [ -f $FENCE_KDUMP_NODES ]; then + files="$files $FENCE_KDUMP_NODES" + fi + check_exist "$files" && check_executable "$EXTRA_BINS" [ $? -ne 0 ] && return 1 -- 1.8.3.1

2 5

[PATCH v2] Add a link in kexec-kdump-howto.txt to explain how to configure kdump in cluster
by Arthur Zou 17 Mar '14

17 Mar '14

Description: There is no info in kexec-kdump-howto.txt which explains how to configure kdump in clustered environment to avoid being fenced off while saving core. Resolution: add a help link in kexec-kdump-howto.txt so that somebody can get to article easily. Signed-off-by: Arthur Zou <zzou(a)redhat.com> --- kexec-kdump-howto.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kexec-kdump-howto.txt b/kexec-kdump-howto.txt index 7ffeab9..8b6212e 100644 --- a/kexec-kdump-howto.txt +++ b/kexec-kdump-howto.txt @@ -98,6 +98,10 @@ parameter, which is expected. You may be able to get by with less than 128M, but testing with only 64M has proven unreliable of late. On ia64, as much as 512M may be required. +If using kdump in cluster environment, please refer to kdump-in-cluster- +environment.txt or https://access.redhat.com/site/articles/67570 to get more +information to avoid being fenced off while saving core. + Now that you've got that reserved memory region set up, you want to turn on the kdump init script: -- 1.8.4.2

1 0

[PATCH v2] kdumpctl: Pass disable_cpu_apicid to kexec of capture kernel
by Jerry Hoemann 16 Mar '14

16 Mar '14

== Version 2 == Addresses Vivek's review comments: 1. Don't force numeric in awk script snipet. 2. Command line processing is moved from load_kernel to new function "prepare_cmdline." This new function is responsible for setting up the command line passed to KEXEC. 3. New function "append_cmdline" is added to append {argument,value} pair to command line if argument is not already present. == Version 1 == A recent patch (https://lkml.org/lkml/2014/1/15/42) enables multiple processors in the crash kernel. To do this safely the crash kernel needs to know which CPU was the 1st kernel BSP (bootstrap processor) so that the crash kernel will NOT send the BSP an INIT. If the crash kernel sends an INIT to the 1st kernel BSP, some systems may reset or hang. The EFI spec doesn't require that any particular processor is chosen as the BSP and the CPU (and its apic id) can change from one boot to the next. Hence automating the selection of CPU to disable if the system would panic is desired. This patch updates the kdumpctl script to get the "initial apicid" of CPU 0 in the first kernel and will pass this as the "disable_cpu_apicid=" arguement to kexec if it wasn't explicitly set in /etc/sysconfig/kdump KDUMP_COMMANDLINE_APPEND. CPU 0 is chosen as it is the processor thats execute the OS initialization code and hence was the BSP as per x86 SDM (Vol 3a Section 8.4.) See associated Red Hat Bugzilla(s) for additional background material: https://bugzilla.redhat.com/show_bug.cgi?id=1059031 https://bugzilla.redhat.com/show_bug.cgi?id=980621 --- kdumpctl | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 54 insertions(+), 7 deletions(-) diff --git a/kdumpctl b/kdumpctl index 46ae633..0a0bab1 100755 --- a/kdumpctl +++ b/kdumpctl @@ -41,6 +41,59 @@ function remove_cmdline_param() echo $cmdline } +# +# This function returns the "initial apicid" of the +# boot cpu (cpu 0) if present. +# +function get_bootcpu_initial_apicid() +{ + awk ' \ + BEGIN { CPU = "-1"; } \ + $1=="processor" && $2==":" { CPU = $NF; } \ + CPU=="0" && /initial apicid/ { print $NF; } \ + ' \ + /proc/cpuinfo +} + +# +# This function appends argument "$2=$3" to string ($1) if not already present. +# +function 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 +function prepare_cmdline() +{ + local cmdline; + if [ -z "$KDUMP_COMMANDLINE" ]; then + cmdline=`cat /proc/cmdline` + else + cmdline=${KDUMP_COMMANDLINE} + fi + cmdline=`remove_cmdline_param "$cmdline" crashkernel hugepages hugepagesz` + + + cmdline="${cmdline} ${KDUMP_COMMANDLINE_APPEND}" + + local id=`get_bootcpu_initial_apicid` + if [ ! -z ${id} ] ; then + cmdline=`append_cmdline "${cmdline}" disable_cpu_apicid ${id}` + fi + + echo $cmdline +} + + function save_core() { coredir="/var/crash/`date +"%Y-%m-%d-%H:%M"`" @@ -244,13 +297,7 @@ function load_kdump() fi fi - if [ -z "$KDUMP_COMMANDLINE" ] - then - KDUMP_COMMANDLINE=`cat /proc/cmdline` - fi - KDUMP_COMMANDLINE=`remove_cmdline_param "$KDUMP_COMMANDLINE" crashkernel hugepages hugepagesz` - - KDUMP_COMMANDLINE="${KDUMP_COMMANDLINE} ${KDUMP_COMMANDLINE_APPEND}" + KDUMP_COMMANDLINE=`prepare_cmdline` $KEXEC $KEXEC_ARGS $standard_kexec_args \ --command-line="$KDUMP_COMMANDLINE" \ -- 1.8.5.3

4 9

Adding support for manually configured fence_kdump
by mperina＠redhat.com 14 Mar '14

14 Mar '14

Hi, we want to integrate support for fence_kdump into oVirt project. Marek Grac pointed me to kexec-tools-2.0.4-23 which contains automatic configuration of fence_kdump from Pacemaker config. Unfortunately for us, this support is tightly bound to Pacemaker, so I created attached patch, which adds support for manual configuration of fence_kdump: 1) Current status without this patch (kexec-tools-2.0.4-23) - when running 'kdumpctl restart' kdump detects if fence_kdump_send command is installed and if so, it tries to: a) Create /etc/sysconfig/fence_kdump file with command line parameters for fence_kdump_send. These parameters are extracted from cluster configuration using 'pcs cluster' command b) Create /etc/fence_kdump_nodes file with list of hosts to send fence_kdump notification to. These hosts are also extracted from cluster configuration using 'pcs cluster' command c) If these two files are successfully created, kdump tries to configure network to be able to reach all hosts defined in /etc/fence_kdump_nodes d) Install these two config files into kdump's kernel initramfs 2) Behavior with this patch - when running 'kdumpctl restart' kdump detect if fence_kdump_send binary is installed and if so, it tries to: a) It tries to detect is cluster is configured ('pcs' command is available). If so, it creates needed config files as described above in steps 1a) and 1b) b) If cluster is not configured, it tries to detect if /etc/sysconfig/fence_kdump and /etc/sysconfig/fence_kdump_nodes exist. If so, fence_kdump is marked as successfully configured and kdump continues with steps 1c) and 1d) Is it possible to integrate such patch into kexec-tools RPM? We would like to integrate fence_kdump support into oVirt 3.5 which should be released in May, so before this to happen, we need kexec-tools RPM with this patch to be available for RHEL 6 and Fedora 19/20. Thanks Martin Perina

3 13

[PATCH 1/2] pass mount info to dracut when default target is a separate disk
by Baoquan He 13 Mar '14

13 Mar '14

When user does not specify dump target explicitly, it's better to dump to the "path" specified. That means after dump user enter into 1st kernel, can find vmcore in the "path". If that path is in root fs, vmcore is stored in root fs. If separate disk is mounted on any tier of "path", we just dump vmcore into the left path on the left separate disk. E.g in kdump.conf path /mnt/nfs in mount info, /dev/vdb on /mnt type ext4 (rw,relatime,seclabel,data=ordered) Then vmcore will be saved in /nfs of /dev/vdb. In this patch, pass mount info to dracut in this case if separate disk is mounted on any tier of "path". Signed-off-by: Baoquan He <bhe(a)redhat.com> --- mkdumprd | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/mkdumprd b/mkdumprd index 241a426..d792b42 100644 --- a/mkdumprd +++ b/mkdumprd @@ -355,12 +355,12 @@ get_block_dump_target() [ -b "$_target" ] && echo $(to_dev_name $_target) } -# If no dump disk is specified make sure /var/crash is not mounted on a -# separate disk. -check_block_dump_target() +#handle the case user does not specify the dump target explicitly +handle_default_dump_target() { local _target local _mntpoint + local _ret _target=$(get_user_configured_dump_disk) [ -n "$_target" ] && return @@ -368,11 +368,16 @@ check_block_dump_target() _target=$(get_root_fs_device) if [ -b "$_target" ]; then mkdir -p $SAVE_PATH - _mntpoint=`df $SAVE_PATH | tail -1 | awk '{print $NF}'` + _ret=$? + if [ $_ret -ne 0 ]; then + perror_exit "mkdir failed on $SAVE_PATH" + fi + _mntpoint=$(df $SAVE_PATH | tail -1 | awk '{print $NF}') if [ "$_mntpoint" != "/" ]; then - perror "No dump target specified. Default dump target is rootfs block device." - perror "But dump path $SAVE_PATH is not backed by rootfs block device. " - perror_exit "Either explicitly specify a dump target or specify a dump path backed by rootfs block device" + SAVE_PATH=$(echo $SAVE_PATH | sed "s,$_mntpoint,,") + _target=$(findmnt -k -f -n -o SOURCE $_mntpoint) + add_mount "$_target" + check_size fs $_target fi fi } @@ -500,8 +505,6 @@ check_crypt() return 1 } -check_block_dump_target - if ! check_resettable; then exit 1 fi @@ -521,6 +524,8 @@ if [ "$(uname -m)" = "s390x" ]; then add_dracut_module "znet" fi +handle_default_dump_target + while read config_opt config_val; do # remove inline comments after the end of a directive. -- 1.8.5.3

5 16

[PATCH] get_ssh_size fix for localized df output
by Dave Young 13 Mar '14

13 Mar '14

When kdump service is started, /sbin/mkdump checks if there is enough free space on the ssh server using "df -P" command. However, the slight difference in the first line of the "df -P" command output for English and Japanese environment causes a problem. ----- # LANG=en_us.utf8 df -P | head -1 Filesystem 1024-blocks Used Available Capacity Mount on # LANG=ja_JP.utf8 df -P | head -1 ファイルシス 1024-ブロック使用使用可容量マウント位置 ----- Because the number of words is 7 in the English output and 6 in Japanese, the subsequent awk command could not correctly locate the free space field and results in an error. One way to fix it is use df -P /var/crash|tail -1, but for remote restricted shell pipe is not supported. Thus fix this by print field NF-2 in awk script. Signed-off-by: Dave Young <dyoung(a)redhat.com> --- mkdumprd | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- kexec-tools.orig/mkdumprd +++ kexec-tools/mkdumprd @@ -142,8 +142,9 @@ get_ssh_size() { [ $? -ne 0 ] && { perror_exit "checking remote ssh server available size failed." } - #ssh output removed the line break, so print $11 instead of $4 - _size=$(echo -n $_out|tail -1 | awk '{print $11}') + + #ssh output removed the line break, so print field NF-2 + _size=$(echo -n $_out| awk '{avail=NF-2; print $avail}') echo -n $_size }

3 2

[PATCH] Backport vmcore-dmsg stack smashing in extreme case
by Arthur Zou 13 Mar '14

13 Mar '14

Resolves bz1071376 In exteme case vmcore-dmesg will overflow. upstream has fixed the some problem. so simply backport it Signed-off-by: Arthur Zou <zzou(a)redhat.com> --- ...sg-stack-smashing-happend-in-extreme-case.patch | 43 ++++++++++++++++++++++ kexec-tools.spec | 2 + 2 files changed, 45 insertions(+) create mode 100644 kexec-tools-2.0.4-vmcore-dmesg-stack-smashing-happend-in-extreme-case.patch diff --git a/kexec-tools-2.0.4-vmcore-dmesg-stack-smashing-happend-in-extreme-case.patch b/kexec-tools-2.0.4-vmcore-dmesg-stack-smashing-happend-in-extreme-case.patch new file mode 100644 index 0000000..044cb61 --- /dev/null +++ b/kexec-tools-2.0.4-vmcore-dmesg-stack-smashing-happend-in-extreme-case.patch @@ -0,0 +1,43 @@ +From 401e037e5e9527134c594b8923342a69ff38b7cb Mon Sep 17 00:00:00 2001 +From: Arthur Zou <zzou(a)redhat.com> +Date: Wed, 12 Mar 2014 13:05:18 +0800 +Subject: [PATCH] vmcore-dmesg stack smashing happend in extreme case + +Description +in dump_dmesg_structured() the out_buf size is 4096, and if the +length is less than 4080( 4096-16 ) it won't really write out. +Normally, after writing one or four chars to the out_buf, it will +check the length of out_buf. But in extreme cases, 19 chars was +written to the out_buf before checking the length. This may cause +the stack corruption. If the length was 4079 (won't realy write out), +and then write 19 chars to it. the out_buf will overflow. + +Solution +Change 16 to 64 thus can make sure that always have 64bytes before +moving to next records. why using 64 is that a long long int can take +20 bytes. so the length of timestamp can be 44 ('[','.',']',' ') in +extreme case. + +Signed-off-by: Arthur Zou <zzou(a)redhat.com> +Acked-by: Vivek Goyal <vgoyal(a)redhat.com> +Signed-off-by: Simon Horman <horms(a)verge.net.au> +--- + vmcore-dmesg/vmcore-dmesg.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vmcore-dmesg/vmcore-dmesg.c b/vmcore-dmesg/vmcore-dmesg.c +index 0345660..e15cd91 100644 +--- a/vmcore-dmesg/vmcore-dmesg.c ++++ b/vmcore-dmesg/vmcore-dmesg.c +@@ -674,7 +674,7 @@ static void dump_dmesg_structured(int fd) + else + out_buf[len++] = c; + +- if (len >= OUT_BUF_SIZE - 16) { ++ if (len >= OUT_BUF_SIZE - 64) { + write_to_stdout(out_buf, len); + len = 0; + } +-- +1.8.4.2 + diff --git a/kexec-tools.spec b/kexec-tools.spec index 1a8f849..ba4589c 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -97,6 +97,7 @@ Patch615: kexec-tools-2.0.4-makedumpfile-Add-non-mmap-option-to-disable-mmap-man Patch616: kexec-tools-2.0.4-makedumpfile-Fall-back-to-read-when-mmap-fails.patch Patch617: kexec-tools-2.0.4-vmcore-dmesg-struct_val_u64-not-casting-u64-to-u32.patch Patch618: kexec-tools-2.0.4-makedumpfile-Improve-progress-information-for-huge-memor.patch +Patch619: kexec-tools-2.0.4-vmcore-dmesg-stack-smashing-happend-in-extreme-case.patch %description kexec-tools provides /sbin/kexec binary that facilitates a new @@ -146,6 +147,7 @@ tar -z -x -v -f %{SOURCE19} %patch616 -p1 %patch617 -p1 %patch618 -p1 +%patch619 -p1 tar -z -x -v -f %{SOURCE13} -- 1.8.4.2

3 3

[Patch v3 1/3] kdump-lib.sh: introduce two functions abstracted from get_block_dump_target for reuse
by Baoquan He 11 Mar '14

11 Mar '14

In function get_block_dump_target(), code block to get user configured dump disk and get root fs device can be reused by other places. Now abstract and wrap them into 2 new functions: get_user_configured_dump_disk() get_root_fs_device() And put them into kdump-lib.sh. Meanwhile change the get_block_dump_target() accordingly. Signed-off-by: Baoquan He <bhe(a)redhat.com> --- kdump-lib.sh | 24 ++++++++++++++++++++++++ mkdumprd | 7 ++----- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/kdump-lib.sh b/kdump-lib.sh index aac0c5f..384f7b4 100755 --- a/kdump-lib.sh +++ b/kdump-lib.sh @@ -37,3 +37,27 @@ is_fence_kdump() # fence kdump not configured? (pcs cluster cib | grep -q 'type="fence_kdump"') &> /dev/null || return 1 } + +get_user_configured_dump_disk() +{ + local _target + + if is_ssh_dump_target || is_nfs_dump_target; then + return + fi + + _target=$(egrep "^ext[234]|^xfs|^btrfs|^minix|^raw" /etc/kdump.conf 2>/dev/null |awk '{print $2}') + [ -n "$_target" ] && echo $_target + + return +} + +get_root_fs_device() +{ + local _target + _target=$(findmnt -k -f -n -o SOURCE /) + [ -n "$_target" ] && echo $_target + + return +} + diff --git a/mkdumprd b/mkdumprd index 6797791..0b71391 100644 --- a/mkdumprd +++ b/mkdumprd @@ -346,15 +346,12 @@ get_block_dump_target() { local _target - if is_ssh_dump_target || is_nfs_dump_target; then - return - fi - _target=$(egrep "^ext[234]|^xfs|^btrfs|^minix|^raw" /etc/kdump.conf 2>/dev/null |awk '{print $2}') + _target=$(get_user_configured_dump_disk) [ -n "$_target" ] && echo $(to_dev_name $_target) && return #get rootfs device name - _target=$(findmnt -k -f -n -o SOURCE /) + _target=$(get_root_fs_device) [ -b "$_target" ] && echo $(to_dev_name $_target) } -- 1.8.3.1

4 17

[PATCH] mkdumprd: dracut omit resume module
by WANG Chao 07 Mar '14

07 Mar '14

Let's omit resume module when building kdump initramfs, because: - kdump don't want to resume - it would pull in the swap device dependencie Tested on Fedora20. This change doesn't break anything. Signed-off-by: WANG Chao <chaowang(a)redhat.com> --- mkdumprd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdumprd b/mkdumprd index 6797791..fbea236 100644 --- a/mkdumprd +++ b/mkdumprd @@ -14,7 +14,7 @@ SSH_KEY_LOCATION="/root/.ssh/kdump_id_rsa" SAVE_PATH=$(grep ^path $conf_file| cut -d' ' -f2) [ -z "$SAVE_PATH" ] && SAVE_PATH="/var/crash" extra_modules="" -dracut_args=("--hostonly" "-o" "plymouth dash") +dracut_args=("--hostonly" "-o" "plymouth dash resume") OVERRIDE_RESETTABLE=0 perror_exit() { -- 1.8.5.3

2 1

[PATCH] mkdumprd: use dracut --hostonly-cmdline by default
by WANG Chao 04 Mar '14

04 Mar '14

dracut has changed its default behavior to not store kernel command line arguments in the initramfs. However kdump initramfs needs these cmdline arguments in initramfs ($initrd/etc/cmdline.d/*.conf) to setup some devices we need properly. To adapt this change, we should modify mkdumprd by calling dracut --hostonly-cmdline to restore the old behavior. Signed-off-by: WANG Chao <chaowang(a)redhat.com> --- mkdumprd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdumprd b/mkdumprd index 6797791..e760a0c 100644 --- a/mkdumprd +++ b/mkdumprd @@ -14,7 +14,7 @@ SSH_KEY_LOCATION="/root/.ssh/kdump_id_rsa" SAVE_PATH=$(grep ^path $conf_file| cut -d' ' -f2) [ -z "$SAVE_PATH" ] && SAVE_PATH="/var/crash" extra_modules="" -dracut_args=("--hostonly" "-o" "plymouth dash") +dracut_args=("--hostonly" "--hostonly-cmdline" "-o" "plymouth dash") OVERRIDE_RESETTABLE=0 perror_exit() { -- 1.8.5.3

2 5

[PATCH v2] s390x: do not install /etc/adjtime
by WANG Chao 03 Mar '14

03 Mar '14

On s390x, RTC or hardware clock doesn't exist. s390 is using a more precise clock source TOD, which is storing time in UTC format. The problem is /etc/adjtime installed by anaconda is saying LOCAL (this is actually a bug in anaconda), which means it's telling the userspace that RTC is storing time in local time format. This is bug and it confuses the init system (systemd in this case) particularly when init is trying to setup the system time. In a normal boot, this wrong adjtime file makes the system time wrong at first, but the system time is corrected by NTP daemon later. Unfortunately, in kdump case, we don't use NTP or any time synchronizing userspace at all. The result is systemd sets the system clock wrong (hours drifted regarding the timezone). To avoid such problem, either /etc/adjtime should be saying UTC at its third line or /etc/adjtime shouldn't exist. Given the fact that anaconda has deferred the bug to the next release, we should first fix this problem in our kdump to avoid this issue by not installing /etc/adjtime in our kdump initramfs. Signed-off-by: WANG Chao <chaowang(a)redhat.com> Acked-by: Dave Young <dyoung(a)redhat.com> --- dracut-module-setup.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh index bdadf7c..d5951ca 100755 --- a/dracut-module-setup.sh +++ b/dracut-module-setup.sh @@ -460,6 +460,16 @@ kdump_install_random_seed() { bs=$poolsize count=1 2> /dev/null } +# /etc/adjtime is used to determine RTC time format (UTC or localtime) +# /etc/localtime is used to set system timezone +kdump_install_time() { + # RTC doesn't exist on s390 + if [ `uname -m` != "s390x" ]; then + dracut_install -o /etc/adjtime + fi + dracut_install -o /etc/localtime +} + install() { kdump_install_conf >"$initdir/lib/dracut/no-emergency-shell" @@ -467,7 +477,7 @@ install() { if is_ssh_dump_target; then kdump_install_random_seed fi - dracut_install -o /etc/adjtime /etc/localtime + kdump_install_time inst "$moddir/monitor_dd_progress" "/kdumpscripts/monitor_dd_progress" chmod +x ${initdir}/kdumpscripts/monitor_dd_progress inst "/bin/dd" "/bin/dd" -- 1.8.5.3

2 1

[Patch v2] kdump fails loading if target is root fs by default while disk is mounted on save path
by Baoquan He 03 Mar '14

03 Mar '14

kdump now dumps vmcore to root partition by default in SAVE_PATCH directory, e.g /var/crash defaultly. This is problematic when another disk is mounted on /var or /var/crash, because the saved vmcore will he hidden after dump in 1st kernel. This also has the potential of blindly filling the root file system without a clue as to why. Now fix this by failing the loading of kdump kernel if dump target is root fs by default while different disk is mounted on save path. Signed-off-by: Baoquan He <bhe(a)redhat.com> --- mkdumprd | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/mkdumprd b/mkdumprd index bc002bc..d30b34c 100644 --- a/mkdumprd +++ b/mkdumprd @@ -453,6 +453,34 @@ check_resettable() return 1 } +check_block_dump_target() +{ + local _target + local _mntpoint + + if is_ssh_dump_target || is_nfs_dump_target; then + return + fi + + _target=$(egrep "^ext[234]|^xfs|^btrfs|^minix|^raw" /etc/kdump.conf 2>/dev/null |awk '{print $2}') + [ -n "$_target" ] && return + + #get rootfs device name + _target=$(findmnt -k -f -n -o SOURCE /) + if [ -b "$_target" ]; then + mkdir -p $SAVE_PATH + _mntpoint=`df $SAVE_PATH | tail -1 | awk '{print $NF}'` + _target=`df $SAVE_PATH | tail -1 | awk '{print $1}'` + if [ "$_mntpoint" != "/" ]; then + perror "Currently SAVE_PATH is $SAVE_PATH, $_target is mounted on $_mntpoint. While dump target is root filesystem by default." + perror_exit "Then vmcore will be hidden in 1st kernel after dump. Please check /etc/kdump.conf clearly to remove confusion!" + fi + fi + +} + +check_block_dump_target + if ! check_resettable; then exit 1 fi -- 1.8.3.1

2 5

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

kexec March 2014