* [RFC PATCH 0/4] Kexec FDT setup consolidation
@ 2020-12-11 22:10 ` Rob Herring
0 siblings, 0 replies; 34+ messages in thread
From: Rob Herring @ 2020-12-11 22:10 UTC (permalink / raw)
To: Lakshmi Ramasubramanian, takahiro.akashi, will, catalin.marinas, mpe
Cc: mark.rutland, benh, bhsharma, tao.li, zohar, paulus,
vincenzo.frascino, frowand.list, sashal, masahiroy, jmorris,
linux-arm-kernel, serge, devicetree, pasha.tatashin, prsriva,
hsinyi, allison, christophe.leroy, mbrugger, balajib,
dmitry.kasatkin, linux-kernel, james.morse, linux-integrity,
Thiago Jung Bauermann
Lakshmi,
As I mentioned before for the arm64 IMA support[1], the common parts of
kexec FDT setup need to be pulled out before adding IMA support. This series
is what I'd like to see done before we add any more kexec features. Arm64
and powerpc do essentially the same DT setup and the differences don't
conflict.
It's RFC because it's compile tested only, could use some better commit
messages, and I'm only throwing it out to show what I want here. A branch
is here[2].
Rob
[1] https://lore.kernel.org/lkml/CAL_Jsq+3qBr6JT3dysSt28j0UJq80u9YRf5pAh0Dvv5_+pFKXw@mail.gmail.com/
[2] git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git dt/kexec
Rob Herring (4):
powerpc: Rename kexec elfcorehdr_addr to elf_headers_mem
of: Add a common kexec FDT setup function
arm64: Use common of_kexec_setup_new_fdt()
powerpc: Use common of_kexec_setup_new_fdt()
arch/arm64/kernel/machine_kexec_file.c | 123 +------------
arch/powerpc/include/asm/kexec.h | 2 +-
arch/powerpc/kexec/file_load.c | 127 +-------------
arch/powerpc/kexec/file_load_64.c | 4 +-
drivers/of/Makefile | 1 +
drivers/of/kexec.c | 228 +++++++++++++++++++++++++
include/linux/of.h | 5 +
7 files changed, 247 insertions(+), 243 deletions(-)
create mode 100644 drivers/of/kexec.c
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 34+ messages in thread
* [RFC PATCH 1/4] powerpc: Rename kexec elfcorehdr_addr to elf_headers_mem
2020-12-11 22:10 ` Rob Herring
@ 2020-12-11 22:10 ` Rob Herring
-1 siblings, 0 replies; 34+ messages in thread
From: Rob Herring @ 2020-12-11 22:10 UTC (permalink / raw)
To: Lakshmi Ramasubramanian, takahiro.akashi, will, catalin.marinas, mpe
Cc: Thiago Jung Bauermann, zohar, james.morse, sashal, benh, paulus,
frowand.list, vincenzo.frascino, mark.rutland, dmitry.kasatkin,
jmorris, serge, pasha.tatashin, allison, masahiroy, bhsharma,
mbrugger, hsinyi, tao.li, christophe.leroy, linux-integrity,
linux-kernel, linux-arm-kernel, devicetree, prsriva, balajib
Align with arm64 name so common code can use it.
Signed-off-by: Rob Herring <robh@kernel.org>
---
arch/powerpc/include/asm/kexec.h | 2 +-
arch/powerpc/kexec/file_load.c | 4 ++--
arch/powerpc/kexec/file_load_64.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h
index 55d6ede30c19..dbf09d2f36d0 100644
--- a/arch/powerpc/include/asm/kexec.h
+++ b/arch/powerpc/include/asm/kexec.h
@@ -108,7 +108,7 @@ struct kimage_arch {
unsigned long backup_start;
void *backup_buf;
- unsigned long elfcorehdr_addr;
+ unsigned long elf_headers_mem;
unsigned long elf_headers_sz;
void *elf_headers;
diff --git a/arch/powerpc/kexec/file_load.c b/arch/powerpc/kexec/file_load.c
index 9a232bc36c8f..e452b11df631 100644
--- a/arch/powerpc/kexec/file_load.c
+++ b/arch/powerpc/kexec/file_load.c
@@ -45,7 +45,7 @@ char *setup_kdump_cmdline(struct kimage *image, char *cmdline,
return NULL;
elfcorehdr_strlen = sprintf(cmdline_ptr, "elfcorehdr=0x%lx ",
- image->arch.elfcorehdr_addr);
+ image->arch.elf_headers_mem);
if (elfcorehdr_strlen + cmdline_len > COMMAND_LINE_SIZE) {
pr_err("Appending elfcorehdr=<addr> exceeds cmdline size\n");
@@ -263,7 +263,7 @@ int setup_new_fdt(const struct kimage *image, void *fdt,
* Avoid elfcorehdr from being stomped on in kdump kernel by
* setting up memory reserve map.
*/
- ret = fdt_add_mem_rsv(fdt, image->arch.elfcorehdr_addr,
+ ret = fdt_add_mem_rsv(fdt, image->arch.elf_headers_mem,
image->arch.elf_headers_sz);
if (ret) {
pr_err("Error reserving elfcorehdr memory: %s\n",
diff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_load_64.c
index c69bcf9b547a..a05c19b3cc60 100644
--- a/arch/powerpc/kexec/file_load_64.c
+++ b/arch/powerpc/kexec/file_load_64.c
@@ -815,7 +815,7 @@ static int load_elfcorehdr_segment(struct kimage *image, struct kexec_buf *kbuf)
goto out;
}
- image->arch.elfcorehdr_addr = kbuf->mem;
+ image->arch.elf_headers_mem = kbuf->mem;
image->arch.elf_headers_sz = headers_sz;
image->arch.elf_headers = headers;
out:
@@ -851,7 +851,7 @@ int load_crashdump_segments_ppc64(struct kimage *image,
return ret;
}
pr_debug("Loaded elf core header at 0x%lx, bufsz=0x%lx memsz=0x%lx\n",
- image->arch.elfcorehdr_addr, kbuf->bufsz, kbuf->memsz);
+ image->arch.elf_headers_mem, kbuf->bufsz, kbuf->memsz);
return 0;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 34+ messages in thread* [RFC PATCH 1/4] powerpc: Rename kexec elfcorehdr_addr to elf_headers_mem
@ 2020-12-11 22:10 ` Rob Herring
0 siblings, 0 replies; 34+ messages in thread
From: Rob Herring @ 2020-12-11 22:10 UTC (permalink / raw)
To: Lakshmi Ramasubramanian, takahiro.akashi, will, catalin.marinas, mpe
Cc: mark.rutland, benh, bhsharma, tao.li, zohar, paulus,
vincenzo.frascino, frowand.list, sashal, masahiroy, jmorris,
linux-arm-kernel, serge, devicetree, pasha.tatashin, prsriva,
hsinyi, allison, christophe.leroy, mbrugger, balajib,
dmitry.kasatkin, linux-kernel, james.morse, linux-integrity,
Thiago Jung Bauermann
Align with arm64 name so common code can use it.
Signed-off-by: Rob Herring <robh@kernel.org>
---
arch/powerpc/include/asm/kexec.h | 2 +-
arch/powerpc/kexec/file_load.c | 4 ++--
arch/powerpc/kexec/file_load_64.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h
index 55d6ede30c19..dbf09d2f36d0 100644
--- a/arch/powerpc/include/asm/kexec.h
+++ b/arch/powerpc/include/asm/kexec.h
@@ -108,7 +108,7 @@ struct kimage_arch {
unsigned long backup_start;
void *backup_buf;
- unsigned long elfcorehdr_addr;
+ unsigned long elf_headers_mem;
unsigned long elf_headers_sz;
void *elf_headers;
diff --git a/arch/powerpc/kexec/file_load.c b/arch/powerpc/kexec/file_load.c
index 9a232bc36c8f..e452b11df631 100644
--- a/arch/powerpc/kexec/file_load.c
+++ b/arch/powerpc/kexec/file_load.c
@@ -45,7 +45,7 @@ char *setup_kdump_cmdline(struct kimage *image, char *cmdline,
return NULL;
elfcorehdr_strlen = sprintf(cmdline_ptr, "elfcorehdr=0x%lx ",
- image->arch.elfcorehdr_addr);
+ image->arch.elf_headers_mem);
if (elfcorehdr_strlen + cmdline_len > COMMAND_LINE_SIZE) {
pr_err("Appending elfcorehdr=<addr> exceeds cmdline size\n");
@@ -263,7 +263,7 @@ int setup_new_fdt(const struct kimage *image, void *fdt,
* Avoid elfcorehdr from being stomped on in kdump kernel by
* setting up memory reserve map.
*/
- ret = fdt_add_mem_rsv(fdt, image->arch.elfcorehdr_addr,
+ ret = fdt_add_mem_rsv(fdt, image->arch.elf_headers_mem,
image->arch.elf_headers_sz);
if (ret) {
pr_err("Error reserving elfcorehdr memory: %s\n",
diff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_load_64.c
index c69bcf9b547a..a05c19b3cc60 100644
--- a/arch/powerpc/kexec/file_load_64.c
+++ b/arch/powerpc/kexec/file_load_64.c
@@ -815,7 +815,7 @@ static int load_elfcorehdr_segment(struct kimage *image, struct kexec_buf *kbuf)
goto out;
}
- image->arch.elfcorehdr_addr = kbuf->mem;
+ image->arch.elf_headers_mem = kbuf->mem;
image->arch.elf_headers_sz = headers_sz;
image->arch.elf_headers = headers;
out:
@@ -851,7 +851,7 @@ int load_crashdump_segments_ppc64(struct kimage *image,
return ret;
}
pr_debug("Loaded elf core header at 0x%lx, bufsz=0x%lx memsz=0x%lx\n",
- image->arch.elfcorehdr_addr, kbuf->bufsz, kbuf->memsz);
+ image->arch.elf_headers_mem, kbuf->bufsz, kbuf->memsz);
return 0;
}
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [RFC PATCH 1/4] powerpc: Rename kexec elfcorehdr_addr to elf_headers_mem
2020-12-11 22:10 ` Rob Herring
@ 2020-12-12 0:54 ` Lakshmi Ramasubramanian
-1 siblings, 0 replies; 34+ messages in thread
From: Lakshmi Ramasubramanian @ 2020-12-12 0:54 UTC (permalink / raw)
To: Rob Herring, takahiro.akashi, will, catalin.marinas, mpe
Cc: Thiago Jung Bauermann, zohar, james.morse, sashal, benh, paulus,
frowand.list, vincenzo.frascino, mark.rutland, dmitry.kasatkin,
jmorris, serge, pasha.tatashin, allison, masahiroy, bhsharma,
mbrugger, hsinyi, tao.li, christophe.leroy, linux-integrity,
linux-kernel, linux-arm-kernel, devicetree, prsriva, balajib
On 12/11/20 2:10 PM, Rob Herring wrote:
Hi Rob,
> Align with arm64 name so common code can use it.
As you'd stated in the cover letter, a better patch description would be
good to have here.
Code changes look good to me.
Reviewed-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
thanks,
-lakshmi
>
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
> arch/powerpc/include/asm/kexec.h | 2 +-
> arch/powerpc/kexec/file_load.c | 4 ++--
> arch/powerpc/kexec/file_load_64.c | 4 ++--
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h
> index 55d6ede30c19..dbf09d2f36d0 100644
> --- a/arch/powerpc/include/asm/kexec.h
> +++ b/arch/powerpc/include/asm/kexec.h
> @@ -108,7 +108,7 @@ struct kimage_arch {
> unsigned long backup_start;
> void *backup_buf;
>
> - unsigned long elfcorehdr_addr;
> + unsigned long elf_headers_mem;
> unsigned long elf_headers_sz;
> void *elf_headers;
>
> diff --git a/arch/powerpc/kexec/file_load.c b/arch/powerpc/kexec/file_load.c
> index 9a232bc36c8f..e452b11df631 100644
> --- a/arch/powerpc/kexec/file_load.c
> +++ b/arch/powerpc/kexec/file_load.c
> @@ -45,7 +45,7 @@ char *setup_kdump_cmdline(struct kimage *image, char *cmdline,
> return NULL;
>
> elfcorehdr_strlen = sprintf(cmdline_ptr, "elfcorehdr=0x%lx ",
> - image->arch.elfcorehdr_addr);
> + image->arch.elf_headers_mem);
>
> if (elfcorehdr_strlen + cmdline_len > COMMAND_LINE_SIZE) {
> pr_err("Appending elfcorehdr=<addr> exceeds cmdline size\n");
> @@ -263,7 +263,7 @@ int setup_new_fdt(const struct kimage *image, void *fdt,
> * Avoid elfcorehdr from being stomped on in kdump kernel by
> * setting up memory reserve map.
> */
> - ret = fdt_add_mem_rsv(fdt, image->arch.elfcorehdr_addr,
> + ret = fdt_add_mem_rsv(fdt, image->arch.elf_headers_mem,
> image->arch.elf_headers_sz);
> if (ret) {
> pr_err("Error reserving elfcorehdr memory: %s\n",
> diff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_load_64.c
> index c69bcf9b547a..a05c19b3cc60 100644
> --- a/arch/powerpc/kexec/file_load_64.c
> +++ b/arch/powerpc/kexec/file_load_64.c
> @@ -815,7 +815,7 @@ static int load_elfcorehdr_segment(struct kimage *image, struct kexec_buf *kbuf)
> goto out;
> }
>
> - image->arch.elfcorehdr_addr = kbuf->mem;
> + image->arch.elf_headers_mem = kbuf->mem;
> image->arch.elf_headers_sz = headers_sz;
> image->arch.elf_headers = headers;
> out:
> @@ -851,7 +851,7 @@ int load_crashdump_segments_ppc64(struct kimage *image,
> return ret;
> }
> pr_debug("Loaded elf core header at 0x%lx, bufsz=0x%lx memsz=0x%lx\n",
> - image->arch.elfcorehdr_addr, kbuf->bufsz, kbuf->memsz);
> + image->arch.elf_headers_mem, kbuf->bufsz, kbuf->memsz);
>
> return 0;
> }
>
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [RFC PATCH 1/4] powerpc: Rename kexec elfcorehdr_addr to elf_headers_mem
@ 2020-12-12 0:54 ` Lakshmi Ramasubramanian
0 siblings, 0 replies; 34+ messages in thread
From: Lakshmi Ramasubramanian @ 2020-12-12 0:54 UTC (permalink / raw)
To: Rob Herring, takahiro.akashi, will, catalin.marinas, mpe
Cc: mark.rutland, benh, bhsharma, tao.li, zohar, paulus,
vincenzo.frascino, frowand.list, sashal, masahiroy, jmorris,
linux-arm-kernel, serge, devicetree, pasha.tatashin, prsriva,
hsinyi, allison, christophe.leroy, mbrugger, balajib,
dmitry.kasatkin, linux-kernel, james.morse, linux-integrity,
Thiago Jung Bauermann
On 12/11/20 2:10 PM, Rob Herring wrote:
Hi Rob,
> Align with arm64 name so common code can use it.
As you'd stated in the cover letter, a better patch description would be
good to have here.
Code changes look good to me.
Reviewed-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
thanks,
-lakshmi
>
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
> arch/powerpc/include/asm/kexec.h | 2 +-
> arch/powerpc/kexec/file_load.c | 4 ++--
> arch/powerpc/kexec/file_load_64.c | 4 ++--
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h
> index 55d6ede30c19..dbf09d2f36d0 100644
> --- a/arch/powerpc/include/asm/kexec.h
> +++ b/arch/powerpc/include/asm/kexec.h
> @@ -108,7 +108,7 @@ struct kimage_arch {
> unsigned long backup_start;
> void *backup_buf;
>
> - unsigned long elfcorehdr_addr;
> + unsigned long elf_headers_mem;
> unsigned long elf_headers_sz;
> void *elf_headers;
>
> diff --git a/arch/powerpc/kexec/file_load.c b/arch/powerpc/kexec/file_load.c
> index 9a232bc36c8f..e452b11df631 100644
> --- a/arch/powerpc/kexec/file_load.c
> +++ b/arch/powerpc/kexec/file_load.c
> @@ -45,7 +45,7 @@ char *setup_kdump_cmdline(struct kimage *image, char *cmdline,
> return NULL;
>
> elfcorehdr_strlen = sprintf(cmdline_ptr, "elfcorehdr=0x%lx ",
> - image->arch.elfcorehdr_addr);
> + image->arch.elf_headers_mem);
>
> if (elfcorehdr_strlen + cmdline_len > COMMAND_LINE_SIZE) {
> pr_err("Appending elfcorehdr=<addr> exceeds cmdline size\n");
> @@ -263,7 +263,7 @@ int setup_new_fdt(const struct kimage *image, void *fdt,
> * Avoid elfcorehdr from being stomped on in kdump kernel by
> * setting up memory reserve map.
> */
> - ret = fdt_add_mem_rsv(fdt, image->arch.elfcorehdr_addr,
> + ret = fdt_add_mem_rsv(fdt, image->arch.elf_headers_mem,
> image->arch.elf_headers_sz);
> if (ret) {
> pr_err("Error reserving elfcorehdr memory: %s\n",
> diff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_load_64.c
> index c69bcf9b547a..a05c19b3cc60 100644
> --- a/arch/powerpc/kexec/file_load_64.c
> +++ b/arch/powerpc/kexec/file_load_64.c
> @@ -815,7 +815,7 @@ static int load_elfcorehdr_segment(struct kimage *image, struct kexec_buf *kbuf)
> goto out;
> }
>
> - image->arch.elfcorehdr_addr = kbuf->mem;
> + image->arch.elf_headers_mem = kbuf->mem;
> image->arch.elf_headers_sz = headers_sz;
> image->arch.elf_headers = headers;
> out:
> @@ -851,7 +851,7 @@ int load_crashdump_segments_ppc64(struct kimage *image,
> return ret;
> }
> pr_debug("Loaded elf core header at 0x%lx, bufsz=0x%lx memsz=0x%lx\n",
> - image->arch.elfcorehdr_addr, kbuf->bufsz, kbuf->memsz);
> + image->arch.elf_headers_mem, kbuf->bufsz, kbuf->memsz);
>
> return 0;
> }
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [RFC PATCH 1/4] powerpc: Rename kexec elfcorehdr_addr to elf_headers_mem
2020-12-11 22:10 ` Rob Herring
@ 2020-12-22 21:42 ` Thiago Jung Bauermann
-1 siblings, 0 replies; 34+ messages in thread
From: Thiago Jung Bauermann @ 2020-12-22 21:42 UTC (permalink / raw)
To: Rob Herring
Cc: Lakshmi Ramasubramanian, takahiro.akashi, will, catalin.marinas,
mpe, zohar, james.morse, sashal, benh, paulus, frowand.list,
vincenzo.frascino, mark.rutland, dmitry.kasatkin, jmorris, serge,
pasha.tatashin, allison, masahiroy, bhsharma, mbrugger, hsinyi,
tao.li, christophe.leroy, linux-integrity, linux-kernel,
linux-arm-kernel, devicetree, prsriva, balajib
Hello Rob,
Thank you for making this series.
Rob Herring <robh@kernel.org> writes:
> Align with arm64 name so common code can use it.
>
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
> arch/powerpc/include/asm/kexec.h | 2 +-
> arch/powerpc/kexec/file_load.c | 4 ++--
> arch/powerpc/kexec/file_load_64.c | 4 ++--
> 3 files changed, 5 insertions(+), 5 deletions(-)
Reviewed-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
--
Thiago Jung Bauermann
IBM Linux Technology Center
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [RFC PATCH 1/4] powerpc: Rename kexec elfcorehdr_addr to elf_headers_mem
@ 2020-12-22 21:42 ` Thiago Jung Bauermann
0 siblings, 0 replies; 34+ messages in thread
From: Thiago Jung Bauermann @ 2020-12-22 21:42 UTC (permalink / raw)
To: Rob Herring
Cc: mark.rutland, benh, bhsharma, tao.li, zohar, paulus,
vincenzo.frascino, frowand.list, sashal, Lakshmi Ramasubramanian,
mpe, masahiroy, jmorris, takahiro.akashi, linux-arm-kernel,
catalin.marinas, serge, devicetree, pasha.tatashin, will,
prsriva, hsinyi, allison, christophe.leroy, mbrugger, balajib,
dmitry.kasatkin, linux-kernel, james.morse, linux-integrity
Hello Rob,
Thank you for making this series.
Rob Herring <robh@kernel.org> writes:
> Align with arm64 name so common code can use it.
>
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
> arch/powerpc/include/asm/kexec.h | 2 +-
> arch/powerpc/kexec/file_load.c | 4 ++--
> arch/powerpc/kexec/file_load_64.c | 4 ++--
> 3 files changed, 5 insertions(+), 5 deletions(-)
Reviewed-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
--
Thiago Jung Bauermann
IBM Linux Technology Center
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 34+ messages in thread
* [RFC PATCH 2/4] of: Add a common kexec FDT setup function
2020-12-11 22:10 ` Rob Herring
@ 2020-12-11 22:10 ` Rob Herring
-1 siblings, 0 replies; 34+ messages in thread
From: Rob Herring @ 2020-12-11 22:10 UTC (permalink / raw)
To: Lakshmi Ramasubramanian, takahiro.akashi, will, catalin.marinas, mpe
Cc: Thiago Jung Bauermann, zohar, james.morse, sashal, benh, paulus,
frowand.list, vincenzo.frascino, mark.rutland, dmitry.kasatkin,
jmorris, serge, pasha.tatashin, allison, masahiroy, bhsharma,
mbrugger, hsinyi, tao.li, christophe.leroy, linux-integrity,
linux-kernel, linux-arm-kernel, devicetree, prsriva, balajib
Both arm64 and powerpc do essentially the same FDT /chosen setup for
kexec. We can simply combine everything each arch does. The differences
are either omissions that arm64 should have or additional properties
that will be ignored.
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.
Signed-off-by: Rob Herring <robh@kernel.org>
---
This could be taken a step further and do the allocation of the new
FDT. The difference is arm64 uses vmalloc and powerpc uses kmalloc. The
arm64 version also retries with a bigger allocation. That seems
unnecessary.
---
drivers/of/Makefile | 1 +
drivers/of/kexec.c | 228 ++++++++++++++++++++++++++++++++++++++++++++
include/linux/of.h | 5 +
3 files changed, 234 insertions(+)
create mode 100644 drivers/of/kexec.c
diff --git a/drivers/of/Makefile b/drivers/of/Makefile
index 6e1e5212f058..8ce11955afde 100644
--- a/drivers/of/Makefile
+++ b/drivers/of/Makefile
@@ -13,5 +13,6 @@ obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o
obj-$(CONFIG_OF_RESOLVE) += resolver.o
obj-$(CONFIG_OF_OVERLAY) += overlay.o
obj-$(CONFIG_OF_NUMA) += of_numa.o
+obj-$(CONFIG_KEXEC_FILE) += kexec.o
obj-$(CONFIG_OF_UNITTEST) += unittest-data/
diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c
new file mode 100644
index 000000000000..66787be081fe
--- /dev/null
+++ b/drivers/of/kexec.c
@@ -0,0 +1,228 @@
+// 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
+ *
+ * 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_setup_new_fdt - modify /chosen and memory reservation for the next kernel
+ *
+ * @image: kexec image being loaded.
+ * @fdt: Flattened device tree for the next kernel.
+ * @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: 0 on success, or negative errno on error.
+ */
+int of_kexec_setup_new_fdt(const struct kimage *image, void *fdt,
+ unsigned long initrd_load_addr, unsigned long initrd_len,
+ const char *cmdline)
+{
+ int ret, chosen_node;
+ const void *prop;
+
+ /* 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)
+ return ret;
+
+ 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)
+ return -EINVAL;
+
+ 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)
+ return ret;
+ }
+
+ /* 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);
+
+ /* 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)
+ return (ret == -FDT_ERR_NOSPACE) ? -ENOMEM : -EINVAL;
+
+ return 0;
+}
diff --git a/include/linux/of.h b/include/linux/of.h
index 5d51891cbf1a..3375f5295875 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -558,6 +558,11 @@ int of_map_id(struct device_node *np, u32 id,
const char *map_name, const char *map_mask_name,
struct device_node **target, u32 *id_out);
+struct kimage;
+int of_kexec_setup_new_fdt(const struct kimage *image, void *fdt,
+ unsigned long initrd_load_addr, unsigned long initrd_len,
+ const char *cmdline);
+
#else /* CONFIG_OF */
static inline void of_core_init(void)
--
2.25.1
^ permalink raw reply related [flat|nested] 34+ messages in thread* [RFC PATCH 2/4] of: Add a common kexec FDT setup function
@ 2020-12-11 22:10 ` Rob Herring
0 siblings, 0 replies; 34+ messages in thread
From: Rob Herring @ 2020-12-11 22:10 UTC (permalink / raw)
To: Lakshmi Ramasubramanian, takahiro.akashi, will, catalin.marinas, mpe
Cc: mark.rutland, benh, bhsharma, tao.li, zohar, paulus,
vincenzo.frascino, frowand.list, sashal, masahiroy, jmorris,
linux-arm-kernel, serge, devicetree, pasha.tatashin, prsriva,
hsinyi, allison, christophe.leroy, mbrugger, balajib,
dmitry.kasatkin, linux-kernel, james.morse, linux-integrity,
Thiago Jung Bauermann
Both arm64 and powerpc do essentially the same FDT /chosen setup for
kexec. We can simply combine everything each arch does. The differences
are either omissions that arm64 should have or additional properties
that will be ignored.
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.
Signed-off-by: Rob Herring <robh@kernel.org>
---
This could be taken a step further and do the allocation of the new
FDT. The difference is arm64 uses vmalloc and powerpc uses kmalloc. The
arm64 version also retries with a bigger allocation. That seems
unnecessary.
---
drivers/of/Makefile | 1 +
drivers/of/kexec.c | 228 ++++++++++++++++++++++++++++++++++++++++++++
include/linux/of.h | 5 +
3 files changed, 234 insertions(+)
create mode 100644 drivers/of/kexec.c
diff --git a/drivers/of/Makefile b/drivers/of/Makefile
index 6e1e5212f058..8ce11955afde 100644
--- a/drivers/of/Makefile
+++ b/drivers/of/Makefile
@@ -13,5 +13,6 @@ obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o
obj-$(CONFIG_OF_RESOLVE) += resolver.o
obj-$(CONFIG_OF_OVERLAY) += overlay.o
obj-$(CONFIG_OF_NUMA) += of_numa.o
+obj-$(CONFIG_KEXEC_FILE) += kexec.o
obj-$(CONFIG_OF_UNITTEST) += unittest-data/
diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c
new file mode 100644
index 000000000000..66787be081fe
--- /dev/null
+++ b/drivers/of/kexec.c
@@ -0,0 +1,228 @@
+// 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
+ *
+ * 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_setup_new_fdt - modify /chosen and memory reservation for the next kernel
+ *
+ * @image: kexec image being loaded.
+ * @fdt: Flattened device tree for the next kernel.
+ * @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: 0 on success, or negative errno on error.
+ */
+int of_kexec_setup_new_fdt(const struct kimage *image, void *fdt,
+ unsigned long initrd_load_addr, unsigned long initrd_len,
+ const char *cmdline)
+{
+ int ret, chosen_node;
+ const void *prop;
+
+ /* 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)
+ return ret;
+
+ 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)
+ return -EINVAL;
+
+ 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)
+ return ret;
+ }
+
+ /* 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);
+
+ /* 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)
+ return (ret == -FDT_ERR_NOSPACE) ? -ENOMEM : -EINVAL;
+
+ return 0;
+}
diff --git a/include/linux/of.h b/include/linux/of.h
index 5d51891cbf1a..3375f5295875 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -558,6 +558,11 @@ int of_map_id(struct device_node *np, u32 id,
const char *map_name, const char *map_mask_name,
struct device_node **target, u32 *id_out);
+struct kimage;
+int of_kexec_setup_new_fdt(const struct kimage *image, void *fdt,
+ unsigned long initrd_load_addr, unsigned long initrd_len,
+ const char *cmdline);
+
#else /* CONFIG_OF */
static inline void of_core_init(void)
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [RFC PATCH 2/4] of: Add a common kexec FDT setup function
2020-12-11 22:10 ` Rob Herring
@ 2020-12-12 1:18 ` Lakshmi Ramasubramanian
-1 siblings, 0 replies; 34+ messages in thread
From: Lakshmi Ramasubramanian @ 2020-12-12 1:18 UTC (permalink / raw)
To: Rob Herring, takahiro.akashi, will, catalin.marinas, mpe
Cc: Thiago Jung Bauermann, zohar, james.morse, sashal, benh, paulus,
frowand.list, vincenzo.frascino, mark.rutland, dmitry.kasatkin,
jmorris, serge, pasha.tatashin, allison, masahiroy, bhsharma,
mbrugger, hsinyi, tao.li, christophe.leroy, linux-integrity,
linux-kernel, linux-arm-kernel, devicetree, prsriva, balajib
On 12/11/20 2:10 PM, Rob Herring wrote:
Hi Rob,
> Both arm64 and powerpc do essentially the same FDT /chosen setup for
> kexec. We can simply combine everything each arch does. The differences
> are either omissions that arm64 should have or additional properties
> that will be ignored.
>
> 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.
>
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
> This could be taken a step further and do the allocation of the new
> FDT. The difference is arm64 uses vmalloc and powerpc uses kmalloc. The
> arm64 version also retries with a bigger allocation. That seems
> unnecessary.
> ---
> drivers/of/Makefile | 1 +
> drivers/of/kexec.c | 228 ++++++++++++++++++++++++++++++++++++++++++++
> include/linux/of.h | 5 +
> 3 files changed, 234 insertions(+)
> create mode 100644 drivers/of/kexec.c
>
> diff --git a/drivers/of/Makefile b/drivers/of/Makefile
> index 6e1e5212f058..8ce11955afde 100644
> --- a/drivers/of/Makefile
> +++ b/drivers/of/Makefile
> @@ -13,5 +13,6 @@ obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o
> obj-$(CONFIG_OF_RESOLVE) += resolver.o
> obj-$(CONFIG_OF_OVERLAY) += overlay.o
> obj-$(CONFIG_OF_NUMA) += of_numa.o
> +obj-$(CONFIG_KEXEC_FILE) += kexec.o
For the functions moved from powerpc & arm64 to "drivers/of/kexec.c" in
this patch, compiling kexec.c when CONFIG_KEXEC_FILE is enabled is fine.
But when more functions (such as remove_ima_buffer()) are moved to this
file, Makefile needs to be updated for other ima kexec related CONFIGs.
Why not compile kexec.c when CONFIG_OF_FLATTREE is enabled, and handle
other CONFIGs using IS_ENABLED (like you'd suggested earlier)?
>
> obj-$(CONFIG_OF_UNITTEST) += unittest-data/
> diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c
> new file mode 100644
> index 000000000000..66787be081fe
> --- /dev/null
> +++ b/drivers/of/kexec.c
> @@ -0,0 +1,228 @@
> +// 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
> + *
> + * 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_setup_new_fdt - modify /chosen and memory reservation for the next kernel
> + *
> + * @image: kexec image being loaded.
> + * @fdt: Flattened device tree for the next kernel.
> + * @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.
nit: alignment of the parameter description seems to be off. But it
could be due to my mail client.
> + *
> + * Return: 0 on success, or negative errno on error.
> + */
> +int of_kexec_setup_new_fdt(const struct kimage *image, void *fdt,
> + unsigned long initrd_load_addr, unsigned long initrd_len,
> + const char *cmdline)
> +{
> + int ret, chosen_node;
> + const void *prop;
> +
> + /* 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)
> + return ret;
> +
> + 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)
> + return -EINVAL;
> +
> + 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)
> + return ret;
> + }
> +
> + /* 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);
Return value from fdt_add_mem_rsv() should be checked.
> +
> + /* 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)
> + return (ret == -FDT_ERR_NOSPACE) ? -ENOMEM : -EINVAL;
> +
> + return 0;
> +}
> diff --git a/include/linux/of.h b/include/linux/of.h
> index 5d51891cbf1a..3375f5295875 100644
> --- a/include/linux/of.h
> +++ b/include/linux/of.h
> @@ -558,6 +558,11 @@ int of_map_id(struct device_node *np, u32 id,
> const char *map_name, const char *map_mask_name,
> struct device_node **target, u32 *id_out);
>
> +struct kimage;
> +int of_kexec_setup_new_fdt(const struct kimage *image, void *fdt,
> + unsigned long initrd_load_addr, unsigned long initrd_len,
> + const char *cmdline);
of_kexec_setup_new_fdt() should only be declared if CONFIG_KEXEC_FILE is
enabled. Right?
-lakshmi
> +
> #else /* CONFIG_OF */
>
> static inline void of_core_init(void)
>
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [RFC PATCH 2/4] of: Add a common kexec FDT setup function
@ 2020-12-12 1:18 ` Lakshmi Ramasubramanian
0 siblings, 0 replies; 34+ messages in thread
From: Lakshmi Ramasubramanian @ 2020-12-12 1:18 UTC (permalink / raw)
To: Rob Herring, takahiro.akashi, will, catalin.marinas, mpe
Cc: mark.rutland, benh, bhsharma, tao.li, zohar, paulus,
vincenzo.frascino, frowand.list, sashal, masahiroy, jmorris,
linux-arm-kernel, serge, devicetree, pasha.tatashin, prsriva,
hsinyi, allison, christophe.leroy, mbrugger, balajib,
dmitry.kasatkin, linux-kernel, james.morse, linux-integrity,
Thiago Jung Bauermann
On 12/11/20 2:10 PM, Rob Herring wrote:
Hi Rob,
> Both arm64 and powerpc do essentially the same FDT /chosen setup for
> kexec. We can simply combine everything each arch does. The differences
> are either omissions that arm64 should have or additional properties
> that will be ignored.
>
> 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.
>
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
> This could be taken a step further and do the allocation of the new
> FDT. The difference is arm64 uses vmalloc and powerpc uses kmalloc. The
> arm64 version also retries with a bigger allocation. That seems
> unnecessary.
> ---
> drivers/of/Makefile | 1 +
> drivers/of/kexec.c | 228 ++++++++++++++++++++++++++++++++++++++++++++
> include/linux/of.h | 5 +
> 3 files changed, 234 insertions(+)
> create mode 100644 drivers/of/kexec.c
>
> diff --git a/drivers/of/Makefile b/drivers/of/Makefile
> index 6e1e5212f058..8ce11955afde 100644
> --- a/drivers/of/Makefile
> +++ b/drivers/of/Makefile
> @@ -13,5 +13,6 @@ obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o
> obj-$(CONFIG_OF_RESOLVE) += resolver.o
> obj-$(CONFIG_OF_OVERLAY) += overlay.o
> obj-$(CONFIG_OF_NUMA) += of_numa.o
> +obj-$(CONFIG_KEXEC_FILE) += kexec.o
For the functions moved from powerpc & arm64 to "drivers/of/kexec.c" in
this patch, compiling kexec.c when CONFIG_KEXEC_FILE is enabled is fine.
But when more functions (such as remove_ima_buffer()) are moved to this
file, Makefile needs to be updated for other ima kexec related CONFIGs.
Why not compile kexec.c when CONFIG_OF_FLATTREE is enabled, and handle
other CONFIGs using IS_ENABLED (like you'd suggested earlier)?
>
> obj-$(CONFIG_OF_UNITTEST) += unittest-data/
> diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c
> new file mode 100644
> index 000000000000..66787be081fe
> --- /dev/null
> +++ b/drivers/of/kexec.c
> @@ -0,0 +1,228 @@
> +// 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
> + *
> + * 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_setup_new_fdt - modify /chosen and memory reservation for the next kernel
> + *
> + * @image: kexec image being loaded.
> + * @fdt: Flattened device tree for the next kernel.
> + * @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.
nit: alignment of the parameter description seems to be off. But it
could be due to my mail client.
> + *
> + * Return: 0 on success, or negative errno on error.
> + */
> +int of_kexec_setup_new_fdt(const struct kimage *image, void *fdt,
> + unsigned long initrd_load_addr, unsigned long initrd_len,
> + const char *cmdline)
> +{
> + int ret, chosen_node;
> + const void *prop;
> +
> + /* 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)
> + return ret;
> +
> + 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)
> + return -EINVAL;
> +
> + 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)
> + return ret;
> + }
> +
> + /* 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);
Return value from fdt_add_mem_rsv() should be checked.
> +
> + /* 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)
> + return (ret == -FDT_ERR_NOSPACE) ? -ENOMEM : -EINVAL;
> +
> + return 0;
> +}
> diff --git a/include/linux/of.h b/include/linux/of.h
> index 5d51891cbf1a..3375f5295875 100644
> --- a/include/linux/of.h
> +++ b/include/linux/of.h
> @@ -558,6 +558,11 @@ int of_map_id(struct device_node *np, u32 id,
> const char *map_name, const char *map_mask_name,
> struct device_node **target, u32 *id_out);
>
> +struct kimage;
> +int of_kexec_setup_new_fdt(const struct kimage *image, void *fdt,
> + unsigned long initrd_load_addr, unsigned long initrd_len,
> + const char *cmdline);
of_kexec_setup_new_fdt() should only be declared if CONFIG_KEXEC_FILE is
enabled. Right?
-lakshmi
> +
> #else /* CONFIG_OF */
>
> static inline void of_core_init(void)
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [RFC PATCH 2/4] of: Add a common kexec FDT setup function
2020-12-12 1:18 ` Lakshmi Ramasubramanian
@ 2020-12-12 2:17 ` Thiago Jung Bauermann
-1 siblings, 0 replies; 34+ messages in thread
From: Thiago Jung Bauermann @ 2020-12-12 2:17 UTC (permalink / raw)
To: Lakshmi Ramasubramanian
Cc: Rob Herring, takahiro.akashi, will, catalin.marinas, mpe, zohar,
james.morse, sashal, benh, paulus, frowand.list,
vincenzo.frascino, mark.rutland, dmitry.kasatkin, jmorris, serge,
pasha.tatashin, allison, masahiroy, bhsharma, mbrugger, hsinyi,
tao.li, christophe.leroy, linux-integrity, linux-kernel,
linux-arm-kernel, devicetree, prsriva, balajib
Lakshmi Ramasubramanian <nramas@linux.microsoft.com> writes:
> On 12/11/20 2:10 PM, Rob Herring wrote:
>
> Hi Rob,
>
>> Both arm64 and powerpc do essentially the same FDT /chosen setup for
>> kexec. We can simply combine everything each arch does. The differences
>> are either omissions that arm64 should have or additional properties
>> that will be ignored.
>> 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.
>> Signed-off-by: Rob Herring <robh@kernel.org>
>> ---
>> This could be taken a step further and do the allocation of the new
>> FDT. The difference is arm64 uses vmalloc and powerpc uses kmalloc. The
>> arm64 version also retries with a bigger allocation. That seems
>> unnecessary.
>> ---
>> drivers/of/Makefile | 1 +
>> drivers/of/kexec.c | 228 ++++++++++++++++++++++++++++++++++++++++++++
>> include/linux/of.h | 5 +
>> 3 files changed, 234 insertions(+)
>> create mode 100644 drivers/of/kexec.c
>> diff --git a/drivers/of/Makefile b/drivers/of/Makefile
>> index 6e1e5212f058..8ce11955afde 100644
>> --- a/drivers/of/Makefile
>> +++ b/drivers/of/Makefile
>> @@ -13,5 +13,6 @@ obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o
>> obj-$(CONFIG_OF_RESOLVE) += resolver.o
>> obj-$(CONFIG_OF_OVERLAY) += overlay.o
>> obj-$(CONFIG_OF_NUMA) += of_numa.o
>> +obj-$(CONFIG_KEXEC_FILE) += kexec.o
>
> For the functions moved from powerpc & arm64 to "drivers/of/kexec.c" in this
> patch, compiling kexec.c when CONFIG_KEXEC_FILE is enabled is fine. But when
> more functions (such as remove_ima_buffer()) are moved to this file, Makefile
> needs to be updated for other ima kexec related CONFIGs.
IMA kexec is only available if CONFIG_KEXEC_FILE is enabled, so I don't
understand what problem you are seeing.
--
Thiago Jung Bauermann
IBM Linux Technology Center
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [RFC PATCH 2/4] of: Add a common kexec FDT setup function
@ 2020-12-12 2:17 ` Thiago Jung Bauermann
0 siblings, 0 replies; 34+ messages in thread
From: Thiago Jung Bauermann @ 2020-12-12 2:17 UTC (permalink / raw)
To: Lakshmi Ramasubramanian
Cc: mark.rutland, benh, bhsharma, tao.li, zohar, paulus,
vincenzo.frascino, frowand.list, sashal, Rob Herring, mpe,
masahiroy, jmorris, takahiro.akashi, linux-arm-kernel,
catalin.marinas, serge, devicetree, pasha.tatashin, will,
prsriva, hsinyi, allison, christophe.leroy, mbrugger, balajib,
dmitry.kasatkin, linux-kernel, james.morse, linux-integrity
Lakshmi Ramasubramanian <nramas@linux.microsoft.com> writes:
> On 12/11/20 2:10 PM, Rob Herring wrote:
>
> Hi Rob,
>
>> Both arm64 and powerpc do essentially the same FDT /chosen setup for
>> kexec. We can simply combine everything each arch does. The differences
>> are either omissions that arm64 should have or additional properties
>> that will be ignored.
>> 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.
>> Signed-off-by: Rob Herring <robh@kernel.org>
>> ---
>> This could be taken a step further and do the allocation of the new
>> FDT. The difference is arm64 uses vmalloc and powerpc uses kmalloc. The
>> arm64 version also retries with a bigger allocation. That seems
>> unnecessary.
>> ---
>> drivers/of/Makefile | 1 +
>> drivers/of/kexec.c | 228 ++++++++++++++++++++++++++++++++++++++++++++
>> include/linux/of.h | 5 +
>> 3 files changed, 234 insertions(+)
>> create mode 100644 drivers/of/kexec.c
>> diff --git a/drivers/of/Makefile b/drivers/of/Makefile
>> index 6e1e5212f058..8ce11955afde 100644
>> --- a/drivers/of/Makefile
>> +++ b/drivers/of/Makefile
>> @@ -13,5 +13,6 @@ obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o
>> obj-$(CONFIG_OF_RESOLVE) += resolver.o
>> obj-$(CONFIG_OF_OVERLAY) += overlay.o
>> obj-$(CONFIG_OF_NUMA) += of_numa.o
>> +obj-$(CONFIG_KEXEC_FILE) += kexec.o
>
> For the functions moved from powerpc & arm64 to "drivers/of/kexec.c" in this
> patch, compiling kexec.c when CONFIG_KEXEC_FILE is enabled is fine. But when
> more functions (such as remove_ima_buffer()) are moved to this file, Makefile
> needs to be updated for other ima kexec related CONFIGs.
IMA kexec is only available if CONFIG_KEXEC_FILE is enabled, so I don't
understand what problem you are seeing.
--
Thiago Jung Bauermann
IBM Linux Technology Center
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [RFC PATCH 2/4] of: Add a common kexec FDT setup function
2020-12-12 2:17 ` Thiago Jung Bauermann
@ 2020-12-12 5:46 ` Lakshmi Ramasubramanian
-1 siblings, 0 replies; 34+ messages in thread
From: Lakshmi Ramasubramanian @ 2020-12-12 5:46 UTC (permalink / raw)
To: Thiago Jung Bauermann
Cc: Rob Herring, takahiro.akashi, will, catalin.marinas, mpe, zohar,
james.morse, sashal, benh, paulus, frowand.list,
vincenzo.frascino, mark.rutland, dmitry.kasatkin, jmorris, serge,
pasha.tatashin, allison, masahiroy, bhsharma, mbrugger, hsinyi,
tao.li, christophe.leroy, linux-integrity, linux-kernel,
linux-arm-kernel, devicetree, prsriva, balajib
On 12/11/20 6:17 PM, Thiago Jung Bauermann wrote:
>
> Lakshmi Ramasubramanian <nramas@linux.microsoft.com> writes:
>
>> On 12/11/20 2:10 PM, Rob Herring wrote:
>>
>> Hi Rob,
>>
>>> Both arm64 and powerpc do essentially the same FDT /chosen setup for
>>> kexec. We can simply combine everything each arch does. The differences
>>> are either omissions that arm64 should have or additional properties
>>> that will be ignored.
>>> 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.
>>> Signed-off-by: Rob Herring <robh@kernel.org>
>>> ---
>>> This could be taken a step further and do the allocation of the new
>>> FDT. The difference is arm64 uses vmalloc and powerpc uses kmalloc. The
>>> arm64 version also retries with a bigger allocation. That seems
>>> unnecessary.
>>> ---
>>> drivers/of/Makefile | 1 +
>>> drivers/of/kexec.c | 228 ++++++++++++++++++++++++++++++++++++++++++++
>>> include/linux/of.h | 5 +
>>> 3 files changed, 234 insertions(+)
>>> create mode 100644 drivers/of/kexec.c
>>> diff --git a/drivers/of/Makefile b/drivers/of/Makefile
>>> index 6e1e5212f058..8ce11955afde 100644
>>> --- a/drivers/of/Makefile
>>> +++ b/drivers/of/Makefile
>>> @@ -13,5 +13,6 @@ obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o
>>> obj-$(CONFIG_OF_RESOLVE) += resolver.o
>>> obj-$(CONFIG_OF_OVERLAY) += overlay.o
>>> obj-$(CONFIG_OF_NUMA) += of_numa.o
>>> +obj-$(CONFIG_KEXEC_FILE) += kexec.o
>>
>> For the functions moved from powerpc & arm64 to "drivers/of/kexec.c" in this
>> patch, compiling kexec.c when CONFIG_KEXEC_FILE is enabled is fine. But when
>> more functions (such as remove_ima_buffer()) are moved to this file, Makefile
>> needs to be updated for other ima kexec related CONFIGs.
>
> IMA kexec is only available if CONFIG_KEXEC_FILE is enabled, so I don't
> understand what problem you are seeing.
>
delete_fdt_mem_rsv() and setup_fdt() functions are defined when
CONFIG_KEXEC_FILE is enabled. So there is no problem with this patch as
such.
I was thinking when other arch independent functions such as
do_get_kexec_buffer() and remove_ima_buffer() are moved to
"drivers/of/kexec.c", they need to be defined only when
CONFIG_HAVE_IMA_KEXEC is enabled.
If CONFIG_HAVE_IMA_KEXEC is enabled, CONFIG_KEXEC_FILE is also enabled.
So there shouldn't be a problem moving those functions to
"drivers/of/kexec.c". You are right Thiago. Thanks.
-lakshmi
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [RFC PATCH 2/4] of: Add a common kexec FDT setup function
@ 2020-12-12 5:46 ` Lakshmi Ramasubramanian
0 siblings, 0 replies; 34+ messages in thread
From: Lakshmi Ramasubramanian @ 2020-12-12 5:46 UTC (permalink / raw)
To: Thiago Jung Bauermann
Cc: mark.rutland, benh, bhsharma, tao.li, zohar, paulus,
vincenzo.frascino, frowand.list, sashal, Rob Herring, mpe,
masahiroy, jmorris, takahiro.akashi, linux-arm-kernel,
catalin.marinas, serge, devicetree, pasha.tatashin, will,
prsriva, hsinyi, allison, christophe.leroy, mbrugger, balajib,
dmitry.kasatkin, linux-kernel, james.morse, linux-integrity
On 12/11/20 6:17 PM, Thiago Jung Bauermann wrote:
>
> Lakshmi Ramasubramanian <nramas@linux.microsoft.com> writes:
>
>> On 12/11/20 2:10 PM, Rob Herring wrote:
>>
>> Hi Rob,
>>
>>> Both arm64 and powerpc do essentially the same FDT /chosen setup for
>>> kexec. We can simply combine everything each arch does. The differences
>>> are either omissions that arm64 should have or additional properties
>>> that will be ignored.
>>> 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.
>>> Signed-off-by: Rob Herring <robh@kernel.org>
>>> ---
>>> This could be taken a step further and do the allocation of the new
>>> FDT. The difference is arm64 uses vmalloc and powerpc uses kmalloc. The
>>> arm64 version also retries with a bigger allocation. That seems
>>> unnecessary.
>>> ---
>>> drivers/of/Makefile | 1 +
>>> drivers/of/kexec.c | 228 ++++++++++++++++++++++++++++++++++++++++++++
>>> include/linux/of.h | 5 +
>>> 3 files changed, 234 insertions(+)
>>> create mode 100644 drivers/of/kexec.c
>>> diff --git a/drivers/of/Makefile b/drivers/of/Makefile
>>> index 6e1e5212f058..8ce11955afde 100644
>>> --- a/drivers/of/Makefile
>>> +++ b/drivers/of/Makefile
>>> @@ -13,5 +13,6 @@ obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o
>>> obj-$(CONFIG_OF_RESOLVE) += resolver.o
>>> obj-$(CONFIG_OF_OVERLAY) += overlay.o
>>> obj-$(CONFIG_OF_NUMA) += of_numa.o
>>> +obj-$(CONFIG_KEXEC_FILE) += kexec.o
>>
>> For the functions moved from powerpc & arm64 to "drivers/of/kexec.c" in this
>> patch, compiling kexec.c when CONFIG_KEXEC_FILE is enabled is fine. But when
>> more functions (such as remove_ima_buffer()) are moved to this file, Makefile
>> needs to be updated for other ima kexec related CONFIGs.
>
> IMA kexec is only available if CONFIG_KEXEC_FILE is enabled, so I don't
> understand what problem you are seeing.
>
delete_fdt_mem_rsv() and setup_fdt() functions are defined when
CONFIG_KEXEC_FILE is enabled. So there is no problem with this patch as
such.
I was thinking when other arch independent functions such as
do_get_kexec_buffer() and remove_ima_buffer() are moved to
"drivers/of/kexec.c", they need to be defined only when
CONFIG_HAVE_IMA_KEXEC is enabled.
If CONFIG_HAVE_IMA_KEXEC is enabled, CONFIG_KEXEC_FILE is also enabled.
So there shouldn't be a problem moving those functions to
"drivers/of/kexec.c". You are right Thiago. Thanks.
-lakshmi
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [RFC PATCH 2/4] of: Add a common kexec FDT setup function
2020-12-11 22:10 ` Rob Herring
@ 2020-12-22 21:48 ` Thiago Jung Bauermann
-1 siblings, 0 replies; 34+ messages in thread
From: Thiago Jung Bauermann @ 2020-12-22 21:48 UTC (permalink / raw)
To: Rob Herring
Cc: Lakshmi Ramasubramanian, takahiro.akashi, will, catalin.marinas,
mpe, zohar, james.morse, sashal, benh, paulus, frowand.list,
vincenzo.frascino, mark.rutland, dmitry.kasatkin, jmorris, serge,
pasha.tatashin, allison, masahiroy, bhsharma, mbrugger, hsinyi,
tao.li, christophe.leroy, linux-integrity, linux-kernel,
linux-arm-kernel, devicetree, prsriva, balajib
Rob Herring <robh@kernel.org> writes:
> Both arm64 and powerpc do essentially the same FDT /chosen setup for
> kexec. We can simply combine everything each arch does. The differences
> are either omissions that arm64 should have or additional properties
> that will be ignored.
>
> 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.
I especially like the elfcorehdr property. It always bothered me that we
pass it on the kernel command line, since it's not something that could
or should be set by an admin.
> - Any existing "linux,usable-memory-range" is removed.
>
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
> This could be taken a step further and do the allocation of the new
> FDT. The difference is arm64 uses vmalloc and powerpc uses kmalloc. The
> arm64 version also retries with a bigger allocation. That seems
> unnecessary.
> ---
> drivers/of/Makefile | 1 +
> drivers/of/kexec.c | 228 ++++++++++++++++++++++++++++++++++++++++++++
> include/linux/of.h | 5 +
> 3 files changed, 234 insertions(+)
> create mode 100644 drivers/of/kexec.c
Reviewed-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
--
Thiago Jung Bauermann
IBM Linux Technology Center
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [RFC PATCH 2/4] of: Add a common kexec FDT setup function
@ 2020-12-22 21:48 ` Thiago Jung Bauermann
0 siblings, 0 replies; 34+ messages in thread
From: Thiago Jung Bauermann @ 2020-12-22 21:48 UTC (permalink / raw)
To: Rob Herring
Cc: mark.rutland, benh, bhsharma, tao.li, zohar, paulus,
vincenzo.frascino, frowand.list, sashal, Lakshmi Ramasubramanian,
mpe, masahiroy, jmorris, takahiro.akashi, linux-arm-kernel,
catalin.marinas, serge, devicetree, pasha.tatashin, will,
prsriva, hsinyi, allison, christophe.leroy, mbrugger, balajib,
dmitry.kasatkin, linux-kernel, james.morse, linux-integrity
Rob Herring <robh@kernel.org> writes:
> Both arm64 and powerpc do essentially the same FDT /chosen setup for
> kexec. We can simply combine everything each arch does. The differences
> are either omissions that arm64 should have or additional properties
> that will be ignored.
>
> 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.
I especially like the elfcorehdr property. It always bothered me that we
pass it on the kernel command line, since it's not something that could
or should be set by an admin.
> - Any existing "linux,usable-memory-range" is removed.
>
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
> This could be taken a step further and do the allocation of the new
> FDT. The difference is arm64 uses vmalloc and powerpc uses kmalloc. The
> arm64 version also retries with a bigger allocation. That seems
> unnecessary.
> ---
> drivers/of/Makefile | 1 +
> drivers/of/kexec.c | 228 ++++++++++++++++++++++++++++++++++++++++++++
> include/linux/of.h | 5 +
> 3 files changed, 234 insertions(+)
> create mode 100644 drivers/of/kexec.c
Reviewed-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
--
Thiago Jung Bauermann
IBM Linux Technology Center
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 34+ messages in thread
* [RFC PATCH 3/4] arm64: Use common of_kexec_setup_new_fdt()
2020-12-11 22:10 ` Rob Herring
@ 2020-12-11 22:10 ` Rob Herring
-1 siblings, 0 replies; 34+ messages in thread
From: Rob Herring @ 2020-12-11 22:10 UTC (permalink / raw)
To: Lakshmi Ramasubramanian, takahiro.akashi, will, catalin.marinas, mpe
Cc: Thiago Jung Bauermann, zohar, james.morse, sashal, benh, paulus,
frowand.list, vincenzo.frascino, mark.rutland, dmitry.kasatkin,
jmorris, serge, pasha.tatashin, allison, masahiroy, bhsharma,
mbrugger, hsinyi, tao.li, christophe.leroy, linux-integrity,
linux-kernel, linux-arm-kernel, devicetree, prsriva, balajib
Signed-off-by: Rob Herring <robh@kernel.org>
---
arch/arm64/kernel/machine_kexec_file.c | 123 +------------------------
1 file changed, 3 insertions(+), 120 deletions(-)
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) {
--
2.25.1
^ permalink raw reply related [flat|nested] 34+ messages in thread* [RFC PATCH 3/4] arm64: Use common of_kexec_setup_new_fdt()
@ 2020-12-11 22:10 ` Rob Herring
0 siblings, 0 replies; 34+ messages in thread
From: Rob Herring @ 2020-12-11 22:10 UTC (permalink / raw)
To: Lakshmi Ramasubramanian, takahiro.akashi, will, catalin.marinas, mpe
Cc: mark.rutland, benh, bhsharma, tao.li, zohar, paulus,
vincenzo.frascino, frowand.list, sashal, masahiroy, jmorris,
linux-arm-kernel, serge, devicetree, pasha.tatashin, prsriva,
hsinyi, allison, christophe.leroy, mbrugger, balajib,
dmitry.kasatkin, linux-kernel, james.morse, linux-integrity,
Thiago Jung Bauermann
Signed-off-by: Rob Herring <robh@kernel.org>
---
arch/arm64/kernel/machine_kexec_file.c | 123 +------------------------
1 file changed, 3 insertions(+), 120 deletions(-)
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) {
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [RFC PATCH 3/4] arm64: Use common of_kexec_setup_new_fdt()
2020-12-11 22:10 ` Rob Herring
@ 2020-12-12 15:20 ` Lakshmi Ramasubramanian
-1 siblings, 0 replies; 34+ messages in thread
From: Lakshmi Ramasubramanian @ 2020-12-12 15:20 UTC (permalink / raw)
To: Rob Herring, takahiro.akashi, will, catalin.marinas, mpe
Cc: Thiago Jung Bauermann, zohar, james.morse, sashal, benh, paulus,
frowand.list, vincenzo.frascino, mark.rutland, dmitry.kasatkin,
jmorris, serge, pasha.tatashin, allison, masahiroy, bhsharma,
mbrugger, hsinyi, tao.li, christophe.leroy, linux-integrity,
linux-kernel, linux-arm-kernel, devicetree, prsriva, balajib
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) {
>
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [RFC PATCH 3/4] arm64: Use common of_kexec_setup_new_fdt()
@ 2020-12-12 15:20 ` Lakshmi Ramasubramanian
0 siblings, 0 replies; 34+ messages in thread
From: Lakshmi Ramasubramanian @ 2020-12-12 15:20 UTC (permalink / raw)
To: Rob Herring, takahiro.akashi, will, catalin.marinas, mpe
Cc: mark.rutland, benh, bhsharma, tao.li, zohar, paulus,
vincenzo.frascino, frowand.list, sashal, masahiroy, jmorris,
linux-arm-kernel, serge, devicetree, pasha.tatashin, prsriva,
hsinyi, allison, christophe.leroy, mbrugger, balajib,
dmitry.kasatkin, linux-kernel, james.morse, linux-integrity,
Thiago Jung Bauermann
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) {
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [RFC PATCH 3/4] arm64: Use common of_kexec_setup_new_fdt()
2020-12-11 22:10 ` Rob Herring
@ 2020-12-22 21:49 ` Thiago Jung Bauermann
-1 siblings, 0 replies; 34+ messages in thread
From: Thiago Jung Bauermann @ 2020-12-22 21:49 UTC (permalink / raw)
To: Rob Herring
Cc: Lakshmi Ramasubramanian, takahiro.akashi, will, catalin.marinas,
mpe, zohar, james.morse, sashal, benh, paulus, frowand.list,
vincenzo.frascino, mark.rutland, dmitry.kasatkin, jmorris, serge,
pasha.tatashin, allison, masahiroy, bhsharma, mbrugger, hsinyi,
tao.li, christophe.leroy, linux-integrity, linux-kernel,
linux-arm-kernel, devicetree, prsriva, balajib
Rob Herring <robh@kernel.org> writes:
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
> arch/arm64/kernel/machine_kexec_file.c | 123 +------------------------
> 1 file changed, 3 insertions(+), 120 deletions(-)
Reviewed-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
--
Thiago Jung Bauermann
IBM Linux Technology Center
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [RFC PATCH 3/4] arm64: Use common of_kexec_setup_new_fdt()
@ 2020-12-22 21:49 ` Thiago Jung Bauermann
0 siblings, 0 replies; 34+ messages in thread
From: Thiago Jung Bauermann @ 2020-12-22 21:49 UTC (permalink / raw)
To: Rob Herring
Cc: mark.rutland, benh, bhsharma, tao.li, zohar, paulus,
vincenzo.frascino, frowand.list, sashal, Lakshmi Ramasubramanian,
mpe, masahiroy, jmorris, takahiro.akashi, linux-arm-kernel,
catalin.marinas, serge, devicetree, pasha.tatashin, will,
prsriva, hsinyi, allison, christophe.leroy, mbrugger, balajib,
dmitry.kasatkin, linux-kernel, james.morse, linux-integrity
Rob Herring <robh@kernel.org> writes:
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
> arch/arm64/kernel/machine_kexec_file.c | 123 +------------------------
> 1 file changed, 3 insertions(+), 120 deletions(-)
Reviewed-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
--
Thiago Jung Bauermann
IBM Linux Technology Center
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [RFC PATCH 3/4] arm64: Use common of_kexec_setup_new_fdt()
2020-12-11 22:10 ` Rob Herring
@ 2021-01-12 14:02 ` Will Deacon
-1 siblings, 0 replies; 34+ messages in thread
From: Will Deacon @ 2021-01-12 14:02 UTC (permalink / raw)
To: Rob Herring
Cc: Lakshmi Ramasubramanian, takahiro.akashi, catalin.marinas, mpe,
Thiago Jung Bauermann, zohar, james.morse, sashal, benh, paulus,
frowand.list, vincenzo.frascino, mark.rutland, dmitry.kasatkin,
jmorris, serge, pasha.tatashin, allison, masahiroy, bhsharma,
mbrugger, hsinyi, tao.li, christophe.leroy, linux-integrity,
linux-kernel, linux-arm-kernel, devicetree, prsriva, balajib
On Fri, Dec 11, 2020 at 04:10:05PM -0600, Rob Herring wrote:
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
-ENOCOMMITMSG
> arch/arm64/kernel/machine_kexec_file.c | 123 +------------------------
> 1 file changed, 3 insertions(+), 120 deletions(-)
But I can't argue with that diffstat, so:
Acked-by: Will Deacon <will@kernel.org>
Will
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [RFC PATCH 3/4] arm64: Use common of_kexec_setup_new_fdt()
@ 2021-01-12 14:02 ` Will Deacon
0 siblings, 0 replies; 34+ messages in thread
From: Will Deacon @ 2021-01-12 14:02 UTC (permalink / raw)
To: Rob Herring
Cc: mark.rutland, benh, bhsharma, tao.li, zohar, paulus,
vincenzo.frascino, frowand.list, sashal, Lakshmi Ramasubramanian,
mpe, masahiroy, jmorris, takahiro.akashi, linux-arm-kernel,
catalin.marinas, serge, devicetree, pasha.tatashin, prsriva,
hsinyi, allison, christophe.leroy, mbrugger, balajib,
dmitry.kasatkin, linux-kernel, james.morse, linux-integrity,
Thiago Jung Bauermann
On Fri, Dec 11, 2020 at 04:10:05PM -0600, Rob Herring wrote:
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
-ENOCOMMITMSG
> arch/arm64/kernel/machine_kexec_file.c | 123 +------------------------
> 1 file changed, 3 insertions(+), 120 deletions(-)
But I can't argue with that diffstat, so:
Acked-by: Will Deacon <will@kernel.org>
Will
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 34+ messages in thread
* [RFC PATCH 4/4] powerpc: Use common of_kexec_setup_new_fdt()
2020-12-11 22:10 ` Rob Herring
@ 2020-12-11 22:10 ` Rob Herring
-1 siblings, 0 replies; 34+ messages in thread
From: Rob Herring @ 2020-12-11 22:10 UTC (permalink / raw)
To: Lakshmi Ramasubramanian, takahiro.akashi, will, catalin.marinas, mpe
Cc: Thiago Jung Bauermann, zohar, james.morse, sashal, benh, paulus,
frowand.list, vincenzo.frascino, mark.rutland, dmitry.kasatkin,
jmorris, serge, pasha.tatashin, allison, masahiroy, bhsharma,
mbrugger, hsinyi, tao.li, christophe.leroy, linux-integrity,
linux-kernel, linux-arm-kernel, devicetree, prsriva, balajib
Signed-off-by: Rob Herring <robh@kernel.org>
---
After the IMA changes, delete_fdt_mem_rsv() can also be removed.
arch/powerpc/kexec/file_load.c | 125 ++-------------------------------
1 file changed, 6 insertions(+), 119 deletions(-)
diff --git a/arch/powerpc/kexec/file_load.c b/arch/powerpc/kexec/file_load.c
index e452b11df631..956bcb2d1ec2 100644
--- a/arch/powerpc/kexec/file_load.c
+++ b/arch/powerpc/kexec/file_load.c
@@ -16,6 +16,7 @@
#include <linux/slab.h>
#include <linux/kexec.h>
+#include <linux/of.h>
#include <linux/of_fdt.h>
#include <linux/libfdt.h>
#include <asm/setup.h>
@@ -156,132 +157,18 @@ int setup_new_fdt(const struct kimage *image, void *fdt,
unsigned long initrd_load_addr, unsigned long initrd_len,
const char *cmdline)
{
- int ret, chosen_node;
- const void *prop;
-
- /* Remove memory reservation for the current device tree. */
- ret = delete_fdt_mem_rsv(fdt, __pa(initial_boot_params),
- fdt_totalsize(initial_boot_params));
- if (ret == 0)
- pr_debug("Removed old device tree reservation.\n");
- else if (ret != -ENOENT)
- return ret;
-
- 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) {
- pr_err("Error creating /chosen.\n");
- return -EINVAL;
- }
- } else if (chosen_node < 0) {
- pr_err("Malformed device tree: error reading /chosen.\n");
- return -EINVAL;
- }
-
- /* Did we boot using an initrd? */
- prop = fdt_getprop(fdt, chosen_node, "linux,initrd-start", NULL);
- if (prop) {
- uint64_t 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) {
- pr_err("Malformed device tree.\n");
- return -EINVAL;
- }
- 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 = delete_fdt_mem_rsv(fdt, tmp_start, tmp_size);
- if (ret == -ENOENT)
- ret = delete_fdt_mem_rsv(fdt, tmp_start,
- round_up(tmp_size, PAGE_SIZE));
- if (ret == 0)
- pr_debug("Removed old initrd reservation.\n");
- else if (ret != -ENOENT)
- return ret;
-
- /* If there's no new initrd, delete the old initrd's info. */
- if (initrd_len == 0) {
- ret = fdt_delprop(fdt, chosen_node,
- "linux,initrd-start");
- if (ret) {
- pr_err("Error deleting linux,initrd-start.\n");
- return -EINVAL;
- }
-
- ret = fdt_delprop(fdt, chosen_node, "linux,initrd-end");
- if (ret) {
- pr_err("Error deleting linux,initrd-end.\n");
- return -EINVAL;
- }
- }
- }
-
- if (initrd_len) {
- ret = fdt_setprop_u64(fdt, chosen_node,
- "linux,initrd-start",
- initrd_load_addr);
- if (ret < 0)
- goto err;
-
- /* initrd-end is the first address after the initrd image. */
- ret = fdt_setprop_u64(fdt, chosen_node, "linux,initrd-end",
- initrd_load_addr + initrd_len);
- if (ret < 0)
- goto err;
-
- ret = fdt_add_mem_rsv(fdt, initrd_load_addr, initrd_len);
- if (ret) {
- pr_err("Error reserving initrd memory: %s\n",
- fdt_strerror(ret));
- return -EINVAL;
- }
- }
-
- if (cmdline != NULL) {
- ret = fdt_setprop_string(fdt, chosen_node, "bootargs", cmdline);
- if (ret < 0)
- goto err;
- } else {
- ret = fdt_delprop(fdt, chosen_node, "bootargs");
- if (ret && ret != -FDT_ERR_NOTFOUND) {
- pr_err("Error deleting bootargs.\n");
- return -EINVAL;
- }
- }
+ int ret;
- if (image->type == KEXEC_TYPE_CRASH) {
- /*
- * 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) {
- pr_err("Error reserving elfcorehdr memory: %s\n",
- fdt_strerror(ret));
- goto err;
- }
- }
+ ret = of_kexec_setup_new_fdt(image, fdt, initrd_load_addr, initrd_len, cmdline);
+ if (ret)
+ goto err;
- ret = setup_ima_buffer(image, fdt, chosen_node);
+ ret = setup_ima_buffer(image, fdt, fdt_path_offset(fdt, "/chosen"));
if (ret) {
pr_err("Error setting up the new device tree.\n");
return ret;
}
- ret = fdt_setprop(fdt, chosen_node, "linux,booted-from-kexec", NULL, 0);
- if (ret)
- goto err;
-
return 0;
err:
--
2.25.1
^ permalink raw reply related [flat|nested] 34+ messages in thread* [RFC PATCH 4/4] powerpc: Use common of_kexec_setup_new_fdt()
@ 2020-12-11 22:10 ` Rob Herring
0 siblings, 0 replies; 34+ messages in thread
From: Rob Herring @ 2020-12-11 22:10 UTC (permalink / raw)
To: Lakshmi Ramasubramanian, takahiro.akashi, will, catalin.marinas, mpe
Cc: mark.rutland, benh, bhsharma, tao.li, zohar, paulus,
vincenzo.frascino, frowand.list, sashal, masahiroy, jmorris,
linux-arm-kernel, serge, devicetree, pasha.tatashin, prsriva,
hsinyi, allison, christophe.leroy, mbrugger, balajib,
dmitry.kasatkin, linux-kernel, james.morse, linux-integrity,
Thiago Jung Bauermann
Signed-off-by: Rob Herring <robh@kernel.org>
---
After the IMA changes, delete_fdt_mem_rsv() can also be removed.
arch/powerpc/kexec/file_load.c | 125 ++-------------------------------
1 file changed, 6 insertions(+), 119 deletions(-)
diff --git a/arch/powerpc/kexec/file_load.c b/arch/powerpc/kexec/file_load.c
index e452b11df631..956bcb2d1ec2 100644
--- a/arch/powerpc/kexec/file_load.c
+++ b/arch/powerpc/kexec/file_load.c
@@ -16,6 +16,7 @@
#include <linux/slab.h>
#include <linux/kexec.h>
+#include <linux/of.h>
#include <linux/of_fdt.h>
#include <linux/libfdt.h>
#include <asm/setup.h>
@@ -156,132 +157,18 @@ int setup_new_fdt(const struct kimage *image, void *fdt,
unsigned long initrd_load_addr, unsigned long initrd_len,
const char *cmdline)
{
- int ret, chosen_node;
- const void *prop;
-
- /* Remove memory reservation for the current device tree. */
- ret = delete_fdt_mem_rsv(fdt, __pa(initial_boot_params),
- fdt_totalsize(initial_boot_params));
- if (ret == 0)
- pr_debug("Removed old device tree reservation.\n");
- else if (ret != -ENOENT)
- return ret;
-
- 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) {
- pr_err("Error creating /chosen.\n");
- return -EINVAL;
- }
- } else if (chosen_node < 0) {
- pr_err("Malformed device tree: error reading /chosen.\n");
- return -EINVAL;
- }
-
- /* Did we boot using an initrd? */
- prop = fdt_getprop(fdt, chosen_node, "linux,initrd-start", NULL);
- if (prop) {
- uint64_t 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) {
- pr_err("Malformed device tree.\n");
- return -EINVAL;
- }
- 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 = delete_fdt_mem_rsv(fdt, tmp_start, tmp_size);
- if (ret == -ENOENT)
- ret = delete_fdt_mem_rsv(fdt, tmp_start,
- round_up(tmp_size, PAGE_SIZE));
- if (ret == 0)
- pr_debug("Removed old initrd reservation.\n");
- else if (ret != -ENOENT)
- return ret;
-
- /* If there's no new initrd, delete the old initrd's info. */
- if (initrd_len == 0) {
- ret = fdt_delprop(fdt, chosen_node,
- "linux,initrd-start");
- if (ret) {
- pr_err("Error deleting linux,initrd-start.\n");
- return -EINVAL;
- }
-
- ret = fdt_delprop(fdt, chosen_node, "linux,initrd-end");
- if (ret) {
- pr_err("Error deleting linux,initrd-end.\n");
- return -EINVAL;
- }
- }
- }
-
- if (initrd_len) {
- ret = fdt_setprop_u64(fdt, chosen_node,
- "linux,initrd-start",
- initrd_load_addr);
- if (ret < 0)
- goto err;
-
- /* initrd-end is the first address after the initrd image. */
- ret = fdt_setprop_u64(fdt, chosen_node, "linux,initrd-end",
- initrd_load_addr + initrd_len);
- if (ret < 0)
- goto err;
-
- ret = fdt_add_mem_rsv(fdt, initrd_load_addr, initrd_len);
- if (ret) {
- pr_err("Error reserving initrd memory: %s\n",
- fdt_strerror(ret));
- return -EINVAL;
- }
- }
-
- if (cmdline != NULL) {
- ret = fdt_setprop_string(fdt, chosen_node, "bootargs", cmdline);
- if (ret < 0)
- goto err;
- } else {
- ret = fdt_delprop(fdt, chosen_node, "bootargs");
- if (ret && ret != -FDT_ERR_NOTFOUND) {
- pr_err("Error deleting bootargs.\n");
- return -EINVAL;
- }
- }
+ int ret;
- if (image->type == KEXEC_TYPE_CRASH) {
- /*
- * 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) {
- pr_err("Error reserving elfcorehdr memory: %s\n",
- fdt_strerror(ret));
- goto err;
- }
- }
+ ret = of_kexec_setup_new_fdt(image, fdt, initrd_load_addr, initrd_len, cmdline);
+ if (ret)
+ goto err;
- ret = setup_ima_buffer(image, fdt, chosen_node);
+ ret = setup_ima_buffer(image, fdt, fdt_path_offset(fdt, "/chosen"));
if (ret) {
pr_err("Error setting up the new device tree.\n");
return ret;
}
- ret = fdt_setprop(fdt, chosen_node, "linux,booted-from-kexec", NULL, 0);
- if (ret)
- goto err;
-
return 0;
err:
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [RFC PATCH 4/4] powerpc: Use common of_kexec_setup_new_fdt()
2020-12-11 22:10 ` Rob Herring
@ 2020-12-12 15:22 ` Lakshmi Ramasubramanian
-1 siblings, 0 replies; 34+ messages in thread
From: Lakshmi Ramasubramanian @ 2020-12-12 15:22 UTC (permalink / raw)
To: Rob Herring, takahiro.akashi, will, catalin.marinas, mpe
Cc: Thiago Jung Bauermann, zohar, james.morse, sashal, benh, paulus,
frowand.list, vincenzo.frascino, mark.rutland, dmitry.kasatkin,
jmorris, serge, pasha.tatashin, allison, masahiroy, bhsharma,
mbrugger, hsinyi, tao.li, christophe.leroy, linux-integrity,
linux-kernel, linux-arm-kernel, devicetree, prsriva, balajib
On 12/11/20 2:10 PM, Rob Herring wrote:
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
>
> After the IMA changes, delete_fdt_mem_rsv() can also be removed.
>
> arch/powerpc/kexec/file_load.c | 125 ++-------------------------------
> 1 file changed, 6 insertions(+), 119 deletions(-)
>
This change looks good to me.
Reviewed-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
-lakshmi
> diff --git a/arch/powerpc/kexec/file_load.c b/arch/powerpc/kexec/file_load.c
> index e452b11df631..956bcb2d1ec2 100644
> --- a/arch/powerpc/kexec/file_load.c
> +++ b/arch/powerpc/kexec/file_load.c
> @@ -16,6 +16,7 @@
>
> #include <linux/slab.h>
> #include <linux/kexec.h>
> +#include <linux/of.h>
> #include <linux/of_fdt.h>
> #include <linux/libfdt.h>
> #include <asm/setup.h>
> @@ -156,132 +157,18 @@ int setup_new_fdt(const struct kimage *image, void *fdt,
> unsigned long initrd_load_addr, unsigned long initrd_len,
> const char *cmdline)
> {
> - int ret, chosen_node;
> - const void *prop;
> -
> - /* Remove memory reservation for the current device tree. */
> - ret = delete_fdt_mem_rsv(fdt, __pa(initial_boot_params),
> - fdt_totalsize(initial_boot_params));
> - if (ret == 0)
> - pr_debug("Removed old device tree reservation.\n");
> - else if (ret != -ENOENT)
> - return ret;
> -
> - 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) {
> - pr_err("Error creating /chosen.\n");
> - return -EINVAL;
> - }
> - } else if (chosen_node < 0) {
> - pr_err("Malformed device tree: error reading /chosen.\n");
> - return -EINVAL;
> - }
> -
> - /* Did we boot using an initrd? */
> - prop = fdt_getprop(fdt, chosen_node, "linux,initrd-start", NULL);
> - if (prop) {
> - uint64_t 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) {
> - pr_err("Malformed device tree.\n");
> - return -EINVAL;
> - }
> - 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 = delete_fdt_mem_rsv(fdt, tmp_start, tmp_size);
> - if (ret == -ENOENT)
> - ret = delete_fdt_mem_rsv(fdt, tmp_start,
> - round_up(tmp_size, PAGE_SIZE));
> - if (ret == 0)
> - pr_debug("Removed old initrd reservation.\n");
> - else if (ret != -ENOENT)
> - return ret;
> -
> - /* If there's no new initrd, delete the old initrd's info. */
> - if (initrd_len == 0) {
> - ret = fdt_delprop(fdt, chosen_node,
> - "linux,initrd-start");
> - if (ret) {
> - pr_err("Error deleting linux,initrd-start.\n");
> - return -EINVAL;
> - }
> -
> - ret = fdt_delprop(fdt, chosen_node, "linux,initrd-end");
> - if (ret) {
> - pr_err("Error deleting linux,initrd-end.\n");
> - return -EINVAL;
> - }
> - }
> - }
> -
> - if (initrd_len) {
> - ret = fdt_setprop_u64(fdt, chosen_node,
> - "linux,initrd-start",
> - initrd_load_addr);
> - if (ret < 0)
> - goto err;
> -
> - /* initrd-end is the first address after the initrd image. */
> - ret = fdt_setprop_u64(fdt, chosen_node, "linux,initrd-end",
> - initrd_load_addr + initrd_len);
> - if (ret < 0)
> - goto err;
> -
> - ret = fdt_add_mem_rsv(fdt, initrd_load_addr, initrd_len);
> - if (ret) {
> - pr_err("Error reserving initrd memory: %s\n",
> - fdt_strerror(ret));
> - return -EINVAL;
> - }
> - }
> -
> - if (cmdline != NULL) {
> - ret = fdt_setprop_string(fdt, chosen_node, "bootargs", cmdline);
> - if (ret < 0)
> - goto err;
> - } else {
> - ret = fdt_delprop(fdt, chosen_node, "bootargs");
> - if (ret && ret != -FDT_ERR_NOTFOUND) {
> - pr_err("Error deleting bootargs.\n");
> - return -EINVAL;
> - }
> - }
> + int ret;
>
> - if (image->type == KEXEC_TYPE_CRASH) {
> - /*
> - * 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) {
> - pr_err("Error reserving elfcorehdr memory: %s\n",
> - fdt_strerror(ret));
> - goto err;
> - }
> - }
> + ret = of_kexec_setup_new_fdt(image, fdt, initrd_load_addr, initrd_len, cmdline);
> + if (ret)
> + goto err;
>
> - ret = setup_ima_buffer(image, fdt, chosen_node);
> + ret = setup_ima_buffer(image, fdt, fdt_path_offset(fdt, "/chosen"));
> if (ret) {
> pr_err("Error setting up the new device tree.\n");
> return ret;
> }
>
> - ret = fdt_setprop(fdt, chosen_node, "linux,booted-from-kexec", NULL, 0);
> - if (ret)
> - goto err;
> -
> return 0;
>
> err:
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [RFC PATCH 4/4] powerpc: Use common of_kexec_setup_new_fdt()
@ 2020-12-12 15:22 ` Lakshmi Ramasubramanian
0 siblings, 0 replies; 34+ messages in thread
From: Lakshmi Ramasubramanian @ 2020-12-12 15:22 UTC (permalink / raw)
To: Rob Herring, takahiro.akashi, will, catalin.marinas, mpe
Cc: mark.rutland, benh, bhsharma, tao.li, zohar, paulus,
vincenzo.frascino, frowand.list, sashal, masahiroy, jmorris,
linux-arm-kernel, serge, devicetree, pasha.tatashin, prsriva,
hsinyi, allison, christophe.leroy, mbrugger, balajib,
dmitry.kasatkin, linux-kernel, james.morse, linux-integrity,
Thiago Jung Bauermann
On 12/11/20 2:10 PM, Rob Herring wrote:
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
>
> After the IMA changes, delete_fdt_mem_rsv() can also be removed.
>
> arch/powerpc/kexec/file_load.c | 125 ++-------------------------------
> 1 file changed, 6 insertions(+), 119 deletions(-)
>
This change looks good to me.
Reviewed-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
-lakshmi
> diff --git a/arch/powerpc/kexec/file_load.c b/arch/powerpc/kexec/file_load.c
> index e452b11df631..956bcb2d1ec2 100644
> --- a/arch/powerpc/kexec/file_load.c
> +++ b/arch/powerpc/kexec/file_load.c
> @@ -16,6 +16,7 @@
>
> #include <linux/slab.h>
> #include <linux/kexec.h>
> +#include <linux/of.h>
> #include <linux/of_fdt.h>
> #include <linux/libfdt.h>
> #include <asm/setup.h>
> @@ -156,132 +157,18 @@ int setup_new_fdt(const struct kimage *image, void *fdt,
> unsigned long initrd_load_addr, unsigned long initrd_len,
> const char *cmdline)
> {
> - int ret, chosen_node;
> - const void *prop;
> -
> - /* Remove memory reservation for the current device tree. */
> - ret = delete_fdt_mem_rsv(fdt, __pa(initial_boot_params),
> - fdt_totalsize(initial_boot_params));
> - if (ret == 0)
> - pr_debug("Removed old device tree reservation.\n");
> - else if (ret != -ENOENT)
> - return ret;
> -
> - 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) {
> - pr_err("Error creating /chosen.\n");
> - return -EINVAL;
> - }
> - } else if (chosen_node < 0) {
> - pr_err("Malformed device tree: error reading /chosen.\n");
> - return -EINVAL;
> - }
> -
> - /* Did we boot using an initrd? */
> - prop = fdt_getprop(fdt, chosen_node, "linux,initrd-start", NULL);
> - if (prop) {
> - uint64_t 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) {
> - pr_err("Malformed device tree.\n");
> - return -EINVAL;
> - }
> - 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 = delete_fdt_mem_rsv(fdt, tmp_start, tmp_size);
> - if (ret == -ENOENT)
> - ret = delete_fdt_mem_rsv(fdt, tmp_start,
> - round_up(tmp_size, PAGE_SIZE));
> - if (ret == 0)
> - pr_debug("Removed old initrd reservation.\n");
> - else if (ret != -ENOENT)
> - return ret;
> -
> - /* If there's no new initrd, delete the old initrd's info. */
> - if (initrd_len == 0) {
> - ret = fdt_delprop(fdt, chosen_node,
> - "linux,initrd-start");
> - if (ret) {
> - pr_err("Error deleting linux,initrd-start.\n");
> - return -EINVAL;
> - }
> -
> - ret = fdt_delprop(fdt, chosen_node, "linux,initrd-end");
> - if (ret) {
> - pr_err("Error deleting linux,initrd-end.\n");
> - return -EINVAL;
> - }
> - }
> - }
> -
> - if (initrd_len) {
> - ret = fdt_setprop_u64(fdt, chosen_node,
> - "linux,initrd-start",
> - initrd_load_addr);
> - if (ret < 0)
> - goto err;
> -
> - /* initrd-end is the first address after the initrd image. */
> - ret = fdt_setprop_u64(fdt, chosen_node, "linux,initrd-end",
> - initrd_load_addr + initrd_len);
> - if (ret < 0)
> - goto err;
> -
> - ret = fdt_add_mem_rsv(fdt, initrd_load_addr, initrd_len);
> - if (ret) {
> - pr_err("Error reserving initrd memory: %s\n",
> - fdt_strerror(ret));
> - return -EINVAL;
> - }
> - }
> -
> - if (cmdline != NULL) {
> - ret = fdt_setprop_string(fdt, chosen_node, "bootargs", cmdline);
> - if (ret < 0)
> - goto err;
> - } else {
> - ret = fdt_delprop(fdt, chosen_node, "bootargs");
> - if (ret && ret != -FDT_ERR_NOTFOUND) {
> - pr_err("Error deleting bootargs.\n");
> - return -EINVAL;
> - }
> - }
> + int ret;
>
> - if (image->type == KEXEC_TYPE_CRASH) {
> - /*
> - * 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) {
> - pr_err("Error reserving elfcorehdr memory: %s\n",
> - fdt_strerror(ret));
> - goto err;
> - }
> - }
> + ret = of_kexec_setup_new_fdt(image, fdt, initrd_load_addr, initrd_len, cmdline);
> + if (ret)
> + goto err;
>
> - ret = setup_ima_buffer(image, fdt, chosen_node);
> + ret = setup_ima_buffer(image, fdt, fdt_path_offset(fdt, "/chosen"));
> if (ret) {
> pr_err("Error setting up the new device tree.\n");
> return ret;
> }
>
> - ret = fdt_setprop(fdt, chosen_node, "linux,booted-from-kexec", NULL, 0);
> - if (ret)
> - goto err;
> -
> return 0;
>
> err:
> --
> 2.25.1
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [RFC PATCH 4/4] powerpc: Use common of_kexec_setup_new_fdt()
2020-12-11 22:10 ` Rob Herring
@ 2020-12-22 21:55 ` Thiago Jung Bauermann
-1 siblings, 0 replies; 34+ messages in thread
From: Thiago Jung Bauermann @ 2020-12-22 21:55 UTC (permalink / raw)
To: Rob Herring
Cc: Lakshmi Ramasubramanian, takahiro.akashi, will, catalin.marinas,
mpe, zohar, james.morse, sashal, benh, paulus, frowand.list,
vincenzo.frascino, mark.rutland, dmitry.kasatkin, jmorris, serge,
pasha.tatashin, allison, masahiroy, bhsharma, mbrugger, hsinyi,
tao.li, christophe.leroy, linux-integrity, linux-kernel,
linux-arm-kernel, devicetree, prsriva, balajib
Rob Herring <robh@kernel.org> writes:
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
>
> After the IMA changes, delete_fdt_mem_rsv() can also be removed.
>
> arch/powerpc/kexec/file_load.c | 125 ++-------------------------------
> 1 file changed, 6 insertions(+), 119 deletions(-)
Reviewed-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
Shouldn't this series also be Cc'd to the linuxppc-dev mailing list?
I just noticed that the ARM64 IMA kexec series hasn't been copying the
linuxppc-dev mailing list, so perhaps this is why this series isn't
doing that, either.
> diff --git a/arch/powerpc/kexec/file_load.c b/arch/powerpc/kexec/file_load.c
> index e452b11df631..956bcb2d1ec2 100644
> --- a/arch/powerpc/kexec/file_load.c
> +++ b/arch/powerpc/kexec/file_load.c
> @@ -16,6 +16,7 @@
>
> #include <linux/slab.h>
> #include <linux/kexec.h>
> +#include <linux/of.h>
> #include <linux/of_fdt.h>
> #include <linux/libfdt.h>
> #include <asm/setup.h>
It's possible to remove the <linux/of_fdt.h> include now.
--
Thiago Jung Bauermann
IBM Linux Technology Center
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [RFC PATCH 4/4] powerpc: Use common of_kexec_setup_new_fdt()
@ 2020-12-22 21:55 ` Thiago Jung Bauermann
0 siblings, 0 replies; 34+ messages in thread
From: Thiago Jung Bauermann @ 2020-12-22 21:55 UTC (permalink / raw)
To: Rob Herring
Cc: mark.rutland, benh, bhsharma, tao.li, zohar, paulus,
vincenzo.frascino, frowand.list, sashal, Lakshmi Ramasubramanian,
mpe, masahiroy, jmorris, takahiro.akashi, linux-arm-kernel,
catalin.marinas, serge, devicetree, pasha.tatashin, will,
prsriva, hsinyi, allison, christophe.leroy, mbrugger, balajib,
dmitry.kasatkin, linux-kernel, james.morse, linux-integrity
Rob Herring <robh@kernel.org> writes:
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
>
> After the IMA changes, delete_fdt_mem_rsv() can also be removed.
>
> arch/powerpc/kexec/file_load.c | 125 ++-------------------------------
> 1 file changed, 6 insertions(+), 119 deletions(-)
Reviewed-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
Shouldn't this series also be Cc'd to the linuxppc-dev mailing list?
I just noticed that the ARM64 IMA kexec series hasn't been copying the
linuxppc-dev mailing list, so perhaps this is why this series isn't
doing that, either.
> diff --git a/arch/powerpc/kexec/file_load.c b/arch/powerpc/kexec/file_load.c
> index e452b11df631..956bcb2d1ec2 100644
> --- a/arch/powerpc/kexec/file_load.c
> +++ b/arch/powerpc/kexec/file_load.c
> @@ -16,6 +16,7 @@
>
> #include <linux/slab.h>
> #include <linux/kexec.h>
> +#include <linux/of.h>
> #include <linux/of_fdt.h>
> #include <linux/libfdt.h>
> #include <asm/setup.h>
It's possible to remove the <linux/of_fdt.h> include now.
--
Thiago Jung Bauermann
IBM Linux Technology Center
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [RFC PATCH 4/4] powerpc: Use common of_kexec_setup_new_fdt()
2020-12-22 21:55 ` Thiago Jung Bauermann
@ 2020-12-22 23:33 ` Lakshmi Ramasubramanian
-1 siblings, 0 replies; 34+ messages in thread
From: Lakshmi Ramasubramanian @ 2020-12-22 23:33 UTC (permalink / raw)
To: Thiago Jung Bauermann, Rob Herring
Cc: takahiro.akashi, will, catalin.marinas, mpe, zohar, james.morse,
sashal, benh, paulus, frowand.list, vincenzo.frascino,
mark.rutland, dmitry.kasatkin, jmorris, serge, pasha.tatashin,
allison, masahiroy, bhsharma, mbrugger, hsinyi, tao.li,
christophe.leroy, linux-integrity, linux-kernel,
linux-arm-kernel, devicetree, prsriva, balajib
On 12/22/20 1:55 PM, Thiago Jung Bauermann wrote:
>
> Rob Herring <robh@kernel.org> writes:
>
>> Signed-off-by: Rob Herring <robh@kernel.org>
>> ---
>>
>> After the IMA changes, delete_fdt_mem_rsv() can also be removed.
>>
>> arch/powerpc/kexec/file_load.c | 125 ++-------------------------------
>> 1 file changed, 6 insertions(+), 119 deletions(-)
>
> Reviewed-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
>
> Shouldn't this series also be Cc'd to the linuxppc-dev mailing list?
>
> I just noticed that the ARM64 IMA kexec series hasn't been copying the
> linuxppc-dev mailing list, so perhaps this is why this series isn't
> doing that, either.
Thanks for pointing that out Thiago.
I will copy linuxppc-dev mailing list (linuxppc-dev@vger.kernel.org)
when I post v14 of my patch set.
-lakshmi
>
>> diff --git a/arch/powerpc/kexec/file_load.c b/arch/powerpc/kexec/file_load.c
>> index e452b11df631..956bcb2d1ec2 100644
>> --- a/arch/powerpc/kexec/file_load.c
>> +++ b/arch/powerpc/kexec/file_load.c
>> @@ -16,6 +16,7 @@
>>
>> #include <linux/slab.h>
>> #include <linux/kexec.h>
>> +#include <linux/of.h>
>> #include <linux/of_fdt.h>
>> #include <linux/libfdt.h>
>> #include <asm/setup.h>
>
> It's possible to remove the <linux/of_fdt.h> include now.
>
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [RFC PATCH 4/4] powerpc: Use common of_kexec_setup_new_fdt()
@ 2020-12-22 23:33 ` Lakshmi Ramasubramanian
0 siblings, 0 replies; 34+ messages in thread
From: Lakshmi Ramasubramanian @ 2020-12-22 23:33 UTC (permalink / raw)
To: Thiago Jung Bauermann, Rob Herring
Cc: mark.rutland, benh, bhsharma, tao.li, zohar, paulus,
vincenzo.frascino, frowand.list, sashal, mpe, masahiroy, jmorris,
takahiro.akashi, linux-arm-kernel, catalin.marinas, serge,
devicetree, pasha.tatashin, will, prsriva, hsinyi, allison,
christophe.leroy, mbrugger, balajib, dmitry.kasatkin,
linux-kernel, james.morse, linux-integrity
On 12/22/20 1:55 PM, Thiago Jung Bauermann wrote:
>
> Rob Herring <robh@kernel.org> writes:
>
>> Signed-off-by: Rob Herring <robh@kernel.org>
>> ---
>>
>> After the IMA changes, delete_fdt_mem_rsv() can also be removed.
>>
>> arch/powerpc/kexec/file_load.c | 125 ++-------------------------------
>> 1 file changed, 6 insertions(+), 119 deletions(-)
>
> Reviewed-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
>
> Shouldn't this series also be Cc'd to the linuxppc-dev mailing list?
>
> I just noticed that the ARM64 IMA kexec series hasn't been copying the
> linuxppc-dev mailing list, so perhaps this is why this series isn't
> doing that, either.
Thanks for pointing that out Thiago.
I will copy linuxppc-dev mailing list (linuxppc-dev@vger.kernel.org)
when I post v14 of my patch set.
-lakshmi
>
>> diff --git a/arch/powerpc/kexec/file_load.c b/arch/powerpc/kexec/file_load.c
>> index e452b11df631..956bcb2d1ec2 100644
>> --- a/arch/powerpc/kexec/file_load.c
>> +++ b/arch/powerpc/kexec/file_load.c
>> @@ -16,6 +16,7 @@
>>
>> #include <linux/slab.h>
>> #include <linux/kexec.h>
>> +#include <linux/of.h>
>> #include <linux/of_fdt.h>
>> #include <linux/libfdt.h>
>> #include <asm/setup.h>
>
> It's possible to remove the <linux/of_fdt.h> include now.
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 34+ messages in thread