- zdev/dracut: fix kdump build to integrate with site support (#2229178)

- Resolves: #2229178
This commit is contained in:
Dan Horák 2023-08-07 09:33:38 +02:00
parent 4e68d72ca2
commit 7dbe365154
2 changed files with 70 additions and 7 deletions

View File

@ -1,7 +1,7 @@
From 26251ccda8351529b8f1e8cb2aa5e73a8e9c4685 Mon Sep 17 00:00:00 2001
From: Stefan Haberland <sth@linux.ibm.com>
Date: Mon, 8 May 2023 14:52:54 +0200
Subject: [PATCH 1/3] zdev: add support for autoquiesce related sysfs
Subject: [PATCH 1/4] zdev: add support for autoquiesce related sysfs
attributes (#2196510)
Autoquiesce is a mechanism that tells Linux to stop issuing I/Os to a
@ -106,13 +106,13 @@ index f9fd231..4330229 100644
),
.unknown_dev_attribs = 1,
--
2.40.1
2.41.0
From d26696e5bfbc0c95b9ca70c3bd4b8fff0e36e38f Mon Sep 17 00:00:00 2001
From: Harald Freudenberger <freude@linux.ibm.com>
Date: Wed, 17 May 2023 11:43:08 +0200
Subject: [PATCH 2/3] lszcrypt: Support for SE AP pass-through support
Subject: [PATCH 2/4] lszcrypt: Support for SE AP pass-through support
(#2110510)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@ -768,13 +768,13 @@ index 502a687..92cf453 100644
#endif /* MISC_H */
--
2.40.1
2.41.0
From 4b8726135731ee039d8eb33566bfa051b66b7bfb Mon Sep 17 00:00:00 2001
From: Harald Freudenberger <freude@linux.ibm.com>
Date: Wed, 17 May 2023 13:13:09 +0200
Subject: [PATCH 3/3] chzcrypt: Support for SE bind, unbind and associate
Subject: [PATCH 3/4] chzcrypt: Support for SE bind, unbind and associate
(#2110510)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@ -1329,5 +1329,64 @@ index 68b36a5..b04bcfa 100644
dev_list_all(&dev_list, &len);
else
--
2.40.1
2.41.0
From 8212d3474c84309adb5955dcc3820a375f76c7ad Mon Sep 17 00:00:00 2001
From: Steffen Maier <maier@linux.ibm.com>
Date: Tue, 1 Aug 2023 18:58:45 +0200
Subject: [PATCH 4/4] zdev/dracut: fix kdump build to integrate with site
support (#2229178)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This complements v2.27.0 commit 73c46a30563d ("zdev/dracut: fix kdump by
only activating required devices"). On older distributions, the absence of
zdev_id can cause the following harmless error messages for each udev
event:
(spawn)[387]: failed to execute '/lib/s390-tools/zdev_id' \
'/lib/s390-tools/zdev_id': No such file or directory
Kdump is still functional nonetheless.
As of v2.24.0 commit 2e89722ef0ec ("zdev: make site specific udev-rule for
ccw"), the invocations of chzdev within
zdev/dracut/95zdev-kdump/module-setup.sh generate
/etc/udev/rules.d/40-zdev-id.rules. And so even though zdev-kdump
intentionally does not install zdev_id and its previous singular user
zdev/udev/81-dpm.rules into the kdump initrd, because DPM device auto
configuration is not desired in the kdump environment, zdev_id meanwhile
has an additional functionality for site-support and the generated
40-zdev-id.rules calls /lib/s390-tools/zdev_id. By installing zdev_id into
the kdump initrd, 40-zdev-id.rules can work without error.
Fixes: 73c46a30563d ("zdev/dracut: fix kdump by only activating required devices")
Reviewed-by: Alexander Egorenkov <egorenar@linux.ibm.com>
Reviewed-by: Vineeth Vijayan <vneethv@linux.ibm.com>
Signed-off-by: Steffen Maier <maier@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
(cherry picked from commit 4b486e87cc2875f532784bd69ee680e714508059)
---
zdev/dracut/95zdev-kdump/module-setup.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/zdev/dracut/95zdev-kdump/module-setup.sh b/zdev/dracut/95zdev-kdump/module-setup.sh
index ad8e309..4ce2fc6 100755
--- a/zdev/dracut/95zdev-kdump/module-setup.sh
+++ b/zdev/dracut/95zdev-kdump/module-setup.sh
@@ -46,6 +46,10 @@ installkernel() {
install() {
local _tempfile
+ # zdev_id is not functionally required for kdump but optionally
+ # installing avoids error messages from zdev site udev rule processing
+ inst_multiple -o /lib/s390-tools/zdev_id
+
# Obtain kdump target device configuration
_tempfile=$(mktemp --tmpdir dracut-zdev.XXXXXX)
--
2.41.0

View File

@ -13,7 +13,7 @@
Name: s390utils
Summary: Utilities and daemons for IBM z Systems
Version: 2.27.0
Release: 2%{?dist}
Release: 3%{?dist}
Epoch: 2
License: MIT
ExclusiveArch: s390 s390x
@ -1004,6 +1004,10 @@ User-space development files for the s390/s390x architecture.
%changelog
* Mon Aug 07 2023 Dan Horák <dhorak@redhat.com> - 2:2.27.0-3
- zdev/dracut: fix kdump build to integrate with site support (#2229178)
- Resolves: #2229178
* Fri Jul 21 2023 Dan Horák <dhorak@redhat.com> - 2:2.27.0-2
- Secure Execution APQN binding and IBK association (#2110510)
- Resolves: #2110510