From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 39180359707 for ; Fri, 14 Nov 2025 21:38:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763156283; cv=none; b=M2gaB+QzhQaI5BdT8DArWs0sbiiuT7t7Aso5hpvehxvkCFQnwv/5cIk0kHryScsEUFP5/jb0NC1eU8QnzULvXxaXKo9wIZ6eOEuEkjXiinvaGrGOdFc2H0mHAYT/SnK90K1hKizdTFxgmIXFm2Uu5HX5wWcmVVxM4MZCJUFWsAQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763156283; c=relaxed/simple; bh=axzO+TNdSN59BYq2HpCQt6ZyP2HZ91lcgmot0ffwMuw=; h=Date:To:From:Subject:Message-Id; b=FmGaW6iTeEDUoS+kzelraH9gRITTOKMoYcxWqauzeuvnmZuogVV2kulEUSO8t6j/Lu7UcLS2BJCvgnyBEwrYFNGXEDGBNEUtUXTpXaPFO+FAUcDFuEgirSPoc6tzpY2iS1LmnQ+Mhlr/qwGakUxs4W909aZmtrI8iUaqLGPrI4g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=KHQUIk9s; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="KHQUIk9s" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D853FC116D0; Fri, 14 Nov 2025 21:38:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1763156283; bh=axzO+TNdSN59BYq2HpCQt6ZyP2HZ91lcgmot0ffwMuw=; h=Date:To:From:Subject:From; b=KHQUIk9s4jd2ZQ9avWfVZvh/10nB4F2B1lvNN1h3mJKQ2LYCF1wLu3yhOxJgs++h0 O3n1F/s+RZrZFoFDonv/kXQWfsa7PQ1nuubcIs/8JcPNhtenCyx0iMwiPNxs8V72Iy US7phc7xagSVhOgpwC2rrJpC5LTiRJKSA9G4zGbE= Date: Fri, 14 Nov 2025 13:38:02 -0800 To: mm-commits@vger.kernel.org,zhangguopeng@kylinos.cn,yoann.congal@smile.fr,yesanishhere@gmail.com,witu@nvidia.com,wagi@kernel.org,vincent.guittot@linaro.org,tj@kernel.org,tglx@linutronix.de,stuart.w.hayes@gmail.com,song@kernel.org,skhawaja@google.com,saeedm@nvidia.com,rppt@kernel.org,rostedt@goodmis.org,roman.gushchin@linux.dev,rientjes@google.com,rdunlap@infradead.org,quic_zijuhu@quicinc.com,ptyadav@amazon.de,pratyush@kernel.org,parav@nvidia.com,pahsa.tatashin@soleen.com,ojeda@kernel.org,myungjoo.ham@samsung.com,mmaurer@google.com,mingo@redhat.com,masahiroy@kernel.org,mark.rutland@arm.com,lukas@wunner.de,linux@weissschuh.net,leonro@nvidia.com,leon@kernel.org,lennart@poettering.net,kanie@linux.alibaba.com,Jonathan.Cameron@huawei.com,joel.granados@kernel.org,jgg@nvidia.com,jannh@google.com,ira.weiny@intel.com,ilpo.jarvinen@linux.intel.com,hughd@google.com,hpa@zytor.com,hannes@cmpxchg.org,gregkh@linuxfoundation.org,graf@amazon.com,dmatlack@google.com,djeffery@redhat.com,david@redhat.com,dan.j.williams@intel.com,dakr@kernel.org,cw00.choi@samsung.com,corbet@lwn.net,chrisl@kernel.org,chenridong@huawei.com,brauner@kernel.org,bp@alien8.de,bhelgaas@google.com,bartosz.golaszewski@linaro.org,axboe@kernel.dk,anna.schumaker@oracle.com,andriy.shevchenko@linux.intel.com,aliceryhl@google.com,aleksander.lobakin@intel.com,pasha.tatashin@soleen.com,akpm@linux-foundation.org From: Andrew Morton Subject: [alternative-merged] liveupdate-kho-when-live-update-add-kho-image-during-kexec-load.patch removed from -mm tree Message-Id: <20251114213802.D853FC116D0@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: liveupdate: kho: when live update add KHO image during kexec load has been removed from the -mm tree. Its filename was liveupdate-kho-when-live-update-add-kho-image-during-kexec-load.patch This patch was dropped because an alternative patch was or shall be merged ------------------------------------------------------ From: Pasha Tatashin Subject: liveupdate: kho: when live update add KHO image during kexec load Date: Fri, 7 Nov 2025 16:03:03 -0500 In case KHO is driven from within kernel via live update, finalize will always happen during reboot, so add the KHO image unconditionally. Link: https://lkml.kernel.org/r/20251107210526.257742-6-pasha.tatashin@soleen.com Signed-off-by: Pasha Tatashin Cc: Aleksander Lobakin Cc: Alexander Graf Cc: Alice Ryhl Cc: Andriy Shevchenko Cc: anish kumar Cc: Anna Schumaker Cc: Bartosz Golaszewski Cc: Bjorn Helgaas Cc: Borislav Betkov Cc: Chanwoo Choi Cc: Chen Ridong Cc: Chris Li Cc: Christian Brauner Cc: Daniel Wagner Cc: Danilo Krummrich Cc: Dan Williams Cc: David Hildenbrand Cc: David Jeffery Cc: David Matlack Cc: David Rientjes Cc: Greg Kroah-Hartman Cc: Guixin Liu Cc: "H. Peter Anvin" Cc: Hugh Dickins Cc: Ilpo Järvinen Cc: Ingo Molnar Cc: Ira Weiny Cc: Jann Horn Cc: Jason Gunthorpe Cc: Jens Axboe Cc: Joanthan Cameron Cc: Joel Granados Cc: Johannes Weiner Cc: Jonathan Corbet Cc: Lennart Poettering Cc: Leon Romanovsky Cc: Leon Romanovsky Cc: Lukas Wunner Cc: Marc Rutland Cc: Masahiro Yamada Cc: Matthew Maurer Cc: Miguel Ojeda Cc: Mike Rapoport Cc: Myugnjoo Ham Cc: Parav Pandit Cc: Pasha Tatashin Cc: Pratyush Yadav Cc: Pratyush Yadav Cc: Randy Dunlap Cc: Roman Gushchin Cc: Saeed Mahameed Cc: Samiullah Khawaja Cc: Song Liu Cc: Steven Rostedt Cc: Stuart Hayes Cc: Tejun Heo Cc: Thomas Gleinxer Cc: Thomas Weißschuh Cc: Vincent Guittot Cc: William Tu Cc: Yoann Congal Cc: zhangguopeng Cc: Zijun Hu Signed-off-by: Andrew Morton --- kernel/liveupdate/kexec_handover.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/kernel/liveupdate/kexec_handover.c~liveupdate-kho-when-live-update-add-kho-image-during-kexec-load +++ a/kernel/liveupdate/kexec_handover.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -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; image->kho.fdt = virt_to_phys(kho_out.fdt); _ Patches currently in -mm which might be from pasha.tatashin@soleen.com are lib-test_kho-check-if-kho-is-enabled.patch kho-make-debugfs-interface-optional.patch kho-add-interfaces-to-unpreserve-folios-page-ranges-and-vmalloc.patch memblock-unpreserve-memory-in-case-of-error.patch test_kho-unpreserve-memory-in-case-of-error.patch kho-dont-unpreserve-memory-during-abort.patch liveupdate-kho-move-to-kernel-liveupdate.patch liveupdate-kho-move-to-kernel-liveupdate-fix.patch maintainers-update-kho-maintainers.patch kho-fix-misleading-log-message-in-kho_populate.patch kho-convert-__kho_abort-to-return-void.patch kho-introduce-high-level-memory-allocation-api.patch kho-preserve-fdt-folio-only-once-during-initialization.patch kho-verify-deserialization-status-and-fix-fdt-alignment-access.patch kho-always-expose-output-fdt-in-debugfs.patch kho-simplify-serialization-and-remove-__kho_abort.patch kho-remove-global-preserved_mem_map-and-store-state-in-fdt.patch kho-remove-abort-functionality-and-support-state-refresh.patch kho-update-fdt-dynamically-for-subtree-addition-removal.patch kho-allow-kexec-load-before-kho-finalization.patch kho-allow-memory-preservation-state-updates-after-finalization.patch kho-add-kconfig-option-to-enable-kho-by-default.patch liveupdate-luo_core-luo_ioctl-live-update-orchestrator.patch liveupdate-luo_core-integrate-with-kho.patch reboot-call-liveupdate_reboot-before-kexec.patch liveupdate-luo_session-add-sessions-support.patch liveupdate-luo_ioctl-add-user-interface.patch liveupdate-luo_file-implement-file-systems-callbacks.patch liveupdate-luo_session-add-ioctls-for-file-preservation-and-state-management.patch liveupdate-luo_flb-introduce-file-lifecycle-bound-global-state.patch docs-add-luo-documentation.patch maintainers-add-liveupdate-entry.patch selftests-liveupdate-add-userspace-api-selftests.patch selftests-liveupdate-add-kexec-based-selftest-for-session-lifecycle.patch selftests-liveupdate-add-kexec-test-for-multiple-and-empty-sessions.patch tests-liveupdate-add-in-kernel-liveupdate-test.patch