d22786bb5a
Resolves: bz2076416
Upstream: Fedora
Conflict: None
commit 568623e69a
Author: Coiby Xu <coxu@redhat.com>
Date: Thu Sep 23 14:25:01 2021 +0800
Address the cases where a NIC has a different name in kdump kernel
A NIC may get a different name in the kdump kernel from 1st kernel
in cases like,
- kernel assigned network interface names are not persistent e.g. [1]
- there is an udev rule to rename the NIC in the 1st kernel but the
kdump initrd may not have that rule e.g. [2]
If NM tries to match a NIC with a connection profile based on NIC name
i.e. connection.interface-name, it will fail the above bases. A simple
solution is to ask NM to match a connection profile by MAC address.
Note we don't need to do this for user-created NICs like vlan, bridge and
bond.
An remaining issue is passing the name of a NIC via the kdumpnic dracut
command line parameter which requires passing ifname=<interface>:<MAC> to
have fixed NIC name. But we can simply drop this requirement. kdumpnic
is needed because kdump needs to get the IP by NIC name and use the IP
to created a dumping folder named "{IP}-{DATE}". We can simply pass the
IP to the kdump kernel directly via a new dracut command line parameter
kdumpip instead. In addition to the benefit of simplifying the code,
there are other three benefits brought by this approach,
- make use of whatever network to transfer the vmcore. Because as long
as we have the network to we don't care which NIC is active.
- if obtained IP in the kdump kernel is different from the one in the
1st kernel. "{IP}-{DATE}" would better tell where the dumped vmcore
comes from.
- without passing ifname=<interface>:<MAC> to kdump initrd, the
issue of there are two interfaces with the same MAC address for
Azure Hyper-V NIC SR-IOV [3] is resolved automatically.
[1] https://bugzilla.redhat.com/show_bug.cgi?id=1121778
[2] https://bugzilla.redhat.com/show_bug.cgi?id=810107
[3] https://bugzilla.redhat.com/show_bug.cgi?id=1962421
Signed-off-by: Coiby Xu <coxu@redhat.com>
Reviewed-by: Thomas Haller <thaller@redhat.com>
Reviewed-by: Philipp Rudo <prudo@redhat.com>
Signed-off-by: Coiby Xu <coxu@redhat.com>
179 lines
3.9 KiB
Bash
Executable File
179 lines
3.9 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# The code in this file will be used in initramfs environment, bash may
|
|
# not be the default shell. Any code added must be POSIX compliant.
|
|
|
|
DEFAULT_PATH="/var/crash/"
|
|
KDUMP_CONFIG_FILE="/etc/kdump.conf"
|
|
FENCE_KDUMP_CONFIG_FILE="/etc/sysconfig/fence_kdump"
|
|
FENCE_KDUMP_SEND="/usr/libexec/fence_kdump_send"
|
|
LVM_CONF="/etc/lvm/lvm.conf"
|
|
|
|
# Read kdump config in well formated style
|
|
kdump_read_conf()
|
|
{
|
|
# Following steps are applied in order: strip trailing comment, strip trailing space,
|
|
# strip heading space, match non-empty line, remove duplicated spaces between conf name and value
|
|
[ -f "$KDUMP_CONFIG_FILE" ] && sed -n -e "s/#.*//;s/\s*$//;s/^\s*//;s/\(\S\+\)\s*\(.*\)/\1 \2/p" $KDUMP_CONFIG_FILE
|
|
}
|
|
|
|
# Retrieves config value defined in kdump.conf
|
|
# $1: config name, sed regexp compatible
|
|
kdump_get_conf_val()
|
|
{
|
|
# For lines matching "^\s*$1\s+", remove matched part (config name including space),
|
|
# remove tailing comment, space, then store in hold space. Print out the hold buffer on last line.
|
|
[ -f "$KDUMP_CONFIG_FILE" ] &&
|
|
sed -n -e "/^\s*\($1\)\s\+/{s/^\s*\($1\)\s\+//;s/#.*//;s/\s*$//;h};\${x;p}" $KDUMP_CONFIG_FILE
|
|
}
|
|
|
|
is_mounted()
|
|
{
|
|
findmnt -k -n "$1" > /dev/null 2>&1
|
|
}
|
|
|
|
# $1: info type
|
|
# $2: mount source type
|
|
# $3: mount source
|
|
# $4: extra args
|
|
get_mount_info()
|
|
{
|
|
__kdump_mnt=$(findmnt -k -n -r -o "$1" "--$2" "$3" $4)
|
|
|
|
[ -z "$__kdump_mnt" ] && [ -e "/etc/fstab" ] && __kdump_mnt=$(findmnt -s -n -r -o "$1" "--$2" "$3" $4)
|
|
|
|
echo "$__kdump_mnt"
|
|
}
|
|
|
|
is_ipv6_address()
|
|
{
|
|
echo "$1" | grep -q ":"
|
|
}
|
|
|
|
is_fs_type_nfs()
|
|
{
|
|
[ "$1" = "nfs" ] || [ "$1" = "nfs4" ]
|
|
}
|
|
|
|
is_fs_type_virtiofs()
|
|
{
|
|
[ "$1" = "virtiofs" ]
|
|
}
|
|
|
|
# If $1 contains dracut_args "--mount", return <filesystem type>
|
|
get_dracut_args_fstype()
|
|
{
|
|
echo $1 | grep "\-\-mount" | sed "s/.*--mount .\(.*\)/\1/" | cut -d' ' -f3
|
|
}
|
|
|
|
# If $1 contains dracut_args "--mount", return <device>
|
|
get_dracut_args_target()
|
|
{
|
|
echo $1 | grep "\-\-mount" | sed "s/.*--mount .\(.*\)/\1/" | cut -d' ' -f1
|
|
}
|
|
|
|
get_save_path()
|
|
{
|
|
__kdump_path=$(kdump_get_conf_val path)
|
|
[ -z "$__kdump_path" ] && __kdump_path=$DEFAULT_PATH
|
|
|
|
# strip the duplicated "/"
|
|
echo "$__kdump_path" | tr -s /
|
|
}
|
|
|
|
get_root_fs_device()
|
|
{
|
|
findmnt -k -f -n -o SOURCE /
|
|
}
|
|
|
|
# Return the current underlying device of a path, ignore bind mounts
|
|
get_target_from_path()
|
|
{
|
|
__kdump_target=$(df "$1" 2> /dev/null | tail -1 | awk '{print $1}')
|
|
[ "$__kdump_target" = "/dev/root" ] && [ ! -e /dev/root ] && __kdump_target=$(get_root_fs_device)
|
|
echo "$__kdump_target"
|
|
}
|
|
|
|
get_fs_type_from_target()
|
|
{
|
|
get_mount_info FSTYPE source "$1" -f
|
|
}
|
|
|
|
get_mntpoint_from_target()
|
|
{
|
|
# --source is applied to ensure non-bind mount is returned
|
|
get_mount_info TARGET source "$1" -f
|
|
}
|
|
|
|
is_ssh_dump_target()
|
|
{
|
|
kdump_get_conf_val ssh | grep -q @
|
|
}
|
|
|
|
is_raw_dump_target()
|
|
{
|
|
[ -n "$(kdump_get_conf_val raw)" ]
|
|
}
|
|
|
|
is_virtiofs_dump_target()
|
|
{
|
|
if [ -n "$(kdump_get_conf_val virtiofs)" ]; then
|
|
return 0
|
|
fi
|
|
|
|
if is_fs_type_virtiofs "$(get_dracut_args_fstype "$(kdump_get_conf_val dracut_args)")"; then
|
|
return 0
|
|
fi
|
|
|
|
if is_fs_type_virtiofs "$(get_fs_type_from_target "$(get_target_from_path "$(get_save_path)")")"; then
|
|
return 0
|
|
fi
|
|
|
|
return 1
|
|
}
|
|
|
|
is_nfs_dump_target()
|
|
{
|
|
if [ -n "$(kdump_get_conf_val nfs)" ]; then
|
|
return 0
|
|
fi
|
|
|
|
if is_fs_type_nfs "$(get_dracut_args_fstype "$(kdump_get_conf_val dracut_args)")"; then
|
|
return 0
|
|
fi
|
|
|
|
if is_fs_type_nfs "$(get_fs_type_from_target "$(get_target_from_path "$(get_save_path)")")"; then
|
|
return 0
|
|
fi
|
|
|
|
return 1
|
|
}
|
|
|
|
is_fs_dump_target()
|
|
{
|
|
[ -n "$(kdump_get_conf_val "ext[234]\|xfs\|btrfs\|minix\|virtiofs")" ]
|
|
}
|
|
|
|
is_lvm2_thinp_device()
|
|
{
|
|
_device_path=$1
|
|
_lvm2_thin_device=$(lvm lvs -S 'lv_layout=sparse && lv_layout=thin' \
|
|
--nosuffix --noheadings -o vg_name,lv_name "$_device_path" 2> /dev/null)
|
|
|
|
[ -n "$_lvm2_thin_device" ]
|
|
}
|
|
|
|
kdump_get_ip_route()
|
|
{
|
|
if ! _route=$(/sbin/ip -o route get to "$1" 2>&1); then
|
|
derror "Bad kdump network destination: $1"
|
|
exit 1
|
|
fi
|
|
echo "$_route"
|
|
}
|
|
|
|
kdump_get_ip_route_field()
|
|
{
|
|
echo "$1" | sed -n -e "s/^.*\<$2\>\s\+\(\S\+\).*$/\1/p"
|
|
}
|