Skip to content

Commit e3a84be

Browse files
coibyakpm00
authored andcommitted
arm64,ppc64le/kdump: pass dm-crypt keys to kdump kernel
CONFIG_CRASH_DM_CRYPT has been introduced to support LUKS-encrypted device dump target by addressing two challenges [1], - Kdump kernel may not be able to decrypt the LUKS partition. For some machines, a system administrator may not have a chance to enter the password to decrypt the device in kdump initramfs after the 1st kernel crashes - LUKS2 by default use the memory-hard Argon2 key derivation function which is quite memory-consuming compared to the limited memory reserved for kdump. To also enable this feature for ARM64 and PowerPC, the missing piece is to let the kdump kernel know where to find the dm-crypt keys which are randomly stored in memory reserved for kdump. Introduce a new device tree property dmcryptkeys [2] as similar to elfcorehdr to pass the memory address of the stored info of dm-crypt keys to the kdump kernel. Since this property is only needed by the kdump kernel, it won't be exposed to userspace. Link: https://lkml.kernel.org/r/20260225060347.718905-4-coxu@redhat.com Link: https://lore.kernel.org/all/20250502011246.99238-1-coxu@redhat.com/ [1] Link: devicetree-org/dt-schema#181 [2] Signed-off-by: Coiby Xu <coxu@redhat.com> Acked-by: Rob Herring (Arm) <robh@kernel.org> Reviewed-by: Sourabh Jain <sourabhjain@linux.ibm.com> Cc: Arnaud Lefebvre <arnaud.lefebvre@clever-cloud.com> Cc: Baoquan he <bhe@redhat.com> Cc: Dave Young <dyoung@redhat.com> Cc: Kairui Song <ryncsn@gmail.com> Cc: Pingfan Liu <kernelfans@gmail.com> Cc: Krzysztof Kozlowski <krzk@kernel.org> Cc: Thomas Staudt <tstaudt@de.ibm.com> Cc: Will Deacon <will@kernel.org> Cc: Christophe Leroy (CS GROUP) <chleroy@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent fe74eb2 commit e3a84be

4 files changed

Lines changed: 48 additions & 0 deletions

File tree

arch/arm64/kernel/machine_kexec_file.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ int load_other_segments(struct kimage *image,
134134

135135
kexec_dprintk("Loaded elf core header at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
136136
image->elf_load_addr, kbuf.bufsz, kbuf.memsz);
137+
138+
ret = crash_load_dm_crypt_keys(image);
139+
if (ret)
140+
goto out_err;
137141
}
138142
#endif
139143

arch/powerpc/kexec/elf_64.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ static void *elf64_load(struct kimage *image, char *kernel_buf,
7979
goto out;
8080
}
8181

82+
ret = crash_load_dm_crypt_keys(image);
83+
if (ret)
84+
goto out;
85+
8286
/* Setup cmdline for kdump kernel case */
8387
modified_cmdline = setup_kdump_cmdline(image, cmdline,
8488
cmdline_len);

drivers/of/fdt.c

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -866,6 +866,26 @@ static void __init early_init_dt_check_for_elfcorehdr(unsigned long node)
866866
elfcorehdr_addr, elfcorehdr_size);
867867
}
868868

869+
static void __init early_init_dt_check_for_dmcryptkeys(unsigned long node)
870+
{
871+
const char *prop_name = "linux,dmcryptkeys";
872+
const __be32 *prop;
873+
874+
if (!IS_ENABLED(CONFIG_CRASH_DM_CRYPT))
875+
return;
876+
877+
pr_debug("Looking for dmcryptkeys property... ");
878+
879+
prop = of_get_flat_dt_prop(node, prop_name, NULL);
880+
if (!prop)
881+
return;
882+
883+
dm_crypt_keys_addr = dt_mem_next_cell(dt_root_addr_cells, &prop);
884+
885+
/* Property only accessible to crash dump kernel */
886+
fdt_delprop(initial_boot_params, node, prop_name);
887+
}
888+
869889
static unsigned long chosen_node_offset = -FDT_ERR_NOTFOUND;
870890

871891
/*
@@ -1097,6 +1117,7 @@ int __init early_init_dt_scan_chosen(char *cmdline)
10971117

10981118
early_init_dt_check_for_initrd(node);
10991119
early_init_dt_check_for_elfcorehdr(node);
1120+
early_init_dt_check_for_dmcryptkeys(node);
11001121

11011122
rng_seed = of_get_flat_dt_prop(node, "rng-seed", &l);
11021123
if (rng_seed && l > 0) {

drivers/of/kexec.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,25 @@ void *of_kexec_alloc_and_setup_fdt(const struct kimage *image,
423423
if (ret)
424424
goto out;
425425

426+
if (image->dm_crypt_keys_addr != 0) {
427+
ret = fdt_appendprop_addrrange(fdt, 0, chosen_node,
428+
"linux,dmcryptkeys",
429+
image->dm_crypt_keys_addr,
430+
image->dm_crypt_keys_sz);
431+
432+
if (ret)
433+
goto out;
434+
435+
/*
436+
* Avoid dmcryptkeys from being stomped on in kdump kernel by
437+
* setting up memory reserve map.
438+
*/
439+
ret = fdt_add_mem_rsv(fdt, image->dm_crypt_keys_addr,
440+
image->dm_crypt_keys_sz);
441+
if (ret)
442+
goto out;
443+
}
444+
426445
#ifdef CONFIG_CRASH_DUMP
427446
/* add linux,usable-memory-range */
428447
ret = fdt_appendprop_addrrange(fdt, 0, chosen_node,

0 commit comments

Comments
 (0)