Store KSTATE physical address & size instead of FDT in kho_data.
and initialize KSTATE from kho_populate().
To be able to use FDT in parallel with KSTATE place FDT
address&size into 'struct kho_fdt' and save/restore it using KSTATE.
This finishes wiring KSTATE with KHO, making it fully functional.
Signed-off-by: Andrey Ryabinin <a...@yandex-team.com>
---
arch/x86/include/uapi/asm/setup_data.h | 4 +-
arch/x86/kernel/kexec-bzimage64.c | 6 +--
arch/x86/kernel/setup.c | 3 +-
drivers/of/fdt.c | 6 +--
include/linux/kexec.h | 2 +-
include/linux/kstate.h | 1 +
kernel/liveupdate/kexec_handover.c | 60 +++++++++++++++++++++-----
7 files changed, 61 insertions(+), 21 deletions(-)
diff --git a/arch/x86/include/uapi/asm/setup_data.h
b/arch/x86/include/uapi/asm/setup_data.h
index 2671c4e1b3a0..844f5b93473f 100644
--- a/arch/x86/include/uapi/asm/setup_data.h
+++ b/arch/x86/include/uapi/asm/setup_data.h
@@ -83,8 +83,8 @@ struct ima_setup_data {
* Locations of kexec handover metadata
*/
struct kho_data {
- __u64 fdt_addr;
- __u64 fdt_size;
+ __u64 kstate_addr;
+ __u64 kstate_size;
__u64 scratch_addr;
__u64 scratch_size;
} __attribute__((packed));
diff --git a/arch/x86/kernel/kexec-bzimage64.c
b/arch/x86/kernel/kexec-bzimage64.c
index 24a41f0e0cf1..1bf9474d4286 100644
--- a/arch/x86/kernel/kexec-bzimage64.c
+++ b/arch/x86/kernel/kexec-bzimage64.c
@@ -253,12 +253,12 @@ static void setup_kho(const struct kimage *image, struct
boot_params *params,
sd->len = sizeof(struct kho_data);
/* Only add if we have all KHO images in place */
- if (!image->kho.fdt || !image->kho.scratch)
+ if (!image->kho.kstate || !image->kho.scratch)
return;
/* Add setup data */
- kho->fdt_addr = image->kho.fdt;
- kho->fdt_size = PAGE_SIZE;
+ kho->kstate_addr = image->kho.kstate;
+ kho->kstate_size = PAGE_SIZE;
kho->scratch_addr = image->kho.scratch->mem;
kho->scratch_size = image->kho.scratch->bufsz;
sd->next = params->hdr.setup_data;
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 1b2edd07a3e1..eedcf4be8985 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -467,7 +467,8 @@ static void __init add_kho(u64 phys_addr, u32 data_len)
return;
}
- kho_populate(kho->fdt_addr, kho->fdt_size, kho->scratch_addr,
kho->scratch_size);
+ kho_populate(kho->kstate_addr, kho->kstate_size, kho->scratch_addr,
+ kho->scratch_size);
early_memunmap(kho, size);
}
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 0edd639898a6..f682ef6a1187 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -893,8 +893,8 @@ static void __init early_init_dt_check_kho(void)
if (l != (dt_root_addr_cells + dt_root_size_cells) * sizeof(__be32))
return;
- fdt_start = dt_mem_next_cell(dt_root_addr_cells, &p);
- fdt_size = dt_mem_next_cell(dt_root_addr_cells, &p);
+ kstate_start = dt_mem_next_cell(dt_root_addr_cells, &p);
+ kstate_size = dt_mem_next_cell(dt_root_addr_cells, &p);
p = of_get_flat_dt_prop(node, "linux,kho-scratch", &l);
if (l != (dt_root_addr_cells + dt_root_size_cells) * sizeof(__be32))
@@ -903,7 +903,7 @@ static void __init early_init_dt_check_kho(void)
scratch_start = dt_mem_next_cell(dt_root_addr_cells, &p);
scratch_size = dt_mem_next_cell(dt_root_addr_cells, &p);
- kho_populate(fdt_start, fdt_size, scratch_start, scratch_size);
+ kho_populate(kstate_addr, kstate_size, scratch_start, scratch_size);
}
#ifdef CONFIG_SERIAL_EARLYCON
diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index 39fe3e6cd282..ebf70361269f 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -416,7 +416,7 @@ struct kimage {
struct {
struct kexec_segment *scratch;
- phys_addr_t fdt;
+ phys_addr_t kstate;
} kho;
/* Core ELF header buffer */
diff --git a/include/linux/kstate.h b/include/linux/kstate.h
index 53992593cb19..5a95960e5b03 100644
--- a/include/linux/kstate.h
+++ b/include/linux/kstate.h
@@ -94,6 +94,7 @@ struct kstate_field {
enum kstate_ids {
KSTATE_FOLIO_ID = 1,
+ KSTATE_KHO_FDT_ID,
KSTATE_LAST_ID = -1,
};
diff --git a/kernel/liveupdate/kexec_handover.c
b/kernel/liveupdate/kexec_handover.c
index f1c6378b2657..216cb58553d6 100644
--- a/kernel/liveupdate/kexec_handover.c
+++ b/kernel/liveupdate/kexec_handover.c
@@ -806,6 +806,10 @@ int kho_abort(void)
goto unlock;
}
+ ret = kstate_abort();
+ if (ret)
+ goto unlock;
+
ret = __kho_abort();
if (ret)
goto unlock;
@@ -984,6 +988,25 @@ int kho_retrieve_subtree(const char *name, phys_addr_t
*phys)
}
EXPORT_SYMBOL_GPL(kho_retrieve_subtree);
+
+#define KHO_FDT_INSTANCE_ID 1
+
+static struct kho_fdt {
+ phys_addr_t fdt_phys;
+ u64 fdt_len;
+} kho_fdt;
+
+struct kstate_description kho_fdt_state = {
+ .name = "kho_fdt",
+ .version_id = 1,
+ .id = KSTATE_KHO_FDT_ID,
+ .fields = (const struct kstate_field[]) {
+ KSTATE_BASE_TYPE(fdt_phys, struct kho_fdt, phys_addr_t),
+ KSTATE_BASE_TYPE(fdt_len, struct kho_fdt, u64),
+ KSTATE_END_OF_LIST()
+ },
+};
+
static __init int kho_init(void)
{
int err = 0;
@@ -1000,13 +1023,20 @@ static __init int kho_init(void)
}
kho_out.fdt = page_to_virt(fdt_page);
- err = kho_debugfs_init();
+ err = kstate_register(&kho_fdt_state, &kho_fdt, KHO_FDT_INSTANCE_ID);
if (err)
goto err_free_fdt;
+ kho_fdt.fdt_phys = page_to_phys(fdt_page);
+ kho_fdt.fdt_len = PAGE_SIZE;
+
+ err = kho_debugfs_init();
+ if (err)
+ goto err_free_kstate;
+
err = kho_out_debugfs_init(&kho_out.dbg);
if (err)
- goto err_free_fdt;
+ goto err_free_kstate;
if (fdt) {
kho_in_debugfs_init(&kho_in.dbg, fdt);
@@ -1025,6 +1055,8 @@ static __init int kho_init(void)
return 0;
+err_free_kstate:
+ kstate_unregister(&kho_fdt_state, &kho_fdt, KHO_FDT_INSTANCE_ID);
err_free_fdt:
put_page(fdt_page);
kho_out.fdt = NULL;
@@ -1165,24 +1197,30 @@ static int __init kho_scratch_init(phys_addr_t
scratch_phys, u64 scratch_len)
return err;
}
-void __init kho_populate(phys_addr_t fdt_phys, u64 fdt_len,
- phys_addr_t scratch_phys, u64 scratch_len)
+void __init kho_populate(phys_addr_t kstate_phys, u64 kstate_len,
+ phys_addr_t scratch_phys, u64 scratch_len)
{
-
int err = 0;
- unsigned int scratch_cnt = scratch_len / sizeof(*kho_scratch);
- err = kho_fdt_init(fdt_phys, fdt_len);
+ err = kho_scratch_init(scratch_phys, scratch_len);
if (err)
goto out;
- err = kho_scratch_init(scratch_phys, scratch_len);
+ err = kstate_early_init(kstate_phys, kstate_len);
+ if (err)
+ goto out;
+
+ err = kstate_restore(&kho_fdt_state, &kho_fdt, KHO_FDT_INSTANCE_ID);
+ if (err)
+ goto out;
+
+ err = kho_fdt_init(kho_fdt.fdt_phys, kho_fdt.fdt_len);
if (err)
goto out;
- kho_in.fdt_phys = fdt_phys;
+ kho_in.fdt_phys = kho_fdt.fdt_phys;
kho_in.scratch_phys = scratch_phys;
- kho_scratch_cnt = scratch_cnt;
+ kho_scratch_cnt = scratch_len / sizeof(*kho_scratch);
pr_info("found kexec handover data. Will skip init for some devices\n");
out:
@@ -1201,7 +1239,7 @@ int kho_fill_kimage(struct kimage *image)
if (!kho_enable)
return 0;
- image->kho.fdt = virt_to_phys(kho_out.fdt);
+ image->kho.kstate = kstate_out_paddr;
scratch_size = sizeof(*kho_scratch) * kho_scratch_cnt;
scratch = (struct kexec_buf){
--
2.49.1
