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 8135336CDE5 for ; Mon, 9 Mar 2026 08:04:26 +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=1773043466; cv=none; b=HiWRgjwe5jxcyiwTZMK9MMOvK1QNoJB12COufbdgwOHLYoVwCwOSZXePfs8+o6VcfsdVE+UAM9LRPhSc824n4/sOlMUDxMxQlqBFN80GkKWVka4PzoWw1lJNo886HhzWHEfu/+122szl1QQ5XX+5DngX9Q84nmAYOVamSMZFFwA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773043466; c=relaxed/simple; bh=LJdvDDnxeuJeBG4MmNELZoIasBg4c8elab3fV1YLp5M=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=KlVYWzBlW2LYPZcVtBC3dwxTJz/0mYDqY7hW8h4bDhMwtYHWww3Kr4FutjJj4xv0FO5qXVuPaqLoluzLIFESp0d9AmoXFwDB+iv61/n3gk2jOslNDB0YlXoJgB7ZpbkWN4JpT7YQOeIAEIDoaRbWddJCOWSxquXL85aXc1cFGMI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mKiYJOH8; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mKiYJOH8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1612AC4CEF7; Mon, 9 Mar 2026 08:04:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773043466; bh=LJdvDDnxeuJeBG4MmNELZoIasBg4c8elab3fV1YLp5M=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=mKiYJOH8KTAZsit44TEX+3pQbHKBOHI8z1ReVGwJCBUwNpNL5xGXpBLXvt/1pOClx 4lVPuiu44AdJrFafUZwy2w5iMPRzFJ4wuO9pbFG2oxsiRhGwOYIV4+jdyoP25X56nP yy+PDrVJ4t9JXJZ5kOh5wPz0Yv5lN4lGMx6uceyKycQ2znfjPV3ardiV8UAOJTw4b2 cmw8/OOLC/BIW0xicLzyFLhbAArhg7P3vaxs6qmajOzcD8eOjmxUVeIyEON1JsL6c1 kqRMWc94i8b70ZoUmbGL3LPgEdME6JNO5ijuZUUOpMa7o3ms27SJnpPqvaoEYbH9MI Gs/fY12XebBTA== Date: Mon, 9 Mar 2026 10:04:19 +0200 From: Mike Rapoport To: Breno Leitao Cc: Alexander Graf , Pasha Tatashin , Pratyush Yadav , linux-kernel@vger.kernel.org, kexec@lists.infradead.org, linux-mm@kvack.org, usamaarif642@gmail.com, SeongJae Park , kernel-team@meta.com Subject: Re: [PATCH v7 3/6] kho: persist blob size in KHO FDT Message-ID: References: <20260306-kho-v7-0-404d14c188bb@debian.org> <20260306-kho-v7-3-404d14c188bb@debian.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260306-kho-v7-3-404d14c188bb@debian.org> Hi Breno, On Fri, Mar 06, 2026 at 04:39:22AM -0800, Breno Leitao wrote: > kho_add_subtree() accepts a size parameter but only forwards it to > debugfs. The size is not persisted in the KHO FDT, so it is lost across > kexec. This makes it impossible for the incoming kernel to determine the > blob size without understanding the blob format. > > Store the blob size as a "blob-size" property in the KHO FDT alongside > the "preserved-data" physical address. This allows the receiving kernel > to recover the size for any blob regardless of format. > > Also extend kho_retrieve_subtree() with an optional size output > parameter so callers can learn the blob size without needing to > understand the blob format. Update all callers to pass NULL for the > new parameter. > > Signed-off-by: Breno Leitao > --- > include/linux/kexec_handover.h | 5 +++-- > include/linux/kho/abi/kexec_handover.h | 12 ++++++++++++ > kernel/liveupdate/kexec_handover.c | 28 ++++++++++++++++++++++------ > kernel/liveupdate/luo_core.c | 2 +- > lib/test_kho.c | 2 +- > mm/memblock.c | 2 +- > 6 files changed, 40 insertions(+), 11 deletions(-) > > diff --git a/include/linux/kexec_handover.h b/include/linux/kexec_handover.h > index 0666cf298c7f4..8968c56d2d73e 100644 > --- a/include/linux/kexec_handover.h > +++ b/include/linux/kexec_handover.h > @@ -34,7 +34,7 @@ struct page *kho_restore_pages(phys_addr_t phys, unsigned long nr_pages); > void *kho_restore_vmalloc(const struct kho_vmalloc *preservation); > int kho_add_subtree(const char *name, void *blob, size_t size); > void kho_remove_subtree(void *blob); > -int kho_retrieve_subtree(const char *name, phys_addr_t *phys); > +int kho_retrieve_subtree(const char *name, phys_addr_t *phys, size_t *size); > > void kho_memory_init(void); > > @@ -104,7 +104,8 @@ static inline int kho_add_subtree(const char *name, void *blob, size_t size) > > static inline void kho_remove_subtree(void *blob) { } > > -static inline int kho_retrieve_subtree(const char *name, phys_addr_t *phys) > +static inline int kho_retrieve_subtree(const char *name, phys_addr_t *phys, > + size_t *size) > { > return -EOPNOTSUPP; > } > diff --git a/include/linux/kho/abi/kexec_handover.h b/include/linux/kho/abi/kexec_handover.h > index 6b7d8ef550f98..15bf7a5be8cf1 100644 > --- a/include/linux/kho/abi/kexec_handover.h > +++ b/include/linux/kho/abi/kexec_handover.h > @@ -47,14 +47,17 @@ > * > * { > * preserved-data = <0x...>; > + * blob-size = <0x...>; Please bump the compatible version > * }; > * > * { > * preserved-data = <0x...>; > + * blob-size = <0x...>; > * }; > * ... ... > * { > * preserved-data = <0x...>; > + * blob-size = <0x...>; > * }; > * }; > * > @@ -78,6 +81,12 @@ > * > * Physical address pointing to a subnode data blob that is also > * being preserved. > + * > + * - blob-size: u64 > + * > + * Size in bytes of the preserved data blob. This is needed because > + * blobs may use arbitrary formats (not just FDT), so the size > + * cannot be determined from the blob content alone. > */ > > /* The compatible string for the KHO FDT root node. */ > @@ -89,6 +98,9 @@ > /* The FDT property for preserved data blobs. */ > #define KHO_FDT_SUB_TREE_PROP_NAME "preserved-data" > > +/* The FDT property for the size of preserved data blobs. */ > +#define KHO_FDT_SUB_TREE_SIZE_PROP_NAME "blob-size" > + I think we can drop _FDT here and in KHO_FDT_SUB_TREE_PROP_NAME > /** > * DOC: Kexec Handover ABI for vmalloc Preservation > * > diff --git a/kernel/liveupdate/kexec_handover.c b/kernel/liveupdate/kexec_handover.c > index ebaf3104c36ab..e52615fdd5e4b 100644 > --- a/kernel/liveupdate/kexec_handover.c > +++ b/kernel/liveupdate/kexec_handover.c > @@ -768,6 +768,7 @@ int kho_add_subtree(const char *name, void *blob, size_t size) > { > phys_addr_t phys = virt_to_phys(blob); > void *root_fdt = kho_out.fdt; > + u64 size_u64 = size; > int err = -ENOMEM; > int off, fdt_err; > > @@ -789,6 +790,11 @@ int kho_add_subtree(const char *name, void *blob, size_t size) > if (err < 0) > goto out_pack; > > + err = fdt_setprop(root_fdt, off, KHO_FDT_SUB_TREE_SIZE_PROP_NAME, > + &size_u64, sizeof(size_u64)); > + if (err < 0) > + goto out_pack; > + > WARN_ON_ONCE(kho_debugfs_blob_add(&kho_out.dbg, name, blob, > size, false)); > > @@ -1311,16 +1317,17 @@ bool is_kho_boot(void) > EXPORT_SYMBOL_GPL(is_kho_boot); > > /** > - * kho_retrieve_subtree - retrieve a preserved sub FDT by its name. > - * @name: the name of the sub FDT passed to kho_add_subtree(). > - * @phys: if found, the physical address of the sub FDT is stored in @phys. > + * kho_retrieve_subtree - retrieve a preserved sub blob by its name. > + * @name: the name of the sub blob passed to kho_add_subtree(). > + * @phys: if found, the physical address of the sub blob is stored in @phys. The renaming part better fits the renaming patch :) > + * @size: if not NULL and found, the size of the sub blob is stored in @size. > * > - * Retrieve a preserved sub FDT named @name and store its physical > - * address in @phys. > + * Retrieve a preserved sub blob named @name and store its physical > + * address in @phys and optionally its size in @size. Here as well. > * > * Return: 0 on success, error code on failure > */ > -int kho_retrieve_subtree(const char *name, phys_addr_t *phys) > +int kho_retrieve_subtree(const char *name, phys_addr_t *phys, size_t *size) > { > const void *fdt = kho_get_fdt(); > const u64 *val; > @@ -1342,6 +1349,15 @@ int kho_retrieve_subtree(const char *name, phys_addr_t *phys) > > *phys = (phys_addr_t)*val; > > + if (size) { > + val = fdt_getprop(fdt, offset, KHO_FDT_SUB_TREE_SIZE_PROP_NAME, > + &len); > + if (val && len == sizeof(*val)) > + *size = (size_t)*val; > + else > + *size = 0; > + } > + > return 0; > } > EXPORT_SYMBOL_GPL(kho_retrieve_subtree); > diff --git a/kernel/liveupdate/luo_core.c b/kernel/liveupdate/luo_core.c > index 04d06a0906c0e..48b25c9abeda3 100644 > --- a/kernel/liveupdate/luo_core.c > +++ b/kernel/liveupdate/luo_core.c > @@ -88,7 +88,7 @@ static int __init luo_early_startup(void) > } > > /* Retrieve LUO subtree, and verify its format. */ > - err = kho_retrieve_subtree(LUO_FDT_KHO_ENTRY_NAME, &fdt_phys); > + err = kho_retrieve_subtree(LUO_FDT_KHO_ENTRY_NAME, &fdt_phys, NULL); > if (err) { > if (err != -ENOENT) { > pr_err("failed to retrieve FDT '%s' from KHO: %pe\n", > diff --git a/lib/test_kho.c b/lib/test_kho.c > index 2631824373152..aa6a0956bb8b7 100644 > --- a/lib/test_kho.c > +++ b/lib/test_kho.c > @@ -319,7 +319,7 @@ static int __init kho_test_init(void) > if (!kho_is_enabled()) > return 0; > > - err = kho_retrieve_subtree(KHO_TEST_FDT, &fdt_phys); > + err = kho_retrieve_subtree(KHO_TEST_FDT, &fdt_phys, NULL); > if (!err) { > err = kho_test_restore(fdt_phys); > if (err) > diff --git a/mm/memblock.c b/mm/memblock.c > index 29e12ea2a854c..4f4bf1a9d7900 100644 > --- a/mm/memblock.c > +++ b/mm/memblock.c > @@ -2533,7 +2533,7 @@ static void *__init reserve_mem_kho_retrieve_fdt(void) > if (fdt) > return fdt; > > - err = kho_retrieve_subtree(MEMBLOCK_KHO_FDT, &fdt_phys); > + err = kho_retrieve_subtree(MEMBLOCK_KHO_FDT, &fdt_phys, NULL); > if (err) { > if (err != -ENOENT) > pr_warn("failed to retrieve FDT '%s' from KHO: %d\n", > > -- > 2.47.3 > > -- Sincerely yours, Mike.