From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1C4C0C54F51 for ; Wed, 29 Jul 2026 14:56:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=PzxYZqqYyrI+9wxKR1kRgJpED7EOcZAMCNlRei/+zXk=; b=Y16RPgNeQRcQfiWkx0Ym6g3YiY ggrH4CZj1FiTzycBSbK3KcdD+eiTFrWn14MVVo0konqRtnDLtQpBA8YgsPrLiE5xh4czEAJ4BHHp3 rE7Kj2FqrZ+k7ijENrnUc1Gc5t1TsISU7ewJVhBkjqMonFvytCgtI6EKF1tPdB96/pv8xlWmvwave 5WG6UsyEwjP0l6zevRvYaZIgaoHaa9cmeTbMvycxrtjoqKW/k4msBOUmH50Tajl2vm1HrBCEX2M4c mAPlN4AloDq2/ozyAboP+ff8uaoX6n0vm+1GDgYzhmDedQnoizHF4iYQzzBpeBvts6X67lK9Td+Jl sQfyPJBg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wp5iA-00000008J9c-3yhM; Wed, 29 Jul 2026 14:56:46 +0000 Received: from tor.source.kernel.org ([2600:3c04:e001:324:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wp5i9-00000008J8K-1IKj for kexec@lists.infradead.org; Wed, 29 Jul 2026 14:56:45 +0000 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id 8401160A5B; Wed, 29 Jul 2026 14:56:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 109541F00A3A; Wed, 29 Jul 2026 14:56:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785337003; bh=PzxYZqqYyrI+9wxKR1kRgJpED7EOcZAMCNlRei/+zXk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QsgHpZjwqbZuf87ikvD8qiVG13txFR8q1MCBJCH0R3wi/68klsjvtClPeaPlunvkk v10AXT0COX4Bs0ylfjt6E9kMQ99OqPWmcFiYRo0ia03DydixQAAb+JKQStWNO7S1ZA qx7lepnjw3RPYiDWthmQuw7ZC74eBef4qgJCe08boKwc+4LVPFP7POah4fjwSrj16j XB12Q3rgkN8slZs08gLd1OCGS+4MliPkqo1Vk9qoJX6KlQnUVWegpeE/VND6+3D4EV 8Lp/ekfadUZN47dcgnt4tRyeyFWdkZVrfHyjhAetRjsama8MQuJcpedDqk+BrdY1LN r5+g2NM3os24A== From: Pratyush Yadav To: Mike Rapoport , Pasha Tatashin , Pratyush Yadav , Alexander Graf , Muchun Song , Oscar Salvador , David Hildenbrand , Andrew Morton , Jason Miu , Jork Loeser Cc: kexec@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 08/22] kho: add callback for table pages Date: Wed, 29 Jul 2026 16:55:53 +0200 Message-ID: <20260729145610.2827231-9-pratyush@kernel.org> X-Mailer: git-send-email 2.55.0.508.g3f0d502094-goog In-Reply-To: <20260729145610.2827231-1-pratyush@kernel.org> References: <20260729145610.2827231-1-pratyush@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: kexec@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "kexec" Errors-To: kexec-bounces+kexec=archiver.kernel.org@lists.infradead.org From: "Pratyush Yadav (Google)" The KHO memory preservation radix tree does not mark the table pages themselves as preserved. This is done to avoid a circular dependency where preserving a page can lead of allocating other preserved pages. This means any walker looking for free ranges of memory outside of scratch areas will ignore the table Add a table callback that is invoked for each table page. The callback is given the physical address of the table page. This is useful for the upcoming mechanism that discovers blocks of memory with no preserved pages and lets them be used for boot memory. Another use case is for users of the radix tree other than KHO itself. The radix tree does not preserve its own pages due to the circular dependency described above. But external users of the radix tree would need to preserve and restore their pages for the radix tree to survive past early boot. They can use this callback to do so. Signed-off-by: Pratyush Yadav (Google) --- include/linux/kho_radix_tree.h | 3 +++ kernel/liveupdate/kexec_handover.c | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/include/linux/kho_radix_tree.h b/include/linux/kho_radix_tree.h index 426a9cc9bcde..ac7ba7e567e1 100644 --- a/include/linux/kho_radix_tree.h +++ b/include/linux/kho_radix_tree.h @@ -37,12 +37,15 @@ struct kho_radix_tree { /** * struct kho_radix_walk_cb - Callbacks for KHO radix tree walk. * @leaf: Called on each present key in the radix tree. + * @node: Called on each node of the radix tree itself. Receives the + * physical address of the page containing the node. * * For each callback, a return value of 0 continues the walk and a non-zero * return value is directly returned to the caller. */ struct kho_radix_walk_cb { int (*leaf)(unsigned long key); + int (*node)(phys_addr_t phys); }; #ifdef CONFIG_KEXEC_HANDOVER diff --git a/kernel/liveupdate/kexec_handover.c b/kernel/liveupdate/kexec_handover.c index 9fb07c0ef18e..2044f35cf1de 100644 --- a/kernel/liveupdate/kexec_handover.c +++ b/kernel/liveupdate/kexec_handover.c @@ -288,6 +288,12 @@ static int kho_radix_walk_leaf(struct kho_radix_leaf *leaf, unsigned long key, unsigned int i; int err; + if (cb->node) { + err = cb->node(virt_to_phys(leaf)); + if (err) + return err; + } + if (!cb->leaf) return 0; @@ -310,6 +316,12 @@ static int __kho_radix_walk_tree(struct kho_radix_node *root, unsigned int shift; int err; + if (cb->node) { + err = cb->node(virt_to_phys(root)); + if (err) + return err; + } + for (i = 0; i < PAGE_SIZE / sizeof(phys_addr_t); i++) { if (!root->table[i]) continue; -- 2.55.0.508.g3f0d502094-goog