kexec October 2014

kexec@lists.fedoraproject.org

8 participants
17 discussions

Re: Fwd: [PATCH v7] Enhance kdump to support ipv6
by Minfei Huang 19 Oct '14

19 Oct '14

On 10/17/14 at 04:38pm, Baoquan He wrote: > ----- Forwarded message from Arthur Zou <zzou(a)redhat.com> ----- > > > Date: Tue, 1 Jul 2014 17:37:20 +0800 > > From: Arthur Zou <zzou(a)redhat.com> > > To: kexec(a)lists.fedoraproject.org > > Cc: WANG Chao <chaowang(a)redhat.com>, Vivek Goyal <vgoyal(a)redhat.com> > > Subject: [PATCH v7] Enhance kdump to support ipv6 > > > > Resolves: bz821620 > > > > Description: > > Currently kdump doesn't support ipv6 nfs/ssh dump. Ipv6 is the latest version > > of the Internet Protocal. so it is a significant feture for kdump to enhance > > to support ipv6. > > > > Solutions: > > Since dracut has supported ipv6 now, it is easy to change the kdump code to > > support ipv6. Just need pass the right _ip_opts to the second kernle. What is > > the main difference in userspace bettwen ipv4 and ipv6 is the ip address format. > > For ipv6 nfs dump: > > if ipv6 address type is link scope, /etc/kdump.conf should be edited like > > "nfs [fe80::5054:ff:fe48:ca80%eth0]:/mnt" > > else /etc/kdump.conf should be edited like "nfs [2001:db8:0:f101::2]:/mnt" > > For ipv6 ssh dump > > if ipv6 address type is link scope, /etc/kdump.conf should be edited like > > "ssh root@fe80::5054:ff:fe48:ca80%eth0" > > else /etc/kdump.conf should be edited like "ssh root@2001:db8:0:f101::2" > > > > What this patch do is: > > a): Add a function is_ipv6_target to tell what version of Internet Protocal > > (ipv4/ipv6) kdump will use to dump to remote target. > > b): Modify kdump_install_net to handle ipv6 configuration in /etc/kdump.conf > > correctly. Get the ipv6 address from /etc/kdump.conf is more complicated > > than ipv4 because the difference configuration format mentioned above. > > c): Based on the ip address type, using corresponding ip address as HOST_IP > > in second kernel. > > > > It was tested for IPV6 and IPV4 address in beaker machine and passed. > > > > Note: > > 1): Currntly only f19 support remount a nfs target in ipv6. detail in https: > > //bugzilla.redhat.com/show_bug.cgi?id=1099761. If using in f20, you can > > comment out "mount -o remount,rw $_mp || return 1" in kdump.sh line 105. > > 2): If Using static ipv6 address and configuring nfs/ssh with hostname of > > remote target, MUST add a ipv6 DNS in ifcfg-devname. > > > > How to create a ipv6 enviromnet. > > 1): Reserving two beaker machine with family fedora19. > > 2): Choosing a beaker machine as a nfs/ssh server and delete it's ipv4 address > > by "ip address del ipv4-address dev nicname" > > 3): Configuring the /etc/kdump.conf like mentioned above. > > > > Signed-off-by: Arthur Zou <zzou(a)redhat.com> > > --- > > dracut-kdump.sh | 8 ++++-- > > dracut-module-setup.sh | 67 ++++++++++++++++++++++++++++++++++++-------------- > > kdump-lib.sh | 33 +++++++++++++++++++++++++ > > 3 files changed, 88 insertions(+), 20 deletions(-) > > > > diff --git a/dracut-kdump.sh b/dracut-kdump.sh > > index cb13d92..9e838eb 100755 > > --- a/dracut-kdump.sh > > +++ b/dracut-kdump.sh > > @@ -206,9 +206,13 @@ get_host_ip() > > then > > kdumpnic=$(getarg kdumpnic=) > > [ -z "$kdumpnic" ] && echo "kdump: failed to get kdumpnic!" && return 1 > > - _host=`ip addr show dev $kdumpnic|grep 'inet '` > > + if is_ipv6_target; then > > + _host=`ip addr show dev $kdumpnic|grep 'inet6'` > > + else > > + _host=`ip addr show dev $kdumpnic|grep 'inet '` > > + fi > > [ $? -ne 0 ] && echo "kdump: wrong kdumpnic: $kdumpnic" && return 1 > > - _host="${_host##*inet }" > > + _host=`echo $_host | cut -d' ' -f2` > > _host="${_host%%/*}" > > [ -z "$_host" ] && echo "kdump: wrong kdumpnic: $kdumpnic" && return 1 > > HOST_IP=$_host > > diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh > > index 87ad072..93e8ca2 100755 > > --- a/dracut-module-setup.sh > > +++ b/dracut-module-setup.sh > > @@ -70,14 +70,24 @@ kdump_setup_dns() { > > #$2: srcaddr > > #if it use static ip echo it, or echo null > > kdump_static_ip() { > > - local _netmask _gateway > > + local _netmask _gateway _ipaddr > > local _netdev="$1" _srcaddr="$2" > > - local _ipaddr=$(ip addr show dev $_netdev permanent | \ > > + > > + if is_ipv6_target; then > > + _ipaddr=$(ip addr show dev $_netdev permanent | \ > > + awk "/ $_srcaddr\/.* /{print \$2}") > > + if [ -n "$_ipaddr" ]; then > > + _gateway=$(ip -6 route list dev $_netdev | awk '/^default /{print $3}') > > + echo -n "[${_srcaddr}]::[${_gateway}]:64::" > > + fi > > + else > > + _ipaddr=$(ip addr show dev $_netdev permanent | \ > > awk "/ $_srcaddr\/.* $_netdev\$/{print \$2}") > > - if [ -n "$_ipaddr" ]; then > > - _netmask=$(ipcalc -m $_ipaddr | cut -d'=' -f2) > > - _gateway=$(ip route list dev $_netdev | awk '/^default /{print $3}') > > - echo -n "${_srcaddr}::${_gateway}:${_netmask}::" > > + if [ -n "$_ipaddr" ]; then > > + _netmask=$(ipcalc -m $_ipaddr | cut -d'=' -f2) > > + _gateway=$(ip route list dev $_netdev | awk '/^default /{print $3}') > > + echo -n "${_srcaddr}::${_gateway}:${_netmask}::" > > + fi > > fi > > } > > > > @@ -231,24 +241,43 @@ kdump_install_net() { > > local _server _netdev _srcaddr > > local config_val="$1" > > > > - _server=`echo $config_val | sed 's/.*@//' | cut -d':' -f1` > > + _server=`get_remote_host $config_val` > > > > - _need_dns=`echo $_server|grep "[a-zA-Z]"` > > - [ -n "$_need_dns" ] && _server=`getent hosts $_server|cut -d' ' -f1` > > + if is_ipv6_target; then > > + _need_dns=`echo $_server|grep "[:]"` > > + [ -z "$_need_dns" ] && _server=`getent hosts $_server| head -n 1 | cut -d' ' -f1` > > + else > > + _need_dns=`echo $_server|grep "[a-zA-Z]"` > > + [ -n "$_need_dns" ] && _server=`getent hosts $_server| head -n 1 | cut -d' ' -f1` > > + fi > > > > _netdev=`/sbin/ip route get to $_server 2>&1` > > [ $? != 0 ] && echo "Bad kdump location: $config_val" && exit 1 > > > > - #the field in the ip output changes if we go to another subnet > > - if [ -n "`echo $_netdev | grep via`" ] > > - then > > - # we are going to a different subnet > > - _srcaddr=`echo $_netdev|awk '{print $7}'|head -n 1` > > - _netdev=`echo $_netdev|awk '{print $5;}'|head -n 1` > > + if is_ipv6_target; then > > + #the field in the ip output changes if we go to another subnet > > + if [ -n "`echo $_netdev | grep via`" ] > > + then > > + # we are going to a different subnet > > + _srcaddr=`echo $_netdev|awk '{print $9}'|head -n 1` > > + _netdev=`echo $_netdev|awk '{print $7;}'|head -n 1` > > + else > > + # we are on the same subnet > > + _srcaddr=`echo $_netdev|awk '{print $7}'|head -n 1` > > + _netdev=`echo $_netdev|awk '{print $5}'|head -n 1` > > + fi > > else > > - # we are on the same subnet > > - _srcaddr=`echo $_netdev|awk '{print $5}'|head -n 1` > > - _netdev=`echo $_netdev|awk '{print $3}'|head -n 1` > > + #the field in the ip output changes if we go to another subnet > > + if [ -n "`echo $_netdev | grep via`" ] > > + then > > + # we are going to a different subnet > > + _srcaddr=`echo $_netdev|awk '{print $7}'|head -n 1` > > + _netdev=`echo $_netdev|awk '{print $5;}'|head -n 1` > > + else > > + # we are on the same subnet > > + _srcaddr=`echo $_netdev|awk '{print $5}'|head -n 1` > > + _netdev=`echo $_netdev|awk '{print $3}'|head -n 1` > > + fi > > fi > > > > kdump_setup_netdev "${_netdev}" "${_srcaddr}" > > @@ -551,6 +580,8 @@ install() { > > inst "/bin/date" "/bin/date" > > inst "/bin/sync" "/bin/sync" > > inst "/bin/cut" "/bin/cut" > > + inst "/bin/getent" "/bin/getent" > > + inst "/bin/head" "/bin/head" > > inst "/sbin/makedumpfile" "/sbin/makedumpfile" > > inst "/sbin/vmcore-dmesg" "/sbin/vmcore-dmesg" > > inst_hook pre-pivot 9999 "$moddir/kdump.sh" > > diff --git a/kdump-lib.sh b/kdump-lib.sh > > index a20c6e8..3ed09b4 100755 > > --- a/kdump-lib.sh > > +++ b/kdump-lib.sh > > @@ -138,3 +138,36 @@ check_save_path_fs() > > fi > > } > > > > +# get ip address or hostname from nfs/ssh config value > > +get_remote_host() > > +{ > > + local _config_val=$1 > > + > > + # in ipv6, the _config_val format is [xxxx:xxxx::xxxx%eth0]:/mnt/nfs or > > + # username@xxxx:xxxx::xxxx%eth0. what we need is just xxxx:xxxx::xxxx > > + _config_val=${_config_val#*@} > > + _config_val=${_config_val%:/*} > > + _config_val=${_config_val#[} > > + _config_val=${_config_val%]} > > + _config_val=${_config_val%\%*} > > + echo $_config_val > > +} > > + > > +# check the remote server ip address tpye > > +is_ipv6_target() > > +{ > > + local _server _server_tmp > > + > > + if is_ssh_dump_target; then > > + _server=`get_option_value ssh` It is fuzzy to get $_server value by using filter ssh. The config of "sshkey /root/.ssh/kdump_id_rsa" can also match the filer. _server=`get_option_value "ssh[[:blank:]].*@"` is fine to filter the correct service address. > > + elif is_nfs_dump_target; then > > + _server=`get_option_value nfs` > > + fi > > + > > + [ -z "$_server" ] && return 1 > > + _server=`get_remote_host $_server` > > + _server_tmp=$_server > > + _server=`getent hosts $_server | head -n 1 | cut -d' ' -f1` > > + _server=${_server:-$_server_tmp} > > + echo $_server | grep -q ":" > > +} > > -- > > 1.8.4.2 > > > > _______________________________________________ > > kexec mailing list > > kexec(a)lists.fedoraproject.org > > https://lists.fedoraproject.org/mailman/listinfo/kexec > > ----- End forwarded message -----

2 1

[PATCH v2] Remove kexec-tools-eppic subpackage
by WANG Chao 17 Oct '14

17 Oct '14

Remove this package and put eppic_makedumpfile.so and its sample scripts in kexec-tools package. makedumpfile does dlopen() on eppic_makedumpfile.so and that does not enforce any choice. One could either ship it in kexec-tools package or in a subpackage. Both will work. The real reason was that code for eppic_makedumpfile.so (extension_eppic.c) and some eppic scripts are in upstream makedumpfile project. And that project is distributed as part of kexec-tools package. Now breaking down that makedumpfile in two parts and shipping all eppic specific bits in a separate subpackage was creating confusion everytime we did some changes. So to avoid that confusion and to keep all of the makedumpfile related bits in a single package, this change is being done. Signed-off-by: WANG Chao <chaowang(a)redhat.com> --- v2 -> v1: - Use "Obsoletes: ... kexec-tools-eppic" to force remove the leftover kexec-tools-eppic package while upgrading kexec-tools. kexec-tools.spec | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/kexec-tools.spec b/kexec-tools.spec index dcfcd43..0b74138 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -48,7 +48,7 @@ BuildRequires: zlib-devel zlib zlib-static elfutils-devel-static glib2-devel bzi BuildRequires: pkgconfig intltool gettext BuildRequires: systemd-units %ifarch %{ix86} x86_64 ppc64 ppc s390x ppc64le -Obsoletes: diskdumputils netdump +Obsoletes: diskdumputils netdump kexec-tools-eppic %endif ExcludeArch: aarch64 @@ -86,18 +86,6 @@ normal or a panic reboot. This package contains the /sbin/kexec binary and ancillary utilities that together form the userspace component of the kernel's kexec feature. -%ifarch %{ix86} x86_64 ppc64 s390x ppc64le -%package eppic -Requires: %{name} = %{version}-%{release} -Summary: Additional eppic_makedumpfile.so shared object -Group: Applications/System - -%description eppic -The eppic_makedumpfile.so shared object is loaded by the -"makedumpfile --eppic" option, and is used to erase sensitive -or confidential kernel data from a dumpfile. -%endif - %package anaconda-addon Summary: Kdump configuration anaconda addon Requires: anaconda >= 21.33 @@ -306,12 +294,8 @@ done %doc TODO %doc kexec-kdump-howto.txt %doc kdump-in-cluster-environment.txt - -%ifarch %{ix86} x86_64 ppc64 s390x ppc64le -%files eppic %{_libdir}/eppic_makedumpfile.so /usr/share/makedumpfile/eppic_scripts/ -%endif %files anaconda-addon -f kdump-anaconda-addon.lang %{_datadir}/anaconda/addons/com_redhat_kdump -- 1.9.3

2 1

[PATCH] Remove kexec-tools-eppic subpackage
by WANG Chao 15 Oct '14

15 Oct '14

It turns out that eppic_makedumpfile.so is dlopen()'d in makedumpfile. We don't need to ship this library in a separate subpackage. Now remove this package and put eppic_makedumpfile.so and its sample scripts in kexec-tools package. Signed-off-by: WANG Chao <chaowang(a)redhat.com> --- kexec-tools.spec | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/kexec-tools.spec b/kexec-tools.spec index dcfcd43..8db0acb 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -86,18 +86,6 @@ normal or a panic reboot. This package contains the /sbin/kexec binary and ancillary utilities that together form the userspace component of the kernel's kexec feature. -%ifarch %{ix86} x86_64 ppc64 s390x ppc64le -%package eppic -Requires: %{name} = %{version}-%{release} -Summary: Additional eppic_makedumpfile.so shared object -Group: Applications/System - -%description eppic -The eppic_makedumpfile.so shared object is loaded by the -"makedumpfile --eppic" option, and is used to erase sensitive -or confidential kernel data from a dumpfile. -%endif - %package anaconda-addon Summary: Kdump configuration anaconda addon Requires: anaconda >= 21.33 @@ -306,12 +294,8 @@ done %doc TODO %doc kexec-kdump-howto.txt %doc kdump-in-cluster-environment.txt - -%ifarch %{ix86} x86_64 ppc64 s390x ppc64le -%files eppic %{_libdir}/eppic_makedumpfile.so /usr/share/makedumpfile/eppic_scripts/ -%endif %files anaconda-addon -f kdump-anaconda-addon.lang %{_datadir}/anaconda/addons/com_redhat_kdump -- 1.9.3

2 2

[PATCH] kdumpctl: Add the command "kdumpctl showmem" to show the reserved memory
by Minfei Huang 14 Oct '14

14 Oct '14

If the grub kernel commandline is set to crashkernel=auto, it will not expand the crashkernel=auto in the /proc/cmdline. It still says crashkernel=auto. Using /sys to determines crashkernel actual size is confusing since there is no unit of measure. Add a new command "kdumpctl showmem" to show the reserved memory kindly. Signed-off-by: Minfei Huang <mhuang(a)redhat.com> --- kdumpctl | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/kdumpctl b/kdumpctl index 70d30fa..6f27669 100755 --- a/kdumpctl +++ b/kdumpctl @@ -526,6 +526,17 @@ propagate_ssh_key() fi } +show_reserved_mem() +{ + MEM_RESERVED=$(cat /sys/kernel/kexec_crash_size) + if [ $MEM_RESERVED -eq 0 ] + then + echo "No memory reserved for crash kernel." + return + fi + echo "The kdump service reserved memory is `expr $MEM_RESERVED / 1024 / 1024`MB" +} + is_fadump_capable() { # Check if firmware-assisted dump is enabled @@ -899,8 +910,11 @@ main () propagate) propagate_ssh_key ;; + showmem) + show_reserved_mem + ;; *) - echo $"Usage: $0 {start|stop|status|restart|propagate}" + echo $"Usage: $0 {start|stop|status|restart|propagate|showmem}" exit 1 esac } -- 1.8.3.1

5 11

[PATCH] Release 2.0.8-1
by WANG Chao 14 Oct '14

14 Oct '14

Rebase kexec-tools-2.0.8 Signed-off-by: WANG Chao <chaowang(a)redhat.com> --- .gitignore | 2 +- kexec-tools.spec | 12 ++---------- sources | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 0de8218..d08d17a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ /eppic_030413.tar.gz -/kexec-tools-2.0.7.tar.xz /makedumpfile-1.5.7.tar.gz /kdump-anaconda-addon-005.tar.gz +/kexec-tools-2.0.8.tar.xz diff --git a/kexec-tools.spec b/kexec-tools.spec index 540a768..dcfcd43 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -1,6 +1,6 @@ Name: kexec-tools -Version: 2.0.7 -Release: 11%{?dist} +Version: 2.0.8 +Release: 1%{?dist} License: GPLv2 Group: Applications/System Summary: The kexec/kdump userspace component @@ -62,14 +62,10 @@ ExcludeArch: aarch64 # # Patches 101 through 200 are meant for x86_64 kexec-tools enablement # -Patch101: kexec-tools-2.0.7-Provide-an-option-to-use-new-kexec-system-call.patch # # Patches 301 through 400 are meant for ppc64 kexec-tools enablement # -Patch301: kexec-tools-2.0.7-kexec-ppc64-move-to-device-tree-version-17.patch -Patch302: kexec-tools-2.0.7-kexec-ppc64-disabling-exception-handling-when-buildi.patch -Patch303: kexec-tools-2.0.7-ppc64-kdump-Fix-ELF-header-endianess.patch # # Patches 401 through 500 are meant for s390 kexec-tools enablement @@ -117,11 +113,7 @@ tar -z -x -v -f %{SOURCE19} tar -z -x -v -f %{SOURCE23} -%patch101 -p1 %patch601 -p1 -%patch301 -p1 -%patch302 -p1 -%patch303 -p1 %ifarch ppc %define archdef ARCH=ppc diff --git a/sources b/sources index 646b14c..4f370aa 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ b48eb2726d602c1aa3abfd3739441f54 eppic_030413.tar.gz -457f49ad1708eea1f6b332484855fe25 kexec-tools-2.0.7.tar.xz 31668a6dfb8823dd0b7ac09d06fb902e makedumpfile-1.5.7.tar.gz 70a9cab337b4bdcb4607e7e62301ebef kdump-anaconda-addon-005.tar.gz +2c4dec4e857e84ca530478bac0ec114b kexec-tools-2.0.8.tar.xz -- 1.9.3

2 1

[RHEL6.6 PATCH v2] mkdumprd: Get rid of dependency of /etc/dasd.conf for the kdump
by Minfei Huang 09 Oct '14

09 Oct '14

Resolves: bz1145315 The kdump service maybe work fine by only several devices in the config /etc/dasd.conf. We should update the kdump configruation if specfy the config /etc/dasd.conf, Although the specfied config is not matter with kdump. So we can remove the dependency of /etc/dasd.conf, and pick out which devices the kdump service needs to write in the file /etc/dasd_bus_ids. Signed-off-by: Minfei Huang <mhuang(a)redhat.com> --- mkdumprd | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mkdumprd b/mkdumprd index 25d30eb..b39159e 100644 --- a/mkdumprd +++ b/mkdumprd @@ -3063,12 +3063,14 @@ EOF emit_dasd_device_init() { local DEVICE OPTIONS - cat /etc/dasd.conf | grep -v "^#" | tr "A-Z" "a-z" | while read DEVICE OPTIONS; do + cat $MNTIMAGE/etc/dasd_bus_ids | grep -v "^#" | tr "A-Z" "a-z" | while read DEVICE; do test -n "$DEVICE" || continue emit "echo "free ${DEVICE/0x/}" > /proc/cio_ignore" emit "echo -n 1 > /proc/cio_settle" emit "echo -n 1 > /sys/bus/ccw/devices/${DEVICE/0x/}/online" # Set device options (if specified) + test -f /etc/dasd.conf || continue + OPTIONS=$(cat /etc/dasd.conf | grep "^$DEVICE" | cut -d " " -f 2-) test -n "$OPTIONS" || continue set $OPTIONS while [ -n "$1" ]; do @@ -3166,7 +3168,7 @@ fi # that tell us what devices we need to wait to see in /sys/block # first bring DASDs online on s390 -if [ -f /etc/dasd.conf ]; then +if [ -f $MNTIMAGE/etc/dasd_bus_ids ]; then emit_dasd_device_init fi -- 1.8.3.1

2 1

[PATCH] mkdumprd: Get rid of dependency of /etc/dasd.conf for the kdump
by Minfei Huang 09 Oct '14

09 Oct '14

The kdump service maybe work fine by only several devices in the config /etc/dasd.conf. We should update the kdump configruation if specfy the config /etc/dasd.conf, Although the specfied config is not matter with kdump. So we can remove the dependency of /etc/dasd.conf, and pick out which devices the kdump service needs to write in the file /etc/dasd_bus_ids. Signed-off-by: Minfei Huang <mhuang(a)redhat.com> --- mkdumprd | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mkdumprd b/mkdumprd index 25d30eb..b39159e 100644 --- a/mkdumprd +++ b/mkdumprd @@ -3063,12 +3063,14 @@ EOF emit_dasd_device_init() { local DEVICE OPTIONS - cat /etc/dasd.conf | grep -v "^#" | tr "A-Z" "a-z" | while read DEVICE OPTIONS; do + cat $MNTIMAGE/etc/dasd_bus_ids | grep -v "^#" | tr "A-Z" "a-z" | while read DEVICE; do test -n "$DEVICE" || continue emit "echo "free ${DEVICE/0x/}" > /proc/cio_ignore" emit "echo -n 1 > /proc/cio_settle" emit "echo -n 1 > /sys/bus/ccw/devices/${DEVICE/0x/}/online" # Set device options (if specified) + test -f /etc/dasd.conf || continue + OPTIONS=$(cat /etc/dasd.conf | grep "^$DEVICE" | cut -d " " -f 2-) test -n "$OPTIONS" || continue set $OPTIONS while [ -n "$1" ]; do @@ -3166,7 +3168,7 @@ fi # that tell us what devices we need to wait to see in /sys/block # first bring DASDs online on s390 -if [ -f /etc/dasd.conf ]; then +if [ -f $MNTIMAGE/etc/dasd_bus_ids ]; then emit_dasd_device_init fi -- 1.8.3.1

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

kexec October 2014