Re: [PATCH v5 05/22] liveupdate: kho: when live update add KHO image during kexec load
From: Mike Rapoport <rppt@kernel.org>
Date: 2025-11-10 12:47:51
Also in:
linux-doc, linux-fsdevel, linux-mm, lkml
On Fri, Nov 07, 2025 at 04:03:03PM -0500, Pasha Tatashin wrote:
quoted hunk ↗ jump to hunk
In case KHO is driven from within kernel via live update, finalize will always happen during reboot, so add the KHO image unconditionally. Signed-off-by: Pasha Tatashin <pasha.tatashin@soleen.com> --- kernel/liveupdate/kexec_handover.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)diff --git a/kernel/liveupdate/kexec_handover.c b/kernel/liveupdate/kexec_handover.c index 9f0913e101be..b54ca665e005 100644 --- a/kernel/liveupdate/kexec_handover.c +++ b/kernel/liveupdate/kexec_handover.c@@ -15,6 +15,7 @@ #include <linux/kexec_handover.h> #include <linux/libfdt.h> #include <linux/list.h> +#include <linux/liveupdate.h> #include <linux/memblock.h> #include <linux/page-isolation.h> #include <linux/vmalloc.h>@@ -1489,7 +1490,7 @@ int kho_fill_kimage(struct kimage *image) int err = 0; struct kexec_buf scratch; - if (!kho_out.finalized) + if (!kho_out.finalized && !liveupdate_enabled()) return 0;
This feels backwards, I don't think KHO should call liveupdate methods.
image->kho.fdt = virt_to_phys(kho_out.fdt); -- 2.51.2.1041.gc1ab5b90ca-goog
-- Sincerely yours, Mike.