Messages in this thread | ![/](/images/icornerl.gif) | | Subject | Re: [PATCH v12 10/16] arm64: kexec_file: load initrd and device-tree | From | James Morse <> | Date | Thu, 26 Jul 2018 14:34:55 +0100 |
| |
Hi Akashi,
On 24/07/18 07:57, AKASHI Takahiro wrote: > load_other_segments() is expected to allocate and place all the necessary > memory segments other than kernel, including initrd and device-tree > blob (and elf core header for crash). > While most of the code was borrowed from kexec-tools' counterpart, > users may not be allowed to specify dtb explicitly, instead, the dtb > presented by the original boot loader is reused. > > arch_kimage_kernel_post_load_cleanup() is responsible for freeing arm64- > specific data allocated in load_other_segments().
Since v11 you've renamed struct kimage_arch's dtb_buf as dtb, but not changed the struct. This series doesn't build until patch 12 where you fix it. This will cause anyone trying to bisect through here a problem.
Thanks,
James
> diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h > index e17f0529a882..026f7e408f0c 100644 > --- a/arch/arm64/include/asm/kexec.h > +++ b/arch/arm64/include/asm/kexec.h
> +struct kimage_arch { > + void *dtb_buf; > + unsigned long dtb_mem; > +};
> diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c > index c38a8048ed00..b28fbb0659c9 100644 > --- a/arch/arm64/kernel/machine_kexec_file.c > +++ b/arch/arm64/kernel/machine_kexec_file.c
> +int arch_kimage_file_post_load_cleanup(struct kimage *image) > +{ > + vfree(image->arch.dtb); > + image->arch.dtb = NULL; > + > + return kexec_image_post_load_cleanup_default(image); > +}
| ![\](/images/icornerr.gif) |