Hi, Jinjie, Why does the ARM64 version of this patch use "kexec_file" in the subject line but the LoongArch version uses "kexec"? It is better to keep consistency.
Huacai On Wed, Aug 26, 2026 at 5:25 PM Jinjie Ruan <[email protected]> wrote: > > During kexec image placement retry loops, any midway failure causes > the loader to truncate `image->nr_segments` back to its initial state > to purge the failed segments. > > However, this truncation introduces a memory leak. The CMA pages > allocated via kexec_add_buffer() during the failed attempt are tracked > in the `image->segment_cma` array. Because the subsequent cleanup paths > only iterate up to the truncated `nr_segments` boundary, these allocated > CMA pages outside the new boundary are permanently leaked. > > Fix this by explicitly releasing the associated CMA buffers in > the failure paths before `image->nr_segments` is reduced. > > Cc: Huacai Chen <[email protected]> > Cc: WANG Xuerui <[email protected]> > Cc: Youling Tang <[email protected]> > Cc: "Mike Rapoport (Microsoft)" <[email protected]> > Cc: Sourabh Jain <[email protected]> > Cc: Kees Cook <[email protected]> > Cc: [email protected] > Link: > https://sashiko.dev/#/patchset/20260729031235.2840255-1-ruanjinjie%40huawei.com > Fixes: 55d990f0084c ("LoongArch: Add EFI binary support for kexec_file") > Signed-off-by: Jinjie Ruan <[email protected]> > --- > arch/loongarch/kernel/kexec_efi.c | 1 + > arch/loongarch/kernel/machine_kexec_file.c | 6 +++++- > 2 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/arch/loongarch/kernel/kexec_efi.c > b/arch/loongarch/kernel/kexec_efi.c > index 5ee78ebb1546..15fd797ff3de 100644 > --- a/arch/loongarch/kernel/kexec_efi.c > +++ b/arch/loongarch/kernel/kexec_efi.c > @@ -86,6 +86,7 @@ static void *efi_kexec_load(struct kimage *image, > * We couldn't find space for the other segments; erase the > * kernel segment and try the next available hole. > */ > + kexec_free_segment_cma(image, kernel_segment_number); > image->nr_segments -= 1; > kbuf.buf_min = kernel_segment->mem + kernel_segment->memsz; > kbuf.mem = KEXEC_BUF_MEM_UNKNOWN; > diff --git a/arch/loongarch/kernel/machine_kexec_file.c > b/arch/loongarch/kernel/machine_kexec_file.c > index 5412aa9f3568..62a5be102065 100644 > --- a/arch/loongarch/kernel/machine_kexec_file.c > +++ b/arch/loongarch/kernel/machine_kexec_file.c > @@ -217,7 +217,11 @@ int load_other_segments(struct kimage *image, > return 0; > > out_err: > - image->nr_segments = orig_segments; > + while (image->nr_segments > orig_segments) { > + kexec_free_segment_cma(image, image->nr_segments - 1); > + image->nr_segments--; > + } > + > kfree(modified_cmdline); > return ret; > } > -- > 2.34.1 >
