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 18C06361664 for ; Mon, 9 Mar 2026 08:22:57 +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=1773044578; cv=none; b=VFdImlp+eqdprYkOyua/IqDCDdKsRqeIVqUa4rnNWZvzRZRVUNyGfTLQC/Ip95djblnJXeZdW2rss2PRmEboYbYTLE0FMNOPwYq5pF/ZJQtxQXAmmDorYIcYnFAy73fvuonZ6/fbOfuj4wq45+z03HVJDimqxyDpT9pWXDleRA8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773044578; c=relaxed/simple; bh=V/B5tPmLCgAxbN8UIEDAM4TeuWOKraxmkgH51tGu4uw=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=WEjzE1I6QcsP0WwaMxLMjorenarkykfmzeNA2A6oy7JutAMcey9mxZD3uZBY2saGU+sqQmdl3G8Vq/YR+jq713zRH3N5N8VrgN9e5FRSoW9PEnQNRjtj8YQZvkXLiTnZgO2O1/77JUqyuKSUm3Rzj6p6MDgr+9keXK3AOD6KDh4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=O3b92q7b; 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="O3b92q7b" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3B623C4CEF7; Mon, 9 Mar 2026 08:22:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773044577; bh=V/B5tPmLCgAxbN8UIEDAM4TeuWOKraxmkgH51tGu4uw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=O3b92q7bgFaOMmV3eGLdzebrY0/Sr+0bh6qjjVKefF860DvD1c1diA+xcCEQSmiek bmvIjE53jg20sq2gBg+7p/LuokK09L0Giolq0uT/UOHHgc9MJtjIB3cMCqwPMGxlQ1 kX5mGd8TNaqCBYpqvuDW+pBSdtOiCO3aIlJ3gRxeTVW4PIsDnAMKzsytp0APqz3sWu EKAYn6dGohnRiYx5K+hJUOYxUnxrL/rrDEhMnaLcIh50LQNGcc5aAZAKeUifPAWf5F 3ShdhuDfGkK99AG/vwbd1ulwOU2eX/UHbTTTevAfbcR3baUHGm7hpB+EXgW4vYHawr pRWS78C/KKv8w== Date: Mon, 9 Mar 2026 10:22:50 +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 4/6] kho: fix kho_in_debugfs_init() to handle non-FDT blobs Message-ID: References: <20260306-kho-v7-0-404d14c188bb@debian.org> <20260306-kho-v7-4-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-4-404d14c188bb@debian.org> On Fri, Mar 06, 2026 at 04:39:23AM -0800, Breno Leitao wrote: > kho_in_debugfs_init() has two problems when displaying incoming > sub-blobs in debugfs: > > 1. It uses the hardcoded property name "fdt" instead of > KHO_FDT_SUB_TREE_PROP_NAME ("preserved-data"), so it never finds > subtrees stored by the current kho_add_subtree(). > > 2. It calls fdt_totalsize() to determine blob sizes, which assumes > all blobs are FDTs. This breaks for non-FDT blobs like struct > kho_kexec_metadata. > > Fix both issues by using KHO_FDT_SUB_TREE_PROP_NAME to find subtrees > and reading the "blob-size" property from the FDT (persisted by > kho_add_subtree()) instead of calling fdt_totalsize(). > > Signed-off-by: Breno Leitao > --- > kernel/liveupdate/kexec_handover_debugfs.c | 38 ++++++++++++++++++++---------- > 1 file changed, 26 insertions(+), 12 deletions(-) > > diff --git a/kernel/liveupdate/kexec_handover_debugfs.c b/kernel/liveupdate/kexec_handover_debugfs.c > index 7a100f2bf3947..fc2baa8b104fd 100644 > --- a/kernel/liveupdate/kexec_handover_debugfs.c > +++ b/kernel/liveupdate/kexec_handover_debugfs.c > @@ -13,6 +13,7 @@ > #include > #include > #include > +#include > #include "kexec_handover_internal.h" > > static struct dentry *debugfs_root; > @@ -121,23 +122,36 @@ __init void kho_in_debugfs_init(struct kho_debugfs *dbg, const void *fdt) > fdt_for_each_subnode(child, fdt, 0) { > int len = 0; > const char *name = fdt_get_name(fdt, child, NULL); > - const u64 *fdt_phys; > - void *sub_fdt; > - > - fdt_phys = fdt_getprop(fdt, child, "fdt", &len); > - if (!fdt_phys) > + const u64 *blob_phys; > + const u64 *blob_size; > + void *blob; > + size_t size; Do we really need two size variables? Can't we just have u64 *size and pass *size to __kho_debugfs_blob_add()? > + > + blob_phys = fdt_getprop(fdt, child, > + KHO_FDT_SUB_TREE_PROP_NAME, &len); > + if (!blob_phys) > continue; > - if (len != sizeof(*fdt_phys)) { > - pr_warn("node %s prop fdt has invalid length: %d\n", > - name, len); > + if (len != sizeof(*blob_phys)) { > + pr_warn("node %s prop %s has invalid length: %d\n", > + name, KHO_FDT_SUB_TREE_PROP_NAME, len); > continue; > } > - sub_fdt = phys_to_virt(*fdt_phys); > + > + blob_size = fdt_getprop(fdt, child, > + KHO_FDT_SUB_TREE_SIZE_PROP_NAME, &len); > + if (!blob_size || len != sizeof(*blob_size)) { > + pr_warn("node %s missing or invalid %s property\n", > + name, KHO_FDT_SUB_TREE_SIZE_PROP_NAME); > + continue; > + } > + size = (size_t)*blob_size; > + > + blob = phys_to_virt(*blob_phys); > err = __kho_debugfs_blob_add(&dbg->fdt_list, sub_fdt_dir, name, > - sub_fdt, fdt_totalsize(sub_fdt)); > + blob, size); > if (err) { > - pr_warn("failed to add fdt %s to debugfs: %pe\n", name, > - ERR_PTR(err)); > + pr_warn("failed to add blob %s to debugfs: %pe\n", > + name, ERR_PTR(err)); > continue; > } > } > > -- > 2.47.3 > > -- Sincerely yours, Mike.