Hello community, here is the log from the commit of package kdump for openSUSE:Factory checked in at 2018-02-25 11:34:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdump (Old) and /work/SRC/openSUSE:Factory/.kdump.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdump" Sun Feb 25 11:34:57 2018 rev:94 rq:579317 version:0.8.16 Changes: -------- --- /work/SRC/openSUSE:Factory/kdump/kdump.changes 2018-02-13 10:26:06.264225589 +0100 +++ /work/SRC/openSUSE:Factory/.kdump.new/kdump.changes 2018-02-25 11:34:59.378679984 +0100 @@ -1,0 +2,15 @@ +Fri Feb 23 08:07:59 UTC 2018 - ptesa...@suse.com + +- kdump-always-kexec_load-if-kexec_file_load-fails.patch: Try + kexec_load(2) if kexec_file_load(2) fails for any reason + (bsc#1080916). + +------------------------------------------------------------------- +Thu Feb 22 13:10:33 UTC 2018 - ptesa...@suse.com + +- kdump-calibrate-do-not-add-KDUMP_PHYS_LOAD-to-RAM.patch: + calibrate: Do not add KDUMP_PHYS_LOAD to required RAM. +- kdump-bootloader-filter-out-KDUMPTOOL_FLAGS.patch: bootloader: + Filter out KDUMPTOOL_FLAGS (bsc#1072584). + +------------------------------------------------------------------- New: ---- kdump-always-kexec_load-if-kexec_file_load-fails.patch kdump-bootloader-filter-out-KDUMPTOOL_FLAGS.patch kdump-calibrate-do-not-add-KDUMP_PHYS_LOAD-to-RAM.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdump.spec ++++++ --- /var/tmp/diff_new_pack.kbWHFE/_old 2018-02-25 11:35:00.774629299 +0100 +++ /var/tmp/diff_new_pack.kbWHFE/_new 2018-02-25 11:35:00.774629299 +0100 @@ -85,6 +85,9 @@ Patch36: %{name}-bail-out-if-no-default-interface.patch Patch37: %{name}-fix-missing-index-of-kdump_Host.patch Patch38: %{name}-nsswitch.conf-filtering.patch +Patch39: %{name}-calibrate-do-not-add-KDUMP_PHYS_LOAD-to-RAM.patch +Patch40: %{name}-bootloader-filter-out-KDUMPTOOL_FLAGS.patch +Patch41: %{name}-always-kexec_load-if-kexec_file_load-fails.patch BuildRequires: asciidoc BuildRequires: cmake BuildRequires: gcc-c++ @@ -185,6 +188,9 @@ %patch36 -p1 %patch37 -p1 %patch38 -p1 +%patch39 -p1 +%patch40 -p1 +%patch41 -p1 %build export CFLAGS="%{optflags}" ++++++ kdump-always-kexec_load-if-kexec_file_load-fails.patch ++++++ From: Petr Tesarik <ptesa...@suse.com> Date: Fri, 23 Feb 2018 08:59:00 +0100 Subject: Try kexec_load(2) if kexec_file_load(2) fails for any reason References: bsc#1080916 Upstream: merged Git-commit: c9f231320fe6544b4e8aedd24a571105c4ff458a Currently, kexec_load(2) is attempted only if kexec_file_load(2) is unavailable. However, kexec_file_load(2) may also fail for other reasons (e.g. missing kernel signature). It makes sense to try the older syscall in that case. Signed-off-by: Petr Tesarik <ptesa...@suse.com> --- init/load.sh | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) --- a/init/load.sh +++ b/init/load.sh @@ -164,30 +164,24 @@ function load_kdump_kexec() output=$(eval "$KEXEC_CALL -s" 2>&1) result=$? - if [ $result -eq 255 ] ; then - echo $output | grep -q 'syscall kexec_file_load not available' && result=7 - fi # print stderr in any case to show warnings that normally # would be supressed (bnc#374185) - echo -n "$output"; echo + echo "$output" if [ $result -eq 0 ] ; then kdump_logger "Loaded kdump kernel: $KEXEC_CALL -s, Result: $output" return 0 - elif [ $result -ne 7 ]; then - kdump_logger "FAILED to load kdump kernel: $KEXEC_CALL -s, Result: $output" - return $result fi - # kexec_file_load(2) not available - kdump_echo "kexec_file_load(2) not available" + # kexec_file_load(2) failed + kdump_echo "kexec_file_load(2) failed" kdump_echo "Starting load kdump kernel with kexec_load(2)" kdump_echo "kexec cmdline: $KEXEC_CALL" output=$(eval "$KEXEC_CALL" 2>&1) result=$? - echo -n "$output";echo + echo "$output" if [ $result -eq 0 ] ; then kdump_logger "Loaded kdump kernel: $KEXEC_CALL, Result: $output" ++++++ kdump-bootloader-filter-out-KDUMPTOOL_FLAGS.patch ++++++ From: Petr Tesarik <ptesa...@suse.com> Date: Thu, 22 Feb 2018 14:03:26 +0100 Subject: bootloader: Filter out KDUMPTOOL_FLAGS References: bsc#1072584 Upstream: merged Git-commit: df216d1815eae7e8c4b139e0676696de4dc447d2 The bootloader update filters out all parameters starting with KDUMP_, MAKEDUMPFILE_ or fadump. KDUMPTOOL_FLAGS does not match, so it is not removed and consequently multiple instances may appear on the command line. Signed-off-by: Petr Tesarik <ptesa...@suse.com> --- init/kdump-bootloader.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/init/kdump-bootloader.pl +++ b/init/kdump-bootloader.pl @@ -26,7 +26,7 @@ if ($ARGV[0] eq "--get") { my $param = $rawparam; $param =~ s/"//g; $param =~ s/=(.*)//; - if (! ($param =~ /^(KDUMP|MAKEDUMPFILE)_|^fadump$/)) { + if (! ($param =~ /^KDUMP(TOOL)?_|^MAKEDUMPFILE_|^fadump$/)) { $result .= " " if length($result); $result .= $rawparam; } ++++++ kdump-calibrate-do-not-add-KDUMP_PHYS_LOAD-to-RAM.patch ++++++ From: Petr Tesarik <ptesa...@suse.com> Date: Tue, 20 Feb 2018 20:44:40 +0100 Subject: calibrate: Do not add KDUMP_PHYS_LOAD to required RAM Upstream: merged Git-commit: b70cbda10aa73f72f2324b8f9bf58918b59c9a86 The memory between 0 and KDUMP_PHYS_LOAD is not really allocated to the panic kernel. It is added to the requirement merely to calculate the memmap size for pages in this range. Signed-off-by: Petr Tesarik <ptesa...@suse.com> --- kdumptool/calibrate.cc | 4 ++++ 1 file changed, 4 insertions(+) --- a/kdumptool/calibrate.cc +++ b/kdumptool/calibrate.cc @@ -968,6 +968,10 @@ void Calibrate::execute() required = prev + align_memmap(maxpfn) * SIZE_STRUCT_PAGE; Debug::debug()->dbg("Maximum memmap size: %lu KiB", required - prev); + // Memory between 0 and KDUMP_PHYS_LOAD is not really allocated, + // so subtract it again after memmap has been sized. + required -= KDUMP_PHYS_LOAD; + // Make sure there is enough space at boot Debug::debug()->dbg("Total run-time size: %lu KiB", required); if (required < bootsize)