diff options
| author | Pratyush Yadav (Google) <pratyush@kernel.org> | 2026-08-01 10:48:16 +0200 |
|---|---|---|
| committer | Mike Rapoport (Microsoft) <rppt@kernel.org> | 2026-08-04 09:19:07 +0300 |
| commit | 64c48113b324d06ccf23047b9534140aa18e6901 (patch) | |
| tree | 1f0bf79d1105dd79c483f6704b3aac96cc955a06 /kernel | |
| parent | e9e4ecd4b7e9c089ca22bf783f801f62f3fc8ecd (diff) | |
kho: add a struct for radix callbacks
A future commit will add more callbacks for the KHO radix tree. Add a
struct for collecting the callbacks.
Signed-off-by: Pratyush Yadav (Google) <pratyush@kernel.org>
Link: https://patch.msgid.link/20260801084833.1897543-8-pratyush@kernel.org
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/liveupdate/kexec_handover.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/kernel/liveupdate/kexec_handover.c b/kernel/liveupdate/kexec_handover.c index b89fe9a9ccc8..7a6c6f19ff11 100644 --- a/kernel/liveupdate/kexec_handover.c +++ b/kernel/liveupdate/kexec_handover.c @@ -281,16 +281,18 @@ void kho_radix_del_key(struct kho_radix_tree *tree, unsigned long key) } EXPORT_SYMBOL_GPL(kho_radix_del_key); -static int kho_radix_walk_leaf(struct kho_radix_leaf *leaf, - unsigned long key, - kho_radix_tree_walk_callback_t cb) +static int kho_radix_walk_leaf(struct kho_radix_leaf *leaf, unsigned long key, + const struct kho_radix_walk_cb *cb) { unsigned long *bitmap = (unsigned long *)leaf; unsigned int i; int err; + if (!cb->leaf) + return 0; + for_each_set_bit(i, bitmap, PAGE_SIZE * BITS_PER_BYTE) { - err = cb(key | i); + err = cb->leaf(key | i); if (err) return err; } @@ -300,7 +302,7 @@ static int kho_radix_walk_leaf(struct kho_radix_leaf *leaf, static int __kho_radix_walk_tree(struct kho_radix_node *root, unsigned int level, unsigned long start, - kho_radix_tree_walk_callback_t cb) + const struct kho_radix_walk_cb *cb) { struct kho_radix_node *node; struct kho_radix_leaf *leaf; @@ -340,18 +342,16 @@ static int __kho_radix_walk_tree(struct kho_radix_node *root, /** * kho_radix_walk_tree - Traverses the radix tree and calls a callback for each key. * @tree: A pointer to the KHO radix tree to walk. - * @cb: A callback function of type kho_radix_tree_walk_callback_t that will be - * invoked for each key in the tree. + * @cb: Set of callbacks to be invoked during the tree walk. * - * This function walks the radix tree, searching from the specified top level - * down to the lowest level (level 0). For each key found, it invokes the - * provided callback. + * This function walks the radix tree, searching from the top level down to the + * lowest level (level 0), invoking the appropriate callbacks. * * Return: 0 if the walk completed the specified tree, or the non-zero return * value from the callback that stopped the walk. */ int kho_radix_walk_tree(struct kho_radix_tree *tree, - kho_radix_tree_walk_callback_t cb) + const struct kho_radix_walk_cb *cb) { if (WARN_ON_ONCE(!tree->root)) return -EINVAL; @@ -1419,6 +1419,9 @@ EXPORT_SYMBOL_GPL(kho_retrieve_subtree); static void __init kho_mem_retrieve(void) { + const struct kho_radix_walk_cb cb = { + .leaf = kho_preserved_memory_reserve, + }; const void *fdt = kho_get_fdt(); void *mem_map = kho_get_mem_map(fdt); int err; @@ -1436,7 +1439,7 @@ static void __init kho_mem_retrieve(void) kho_in.radix_tree.root = mem_map; mutex_init(&kho_in.radix_tree.lock); - err = kho_radix_walk_tree(&kho_in.radix_tree, kho_preserved_memory_reserve); + err = kho_radix_walk_tree(&kho_in.radix_tree, &cb); if (err) { /* * Failed to initialize preserved memory. Clear FDT and radix |