| Message ID | 20210209182200.30606-3-nramas@linux.microsoft.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Carry forward IMA measurement log on kexec on ARM64 | expand |
On Tue, Feb 09, 2021 at 10:21:52AM -0800, Lakshmi Ramasubramanian wrote: > From: Rob Herring <robh@kernel.org> > > Both arm64 and powerpc do essentially the same FDT /chosen setup for > kexec. The differences are either omissions that arm64 should have > or additional properties that will be ignored. The setup code can be > combined and shared by both powerpc and arm64. > > The differences relative to the arm64 version: > - If /chosen doesn't exist, it will be created (should never happen). > - Any old dtb and initrd reserved memory will be released. > - The new initrd and elfcorehdr are marked reserved. > - "linux,booted-from-kexec" is set. > > The differences relative to the powerpc version: > - "kaslr-seed" and "rng-seed" may be set. > - "linux,elfcorehdr" is set. > - Any existing "linux,usable-memory-range" is removed. > > Combine the code for setting up the /chosen node in the FDT and updating > the memory reservation for kexec, for powerpc and arm64, in > of_kexec_alloc_and_setup_fdt() and move it to "drivers/of/kexec.c". > > Signed-off-by: Rob Herring <robh@kernel.org> > Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com> > --- > drivers/of/Makefile | 6 ++ > drivers/of/kexec.c | 258 ++++++++++++++++++++++++++++++++++++++++++++ > include/linux/of.h | 13 +++ > 3 files changed, 277 insertions(+) > create mode 100644 drivers/of/kexec.c > > diff --git a/drivers/of/Makefile b/drivers/of/Makefile > index 6e1e5212f058..c13b982084a3 100644 > --- a/drivers/of/Makefile > +++ b/drivers/of/Makefile > @@ -14,4 +14,10 @@ obj-$(CONFIG_OF_RESOLVE) += resolver.o > obj-$(CONFIG_OF_OVERLAY) += overlay.o > obj-$(CONFIG_OF_NUMA) += of_numa.o > > +ifdef CONFIG_KEXEC_FILE > +ifdef CONFIG_OF_FLATTREE > +obj-y += kexec.o > +endif > +endif > + > obj-$(CONFIG_OF_UNITTEST) += unittest-data/ > diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c > new file mode 100644 > index 000000000000..469e09613cdd > --- /dev/null > +++ b/drivers/of/kexec.c > @@ -0,0 +1,258 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Copyright (C) 2020 Arm Limited > + * > + * Based on arch/arm64/kernel/machine_kexec_file.c: > + * Copyright (C) 2018 Linaro Limited > + * > + * And arch/powerpc/kexec/file_load.c: > + * Copyright (C) 2016 IBM Corporation > + */ > + > +#include <linux/kernel.h> > +#include <linux/kexec.h> > +#include <linux/libfdt.h> > +#include <linux/of.h> > +#include <linux/of_fdt.h> > +#include <linux/random.h> > +#include <linux/types.h> > + > +/* relevant device tree properties */ > +#define FDT_PROP_KEXEC_ELFHDR "linux,elfcorehdr" > +#define FDT_PROP_MEM_RANGE "linux,usable-memory-range" > +#define FDT_PROP_INITRD_START "linux,initrd-start" > +#define FDT_PROP_INITRD_END "linux,initrd-end" > +#define FDT_PROP_BOOTARGS "bootargs" > +#define FDT_PROP_KASLR_SEED "kaslr-seed" > +#define FDT_PROP_RNG_SEED "rng-seed" > +#define RNG_SEED_SIZE 128 > + > +/** > + * fdt_find_and_del_mem_rsv - delete memory reservation with given address and size > + * > + * @fdt: Flattened device tree for the current kernel. > + * @start: Starting address of the reserved memory. > + * @size: Size of the reserved memory. > + * > + * Return: 0 on success, or negative errno on error. > + */ > +static int fdt_find_and_del_mem_rsv(void *fdt, unsigned long start, unsigned long size) > +{ > + int i, ret, num_rsvs = fdt_num_mem_rsv(fdt); > + > + for (i = 0; i < num_rsvs; i++) { > + u64 rsv_start, rsv_size; > + > + ret = fdt_get_mem_rsv(fdt, i, &rsv_start, &rsv_size); > + if (ret) { > + pr_err("Malformed device tree.\n"); > + return -EINVAL; > + } > + > + if (rsv_start == start && rsv_size == size) { > + ret = fdt_del_mem_rsv(fdt, i); > + if (ret) { > + pr_err("Error deleting device tree reservation.\n"); > + return -EINVAL; > + } > + > + return 0; > + } > + } > + > + return -ENOENT; > +} > + > +/* > + * of_kexec_alloc_and_setup_fdt - Alloc and setup a new Flattened Device Tree > + * > + * @image: kexec image being loaded. > + * @initrd_load_addr: Address where the next initrd will be loaded. > + * @initrd_len: Size of the next initrd, or 0 if there will be none. > + * @cmdline: Command line for the next kernel, or NULL if there will > + * be none. > + * > + * Return: fdt on success, or NULL errno on error. > + */ > +void *of_kexec_alloc_and_setup_fdt(const struct kimage *image, > + unsigned long initrd_load_addr, > + unsigned long initrd_len, > + const char *cmdline) > +{ > + void *fdt; > + int ret, chosen_node; > + const void *prop; > + unsigned long fdt_size; > + > + fdt_size = fdt_totalsize(initial_boot_params) + > + (cmdline ? strlen(cmdline) : 0) + > + FDT_EXTRA_SPACE; > + > + fdt = kvmalloc(fdt_size, GFP_KERNEL); > + if (!fdt) > + return NULL; > + > + ret = fdt_open_into(initial_boot_params, fdt, fdt_size); > + if (ret < 0) { > + pr_err("Error %d setting up the new device tree.\n", ret); > + goto out; > + } > + > + /* Remove memory reservation for the current device tree. */ > + ret = fdt_find_and_del_mem_rsv(fdt, __pa(initial_boot_params), > + fdt_totalsize(initial_boot_params)); > + if (ret == -EINVAL) { > + pr_err("Error removing memory reservation.\n"); > + goto out; > + } > + > + chosen_node = fdt_path_offset(fdt, "/chosen"); > + if (chosen_node == -FDT_ERR_NOTFOUND) > + chosen_node = fdt_add_subnode(fdt, fdt_path_offset(fdt, "/"), > + "chosen"); > + if (chosen_node < 0) { > + ret = chosen_node; > + goto out; > + } > + > + ret = fdt_delprop(fdt, chosen_node, FDT_PROP_KEXEC_ELFHDR); > + if (ret && ret != -FDT_ERR_NOTFOUND) > + goto out; > + ret = fdt_delprop(fdt, chosen_node, FDT_PROP_MEM_RANGE); > + if (ret && ret != -FDT_ERR_NOTFOUND) > + goto out; > + > + /* Did we boot using an initrd? */ > + prop = fdt_getprop(fdt, chosen_node, "linux,initrd-start", NULL); > + if (prop) { > + u64 tmp_start, tmp_end, tmp_size; > + > + tmp_start = fdt64_to_cpu(*((const fdt64_t *) prop)); > + > + prop = fdt_getprop(fdt, chosen_node, "linux,initrd-end", NULL); > + if (!prop) { > + ret = -EINVAL; > + goto out; > + } > + > + tmp_end = fdt64_to_cpu(*((const fdt64_t *) prop)); > + > + /* > + * kexec reserves exact initrd size, while firmware may > + * reserve a multiple of PAGE_SIZE, so check for both. > + */ > + tmp_size = tmp_end - tmp_start; > + ret = fdt_find_and_del_mem_rsv(fdt, tmp_start, tmp_size); > + if (ret == -ENOENT) > + ret = fdt_find_and_del_mem_rsv(fdt, tmp_start, > + round_up(tmp_size, PAGE_SIZE)); > + if (ret == -EINVAL) > + goto out; > + } > + > + /* add initrd-* */ > + if (initrd_load_addr) { > + ret = fdt_setprop_u64(fdt, chosen_node, FDT_PROP_INITRD_START, > + initrd_load_addr); > + if (ret) > + goto out; > + > + ret = fdt_setprop_u64(fdt, chosen_node, FDT_PROP_INITRD_END, > + initrd_load_addr + initrd_len); > + if (ret) > + goto out; > + > + ret = fdt_add_mem_rsv(fdt, initrd_load_addr, initrd_len); > + if (ret) > + goto out; > + > + } else { > + ret = fdt_delprop(fdt, chosen_node, FDT_PROP_INITRD_START); > + if (ret && (ret != -FDT_ERR_NOTFOUND)) > + goto out; > + > + ret = fdt_delprop(fdt, chosen_node, FDT_PROP_INITRD_END); > + if (ret && (ret != -FDT_ERR_NOTFOUND)) > + goto out; > + } > + > + if (image->type == KEXEC_TYPE_CRASH) { > + /* add linux,elfcorehdr */ > + ret = fdt_appendprop_addrrange(fdt, 0, chosen_node, > + FDT_PROP_KEXEC_ELFHDR, > + image->arch.elf_headers_mem, > + image->arch.elf_headers_sz); > + if (ret) > + goto out; > + > + /* > + * Avoid elfcorehdr from being stomped on in kdump kernel by > + * setting up memory reserve map. > + */ > + ret = fdt_add_mem_rsv(fdt, image->arch.elf_headers_mem, > + image->arch.elf_headers_sz); > + if (ret) > + goto out; > + > + /* add linux,usable-memory-range */ > + ret = fdt_appendprop_addrrange(fdt, 0, chosen_node, > + FDT_PROP_MEM_RANGE, > + crashk_res.start, > + crashk_res.end - crashk_res.start + 1); > + if (ret) > + goto out; > + } > + > + /* add bootargs */ > + if (cmdline) { > + ret = fdt_setprop_string(fdt, chosen_node, FDT_PROP_BOOTARGS, cmdline); > + if (ret) > + goto out; > + } else { > + ret = fdt_delprop(fdt, chosen_node, FDT_PROP_BOOTARGS); > + if (ret && (ret != -FDT_ERR_NOTFOUND)) > + goto out; > + } > + > + /* add kaslr-seed */ > + ret = fdt_delprop(fdt, chosen_node, FDT_PROP_KASLR_SEED); > + if (ret == -FDT_ERR_NOTFOUND) > + ret = 0; > + else if (ret) > + goto out; > + > + if (rng_is_initialized()) { > + u64 seed = get_random_u64(); > + > + ret = fdt_setprop_u64(fdt, chosen_node, FDT_PROP_KASLR_SEED, seed); > + if (ret) > + goto out; > + } else { > + pr_notice("RNG is not initialised: omitting \"%s\" property\n", > + FDT_PROP_KASLR_SEED); > + } > + > + /* add rng-seed */ > + if (rng_is_initialized()) { > + void *rng_seed; > + > + ret = fdt_setprop_placeholder(fdt, chosen_node, FDT_PROP_RNG_SEED, > + RNG_SEED_SIZE, &rng_seed); > + if (ret) > + goto out; > + get_random_bytes(rng_seed, RNG_SEED_SIZE); > + } else { > + pr_notice("RNG is not initialised: omitting \"%s\" property\n", > + FDT_PROP_RNG_SEED); > + } > + > + ret = fdt_setprop(fdt, chosen_node, "linux,booted-from-kexec", NULL, 0); > + > +out: > + if (ret) { > + kvfree(fdt); > + fdt = NULL; > + } > + > + return fdt; > +} > diff --git a/include/linux/of.h b/include/linux/of.h > index 4b27c9a27df3..f0eff5e84353 100644 > --- a/include/linux/of.h > +++ b/include/linux/of.h > @@ -560,6 +560,19 @@ int of_map_id(struct device_node *np, u32 id, > > phys_addr_t of_dma_get_max_cpu_address(struct device_node *np); > > +/* > + * Additional space needed for the buffer to build the new FDT > + * so that we can add initrd, bootargs, kaslr-seed, rng-seed, > + * userable-memory-range and elfcorehdr. > + */ > +#define FDT_EXTRA_SPACE 0x1000 No need for this to be public now. Move it to of/kexec.c. Rob
On 2/10/21 9:23 AM, Rob Herring wrote: > On Tue, Feb 09, 2021 at 10:21:52AM -0800, Lakshmi Ramasubramanian wrote: >> From: Rob Herring <robh@kernel.org> >> >> Both arm64 and powerpc do essentially the same FDT /chosen setup for >> kexec. The differences are either omissions that arm64 should have >> or additional properties that will be ignored. The setup code can be >> combined and shared by both powerpc and arm64. >> >> The differences relative to the arm64 version: >> - If /chosen doesn't exist, it will be created (should never happen). >> - Any old dtb and initrd reserved memory will be released. >> - The new initrd and elfcorehdr are marked reserved. >> - "linux,booted-from-kexec" is set. >> >> The differences relative to the powerpc version: >> - "kaslr-seed" and "rng-seed" may be set. >> - "linux,elfcorehdr" is set. >> - Any existing "linux,usable-memory-range" is removed. >> >> Combine the code for setting up the /chosen node in the FDT and updating >> the memory reservation for kexec, for powerpc and arm64, in >> of_kexec_alloc_and_setup_fdt() and move it to "drivers/of/kexec.c". >> >> Signed-off-by: Rob Herring <robh@kernel.org> >> Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com> >> --- >> drivers/of/Makefile | 6 ++ >> drivers/of/kexec.c | 258 ++++++++++++++++++++++++++++++++++++++++++++ >> include/linux/of.h | 13 +++ >> 3 files changed, 277 insertions(+) >> create mode 100644 drivers/of/kexec.c >> diff --git a/include/linux/of.h b/include/linux/of.h >> index 4b27c9a27df3..f0eff5e84353 100644 >> --- a/include/linux/of.h >> +++ b/include/linux/of.h >> @@ -560,6 +560,19 @@ int of_map_id(struct device_node *np, u32 id, >> >> phys_addr_t of_dma_get_max_cpu_address(struct device_node *np); >> >> +/* >> + * Additional space needed for the buffer to build the new FDT >> + * so that we can add initrd, bootargs, kaslr-seed, rng-seed, >> + * userable-memory-range and elfcorehdr. >> + */ >> +#define FDT_EXTRA_SPACE 0x1000 > > No need for this to be public now. Move it to of/kexec.c. > Will do. -lakshmi
Lakshmi Ramasubramanian <nramas@linux.microsoft.com> writes: > From: Rob Herring <robh@kernel.org> > > Both arm64 and powerpc do essentially the same FDT /chosen setup for > kexec. The differences are either omissions that arm64 should have > or additional properties that will be ignored. The setup code can be > combined and shared by both powerpc and arm64. > > The differences relative to the arm64 version: > - If /chosen doesn't exist, it will be created (should never happen). > - Any old dtb and initrd reserved memory will be released. > - The new initrd and elfcorehdr are marked reserved. > - "linux,booted-from-kexec" is set. > > The differences relative to the powerpc version: > - "kaslr-seed" and "rng-seed" may be set. > - "linux,elfcorehdr" is set. > - Any existing "linux,usable-memory-range" is removed. > > Combine the code for setting up the /chosen node in the FDT and updating > the memory reservation for kexec, for powerpc and arm64, in > of_kexec_alloc_and_setup_fdt() and move it to "drivers/of/kexec.c". > > Signed-off-by: Rob Herring <robh@kernel.org> > Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com> > --- > drivers/of/Makefile | 6 ++ > drivers/of/kexec.c | 258 ++++++++++++++++++++++++++++++++++++++++++++ > include/linux/of.h | 13 +++ > 3 files changed, 277 insertions(+) > create mode 100644 drivers/of/kexec.c Reviewed-by: Thiago Jung Bauermann <bauerman@linux.ibm.com> -- Thiago Jung Bauermann IBM Linux Technology Center
There's actually a complication that I just noticed and needs to be addressed. More below. Lakshmi Ramasubramanian <nramas@linux.microsoft.com> writes: > From: Rob Herring <robh@kernel.org> > > Both arm64 and powerpc do essentially the same FDT /chosen setup for > kexec. The differences are either omissions that arm64 should have > or additional properties that will be ignored. The setup code can be > combined and shared by both powerpc and arm64. > > The differences relative to the arm64 version: > - If /chosen doesn't exist, it will be created (should never happen). > - Any old dtb and initrd reserved memory will be released. > - The new initrd and elfcorehdr are marked reserved. > - "linux,booted-from-kexec" is set. > > The differences relative to the powerpc version: > - "kaslr-seed" and "rng-seed" may be set. > - "linux,elfcorehdr" is set. > - Any existing "linux,usable-memory-range" is removed. > > Combine the code for setting up the /chosen node in the FDT and updating > the memory reservation for kexec, for powerpc and arm64, in > of_kexec_alloc_and_setup_fdt() and move it to "drivers/of/kexec.c". > > Signed-off-by: Rob Herring <robh@kernel.org> > Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com> > --- > drivers/of/Makefile | 6 ++ > drivers/of/kexec.c | 258 ++++++++++++++++++++++++++++++++++++++++++++ > include/linux/of.h | 13 +++ > 3 files changed, 277 insertions(+) > create mode 100644 drivers/of/kexec.c > > diff --git a/drivers/of/Makefile b/drivers/of/Makefile > index 6e1e5212f058..c13b982084a3 100644 > --- a/drivers/of/Makefile > +++ b/drivers/of/Makefile > @@ -14,4 +14,10 @@ obj-$(CONFIG_OF_RESOLVE) += resolver.o > obj-$(CONFIG_OF_OVERLAY) += overlay.o > obj-$(CONFIG_OF_NUMA) += of_numa.o > > +ifdef CONFIG_KEXEC_FILE > +ifdef CONFIG_OF_FLATTREE > +obj-y += kexec.o > +endif > +endif > + > obj-$(CONFIG_OF_UNITTEST) += unittest-data/ > diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c > new file mode 100644 > index 000000000000..469e09613cdd > --- /dev/null > +++ b/drivers/of/kexec.c > @@ -0,0 +1,258 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Copyright (C) 2020 Arm Limited > + * > + * Based on arch/arm64/kernel/machine_kexec_file.c: > + * Copyright (C) 2018 Linaro Limited > + * > + * And arch/powerpc/kexec/file_load.c: > + * Copyright (C) 2016 IBM Corporation > + */ > + > +#include <linux/kernel.h> > +#include <linux/kexec.h> > +#include <linux/libfdt.h> > +#include <linux/of.h> > +#include <linux/of_fdt.h> > +#include <linux/random.h> > +#include <linux/types.h> > + > +/* relevant device tree properties */ > +#define FDT_PROP_KEXEC_ELFHDR "linux,elfcorehdr" > +#define FDT_PROP_MEM_RANGE "linux,usable-memory-range" > +#define FDT_PROP_INITRD_START "linux,initrd-start" > +#define FDT_PROP_INITRD_END "linux,initrd-end" > +#define FDT_PROP_BOOTARGS "bootargs" > +#define FDT_PROP_KASLR_SEED "kaslr-seed" > +#define FDT_PROP_RNG_SEED "rng-seed" > +#define RNG_SEED_SIZE 128 > + > +/** > + * fdt_find_and_del_mem_rsv - delete memory reservation with given address and size > + * > + * @fdt: Flattened device tree for the current kernel. > + * @start: Starting address of the reserved memory. > + * @size: Size of the reserved memory. > + * > + * Return: 0 on success, or negative errno on error. > + */ > +static int fdt_find_and_del_mem_rsv(void *fdt, unsigned long start, unsigned long size) > +{ > + int i, ret, num_rsvs = fdt_num_mem_rsv(fdt); > + > + for (i = 0; i < num_rsvs; i++) { > + u64 rsv_start, rsv_size; > + > + ret = fdt_get_mem_rsv(fdt, i, &rsv_start, &rsv_size); > + if (ret) { > + pr_err("Malformed device tree.\n"); > + return -EINVAL; > + } > + > + if (rsv_start == start && rsv_size == size) { > + ret = fdt_del_mem_rsv(fdt, i); > + if (ret) { > + pr_err("Error deleting device tree reservation.\n"); > + return -EINVAL; > + } > + > + return 0; > + } > + } > + > + return -ENOENT; > +} > + > +/* > + * of_kexec_alloc_and_setup_fdt - Alloc and setup a new Flattened Device Tree > + * > + * @image: kexec image being loaded. > + * @initrd_load_addr: Address where the next initrd will be loaded. > + * @initrd_len: Size of the next initrd, or 0 if there will be none. > + * @cmdline: Command line for the next kernel, or NULL if there will > + * be none. > + * > + * Return: fdt on success, or NULL errno on error. > + */ > +void *of_kexec_alloc_and_setup_fdt(const struct kimage *image, > + unsigned long initrd_load_addr, > + unsigned long initrd_len, > + const char *cmdline) > +{ > + void *fdt; > + int ret, chosen_node; > + const void *prop; > + unsigned long fdt_size; > + > + fdt_size = fdt_totalsize(initial_boot_params) + > + (cmdline ? strlen(cmdline) : 0) + > + FDT_EXTRA_SPACE; Just adding 4 KB to initial_boot_params won't be enough for crash kernels on ppc64. The current powerpc code doubles the size of initial_boot_params (which is normally larger than 4 KB) and even that isn't enough. A patch was added to powerpc/next today which uses a more precise (but arch-specific) formula: https://lore.kernel.org/linuxppc-dev/161243826811.119001.14083048209224609814.stgit@hbathini/ So I believe we need a hook here where architectures can provide their own specific calculation for the size of the fdt. Perhaps a weakly defined function providing a default implementation which an arch-specific file can override (a la arch_kexec_kernel_image_load())? Then the powerpc specific hook would be the kexec_fdt_totalsize_ppc64() function from the patch I linked above. -- Thiago Jung Bauermann IBM Linux Technology Center
On 2/11/21 5:09 PM, Thiago Jung Bauermann wrote: > > There's actually a complication that I just noticed and needs to be > addressed. More below. > <...> >> + >> +/* >> + * of_kexec_alloc_and_setup_fdt - Alloc and setup a new Flattened Device Tree >> + * >> + * @image: kexec image being loaded. >> + * @initrd_load_addr: Address where the next initrd will be loaded. >> + * @initrd_len: Size of the next initrd, or 0 if there will be none. >> + * @cmdline: Command line for the next kernel, or NULL if there will >> + * be none. >> + * >> + * Return: fdt on success, or NULL errno on error. >> + */ >> +void *of_kexec_alloc_and_setup_fdt(const struct kimage *image, >> + unsigned long initrd_load_addr, >> + unsigned long initrd_len, >> + const char *cmdline) >> +{ >> + void *fdt; >> + int ret, chosen_node; >> + const void *prop; >> + unsigned long fdt_size; >> + >> + fdt_size = fdt_totalsize(initial_boot_params) + >> + (cmdline ? strlen(cmdline) : 0) + >> + FDT_EXTRA_SPACE; > > Just adding 4 KB to initial_boot_params won't be enough for crash > kernels on ppc64. The current powerpc code doubles the size of > initial_boot_params (which is normally larger than 4 KB) and even that > isn't enough. A patch was added to powerpc/next today which uses a more > precise (but arch-specific) formula: > > https://lore.kernel.org/linuxppc-dev/161243826811.119001.14083048209224609814.stgit@hbathini/ > > So I believe we need a hook here where architectures can provide their > own specific calculation for the size of the fdt. Perhaps a weakly > defined function providing a default implementation which an > arch-specific file can override (a la arch_kexec_kernel_image_load())? > > Then the powerpc specific hook would be the kexec_fdt_totalsize_ppc64() > function from the patch I linked above. > Do you think it'd better to add "fdt_size" parameter to of_kexec_alloc_and_setup_fdt() so that the caller can provide the desired FDT buffer size? thanks, -lakshmi
Lakshmi Ramasubramanian <nramas@linux.microsoft.com> writes: > On 2/11/21 5:09 PM, Thiago Jung Bauermann wrote: >> There's actually a complication that I just noticed and needs to be >> addressed. More below. >> > > <...> > >>> + >>> +/* >>> + * of_kexec_alloc_and_setup_fdt - Alloc and setup a new Flattened Device Tree >>> + * >>> + * @image: kexec image being loaded. >>> + * @initrd_load_addr: Address where the next initrd will be loaded. >>> + * @initrd_len: Size of the next initrd, or 0 if there will be none. >>> + * @cmdline: Command line for the next kernel, or NULL if there will >>> + * be none. >>> + * >>> + * Return: fdt on success, or NULL errno on error. >>> + */ >>> +void *of_kexec_alloc_and_setup_fdt(const struct kimage *image, >>> + unsigned long initrd_load_addr, >>> + unsigned long initrd_len, >>> + const char *cmdline) >>> +{ >>> + void *fdt; >>> + int ret, chosen_node; >>> + const void *prop; >>> + unsigned long fdt_size; >>> + >>> + fdt_size = fdt_totalsize(initial_boot_params) + >>> + (cmdline ? strlen(cmdline) : 0) + >>> + FDT_EXTRA_SPACE; >> Just adding 4 KB to initial_boot_params won't be enough for crash >> kernels on ppc64. The current powerpc code doubles the size of >> initial_boot_params (which is normally larger than 4 KB) and even that >> isn't enough. A patch was added to powerpc/next today which uses a more >> precise (but arch-specific) formula: >> https://lore.kernel.org/linuxppc-dev/161243826811.119001.14083048209224609814.stgit@hbathini/ >> So I believe we need a hook here where architectures can provide their >> own specific calculation for the size of the fdt. Perhaps a weakly >> defined function providing a default implementation which an >> arch-specific file can override (a la arch_kexec_kernel_image_load())? >> Then the powerpc specific hook would be the kexec_fdt_totalsize_ppc64() >> function from the patch I linked above. >> > > Do you think it'd better to add "fdt_size" parameter to > of_kexec_alloc_and_setup_fdt() so that the caller can provide the > desired FDT buffer size? Yes, that is actually simpler and better than my idea. :-) -- Thiago Jung Bauermann IBM Linux Technology Center
On Thu, Feb 11, 2021 at 7:17 PM Lakshmi Ramasubramanian <nramas@linux.microsoft.com> wrote: > > On 2/11/21 5:09 PM, Thiago Jung Bauermann wrote: > > > > There's actually a complication that I just noticed and needs to be > > addressed. More below. > > > > <...> > > >> + > >> +/* > >> + * of_kexec_alloc_and_setup_fdt - Alloc and setup a new Flattened Device Tree > >> + * > >> + * @image: kexec image being loaded. > >> + * @initrd_load_addr: Address where the next initrd will be loaded. > >> + * @initrd_len: Size of the next initrd, or 0 if there will be none. > >> + * @cmdline: Command line for the next kernel, or NULL if there will > >> + * be none. > >> + * > >> + * Return: fdt on success, or NULL errno on error. > >> + */ > >> +void *of_kexec_alloc_and_setup_fdt(const struct kimage *image, > >> + unsigned long initrd_load_addr, > >> + unsigned long initrd_len, > >> + const char *cmdline) > >> +{ > >> + void *fdt; > >> + int ret, chosen_node; > >> + const void *prop; > >> + unsigned long fdt_size; > >> + > >> + fdt_size = fdt_totalsize(initial_boot_params) + > >> + (cmdline ? strlen(cmdline) : 0) + > >> + FDT_EXTRA_SPACE; > > > > Just adding 4 KB to initial_boot_params won't be enough for crash > > kernels on ppc64. The current powerpc code doubles the size of > > initial_boot_params (which is normally larger than 4 KB) and even that > > isn't enough. A patch was added to powerpc/next today which uses a more > > precise (but arch-specific) formula: > > > > https://lore.kernel.org/linuxppc-dev/161243826811.119001.14083048209224609814.stgit@hbathini/ > > > > So I believe we need a hook here where architectures can provide their > > own specific calculation for the size of the fdt. Perhaps a weakly > > defined function providing a default implementation which an > > arch-specific file can override (a la arch_kexec_kernel_image_load())? > > > > Then the powerpc specific hook would be the kexec_fdt_totalsize_ppc64() > > function from the patch I linked above. > > > > Do you think it'd better to add "fdt_size" parameter to > of_kexec_alloc_and_setup_fdt() so that the caller can provide the > desired FDT buffer size? Yes, I guess so. But please define the param as extra size, not total size. The kernel command line size addition can be in the common code. The above change is also going to conflict, so I think this may have to wait. Or I'll take the common and arm bits and powerpc can be converted next cycle (or after the merge window). Rob
On 2/12/21 6:38 AM, Rob Herring wrote: > On Thu, Feb 11, 2021 at 7:17 PM Lakshmi Ramasubramanian > <nramas@linux.microsoft.com> wrote: >> >> On 2/11/21 5:09 PM, Thiago Jung Bauermann wrote: >>> >>> There's actually a complication that I just noticed and needs to be >>> addressed. More below. >>> >> >> <...> >> >>>> + >>>> +/* >>>> + * of_kexec_alloc_and_setup_fdt - Alloc and setup a new Flattened Device Tree >>>> + * >>>> + * @image: kexec image being loaded. >>>> + * @initrd_load_addr: Address where the next initrd will be loaded. >>>> + * @initrd_len: Size of the next initrd, or 0 if there will be none. >>>> + * @cmdline: Command line for the next kernel, or NULL if there will >>>> + * be none. >>>> + * >>>> + * Return: fdt on success, or NULL errno on error. >>>> + */ >>>> +void *of_kexec_alloc_and_setup_fdt(const struct kimage *image, >>>> + unsigned long initrd_load_addr, >>>> + unsigned long initrd_len, >>>> + const char *cmdline) >>>> +{ >>>> + void *fdt; >>>> + int ret, chosen_node; >>>> + const void *prop; >>>> + unsigned long fdt_size; >>>> + >>>> + fdt_size = fdt_totalsize(initial_boot_params) + >>>> + (cmdline ? strlen(cmdline) : 0) + >>>> + FDT_EXTRA_SPACE; >>> >>> Just adding 4 KB to initial_boot_params won't be enough for crash >>> kernels on ppc64. The current powerpc code doubles the size of >>> initial_boot_params (which is normally larger than 4 KB) and even that >>> isn't enough. A patch was added to powerpc/next today which uses a more >>> precise (but arch-specific) formula: >>> >>> https://lore.kernel.org/linuxppc-dev/161243826811.119001.14083048209224609814.stgit@hbathini/ >>> >>> So I believe we need a hook here where architectures can provide their >>> own specific calculation for the size of the fdt. Perhaps a weakly >>> defined function providing a default implementation which an >>> arch-specific file can override (a la arch_kexec_kernel_image_load())? >>> >>> Then the powerpc specific hook would be the kexec_fdt_totalsize_ppc64() >>> function from the patch I linked above. >>> >> >> Do you think it'd better to add "fdt_size" parameter to >> of_kexec_alloc_and_setup_fdt() so that the caller can provide the >> desired FDT buffer size? > > Yes, I guess so. But please define the param as extra size, not total > size. The kernel command line size addition can be in the common code. Will do. Just to clarify - The common code will do: fdt_totalsize(initial_boot_params) + strlen(cmdline) + extra_fdt_size The caller will pass "extra_fdt_size" ARM64 => 4KB PPC64 => fdt_totalsize(initial_boot_params) - which will be updated when the patch Thiago had referred to is merged. > > The above change is also going to conflict, so I think this may have > to wait. Or I'll take the common and arm bits and powerpc can be > converted next cycle (or after the merge window). > thanks. -lakshmi
On Fri, Feb 12, 2021 at 11:19 AM Lakshmi Ramasubramanian <nramas@linux.microsoft.com> wrote: > > On 2/12/21 6:38 AM, Rob Herring wrote: > > On Thu, Feb 11, 2021 at 7:17 PM Lakshmi Ramasubramanian > > <nramas@linux.microsoft.com> wrote: > >> > >> On 2/11/21 5:09 PM, Thiago Jung Bauermann wrote: > >>> > >>> There's actually a complication that I just noticed and needs to be > >>> addressed. More below. > >>> > >> > >> <...> > >> > >>>> + > >>>> +/* > >>>> + * of_kexec_alloc_and_setup_fdt - Alloc and setup a new Flattened Device Tree > >>>> + * > >>>> + * @image: kexec image being loaded. > >>>> + * @initrd_load_addr: Address where the next initrd will be loaded. > >>>> + * @initrd_len: Size of the next initrd, or 0 if there will be none. > >>>> + * @cmdline: Command line for the next kernel, or NULL if there will > >>>> + * be none. > >>>> + * > >>>> + * Return: fdt on success, or NULL errno on error. > >>>> + */ > >>>> +void *of_kexec_alloc_and_setup_fdt(const struct kimage *image, > >>>> + unsigned long initrd_load_addr, > >>>> + unsigned long initrd_len, > >>>> + const char *cmdline) > >>>> +{ > >>>> + void *fdt; > >>>> + int ret, chosen_node; > >>>> + const void *prop; > >>>> + unsigned long fdt_size; > >>>> + > >>>> + fdt_size = fdt_totalsize(initial_boot_params) + > >>>> + (cmdline ? strlen(cmdline) : 0) + > >>>> + FDT_EXTRA_SPACE; > >>> > >>> Just adding 4 KB to initial_boot_params won't be enough for crash > >>> kernels on ppc64. The current powerpc code doubles the size of > >>> initial_boot_params (which is normally larger than 4 KB) and even that > >>> isn't enough. A patch was added to powerpc/next today which uses a more > >>> precise (but arch-specific) formula: > >>> > >>> https://lore.kernel.org/linuxppc-dev/161243826811.119001.14083048209224609814.stgit@hbathini/ > >>> > >>> So I believe we need a hook here where architectures can provide their > >>> own specific calculation for the size of the fdt. Perhaps a weakly > >>> defined function providing a default implementation which an > >>> arch-specific file can override (a la arch_kexec_kernel_image_load())? > >>> > >>> Then the powerpc specific hook would be the kexec_fdt_totalsize_ppc64() > >>> function from the patch I linked above. > >>> > >> > >> Do you think it'd better to add "fdt_size" parameter to > >> of_kexec_alloc_and_setup_fdt() so that the caller can provide the > >> desired FDT buffer size? > > > > Yes, I guess so. But please define the param as extra size, not total > > size. The kernel command line size addition can be in the common code. > > Will do. Just to clarify - > > The common code will do: > > fdt_totalsize(initial_boot_params) + strlen(cmdline) + extra_fdt_size > > The caller will pass "extra_fdt_size" > ARM64 => 4KB > PPC64 => fdt_totalsize(initial_boot_params) - which will be updated when > the patch Thiago had referred to is merged. Yes, I'd leave the 4KB in there by default and arm64 use 0. Rob
On 2/12/21 10:24 AM, Rob Herring wrote: > On Fri, Feb 12, 2021 at 11:19 AM Lakshmi Ramasubramanian > <nramas@linux.microsoft.com> wrote: >> >> On 2/12/21 6:38 AM, Rob Herring wrote: >>> On Thu, Feb 11, 2021 at 7:17 PM Lakshmi Ramasubramanian >>> <nramas@linux.microsoft.com> wrote: >>>> >>>> On 2/11/21 5:09 PM, Thiago Jung Bauermann wrote: >>>>> >>>>> There's actually a complication that I just noticed and needs to be >>>>> addressed. More below. >>>>> >>>> >>>> <...> >>>> >>>>>> + >>>>>> +/* >>>>>> + * of_kexec_alloc_and_setup_fdt - Alloc and setup a new Flattened Device Tree >>>>>> + * >>>>>> + * @image: kexec image being loaded. >>>>>> + * @initrd_load_addr: Address where the next initrd will be loaded. >>>>>> + * @initrd_len: Size of the next initrd, or 0 if there will be none. >>>>>> + * @cmdline: Command line for the next kernel, or NULL if there will >>>>>> + * be none. >>>>>> + * >>>>>> + * Return: fdt on success, or NULL errno on error. >>>>>> + */ >>>>>> +void *of_kexec_alloc_and_setup_fdt(const struct kimage *image, >>>>>> + unsigned long initrd_load_addr, >>>>>> + unsigned long initrd_len, >>>>>> + const char *cmdline) >>>>>> +{ >>>>>> + void *fdt; >>>>>> + int ret, chosen_node; >>>>>> + const void *prop; >>>>>> + unsigned long fdt_size; >>>>>> + >>>>>> + fdt_size = fdt_totalsize(initial_boot_params) + >>>>>> + (cmdline ? strlen(cmdline) : 0) + >>>>>> + FDT_EXTRA_SPACE; >>>>> >>>>> Just adding 4 KB to initial_boot_params won't be enough for crash >>>>> kernels on ppc64. The current powerpc code doubles the size of >>>>> initial_boot_params (which is normally larger than 4 KB) and even that >>>>> isn't enough. A patch was added to powerpc/next today which uses a more >>>>> precise (but arch-specific) formula: >>>>> >>>>> https://lore.kernel.org/linuxppc-dev/161243826811.119001.14083048209224609814.stgit@hbathini/ >>>>> >>>>> So I believe we need a hook here where architectures can provide their >>>>> own specific calculation for the size of the fdt. Perhaps a weakly >>>>> defined function providing a default implementation which an >>>>> arch-specific file can override (a la arch_kexec_kernel_image_load())? >>>>> >>>>> Then the powerpc specific hook would be the kexec_fdt_totalsize_ppc64() >>>>> function from the patch I linked above. >>>>> >>>> >>>> Do you think it'd better to add "fdt_size" parameter to >>>> of_kexec_alloc_and_setup_fdt() so that the caller can provide the >>>> desired FDT buffer size? >>> >>> Yes, I guess so. But please define the param as extra size, not total >>> size. The kernel command line size addition can be in the common code. >> >> Will do. Just to clarify - >> >> The common code will do: >> >> fdt_totalsize(initial_boot_params) + strlen(cmdline) + extra_fdt_size >> >> The caller will pass "extra_fdt_size" >> ARM64 => 4KB >> PPC64 => fdt_totalsize(initial_boot_params) - which will be updated when >> the patch Thiago had referred to is merged. > > Yes, I'd leave the 4KB in there by default and arm64 use 0. > Sounds good. common: fdt_totalsize(initial_boot_params) + strlen(cmdline) + 0x1000 + extra arm64 => 0 for extra ppc => fdt_totalsize(initial_boot_params) for extra. -lakshmi
Lakshmi Ramasubramanian <nramas@linux.microsoft.com> writes: > On 2/12/21 10:24 AM, Rob Herring wrote: >> On Fri, Feb 12, 2021 at 11:19 AM Lakshmi Ramasubramanian >> <nramas@linux.microsoft.com> wrote: >>> >>> On 2/12/21 6:38 AM, Rob Herring wrote: >>>> On Thu, Feb 11, 2021 at 7:17 PM Lakshmi Ramasubramanian >>>> <nramas@linux.microsoft.com> wrote: >>>>> >>>>> On 2/11/21 5:09 PM, Thiago Jung Bauermann wrote: >>>>>> >>>>>> There's actually a complication that I just noticed and needs to be >>>>>> addressed. More below. >>>>>> >>>>> >>>>> <...> >>>>> >>>>>>> + >>>>>>> +/* >>>>>>> + * of_kexec_alloc_and_setup_fdt - Alloc and setup a new Flattened Device Tree >>>>>>> + * >>>>>>> + * @image: kexec image being loaded. >>>>>>> + * @initrd_load_addr: Address where the next initrd will be loaded. >>>>>>> + * @initrd_len: Size of the next initrd, or 0 if there will be none. >>>>>>> + * @cmdline: Command line for the next kernel, or NULL if there will >>>>>>> + * be none. >>>>>>> + * >>>>>>> + * Return: fdt on success, or NULL errno on error. >>>>>>> + */ >>>>>>> +void *of_kexec_alloc_and_setup_fdt(const struct kimage *image, >>>>>>> + unsigned long initrd_load_addr, >>>>>>> + unsigned long initrd_len, >>>>>>> + const char *cmdline) >>>>>>> +{ >>>>>>> + void *fdt; >>>>>>> + int ret, chosen_node; >>>>>>> + const void *prop; >>>>>>> + unsigned long fdt_size; >>>>>>> + >>>>>>> + fdt_size = fdt_totalsize(initial_boot_params) + >>>>>>> + (cmdline ? strlen(cmdline) : 0) + >>>>>>> + FDT_EXTRA_SPACE; >>>>>> >>>>>> Just adding 4 KB to initial_boot_params won't be enough for crash >>>>>> kernels on ppc64. The current powerpc code doubles the size of >>>>>> initial_boot_params (which is normally larger than 4 KB) and even that >>>>>> isn't enough. A patch was added to powerpc/next today which uses a more >>>>>> precise (but arch-specific) formula: >>>>>> >>>>>> https://lore.kernel.org/linuxppc-dev/161243826811.119001.14083048209224609814.stgit@hbathini/ >>>>>> >>>>>> So I believe we need a hook here where architectures can provide their >>>>>> own specific calculation for the size of the fdt. Perhaps a weakly >>>>>> defined function providing a default implementation which an >>>>>> arch-specific file can override (a la arch_kexec_kernel_image_load())? >>>>>> >>>>>> Then the powerpc specific hook would be the kexec_fdt_totalsize_ppc64() >>>>>> function from the patch I linked above. >>>>>> >>>>> >>>>> Do you think it'd better to add "fdt_size" parameter to >>>>> of_kexec_alloc_and_setup_fdt() so that the caller can provide the >>>>> desired FDT buffer size? >>>> >>>> Yes, I guess so. But please define the param as extra size, not total >>>> size. The kernel command line size addition can be in the common code. >>> >>> Will do. Just to clarify - >>> >>> The common code will do: >>> >>> fdt_totalsize(initial_boot_params) + strlen(cmdline) + extra_fdt_size >>> >>> The caller will pass "extra_fdt_size" >>> ARM64 => 4KB >>> PPC64 => fdt_totalsize(initial_boot_params) - which will be updated when >>> the patch Thiago had referred to is merged. >> Yes, I'd leave the 4KB in there by default and arm64 use 0. >> > > Sounds good. > > common: > fdt_totalsize(initial_boot_params) + strlen(cmdline) + 0x1000 + extra > > arm64 => 0 for extra > ppc => fdt_totalsize(initial_boot_params) for extra. Looks good to me. -- Thiago Jung Bauermann IBM Linux Technology Center
diff --git a/drivers/of/Makefile b/drivers/of/Makefile index 6e1e5212f058..c13b982084a3 100644 --- a/drivers/of/Makefile +++ b/drivers/of/Makefile @@ -14,4 +14,10 @@ obj-$(CONFIG_OF_RESOLVE) += resolver.o obj-$(CONFIG_OF_OVERLAY) += overlay.o obj-$(CONFIG_OF_NUMA) += of_numa.o +ifdef CONFIG_KEXEC_FILE +ifdef CONFIG_OF_FLATTREE +obj-y += kexec.o +endif +endif + obj-$(CONFIG_OF_UNITTEST) += unittest-data/ diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c new file mode 100644 index 000000000000..469e09613cdd --- /dev/null +++ b/drivers/of/kexec.c @@ -0,0 +1,258 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2020 Arm Limited + * + * Based on arch/arm64/kernel/machine_kexec_file.c: + * Copyright (C) 2018 Linaro Limited + * + * And arch/powerpc/kexec/file_load.c: + * Copyright (C) 2016 IBM Corporation + */ + +#include <linux/kernel.h> +#include <linux/kexec.h> +#include <linux/libfdt.h> +#include <linux/of.h> +#include <linux/of_fdt.h> +#include <linux/random.h> +#include <linux/types.h> + +/* relevant device tree properties */ +#define FDT_PROP_KEXEC_ELFHDR "linux,elfcorehdr" +#define FDT_PROP_MEM_RANGE "linux,usable-memory-range" +#define FDT_PROP_INITRD_START "linux,initrd-start" +#define FDT_PROP_INITRD_END "linux,initrd-end" +#define FDT_PROP_BOOTARGS "bootargs" +#define FDT_PROP_KASLR_SEED "kaslr-seed" +#define FDT_PROP_RNG_SEED "rng-seed" +#define RNG_SEED_SIZE 128 + +/** + * fdt_find_and_del_mem_rsv - delete memory reservation with given address and size + * + * @fdt: Flattened device tree for the current kernel. + * @start: Starting address of the reserved memory. + * @size: Size of the reserved memory. + * + * Return: 0 on success, or negative errno on error. + */ +static int fdt_find_and_del_mem_rsv(void *fdt, unsigned long start, unsigned long size) +{ + int i, ret, num_rsvs = fdt_num_mem_rsv(fdt); + + for (i = 0; i < num_rsvs; i++) { + u64 rsv_start, rsv_size; + + ret = fdt_get_mem_rsv(fdt, i, &rsv_start, &rsv_size); + if (ret) { + pr_err("Malformed device tree.\n"); + return -EINVAL; + } + + if (rsv_start == start && rsv_size == size) { + ret = fdt_del_mem_rsv(fdt, i); + if (ret) { + pr_err("Error deleting device tree reservation.\n"); + return -EINVAL; + } + + return 0; + } + } + + return -ENOENT; +} + +/* + * of_kexec_alloc_and_setup_fdt - Alloc and setup a new Flattened Device Tree + * + * @image: kexec image being loaded. + * @initrd_load_addr: Address where the next initrd will be loaded. + * @initrd_len: Size of the next initrd, or 0 if there will be none. + * @cmdline: Command line for the next kernel, or NULL if there will + * be none. + * + * Return: fdt on success, or NULL errno on error. + */ +void *of_kexec_alloc_and_setup_fdt(const struct kimage *image, + unsigned long initrd_load_addr, + unsigned long initrd_len, + const char *cmdline) +{ + void *fdt; + int ret, chosen_node; + const void *prop; + unsigned long fdt_size; + + fdt_size = fdt_totalsize(initial_boot_params) + + (cmdline ? strlen(cmdline) : 0) + + FDT_EXTRA_SPACE; + + fdt = kvmalloc(fdt_size, GFP_KERNEL); + if (!fdt) + return NULL; + + ret = fdt_open_into(initial_boot_params, fdt, fdt_size); + if (ret < 0) { + pr_err("Error %d setting up the new device tree.\n", ret); + goto out; + } + + /* Remove memory reservation for the current device tree. */ + ret = fdt_find_and_del_mem_rsv(fdt, __pa(initial_boot_params), + fdt_totalsize(initial_boot_params)); + if (ret == -EINVAL) { + pr_err("Error removing memory reservation.\n"); + goto out; + } + + chosen_node = fdt_path_offset(fdt, "/chosen"); + if (chosen_node == -FDT_ERR_NOTFOUND) + chosen_node = fdt_add_subnode(fdt, fdt_path_offset(fdt, "/"), + "chosen"); + if (chosen_node < 0) { + ret = chosen_node; + goto out; + } + + ret = fdt_delprop(fdt, chosen_node, FDT_PROP_KEXEC_ELFHDR); + if (ret && ret != -FDT_ERR_NOTFOUND) + goto out; + ret = fdt_delprop(fdt, chosen_node, FDT_PROP_MEM_RANGE); + if (ret && ret != -FDT_ERR_NOTFOUND) + goto out; + + /* Did we boot using an initrd? */ + prop = fdt_getprop(fdt, chosen_node, "linux,initrd-start", NULL); + if (prop) { + u64 tmp_start, tmp_end, tmp_size; + + tmp_start = fdt64_to_cpu(*((const fdt64_t *) prop)); + + prop = fdt_getprop(fdt, chosen_node, "linux,initrd-end", NULL); + if (!prop) { + ret = -EINVAL; + goto out; + } + + tmp_end = fdt64_to_cpu(*((const fdt64_t *) prop)); + + /* + * kexec reserves exact initrd size, while firmware may + * reserve a multiple of PAGE_SIZE, so check for both. + */ + tmp_size = tmp_end - tmp_start; + ret = fdt_find_and_del_mem_rsv(fdt, tmp_start, tmp_size); + if (ret == -ENOENT) + ret = fdt_find_and_del_mem_rsv(fdt, tmp_start, + round_up(tmp_size, PAGE_SIZE)); + if (ret == -EINVAL) + goto out; + } + + /* add initrd-* */ + if (initrd_load_addr) { + ret = fdt_setprop_u64(fdt, chosen_node, FDT_PROP_INITRD_START, + initrd_load_addr); + if (ret) + goto out; + + ret = fdt_setprop_u64(fdt, chosen_node, FDT_PROP_INITRD_END, + initrd_load_addr + initrd_len); + if (ret) + goto out; + + ret = fdt_add_mem_rsv(fdt, initrd_load_addr, initrd_len); + if (ret) + goto out; + + } else { + ret = fdt_delprop(fdt, chosen_node, FDT_PROP_INITRD_START); + if (ret && (ret != -FDT_ERR_NOTFOUND)) + goto out; + + ret = fdt_delprop(fdt, chosen_node, FDT_PROP_INITRD_END); + if (ret && (ret != -FDT_ERR_NOTFOUND)) + goto out; + } + + if (image->type == KEXEC_TYPE_CRASH) { + /* add linux,elfcorehdr */ + ret = fdt_appendprop_addrrange(fdt, 0, chosen_node, + FDT_PROP_KEXEC_ELFHDR, + image->arch.elf_headers_mem, + image->arch.elf_headers_sz); + if (ret) + goto out; + + /* + * Avoid elfcorehdr from being stomped on in kdump kernel by + * setting up memory reserve map. + */ + ret = fdt_add_mem_rsv(fdt, image->arch.elf_headers_mem, + image->arch.elf_headers_sz); + if (ret) + goto out; + + /* add linux,usable-memory-range */ + ret = fdt_appendprop_addrrange(fdt, 0, chosen_node, + FDT_PROP_MEM_RANGE, + crashk_res.start, + crashk_res.end - crashk_res.start + 1); + if (ret) + goto out; + } + + /* add bootargs */ + if (cmdline) { + ret = fdt_setprop_string(fdt, chosen_node, FDT_PROP_BOOTARGS, cmdline); + if (ret) + goto out; + } else { + ret = fdt_delprop(fdt, chosen_node, FDT_PROP_BOOTARGS); + if (ret && (ret != -FDT_ERR_NOTFOUND)) + goto out; + } + + /* add kaslr-seed */ + ret = fdt_delprop(fdt, chosen_node, FDT_PROP_KASLR_SEED); + if (ret == -FDT_ERR_NOTFOUND) + ret = 0; + else if (ret) + goto out; + + if (rng_is_initialized()) { + u64 seed = get_random_u64(); + + ret = fdt_setprop_u64(fdt, chosen_node, FDT_PROP_KASLR_SEED, seed); + if (ret) + goto out; + } else { + pr_notice("RNG is not initialised: omitting \"%s\" property\n", + FDT_PROP_KASLR_SEED); + } + + /* add rng-seed */ + if (rng_is_initialized()) { + void *rng_seed; + + ret = fdt_setprop_placeholder(fdt, chosen_node, FDT_PROP_RNG_SEED, + RNG_SEED_SIZE, &rng_seed); + if (ret) + goto out; + get_random_bytes(rng_seed, RNG_SEED_SIZE); + } else { + pr_notice("RNG is not initialised: omitting \"%s\" property\n", + FDT_PROP_RNG_SEED); + } + + ret = fdt_setprop(fdt, chosen_node, "linux,booted-from-kexec", NULL, 0); + +out: + if (ret) { + kvfree(fdt); + fdt = NULL; + } + + return fdt; +} diff --git a/include/linux/of.h b/include/linux/of.h index 4b27c9a27df3..f0eff5e84353 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -560,6 +560,19 @@ int of_map_id(struct device_node *np, u32 id, phys_addr_t of_dma_get_max_cpu_address(struct device_node *np); +/* + * Additional space needed for the buffer to build the new FDT + * so that we can add initrd, bootargs, kaslr-seed, rng-seed, + * userable-memory-range and elfcorehdr. + */ +#define FDT_EXTRA_SPACE 0x1000 + +struct kimage; +void *of_kexec_alloc_and_setup_fdt(const struct kimage *image, + unsigned long initrd_load_addr, + unsigned long initrd_len, + const char *cmdline); + #else /* CONFIG_OF */ static inline void of_core_init(void)