From nobody Mon Feb 9 13:35:58 2026 Received: from mail-dl1-f73.google.com (mail-dl1-f73.google.com [74.125.82.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 261A733031F for ; Thu, 15 Jan 2026 23:00:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768518065; cv=none; b=B4nTtcaD7XD1uj4SrtqOgHW/heyMCPQCZt/OtwSV6VAMxqF2fMqWW6J0qIo3IxkQ3tDvf781c/gn7Y3hxSDDE6lPURzqye4hv5R+DS1l1euHjtMgkwxezmdoLpCisRkwLYpq97aySpcscHUlHFqMY4ohrAs7NOczpRsEqYaPJfA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768518065; c=relaxed/simple; bh=zyh5GfztKxFiN8u5cb2xQ/xzyVMG2xEaHajpmGypSs0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=Weg6WO0KUK6eWkoq9FtKeEsxGZqjeWbLzVwkQqA+EV4LtmuIRgZFci6QV1AnUdHP1kO9ws1KOUVfy+VeUPofwpnkf8kr3/H9YBIL0AiKkAQdSiZ237WN5lqMA8SPvum+lYoqQUMmmq3T15m80IphI819kzyQONGnfK18HOAbTUY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jasonmiu.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=feW1I0/f; arc=none smtp.client-ip=74.125.82.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--jasonmiu.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="feW1I0/f" Received: by mail-dl1-f73.google.com with SMTP id a92af1059eb24-123840bf029so2118181c88.1 for ; Thu, 15 Jan 2026 15:00:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1768518054; x=1769122854; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=IMdtswLamt3UOykeQTkJyuYvDnFmHdnfUUvbhOgS5Nk=; b=feW1I0/fjQk15LYsEdXfYlgkr8NwVIJoOD2L28FdbQdroUyXuhZcPE1YC9/2jJQiKY w7+FAqKR7WhTgQGDGokdtwE88uF5GNSXhBzQQ1zO6DkFs85Zc1yo3A2H7U9FvxKuwo3Q O/EKtybd9scGk3Mc1k90CoTIeQPQwq0MoWjbT0VBNGAw6V0azgCgzDnnNRqt2I2ClOYE ybwKpJz6C8cC5f/JkGzwUmiCATWAr5DdHXZyoRLryPlgfZWpcxU8js2hUaRtrDQdEjjx NnrG3ofqWkjJOHRHx7wTiJXH7tUaq4l0pabjafXXmRGEytcyWI1orHHDeLBqPF3mjBl4 x+yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768518054; x=1769122854; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=IMdtswLamt3UOykeQTkJyuYvDnFmHdnfUUvbhOgS5Nk=; b=DFXXzgwKxRQaXfMjTp5DycNfFrc4QLT1EMOTFF/vONBuPvUKHjj9FlxiZR4CAusJGr KD8NpBKI6DWaranqeI430NMIVaU/tTSpFjVqZTT0aI/FSbiyQRP2bOUS9CosB5EifttB XjSKBzvUvlJtXhqwYL+/NqCN69e5BmDf8D9WDxGq+qZDiMfjmTu7Q7ATHbquNXMSLYBo ppXrYVvDZ/70995oeYW/jdq/YDJFdvGjA48V9/KF31TkK8u2crNXFVbcxztlrad6UMFA 3d9MLqo8Fx2s1bTowUDP1bUQQxGtDAOaeBv7yijGdUcu0pzT/imPMD8SGI8kqR0sR5ZD Ss5g== X-Forwarded-Encrypted: i=1; AJvYcCXEOYyja5CSzvERF2CZjvfjGPJuPATSqiIvE2BMV8M0ivZB16Bddoa+zn/NGNjtwiUblD0j8oSMsR8+Nxs=@vger.kernel.org X-Gm-Message-State: AOJu0Yzh3VwdstBzut+Flht/8FLXBp2ljie8+9XxYvs6vr0MkyvqglXv GKCpPXHuFysEN53kqyJ9u4iiu1CdzjnF3JfY4BrOXGiLtMW+KBS1kdXd2h5nsfMHh8VC8J/Jw8y H96Zxdw6M7BQmhQ== X-Received: from dlbui3.prod.google.com ([2002:a05:7022:3d03:b0:11d:cfca:1df5]) (user=jasonmiu job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:2206:b0:123:3bc6:1ffe with SMTP id a92af1059eb24-1244a70d2e6mr1427106c88.15.1768518054137; Thu, 15 Jan 2026 15:00:54 -0800 (PST) Date: Thu, 15 Jan 2026 15:00:47 -0800 In-Reply-To: <20260115230047.1220580-1-jasonmiu@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260115230047.1220580-1-jasonmiu@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260115230047.1220580-3-jasonmiu@google.com> Subject: [PATCH v6 2/2] kho: Remove finalize state and clients From: Jason Miu To: Alexander Graf , Andrew Morton , Baoquan He , Changyuan Lyu , David Matlack , David Rientjes , Jason Gunthorpe , Jason Miu , Mike Rapoport , Pasha Tatashin , Pratyush Yadav , kexec@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Eliminate the `kho_finalize()` function and its associated state from the KHO subsystem. The transition to a radix tree for memory tracking makes the explicit "finalize" state and its serialization step obsolete. Remove the `kho_finalize()` and `kho_finalized()` APIs and their stub implementations. Update KHO client code and the debugfs interface to no longer call or depend on the `kho_finalize()` mechanism. Complete the move towards a stateless KHO, simplifying the overall design by removing unnecessary state management. Signed-off-by: Jason Miu --- Documentation/admin-guide/mm/kho.rst | 53 +++++---------------- Documentation/core-api/kho/index.rst | 12 ----- kernel/liveupdate/kexec_handover.c | 21 +------- kernel/liveupdate/kexec_handover_debugfs.c | 23 --------- kernel/liveupdate/kexec_handover_internal.h | 3 -- kernel/liveupdate/luo_core.c | 12 +---- kernel/liveupdate/luo_flb.c | 2 +- tools/testing/selftests/kho/init.c | 20 -------- 8 files changed, 14 insertions(+), 132 deletions(-) diff --git a/Documentation/admin-guide/mm/kho.rst b/Documentation/admin-gui= de/mm/kho.rst index 6dc18ed4b886..454b378cf239 100644 --- a/Documentation/admin-guide/mm/kho.rst +++ b/Documentation/admin-guide/mm/kho.rst @@ -28,20 +28,10 @@ per NUMA node scratch regions on boot. Perform a KHO kexec =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 -First, before you perform a KHO kexec, you need to move the system into -the :ref:`KHO finalization phase ` :: - - $ echo 1 > /sys/kernel/debug/kho/out/finalize - -After this command, the KHO FDT is available in -``/sys/kernel/debug/kho/out/fdt``. Other subsystems may also register -their own preserved sub FDTs under -``/sys/kernel/debug/kho/out/sub_fdts/``. - -Next, load the target payload and kexec into it. It is important that you -use the ``-s`` parameter to use the in-kernel kexec file loader, as user -space kexec tooling currently has no support for KHO with the user space -based file loader :: +To perform a KHO kexec, load the target payload and kexec into it. It +is important that you use the ``-s`` parameter to use the in-kernel +kexec file loader, as user space kexec tooling currently has no +support for KHO with the user space based file loader :: =20 # kexec -l /path/to/bzImage --initrd /path/to/initrd -s # kexec -e @@ -52,40 +42,19 @@ For example, if you used ``reserve_mem`` command line p= arameter to create an early memory reservation, the new kernel will have that memory at the same physical address as the old kernel. =20 -Abort a KHO exec -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - -You can move the system out of KHO finalization phase again by calling :: - - $ echo 0 > /sys/kernel/debug/kho/out/active - -After this command, the KHO FDT is no longer available in -``/sys/kernel/debug/kho/out/fdt``. - debugfs Interfaces =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 +These debugfs interfaces are available when the kernel is compiled with +``CONFIG_KEXEC_HANDOVER_DEBUGFS`` enabled. + Currently KHO creates the following debugfs interfaces. Notice that these interfaces may change in the future. They will be moved to sysfs once KHO = is stabilized. =20 -``/sys/kernel/debug/kho/out/finalize`` - Kexec HandOver (KHO) allows Linux to transition the state of - compatible drivers into the next kexec'ed kernel. To do so, - device drivers will instruct KHO to preserve memory regions, - which could contain serialized kernel state. - While the state is serialized, they are unable to perform - any modifications to state that was serialized, such as - handed over memory allocations. - - When this file contains "1", the system is in the transition - state. When contains "0", it is not. To switch between the - two states, echo the respective number into this file. - ``/sys/kernel/debug/kho/out/fdt`` - When KHO state tree is finalized, the kernel exposes the - flattened device tree blob that carries its current KHO - state in this file. Kexec user space tooling can use this + The kernel exposes the flattened device tree blob that carries its + current KHO state in this file. Kexec user space tooling can use this as input file for the KHO payload image. =20 ``/sys/kernel/debug/kho/out/scratch_len`` @@ -100,8 +69,8 @@ stabilized. it should place its payload images. =20 ``/sys/kernel/debug/kho/out/sub_fdts/`` - In the KHO finalization phase, KHO producers register their own - FDT blob under this directory. + KHO producers can register their own FDT blob another binary blob under + this directory. =20 ``/sys/kernel/debug/kho/in/fdt`` When the kernel was booted with Kexec HandOver (KHO), diff --git a/Documentation/core-api/kho/index.rst b/Documentation/core-api/= kho/index.rst index 002bdf0beb2e..0a2dee4f8e7d 100644 --- a/Documentation/core-api/kho/index.rst +++ b/Documentation/core-api/kho/index.rst @@ -71,18 +71,6 @@ for boot memory allocations and as target memory for kex= ec blobs, some parts of that memory region may be reserved. These reservations are irrelevant f= or the next KHO, because kexec can overwrite even the original kernel. =20 -.. _kho-finalization-phase: - -KHO finalization phase -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - -To enable user space based kexec file loader, the kernel needs to be able = to -provide the FDT that describes the current kernel's state before -performing the actual kexec. The process of generating that FDT is -called serialization. When the FDT is generated, some properties -of the system may become immutable because they are already written down -in the FDT. That state is called the KHO finalization phase. - Kexec Handover Radix Tree =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D =20 diff --git a/kernel/liveupdate/kexec_handover.c b/kernel/liveupdate/kexec_h= andover.c index 33ba1c7db661..411bf7aa80c2 100644 --- a/kernel/liveupdate/kexec_handover.c +++ b/kernel/liveupdate/kexec_handover.c @@ -68,8 +68,7 @@ early_param("kho", kho_parse_enable); =20 struct kho_out { void *fdt; - bool finalized; - struct mutex lock; /* protects KHO FDT finalization */ + struct mutex lock; /* protects KHO FDT */ =20 struct kho_radix_tree radix_tree; struct kho_debugfs dbg; @@ -80,7 +79,6 @@ static struct kho_out kho_out =3D { .radix_tree =3D { .lock =3D __MUTEX_INITIALIZER(kho_out.radix_tree.lock), }, - .finalized =3D false, }; =20 /** @@ -1196,23 +1194,6 @@ void kho_restore_free(void *mem) } EXPORT_SYMBOL_GPL(kho_restore_free); =20 -int kho_finalize(void) -{ - if (!kho_enable) - return -EOPNOTSUPP; - - guard(mutex)(&kho_out.lock); - kho_out.finalized =3D true; - - return 0; -} - -bool kho_finalized(void) -{ - guard(mutex)(&kho_out.lock); - return kho_out.finalized; -} - struct kho_in { phys_addr_t fdt_phys; phys_addr_t scratch_phys; diff --git a/kernel/liveupdate/kexec_handover_debugfs.c b/kernel/liveupdate= /kexec_handover_debugfs.c index 2abbf62ba942..430c9521d59c 100644 --- a/kernel/liveupdate/kexec_handover_debugfs.c +++ b/kernel/liveupdate/kexec_handover_debugfs.c @@ -75,24 +75,6 @@ void kho_debugfs_fdt_remove(struct kho_debugfs *dbg, voi= d *fdt) } } =20 -static int kho_out_finalize_get(void *data, u64 *val) -{ - *val =3D kho_finalized(); - - return 0; -} - -static int kho_out_finalize_set(void *data, u64 val) -{ - if (val) - return kho_finalize(); - else - return -EINVAL; -} - -DEFINE_DEBUGFS_ATTRIBUTE(kho_out_finalize_fops, kho_out_finalize_get, - kho_out_finalize_set, "%llu\n"); - static int scratch_phys_show(struct seq_file *m, void *v) { for (int i =3D 0; i < kho_scratch_cnt; i++) @@ -198,11 +180,6 @@ __init int kho_out_debugfs_init(struct kho_debugfs *db= g) if (IS_ERR(f)) goto err_rmdir; =20 - f =3D debugfs_create_file("finalize", 0600, dir, NULL, - &kho_out_finalize_fops); - if (IS_ERR(f)) - goto err_rmdir; - dbg->dir =3D dir; dbg->sub_fdt_dir =3D sub_fdt_dir; return 0; diff --git a/kernel/liveupdate/kexec_handover_internal.h b/kernel/liveupdat= e/kexec_handover_internal.h index 0202c85ad14f..9a832a35254c 100644 --- a/kernel/liveupdate/kexec_handover_internal.h +++ b/kernel/liveupdate/kexec_handover_internal.h @@ -22,9 +22,6 @@ struct kho_debugfs {}; extern struct kho_scratch *kho_scratch; extern unsigned int kho_scratch_cnt; =20 -bool kho_finalized(void); -int kho_finalize(void); - #ifdef CONFIG_KEXEC_HANDOVER_DEBUGFS int kho_debugfs_init(void); void kho_in_debugfs_init(struct kho_debugfs *dbg, const void *fdt); diff --git a/kernel/liveupdate/luo_core.c b/kernel/liveupdate/luo_core.c index dda7bb57d421..84ac728d63ba 100644 --- a/kernel/liveupdate/luo_core.c +++ b/kernel/liveupdate/luo_core.c @@ -230,17 +230,7 @@ int liveupdate_reboot(void) =20 luo_flb_serialize(); =20 - err =3D kho_finalize(); - if (err) { - pr_err("kho_finalize failed %d\n", err); - /* - * kho_finalize() may return libfdt errors, to aboid passing to - * userspace unknown errors, change this to EAGAIN. - */ - err =3D -EAGAIN; - } - - return err; + return 0; } =20 /** diff --git a/kernel/liveupdate/luo_flb.c b/kernel/liveupdate/luo_flb.c index 4c437de5c0b0..22f6409875c9 100644 --- a/kernel/liveupdate/luo_flb.c +++ b/kernel/liveupdate/luo_flb.c @@ -630,7 +630,7 @@ int __init luo_flb_setup_incoming(void *fdt_in) * data handle, and the final reference count. This allows the new kernel = to * find the appropriate handler and reconstruct the FLB's state. * - * Context: Called from liveupdate_reboot() just before kho_finalize(). + * Context: Called from liveupdate_reboot(). */ void luo_flb_serialize(void) { diff --git a/tools/testing/selftests/kho/init.c b/tools/testing/selftests/k= ho/init.c index 6d9e91d55d68..88a41b6eba95 100644 --- a/tools/testing/selftests/kho/init.c +++ b/tools/testing/selftests/kho/init.c @@ -11,7 +11,6 @@ /* from arch/x86/include/asm/setup.h */ #define COMMAND_LINE_SIZE 2048 =20 -#define KHO_FINALIZE "/debugfs/kho/out/finalize" #define KERNEL_IMAGE "/kernel" =20 static int mount_filesystems(void) @@ -22,22 +21,6 @@ static int mount_filesystems(void) return mount("proc", "/proc", "proc", 0, NULL); } =20 -static int kho_enable(void) -{ - const char enable[] =3D "1"; - int fd; - - fd =3D open(KHO_FINALIZE, O_RDWR); - if (fd < 0) - return -1; - - if (write(fd, enable, sizeof(enable)) !=3D sizeof(enable)) - return 1; - - close(fd); - return 0; -} - static long kexec_file_load(int kernel_fd, int initrd_fd, unsigned long cmdline_len, const char *cmdline, unsigned long flags) @@ -78,9 +61,6 @@ int main(int argc, char *argv[]) if (mount_filesystems()) goto err_reboot; =20 - if (kho_enable()) - goto err_reboot; - if (kexec_load()) goto err_reboot; =20 --=20 2.52.0.457.g6b5491de43-goog