Re: [RFC 1/1] add support of `--initrd` for ELF-ARM kernels
Hello Alex,
>
>
>> Am 14.04.2023 um 10:54 schrieb Alex Bennée :
>>
>>
>> Also could you not achieve the same thing using the guest-loader which
>> uses the multiboot spec and sets:
>>
>> const char *compat[2] = { "multiboot,module", "multiboot,ramdisk" };
>> if (qemu_fdt_setprop_string_array(fdt, node, "compatible",
>> (char **) ,
>> ARRAY_SIZE(compat)) < 0) {
>> error_setg(errp, "couldn't set %s/compatible", node);
>> return;
>> }
>>
>
> Thanks for the hint. I will check it.
>
I check it and it works fine for me. Consequently, you can ignore this RFC.
I was confused that the flag `—initrd` is available and not used.
Cheers
Stefan
smime.p7s
Description: S/MIME cryptographic signature
Re: [RFC 1/1] add support of `--initrd` for ELF-ARM kernels
> Am 14.04.2023 um 10:54 schrieb Alex Bennée :
>
Hello Alex,
>
> Where are these DTB nodes documented?
Yes, it is currently missing.
>
> Also could you not achieve the same thing using the guest-loader which
> uses the multiboot spec and sets:
>
>const char *compat[2] = { "multiboot,module", "multiboot,ramdisk" };
>if (qemu_fdt_setprop_string_array(fdt, node, "compatible",
> (char **) ,
> ARRAY_SIZE(compat)) < 0) {
>error_setg(errp, "couldn't set %s/compatible", node);
>return;
>}
>
Thanks for the hint. I will check it.
Cheers
Stefan
smime.p7s
Description: S/MIME cryptographic signature
Re: [RFC 1/1] add support of `--initrd` for ELF-ARM kernels
Hello Peter, I totally agree. We are developing a unikernel (https://github.com/hermitcore/rusty-hermit). On x86, we are using the multiboot specification. I thought that this specification is only available on x86. In principle, a unikernel is a single application, which runs directly on the hardware/VM. Our ELF loader parse the ELF application to determine the thread local storage. On x86, Qemu loads the unikernel as initrd into the memory. The loader just initialize the system. I miss a similar feature on ARM. Maybe I oversee something. Cheers Stefan > Am 14.04.2023 um 11:03 schrieb Peter Maydell : > > On Fri, 14 Apr 2023 at 08:35, Stefan Lankes > wrote: >> Currently, the flag `--initrd` is only support for Linux ARM kernels. >> However, also other ELF kernels could depend on an initial ramdisk. >> This PR loads also the initrd for ELF kernels and announce the >> location by the nodes "/chosen/initrd-start" and >> "/chosen/initrd-end" within the device tree. > > What are these "other ELF kernels" ? Is there some defined > specification of bootloader you're trying to implement here? > > Currently QEMU for Arm supports two things: > (1) I am a Linux kernel, load me like the Linux kernel defines > (2) I'm just a bare-metal image (ELF file or raw) > > Adding support for some third type of loading would need a > pretty solid justification, eg that this is a very common kind > of image to load, that there is a well defined specification, > that it's supported by lots of other bootloaders, etc. > The bootloading code is too complicated already and I am > very reluctant to add more to it. > > thanks > -- PMM smime.p7s Description: S/MIME cryptographic signature
Re: [RFC 1/1] add support of `--initrd` for ELF-ARM kernels
On Fri, 14 Apr 2023 at 08:35, Stefan Lankes wrote: > > Currently, the flag `--initrd` is only support for Linux ARM kernels. > However, also other ELF kernels could depend on an initial ramdisk. > This PR loads also the initrd for ELF kernels and announce the > location by the nodes "/chosen/initrd-start" and > "/chosen/initrd-end" within the device tree. What are these "other ELF kernels" ? Is there some defined specification of bootloader you're trying to implement here? Currently QEMU for Arm supports two things: (1) I am a Linux kernel, load me like the Linux kernel defines (2) I'm just a bare-metal image (ELF file or raw) Adding support for some third type of loading would need a pretty solid justification, eg that this is a very common kind of image to load, that there is a well defined specification, that it's supported by lots of other bootloaders, etc. The bootloading code is too complicated already and I am very reluctant to add more to it. thanks -- PMM
Re: [RFC 1/1] add support of `--initrd` for ELF-ARM kernels
Stefan Lankes writes:
> Currently, the flag `--initrd` is only support for Linux ARM kernels.
> However, also other ELF kernels could depend on an initial ramdisk.
> This PR loads also the initrd for ELF kernels and announce the
> location by the nodes "/chosen/initrd-start" and
> "/chosen/initrd-end" within the device tree.
>
> Signed-off-by: Stefan Lankes
> ---
> hw/arm/boot.c | 106 +-
> 1 file changed, 62 insertions(+), 44 deletions(-)
>
> diff --git a/hw/arm/boot.c b/hw/arm/boot.c
> index 54f6a3e0b3..f767a4809e 100644
> --- a/hw/arm/boot.c
> +++ b/hw/arm/boot.c
> @@ -657,20 +657,38 @@ int arm_load_dtb(hwaddr addr, const struct
> arm_boot_info *binfo,
> }
>
> if (binfo->initrd_size) {
> -rc = qemu_fdt_setprop_sized_cells(fdt, "/chosen",
> "linux,initrd-start",
> +if (binfo->is_linux) {
> +rc = qemu_fdt_setprop_sized_cells(fdt, "/chosen",
> "linux,initrd-start",
>acells, binfo->initrd_start);
> -if (rc < 0) {
> -fprintf(stderr, "couldn't set /chosen/linux,initrd-start\n");
> -goto fail;
> -}
> +if (rc < 0) {
> +fprintf(stderr, "couldn't set /chosen/linux,initrd-start\n");
> +goto fail;
> +}
>
> -rc = qemu_fdt_setprop_sized_cells(fdt, "/chosen", "linux,initrd-end",
> - acells,
> - binfo->initrd_start +
> - binfo->initrd_size);
> -if (rc < 0) {
> -fprintf(stderr, "couldn't set /chosen/linux,initrd-end\n");
> -goto fail;
> +rc = qemu_fdt_setprop_sized_cells(fdt, "/chosen",
> "linux,initrd-end",
> + acells,
> + binfo->initrd_start +
> + binfo->initrd_size);
> +if (rc < 0) {
> +fprintf(stderr, "couldn't set /chosen/linux,initrd-end\n");
> +goto fail;
> +}
> +} else {
> +rc = qemu_fdt_setprop_sized_cells(fdt, "/chosen", "initrd-start",
> + acells, binfo->initrd_start);
> +if (rc < 0) {
> +fprintf(stderr, "couldn't set /chosen/initrd-start\n");
> +goto fail;
> +}
> +
> +rc = qemu_fdt_setprop_sized_cells(fdt, "/chosen", "initrd-end",
> + acells,
> + binfo->initrd_start +
> + binfo->initrd_size);
> +if (rc < 0) {
> +fprintf(stderr, "couldn't set /chosen/initrd-end\n");
> +goto fail;
> +}
Where are these DTB nodes documented?
Also could you not achieve the same thing using the guest-loader which
uses the multiboot spec and sets:
const char *compat[2] = { "multiboot,module", "multiboot,ramdisk" };
if (qemu_fdt_setprop_string_array(fdt, node, "compatible",
(char **) ,
ARRAY_SIZE(compat)) < 0) {
error_setg(errp, "couldn't set %s/compatible", node);
return;
}
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
[RFC 1/1] add support of `--initrd` for ELF-ARM kernels
Currently, the flag `--initrd` is only support for Linux ARM kernels.
However, also other ELF kernels could depend on an initial ramdisk.
This PR loads also the initrd for ELF kernels and announce the
location by the nodes "/chosen/initrd-start" and
"/chosen/initrd-end" within the device tree.
Signed-off-by: Stefan Lankes
---
hw/arm/boot.c | 106 +-
1 file changed, 62 insertions(+), 44 deletions(-)
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index 54f6a3e0b3..f767a4809e 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -657,20 +657,38 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_info
*binfo,
}
if (binfo->initrd_size) {
-rc = qemu_fdt_setprop_sized_cells(fdt, "/chosen", "linux,initrd-start",
+if (binfo->is_linux) {
+rc = qemu_fdt_setprop_sized_cells(fdt, "/chosen",
"linux,initrd-start",
acells, binfo->initrd_start);
-if (rc < 0) {
-fprintf(stderr, "couldn't set /chosen/linux,initrd-start\n");
-goto fail;
-}
+if (rc < 0) {
+fprintf(stderr, "couldn't set /chosen/linux,initrd-start\n");
+goto fail;
+}
-rc = qemu_fdt_setprop_sized_cells(fdt, "/chosen", "linux,initrd-end",
- acells,
- binfo->initrd_start +
- binfo->initrd_size);
-if (rc < 0) {
-fprintf(stderr, "couldn't set /chosen/linux,initrd-end\n");
-goto fail;
+rc = qemu_fdt_setprop_sized_cells(fdt, "/chosen",
"linux,initrd-end",
+ acells,
+ binfo->initrd_start +
+ binfo->initrd_size);
+if (rc < 0) {
+fprintf(stderr, "couldn't set /chosen/linux,initrd-end\n");
+goto fail;
+}
+} else {
+rc = qemu_fdt_setprop_sized_cells(fdt, "/chosen", "initrd-start",
+ acells, binfo->initrd_start);
+if (rc < 0) {
+fprintf(stderr, "couldn't set /chosen/initrd-start\n");
+goto fail;
+}
+
+rc = qemu_fdt_setprop_sized_cells(fdt, "/chosen", "initrd-end",
+ acells,
+ binfo->initrd_start +
+ binfo->initrd_size);
+if (rc < 0) {
+fprintf(stderr, "couldn't set /chosen/initrd-end\n");
+goto fail;
+}
}
}
@@ -1099,41 +1117,41 @@ static void arm_setup_direct_kernel_boot(ARMCPU *cpu,
}
info->initrd_start = TARGET_PAGE_ALIGN(info->initrd_start);
-if (is_linux) {
-uint32_t fixupcontext[FIXUP_MAX];
-
-if (info->initrd_filename) {
+if (info->initrd_filename) {
-if (info->initrd_start >= ram_end) {
-error_report("not enough space after kernel to load initrd");
-exit(1);
-}
+if (info->initrd_start >= ram_end) {
+error_report("not enough space after kernel to load initrd");
+exit(1);
+}
-initrd_size = load_ramdisk_as(info->initrd_filename,
- info->initrd_start,
- ram_end - info->initrd_start, as);
-if (initrd_size < 0) {
-initrd_size = load_image_targphys_as(info->initrd_filename,
- info->initrd_start,
- ram_end -
- info->initrd_start,
- as);
-}
-if (initrd_size < 0) {
-error_report("could not load initrd '%s'",
- info->initrd_filename);
-exit(1);
-}
-if (info->initrd_start + initrd_size > ram_end) {
-error_report("could not load initrd '%s': "
- "too big to fit into RAM after the kernel",
- info->initrd_filename);
-exit(1);
-}
-} else {
-initrd_size = 0;
+initrd_size = load_ramdisk_as(info->initrd_filename,
+ info->initrd_start,
+ ram_end - info->initrd_start, as);
+if (initrd_size < 0) {
+initrd_size = load_image_targphys_as(info->initrd_filename,
+ info->initrd_start,
+ ram_end -
+
