Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
e9d22f4e59 | ||
|
be96a24f13 | ||
|
f261f90231 | ||
|
b0d6e9f357 | ||
|
d83c41c768 |
5
.gitignore
vendored
5
.gitignore
vendored
@ -1 +1,4 @@
|
||||
kdump-utils-1.0.43.tar.gz
|
||||
/kdump-utils-1.0.42.tar.gz
|
||||
/kdump-utils-1.0.43.tar.gz
|
||||
/kdump-utils-1.0.45.tar.gz
|
||||
/kdump-utils-1.0.51.tar.gz
|
||||
|
@ -0,0 +1,35 @@
|
||||
From 679a1c5a96e4b5fac06f2045db97db21e6a62ff8 Mon Sep 17 00:00:00 2001
|
||||
From: Sourabh Jain <sourabhjain@linux.ibm.com>
|
||||
Date: Wed, 8 Jan 2025 12:11:10 +0530
|
||||
Subject: [PATCH] powerpc: fix early exit from udev on hotplug event for fadump
|
||||
|
||||
Sysfs /sys/kernel/fadump/hotplug_ready contains 1 if hotplug is
|
||||
supported by fadump.
|
||||
|
||||
Now to exit early the RUN command should grep 0 from
|
||||
/sys/kernel/fadump/hotplug_ready instead of 1.
|
||||
|
||||
Fix it by updating RUN command.
|
||||
|
||||
Fixes: b4e3d3724cf3 ("fadump/udev: do not re-register fadump if kernel hotplug ready")
|
||||
Signed-off-by: Sourabh Jain <sourabhjain@linux.ibm.com>
|
||||
---
|
||||
98-kexec.rules.ppc64 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/98-kexec.rules.ppc64 b/98-kexec.rules.ppc64
|
||||
index 85fe0b1..ac6d42a 100644
|
||||
--- a/98-kexec.rules.ppc64
|
||||
+++ b/98-kexec.rules.ppc64
|
||||
@@ -17,7 +17,7 @@ LABEL="kdump_reload_mem"
|
||||
|
||||
# Don't re-register fadump if /sys/kernel/fadump/hotplug_ready sysfs is set to 1.
|
||||
|
||||
-RUN+="/bin/sh -c '/usr/bin/systemctl is-active kdump.service || exit 0; ! test -f /sys/kernel/fadump/hotplug_ready || cat /sys/kernel/fadump/hotplug_ready | grep 1 || exit 0; /usr/bin/systemd-run --quiet --no-block /usr/lib/udev/kdump-udev-throttler'"
|
||||
+RUN+="/bin/sh -c '/usr/bin/systemctl is-active kdump.service || exit 0; ! test -f /sys/kernel/fadump/hotplug_ready || cat /sys/kernel/fadump/hotplug_ready | grep 0 || exit 0; /usr/bin/systemd-run --quiet --no-block /usr/lib/udev/kdump-udev-throttler'"
|
||||
|
||||
GOTO="kdump_reload_end"
|
||||
|
||||
--
|
||||
2.41.0
|
||||
|
34
0002-99-kdump.conf-Omit-nouveau-and-amdgpu-module.patch
Normal file
34
0002-99-kdump.conf-Omit-nouveau-and-amdgpu-module.patch
Normal file
@ -0,0 +1,34 @@
|
||||
From 77a0246cde3505777cfa1f9c2a1a834e76b7eed6 Mon Sep 17 00:00:00 2001
|
||||
From: Lichen Liu <lichliu@redhat.com>
|
||||
Date: Mon, 13 Jan 2025 17:39:56 +0800
|
||||
Subject: [PATCH] 99-kdump.conf: Omit nouveau and amdgpu module
|
||||
|
||||
Resolves: https://issues.redhat.com/browse/RHEL-52304
|
||||
|
||||
The GPU module provides no significant utility in second kernel, and it
|
||||
introduces firmware that occupies lots of memory, which is critical in
|
||||
the constrained environment of kdump. Omit it helps reduce memory usage
|
||||
and optimize the crash recovery process.
|
||||
|
||||
See also:
|
||||
https://access.redhat.com/solutions/6977793
|
||||
https://access.redhat.com/solutions/7100186
|
||||
|
||||
Signed-off-by: Lichen Liu <lichliu@redhat.com>
|
||||
---
|
||||
99-kdump.conf | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/99-kdump.conf b/99-kdump.conf
|
||||
index 80d6e43..696c7ac 100644
|
||||
--- a/99-kdump.conf
|
||||
+++ b/99-kdump.conf
|
||||
@@ -1,3 +1,4 @@
|
||||
dracutmodules=''
|
||||
add_dracutmodules=' kdumpbase '
|
||||
omit_dracutmodules=' rdma plymouth resume ifcfg earlykdump '
|
||||
+omit_drivers+=' nouveau amdgpu '
|
||||
\ No newline at end of file
|
||||
--
|
||||
2.47.0
|
||||
|
43
0003-99-kdump.conf-Omit-hwdb-dracut-module.patch
Normal file
43
0003-99-kdump.conf-Omit-hwdb-dracut-module.patch
Normal file
@ -0,0 +1,43 @@
|
||||
From 966dc0845980d2150a6614387ce6a05c79e1eb80 Mon Sep 17 00:00:00 2001
|
||||
From: Lichen Liu <lichliu@redhat.com>
|
||||
Date: Tue, 21 Jan 2025 14:04:28 +0800
|
||||
Subject: [PATCH] 99-kdump.conf: Omit hwdb dracut module
|
||||
|
||||
The hwdb (udev hardware database) file `/etc/udev/hwdb.bin` is currently
|
||||
included in the initramfs, taking up approximately 13MB of space. This is
|
||||
a significant size for kdump initramfs, which may lead more OOM issues.
|
||||
|
||||
Certain advanced device initializations that rely on hwdb (e.g., custom
|
||||
keyboard mappings, specific touchpad configurations) may not work in the
|
||||
kdump environment.
|
||||
|
||||
However, kdump do not require hwdb in the most cases, as critical devices
|
||||
like storage, network, and basic input devices are typically handled by
|
||||
standard udev rules and kernel drivers.
|
||||
|
||||
This change prioritizes reducing initramfs size over retaining hardware
|
||||
database functionality, as the latter is rarely critical in the kdump
|
||||
environment.
|
||||
|
||||
Resolves: https://issues.redhat.com/browse/RHEL-57731
|
||||
|
||||
Signed-off-by: Lichen Liu <lichliu@redhat.com>
|
||||
---
|
||||
99-kdump.conf | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/99-kdump.conf b/99-kdump.conf
|
||||
index 696c7ac..1301c44 100644
|
||||
--- a/99-kdump.conf
|
||||
+++ b/99-kdump.conf
|
||||
@@ -1,4 +1,4 @@
|
||||
dracutmodules=''
|
||||
add_dracutmodules=' kdumpbase '
|
||||
-omit_dracutmodules=' rdma plymouth resume ifcfg earlykdump '
|
||||
-omit_drivers+=' nouveau amdgpu '
|
||||
\ No newline at end of file
|
||||
+omit_dracutmodules=' hwdb rdma plymouth resume ifcfg earlykdump '
|
||||
+omit_drivers+=' nouveau amdgpu '
|
||||
--
|
||||
2.47.0
|
||||
|
6
gating.yaml
Normal file
6
gating.yaml
Normal file
@ -0,0 +1,6 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-10
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.general-kdump.tier0.functional}
|
@ -1,13 +1,16 @@
|
||||
# kdump-utils has no debug source
|
||||
%global debug_package %{nil}
|
||||
Name: kdump-utils
|
||||
Version:1.0.43
|
||||
Release: 1%{?dist}
|
||||
Version:1.0.51
|
||||
Release: %autorelease
|
||||
Summary: Kernel crash dump collection utilities
|
||||
|
||||
License: GPL-2.0-only
|
||||
URL: https://github.com/rhkdump/kdump-utils
|
||||
Source0: https://github.com/rhkdump/kdump-utils/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
Patch01: 0001-powerpc-fix-early-exit-from-udev-on-hotplug-event-fo.patch
|
||||
Patch02: 0002-99-kdump.conf-Omit-nouveau-and-amdgpu-module.patch
|
||||
Patch03: 0003-99-kdump.conf-Omit-hwdb-dracut-module.patch
|
||||
|
||||
%ifarch ppc64 ppc64le
|
||||
Requires(post): servicelog
|
||||
@ -39,23 +42,15 @@ kdump kernel and initramfs to save the collected crash kernel dump to specified
|
||||
target.
|
||||
|
||||
%prep
|
||||
%autosetup
|
||||
%autosetup -p1
|
||||
|
||||
%install
|
||||
%make_install sbindir=%_sbindir
|
||||
|
||||
|
||||
%post
|
||||
# don't try to systemctl preset the kdump service for old kexec-tools
|
||||
#
|
||||
# when the old kexec-tools gets removed, this trigger will be excuted to
|
||||
# create a file. So later the posttrans scriptlet will know there is no need to
|
||||
# systemctl preset the kdump service.
|
||||
# This solution can be dropped in F41 when we assume no users will use old
|
||||
# version of kexec-tools.
|
||||
%define kexec_tools_no_preset %{_localstatedir}/lib/rpm-state/kexec-tools.no-preset
|
||||
%triggerun -- kexec-tools
|
||||
touch %{kexec_tools_no_preset}
|
||||
# kdumpctl will only set up default crashkernel when kdump.service is enabled
|
||||
%systemd_post kdump.service
|
||||
|
||||
touch /etc/kdump.conf
|
||||
|
||||
@ -75,14 +70,6 @@ servicelog_notify --remove --command=/usr/lib/kdump/kdump-migrate-action.sh >/de
|
||||
%systemd_preun kdump.service
|
||||
|
||||
%posttrans
|
||||
# don't try to systemctl preset the kdump service for old kexec-tools
|
||||
if [[ -f %{kexec_tools_no_preset} ]]; then
|
||||
# this if branch can be removed in F41 when we assume no users will use the old kexec-tools
|
||||
rm %{kexec_tools_no_preset}
|
||||
else
|
||||
# Initial installation
|
||||
%systemd_post kdump.service
|
||||
fi
|
||||
# Try to reset kernel crashkernel value to new default value or set up
|
||||
# crasherkernel value for new install
|
||||
#
|
||||
@ -90,6 +77,7 @@ fi
|
||||
# 1. Skip ostree systems as they are not supported.
|
||||
# 2. For Fedora 36 and RHEL9, "[ $1 == 1 ]" in posttrans scriptlet means both install and upgrade;
|
||||
# For Fedora > 36, "[ $1 == 1 ]" only means install and "[ $1 == 2 ]" means upgrade
|
||||
# 3. osbuild depends on "kdumpctl _reset-crashkernel-for-installed_kernel" to set up crashkernel
|
||||
if [ ! -f /run/ostree-booted ] && [ $1 == 1 -o $1 == 2 ]; then
|
||||
kdumpctl _reset-crashkernel-after-update
|
||||
:
|
||||
@ -132,8 +120,4 @@ fi
|
||||
%doc supported-kdump-targets.txt
|
||||
|
||||
%changelog
|
||||
* Mon Jul 15 2024 Lichen Liu <lichliu@redhat.com> - 1.0.43-1
|
||||
- Update to upstream 1.0.43
|
||||
|
||||
* Tue Oct 24 2023 Coiby <coxu@redhat.com> - 1.0.42-10
|
||||
- split from kexec-tools
|
||||
%autochangelog
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (kdump-utils-1.0.43.tar.gz) = ede87a85f63f1f08aec477729a2fe7858d78bd21588b00d13c8ce25b6d951bd400a0642bc2ae34c62ebcce54b8b8ff0c7a8d1d867be18217c9b015adc4131707
|
||||
SHA512 (kdump-utils-1.0.51.tar.gz) = 4dcad4cfa8f4434e93d712675de296a49791e430b4f697c8dcfbaddbe148b53f5ef5a77d022cf7175a7650d907346def77139370ffd27ef2f6a0f6b8c9dbfa12
|
||||
|
Loading…
Reference in New Issue
Block a user