In case of fadump, the initramfs image has to be built to boot into the production environment as well as to offload the active crash dump to the specified dump target (for boot after crash). As the same image would be used for both boot scenarios, it could not be built optimally while accommodating both cases.
Since dracut commit 8f7c332e488f ("refactor(squash): structure in a cleaner way"), the squash'ed image is a complete environment that can be activated for a given boot scenario. Use --include to include the squash'ed initramfs image built to offload active crash dump to the specified dump target.
Also, introduce a new out-of-tree dracut module (99zz-fadumpinit) that installs a customized init program while moving the default /init to /init.dracut.
Thus, the customized init program is leveraged to isolate fadump image within the default initramfs image by kicking off default boot process (exec /init.dracut) for regular boot scenario and activating squash'ed image only when an active crash dump is to be available for capturing.
Signed-off-by: Hari Bathini hbathini@linux.ibm.com --- dracut-fadump-init-fadump.sh | 40 ++++++++++++++++++++++++++++++++++++++++ dracut-fadump-module-setup.sh | 22 ++++++++++++++++++++++ dracut-module-setup.sh | 2 +- kdumpctl | 11 ++++++++++- kexec-tools.spec | 8 ++++++++ 5 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 dracut-fadump-init-fadump.sh create mode 100644 dracut-fadump-module-setup.sh
diff --git a/dracut-fadump-init-fadump.sh b/dracut-fadump-init-fadump.sh new file mode 100644 index 0000000..d96a086 --- /dev/null +++ b/dracut-fadump-init-fadump.sh @@ -0,0 +1,40 @@ +#!/usr/bin/sh +PATH=/bin:/sbin + +[ -e /proc/self/mounts ] \ + || (mkdir -p /proc && mount -t proc -o nosuid,noexec,nodev proc /proc) + +grep -q '^sysfs /sys sysfs' /proc/self/mounts \ + || (mkdir -p /sys && mount -t sysfs -o nosuid,noexec,nodev sysfs /sys) + +grep -q '^devtmpfs /dev devtmpfs' /proc/self/mounts \ + || (mkdir -p /dev && mount -t devtmpfs -o mode=755,noexec,nosuid,strictatime devtmpfs /dev) + +grep -q '^tmpfs /run tmpfs' /proc/self/mounts \ + || (mkdir -p /run && mount -t tmpfs -o mode=755,noexec,nosuid,strictatime tmpfs /run) + +if [ ! -f /proc/device-tree/rtas/ibm,kernel-dump ] && [ ! -f /proc/device-tree/ibm,opal/dump/mpipl-boot ]; then + exec /init.dracut + exit +fi + +# Load required modules +modprobe loop +modprobe squashfs +modprobe overlay + +# Mount the squash image +mkdir -p /squash +mount -t ramfs ramfs /squash +mkdir -p /squash/root /squash/overlay/upper /squash/overlay/work +mount -t squashfs -o ro,loop /fadump-squash.img /squash/root + +# Setup new root overlay +mkdir -p /newroot +mount -t overlay overlay -o lowerdir=/squash/root,upperdir=/squash/overlay/upper,workdir=/squash/overlay/work/ /newroot/ + +# Move all mount points to new root to prepare chroot +mount --move /squash /newroot/squash + +# Jump to new root and clean setup files +SYSTEMD_IN_INITRD=lenient exec switch_root /newroot /init diff --git a/dracut-fadump-module-setup.sh b/dracut-fadump-module-setup.sh new file mode 100644 index 0000000..af621aa --- /dev/null +++ b/dracut-fadump-module-setup.sh @@ -0,0 +1,22 @@ +#!/usr/bin/bash + +# called by dracut +check() { + return 255 +} + +# called by dracut +depends() { + return 0 +} + +# called by dracut +install() { + mv -f "$initdir/init" "$initdir/init.dracut" + inst_simple "$moddir/init-fadump.sh" /init + chmod 0755 "$initdir/init" + + # Install required modules and binaries for the init script (init-fadump.sh) + inst_multiple sh mount modprobe mkdir switch_root grep + hostonly="" instmods "loop" "squashfs" "overlay" +} diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh index a99a0ea..ab48e79 100755 --- a/dracut-module-setup.sh +++ b/dracut-module-setup.sh @@ -37,7 +37,7 @@ depends() { done }
- if is_squash_available && ! is_fadump_capable; then + if is_squash_available; then add_opt_module squash else dwarning "Required modules to build a squashed kdump image is missing!" diff --git a/kdumpctl b/kdumpctl index 978dae5..e3780a7 100755 --- a/kdumpctl +++ b/kdumpctl @@ -18,6 +18,7 @@ DEFAULT_INITRD_BAK="" KDUMP_INITRD="" TARGET_INITRD="" FADUMP_REGISTER_SYS_NODE="/sys/kernel/fadump_registered" +FADUMP_SQUASH_IMG=fadump-squash.img #kdump shall be the default dump mode DEFAULT_DUMP_MODE="kdump" image_time=0 @@ -119,6 +120,14 @@ rebuild_fadump_initrd() fi rm -f /tmp/fadump.initramfs
+ lsinitrd $target_initrd_tmp squash-root.img > /tmp/$FADUMP_SQUASH_IMG + if [ ! -s /tmp/$FADUMP_SQUASH_IMG ] \ + || [ $(dracut -f --rebuild $DEFAULT_INITRD_BAK --add "zz-fadumpinit" \ + -i /tmp/$FADUMP_SQUASH_IMG /$FADUMP_SQUASH_IMG $target_initrd_tmp) -ne 0 ]; then + dwarn "WARNING: Could not isolate the dump capture initramfs image." + fi + rm -f /tmp/$FADUMP_SQUASH_IMG + # updating fadump initrd ddebug "updating fadump initrd: $target_initrd_tmp $TARGET_INITRD" mv $target_initrd_tmp $TARGET_INITRD @@ -612,7 +621,7 @@ check_rebuild() #in case of fadump mode, check whether the default/target #initrd is already built with dump capture capability if [ "$DEFAULT_DUMP_MODE" == "fadump" ]; then - capture_capable_initrd=$(lsinitrd -f $DRACUT_MODULES_FILE $TARGET_INITRD | grep ^kdumpbase$ | wc -l) + capture_capable_initrd=$(lsinitrd -f $DRACUT_MODULES_FILE $TARGET_INITRD | grep -e ^kdumpbase$ -e ^zz-fadumpinit$ | wc -l) fi fi
diff --git a/kexec-tools.spec b/kexec-tools.spec index 11c64cb..e8272ca 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -55,6 +55,9 @@ Source107: dracut-kdump-emergency.target Source108: dracut-early-kdump.sh Source109: dracut-early-kdump-module-setup.sh
+Source200: dracut-fadump-init-fadump.sh +Source201: dracut-fadump-module-setup.sh + Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units @@ -212,6 +215,7 @@ install -m 644 makedumpfile-%{mkdf_ver}/eppic_scripts/* $RPM_BUILD_ROOT/usr/shar
%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') +%define remove_dracut_fadump_prefix() %(echo -n %1|sed 's/.*dracut-fadump-//g')
# deal with dracut modules mkdir -p -m755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase @@ -230,6 +234,10 @@ cp %{SOURCE108} $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99earlyk 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}} +%ifarch ppc64 ppc64le +chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99zz-fadumpinit/%{remove_dracut_fadump_prefix %{SOURCE200}} +chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99zz-fadumpinit/%{remove_dracut_fadump_prefix %{SOURCE201}} +%endif
%define dracutlibdir %{_prefix}/lib/dracut