Skip to content

Commit 90eb9ae

Browse files
rpptakpm00
authored andcommitted
lib/test_kho: use kho_preserve_vmalloc instead of storing addresses in fdt
KHO test stores physical addresses of the preserved folios directly in fdt. Use kho_preserve_vmalloc() instead of it and kho_restore_vmalloc() to retrieve the addresses after kexec. This makes the test more scalable from one side and adds tests coverage for kho_preserve_vmalloc() from the other. Link: https://lkml.kernel.org/r/20250921054458.4043761-5-rppt@kernel.org Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org> Reviewed-by: Pratyush Yadav <pratyush@kernel.org> Cc: Alexander Graf <graf@amazon.com> Cc: Baoquan He <bhe@redhat.com> Cc: Changyuan Lyu <changyuanl@google.com> Cc: Chris Li <chrisl@kernel.org> Cc: Jason Gunthorpe <jgg@nvidia.com> Cc: Pasha Tatashin <pasha.tatashin@soleen.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent a667300 commit 90eb9ae

File tree

1 file changed

+29
-12
lines changed

1 file changed

+29
-12
lines changed

lib/test_kho.c

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ module_param(max_mem, long, 0644);
3232
struct kho_test_state {
3333
unsigned int nr_folios;
3434
struct folio **folios;
35+
phys_addr_t *folios_info;
3536
struct folio *fdt;
3637
__wsum csum;
3738
};
@@ -67,18 +68,15 @@ static struct notifier_block kho_test_nb = {
6768

6869
static int kho_test_save_data(struct kho_test_state *state, void *fdt)
6970
{
70-
phys_addr_t *folios_info;
71+
phys_addr_t *folios_info __free(kvfree) = NULL;
72+
struct kho_vmalloc folios_info_phys;
7173
int err = 0;
7274

73-
err |= fdt_begin_node(fdt, "data");
74-
err |= fdt_property(fdt, "nr_folios", &state->nr_folios,
75-
sizeof(state->nr_folios));
76-
err |= fdt_property_placeholder(fdt, "folios_info",
77-
state->nr_folios * sizeof(*folios_info),
78-
(void **)&folios_info);
79-
err |= fdt_property(fdt, "csum", &state->csum, sizeof(state->csum));
80-
err |= fdt_end_node(fdt);
75+
folios_info = vmalloc_array(state->nr_folios, sizeof(*folios_info));
76+
if (!folios_info)
77+
return -ENOMEM;
8178

79+
err = kho_preserve_vmalloc(folios_info, &folios_info_phys);
8280
if (err)
8381
return err;
8482

@@ -93,6 +91,17 @@ static int kho_test_save_data(struct kho_test_state *state, void *fdt)
9391
break;
9492
}
9593

94+
err |= fdt_begin_node(fdt, "data");
95+
err |= fdt_property(fdt, "nr_folios", &state->nr_folios,
96+
sizeof(state->nr_folios));
97+
err |= fdt_property(fdt, "folios_info", &folios_info_phys,
98+
sizeof(folios_info_phys));
99+
err |= fdt_property(fdt, "csum", &state->csum, sizeof(state->csum));
100+
err |= fdt_end_node(fdt);
101+
102+
if (!err)
103+
state->folios_info = no_free_ptr(folios_info);
104+
96105
return err;
97106
}
98107

@@ -209,8 +218,9 @@ static int kho_test_save(void)
209218

210219
static int kho_test_restore_data(const void *fdt, int node)
211220
{
221+
const struct kho_vmalloc *folios_info_phys;
212222
const unsigned int *nr_folios;
213-
const phys_addr_t *folios_info;
223+
phys_addr_t *folios_info;
214224
const __wsum *old_csum;
215225
__wsum csum = 0;
216226
int len;
@@ -225,8 +235,12 @@ static int kho_test_restore_data(const void *fdt, int node)
225235
if (!old_csum || len != sizeof(*old_csum))
226236
return -EINVAL;
227237

228-
folios_info = fdt_getprop(fdt, node, "folios_info", &len);
229-
if (!folios_info || len != sizeof(*folios_info) * *nr_folios)
238+
folios_info_phys = fdt_getprop(fdt, node, "folios_info", &len);
239+
if (!folios_info_phys || len != sizeof(*folios_info_phys))
240+
return -EINVAL;
241+
242+
folios_info = kho_restore_vmalloc(folios_info_phys);
243+
if (!folios_info)
230244
return -EINVAL;
231245

232246
for (int i = 0; i < *nr_folios; i++) {
@@ -246,6 +260,8 @@ static int kho_test_restore_data(const void *fdt, int node)
246260
folio_put(folio);
247261
}
248262

263+
vfree(folios_info);
264+
249265
if (csum != *old_csum)
250266
return -EINVAL;
251267

@@ -304,6 +320,7 @@ static void kho_test_cleanup(void)
304320
folio_put(kho_test_state.folios[i]);
305321

306322
kvfree(kho_test_state.folios);
323+
vfree(kho_test_state.folios_info);
307324
folio_put(kho_test_state.fdt);
308325
}
309326

0 commit comments

Comments
 (0)