From: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
To: Rob Herring <robh@kernel.org>,
takahiro.akashi@linaro.org, will@kernel.org,
catalin.marinas@arm.com, mpe@ellerman.id.au
Cc: Thiago Jung Bauermann <bauerman@linux.ibm.com>,
zohar@linux.ibm.com, james.morse@arm.com, sashal@kernel.org,
benh@kernel.crashing.org, paulus@samba.org,
frowand.list@gmail.com, vincenzo.frascino@arm.com,
mark.rutland@arm.com, dmitry.kasatkin@gmail.com,
jmorris@namei.org, serge@hallyn.com, pasha.tatashin@soleen.com,
allison@lohutok.net, masahiroy@kernel.org, bhsharma@redhat.com,
mbrugger@suse.com, hsinyi@chromium.org, tao.li@vivo.com,
christophe.leroy@c-s.fr, linux-integrity@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
prsriva@linux.microsoft.com, balajib@linux.microsoft.com
Subject: Re: [RFC PATCH 3/4] arm64: Use common of_kexec_setup_new_fdt()
Date: Sat, 12 Dec 2020 07:20:53 -0800 [thread overview]
Message-ID: <f0346242-2232-2c2a-a60f-316d4809ee5e@linux.microsoft.com> (raw)
In-Reply-To: <20201211221006.1052453-4-robh@kernel.org>
On 12/11/20 2:10 PM, Rob Herring wrote:
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
> arch/arm64/kernel/machine_kexec_file.c | 123 +------------------------
> 1 file changed, 3 insertions(+), 120 deletions(-)
>
This change looks good to me.
Reviewed-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
-lakshmi
> diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
> index 5b0e67b93cdc..7de9c47dee7c 100644
> --- a/arch/arm64/kernel/machine_kexec_file.c
> +++ b/arch/arm64/kernel/machine_kexec_file.c
> @@ -15,23 +15,12 @@
> #include <linux/kexec.h>
> #include <linux/libfdt.h>
> #include <linux/memblock.h>
> +#include <linux/of.h>
> #include <linux/of_fdt.h>
> -#include <linux/random.h>
> #include <linux/slab.h>
> #include <linux/string.h>
> #include <linux/types.h>
> #include <linux/vmalloc.h>
> -#include <asm/byteorder.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
>
> const struct kexec_file_ops * const kexec_file_loaders[] = {
> &kexec_image_ops,
> @@ -50,112 +39,6 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image)
> return kexec_image_post_load_cleanup_default(image);
> }
>
> -static int setup_dtb(struct kimage *image,
> - unsigned long initrd_load_addr, unsigned long initrd_len,
> - char *cmdline, void *dtb)
> -{
> - int off, ret;
> -
> - ret = fdt_path_offset(dtb, "/chosen");
> - if (ret < 0)
> - goto out;
> -
> - off = ret;
> -
> - ret = fdt_delprop(dtb, off, FDT_PROP_KEXEC_ELFHDR);
> - if (ret && ret != -FDT_ERR_NOTFOUND)
> - goto out;
> - ret = fdt_delprop(dtb, off, FDT_PROP_MEM_RANGE);
> - if (ret && ret != -FDT_ERR_NOTFOUND)
> - goto out;
> -
> - if (image->type == KEXEC_TYPE_CRASH) {
> - /* add linux,elfcorehdr */
> - ret = fdt_appendprop_addrrange(dtb, 0, off,
> - FDT_PROP_KEXEC_ELFHDR,
> - image->arch.elf_headers_mem,
> - image->arch.elf_headers_sz);
> - if (ret)
> - return (ret == -FDT_ERR_NOSPACE ? -ENOMEM : -EINVAL);
> -
> - /* add linux,usable-memory-range */
> - ret = fdt_appendprop_addrrange(dtb, 0, off,
> - FDT_PROP_MEM_RANGE,
> - crashk_res.start,
> - crashk_res.end - crashk_res.start + 1);
> - if (ret)
> - return (ret == -FDT_ERR_NOSPACE ? -ENOMEM : -EINVAL);
> - }
> -
> - /* add bootargs */
> - if (cmdline) {
> - ret = fdt_setprop_string(dtb, off, FDT_PROP_BOOTARGS, cmdline);
> - if (ret)
> - goto out;
> - } else {
> - ret = fdt_delprop(dtb, off, FDT_PROP_BOOTARGS);
> - if (ret && (ret != -FDT_ERR_NOTFOUND))
> - goto out;
> - }
> -
> - /* add initrd-* */
> - if (initrd_load_addr) {
> - ret = fdt_setprop_u64(dtb, off, FDT_PROP_INITRD_START,
> - initrd_load_addr);
> - if (ret)
> - goto out;
> -
> - ret = fdt_setprop_u64(dtb, off, FDT_PROP_INITRD_END,
> - initrd_load_addr + initrd_len);
> - if (ret)
> - goto out;
> - } else {
> - ret = fdt_delprop(dtb, off, FDT_PROP_INITRD_START);
> - if (ret && (ret != -FDT_ERR_NOTFOUND))
> - goto out;
> -
> - ret = fdt_delprop(dtb, off, FDT_PROP_INITRD_END);
> - if (ret && (ret != -FDT_ERR_NOTFOUND))
> - goto out;
> - }
> -
> - /* add kaslr-seed */
> - ret = fdt_delprop(dtb, off, 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(dtb, off, 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(dtb, off, 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);
> - }
> -
> -out:
> - if (ret)
> - return (ret == -FDT_ERR_NOSPACE) ? -ENOMEM : -EINVAL;
> -
> - return 0;
> -}
> -
> /*
> * More space needed so that we can add initrd, bootargs, kaslr-seed,
> * rng-seed, userable-memory-range and elfcorehdr.
> @@ -185,8 +68,8 @@ static int create_dtb(struct kimage *image,
> if (ret)
> return -EINVAL;
>
> - ret = setup_dtb(image, initrd_load_addr, initrd_len,
> - cmdline, buf);
> + ret = of_kexec_setup_new_fdt(image, buf, initrd_load_addr,
> + initrd_len, cmdline);
> if (ret) {
> vfree(buf);
> if (ret == -ENOMEM) {
>
next prev parent reply other threads:[~2020-12-12 15:21 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-11 22:10 [RFC PATCH 0/4] Kexec FDT setup consolidation Rob Herring
2020-12-11 22:10 ` [RFC PATCH 1/4] powerpc: Rename kexec elfcorehdr_addr to elf_headers_mem Rob Herring
2020-12-12 0:54 ` Lakshmi Ramasubramanian
2020-12-22 21:42 ` Thiago Jung Bauermann
2020-12-11 22:10 ` [RFC PATCH 2/4] of: Add a common kexec FDT setup function Rob Herring
2020-12-12 1:18 ` Lakshmi Ramasubramanian
2020-12-12 2:17 ` Thiago Jung Bauermann
2020-12-12 5:46 ` Lakshmi Ramasubramanian
2020-12-22 21:48 ` Thiago Jung Bauermann
2020-12-11 22:10 ` [RFC PATCH 3/4] arm64: Use common of_kexec_setup_new_fdt() Rob Herring
2020-12-12 15:20 ` Lakshmi Ramasubramanian [this message]
2020-12-22 21:49 ` Thiago Jung Bauermann
2021-01-12 14:02 ` Will Deacon
2020-12-11 22:10 ` [RFC PATCH 4/4] powerpc: " Rob Herring
2020-12-12 15:22 ` Lakshmi Ramasubramanian
2020-12-22 21:55 ` Thiago Jung Bauermann
2020-12-22 23:33 ` Lakshmi Ramasubramanian
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f0346242-2232-2c2a-a60f-316d4809ee5e@linux.microsoft.com \
--to=nramas@linux.microsoft.com \
--cc=allison@lohutok.net \
--cc=balajib@linux.microsoft.com \
--cc=bauerman@linux.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=bhsharma@redhat.com \
--cc=catalin.marinas@arm.com \
--cc=christophe.leroy@c-s.fr \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.kasatkin@gmail.com \
--cc=frowand.list@gmail.com \
--cc=hsinyi@chromium.org \
--cc=james.morse@arm.com \
--cc=jmorris@namei.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=masahiroy@kernel.org \
--cc=mbrugger@suse.com \
--cc=mpe@ellerman.id.au \
--cc=pasha.tatashin@soleen.com \
--cc=paulus@samba.org \
--cc=prsriva@linux.microsoft.com \
--cc=robh@kernel.org \
--cc=sashal@kernel.org \
--cc=serge@hallyn.com \
--cc=takahiro.akashi@linaro.org \
--cc=tao.li@vivo.com \
--cc=vincenzo.frascino@arm.com \
--cc=will@kernel.org \
--cc=zohar@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).