From 4eec72b56b89c72dde1fae681423301e1830f9e2 Mon Sep 17 00:00:00 2001 From: Coiby Xu Date: Fri, 2 Feb 2024 19:39:18 +0800 Subject: [PATCH] 2.0.28 upstream release Upstream tag: v2.0.28 Upstream commit: 328de8e0 Signed-off-by: Coiby Xu --- README.packit | 2 +- ...uilding-on-x86_64-with-binutils-2.41.patch | 92 +++++++++++++++++++ ...xec-don-t-use-kexec_file_load-on-XEN.patch | 60 ++++++++++++ kexec-tools.spec | 14 ++- 4 files changed, 166 insertions(+), 2 deletions(-) create mode 100644 kexec-tools-2.0.28-Fix-building-on-x86_64-with-binutils-2.41.patch create mode 100644 kexec-tools-2.0.28-kexec-don-t-use-kexec_file_load-on-XEN.patch diff --git a/README.packit b/README.packit index d529207..00a8c4d 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.87.1. +The file was generated using packit 0.89.0. diff --git a/kexec-tools-2.0.28-Fix-building-on-x86_64-with-binutils-2.41.patch b/kexec-tools-2.0.28-Fix-building-on-x86_64-with-binutils-2.41.patch new file mode 100644 index 0000000..60b15f3 --- /dev/null +++ b/kexec-tools-2.0.28-Fix-building-on-x86_64-with-binutils-2.41.patch @@ -0,0 +1,92 @@ +From 328de8e00e298f00d7ba6b25dc3950147e9642e6 Mon Sep 17 00:00:00 2001 +From: Michel Lind +Date: Tue, 30 Jan 2024 04:14:31 -0600 +Subject: [PATCH 2/2] Fix building on x86_64 with binutils 2.41 + +Newer versions of the GNU assembler (observed with binutils 2.41) will +complain about the ".arch i386" in files assembled with "as --64", +with the message "Error: 64bit mode not supported on 'i386'". + +Fix by moving ".arch i386" below the relevant ".code32" directive, so +that the assembler is no longer expecting 64-bit instructions to be used +by the time that the ".arch i386" directive is encountered. + +Based on similar iPXE fix: +https://github.com/ipxe/ipxe/commit/6ca597eee + +Signed-off-by: Michel Lind +Signed-off-by: Simon Horman +--- + purgatory/arch/i386/entry32-16-debug.S | 2 +- + purgatory/arch/i386/entry32-16.S | 2 +- + purgatory/arch/i386/entry32.S | 2 +- + purgatory/arch/i386/setup-x86.S | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/purgatory/arch/i386/entry32-16-debug.S b/purgatory/arch/i386/entry32-16-debug.S +index 5167944..12e1164 100644 +--- a/purgatory/arch/i386/entry32-16-debug.S ++++ b/purgatory/arch/i386/entry32-16-debug.S +@@ -25,10 +25,10 @@ + .globl entry16_debug_pre32 + .globl entry16_debug_first32 + .globl entry16_debug_old_first32 +- .arch i386 + .balign 16 + entry16_debug: + .code32 ++ .arch i386 + /* Compute where I am running at (assumes esp valid) */ + call 1f + 1: popl %ebx +diff --git a/purgatory/arch/i386/entry32-16.S b/purgatory/arch/i386/entry32-16.S +index c051aab..eace095 100644 +--- a/purgatory/arch/i386/entry32-16.S ++++ b/purgatory/arch/i386/entry32-16.S +@@ -20,10 +20,10 @@ + #undef i386 + .text + .globl entry16, entry16_regs +- .arch i386 + .balign 16 + entry16: + .code32 ++ .arch i386 + /* Compute where I am running at (assumes esp valid) */ + call 1f + 1: popl %ebx +diff --git a/purgatory/arch/i386/entry32.S b/purgatory/arch/i386/entry32.S +index f7a494f..8ce9e31 100644 +--- a/purgatory/arch/i386/entry32.S ++++ b/purgatory/arch/i386/entry32.S +@@ -20,10 +20,10 @@ + #undef i386 + + .text +- .arch i386 + .globl entry32, entry32_regs + entry32: + .code32 ++ .arch i386 + + /* Setup a gdt that should that is generally usefully */ + lgdt %cs:gdt +diff --git a/purgatory/arch/i386/setup-x86.S b/purgatory/arch/i386/setup-x86.S +index 201bb2c..a212eed 100644 +--- a/purgatory/arch/i386/setup-x86.S ++++ b/purgatory/arch/i386/setup-x86.S +@@ -21,10 +21,10 @@ + #undef i386 + + .text +- .arch i386 + .globl purgatory_start + purgatory_start: + .code32 ++ .arch i386 + + /* Load a gdt so I know what the segment registers are */ + lgdt %cs:gdt +-- +2.43.0 + diff --git a/kexec-tools-2.0.28-kexec-don-t-use-kexec_file_load-on-XEN.patch b/kexec-tools-2.0.28-kexec-don-t-use-kexec_file_load-on-XEN.patch new file mode 100644 index 0000000..2af234b --- /dev/null +++ b/kexec-tools-2.0.28-kexec-don-t-use-kexec_file_load-on-XEN.patch @@ -0,0 +1,60 @@ +From 94fbe64fb22d61726ca0c0996987574b6c783c19 Mon Sep 17 00:00:00 2001 +From: Jiri Bohac +Date: Tue, 16 Jan 2024 18:14:31 +0100 +Subject: [PATCH 1/2] kexec: don't use kexec_file_load on XEN + +Since commit 29fe5067ed07 ("kexec: make -a the default") +kexec tries the kexec_file_load syscall first and only falls back to kexec_load on +selected error codes. + +This effectively breaks kexec on XEN, unless -c is pecified to force the kexec_load +syscall. + +The XEN-specific functions (xen_kexec_load / xen_kexec_unload) are only called +from my_load / k_unload, i.e. the kexec_load code path. + +With -p (panic kernel) kexec_file_load on XEN fails with -EADDRNOTAVAIL (crash +kernel reservation is ignored by the kernel on XEN), which is not in the list +of return codes that cause the fallback to kexec_file. + +Without -p kexec_file_load actualy leads to a kernel oops on v6.4.0 +(needs to be dubugged separately). + +Signed-off-by: Jiri Bohac +Fixes: 29fe5067ed07 ("kexec: make -a the default") +Signed-off-by: Simon Horman +--- + kexec/kexec.8 | 1 + + kexec/kexec.c | 4 ++++ + 2 files changed, 5 insertions(+) + +diff --git a/kexec/kexec.8 b/kexec/kexec.8 +index b969cea..9e995fe 100644 +--- a/kexec/kexec.8 ++++ b/kexec/kexec.8 +@@ -162,6 +162,7 @@ Specify that the new kernel is of this + .TP + .BI \-s\ (\-\-kexec-file-syscall) + Specify that the new KEXEC_FILE_LOAD syscall should be used exclusively. ++Ignored on XEN. + .TP + .BI \-c\ (\-\-kexec-syscall) + Specify that the old KEXEC_LOAD syscall should be used exclusively. +diff --git a/kexec/kexec.c b/kexec/kexec.c +index 08edfca..9d0ec46 100644 +--- a/kexec/kexec.c ++++ b/kexec/kexec.c +@@ -1685,6 +1685,10 @@ int main(int argc, char *argv[]) + } + } + } ++ if (xen_present()) { ++ do_kexec_file_syscall = 0; ++ do_kexec_fallback = 0; ++ } + if (do_kexec_file_syscall) { + if (do_load_jump_back_helper && !do_kexec_fallback) + die("--load-jump-back-helper not supported with kexec_file_load\n"); +-- +2.43.0 + diff --git a/kexec-tools.spec b/kexec-tools.spec index c15c994..af24741 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -5,7 +5,7 @@ Name: kexec-tools Version: 2.0.28 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL-2.0-only Summary: The kexec/kdump userspace component @@ -89,6 +89,9 @@ Requires: systemd-udev%{?_isa} # # Patches 101 through 200 are meant for x86_64 kexec-tools enablement # +# Fix building on x86_64 with binutils 2.41 +# Author: Michel Lind +Patch101: kexec-tools-2.0.28-Fix-building-on-x86_64-with-binutils-2.41.patch # # Patches 301 through 400 are meant for ppc64 kexec-tools enablement @@ -105,6 +108,9 @@ Requires: systemd-udev%{?_isa} # # Patches 601 onward are generic patches # +# kexec: don't use kexec_file_load on XEN +# Author: Jiri Bohac +Patch601: kexec-tools-2.0.28-kexec-don-t-use-kexec_file_load-on-XEN.patch %description kexec-tools provides /sbin/kexec binary that facilitates a new @@ -120,6 +126,8 @@ mkdir -p -m755 kcp tar -z -x -v -f %{SOURCE9} tar -z -x -v -f %{SOURCE19} +%patch 101 -p1 +%patch 601 -p1 %ifarch ppc %define archdef ARCH=ppc @@ -359,6 +367,10 @@ fi %endif %changelog +* Fri Feb 02 2024 Coiby Xu - 2.0.28-4 +- kexec: don't use kexec_file_load on XEN +- Fix building on x86_64 with binutils 2.41 + * Wed Jan 24 2024 Fedora Release Engineering - 2.0.28-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild