From nobody Fri Oct 3 20:57:36 2025 Received: from out-186.mta0.migadu.com (out-186.mta0.migadu.com [91.218.175.186]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6E58526E6F5 for ; Tue, 26 Aug 2025 01:18:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.186 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756171105; cv=none; b=AKH1i+9+VTCBi9u3XoTq/5D0Bm5+Yz4moJORwLdChlqZJvnzRdNFuQhY/UAYqLkjH71qkbdrreEthZaLMdbzOUPi6pCkQJxfAgy4YXVHz/Z/NVuqWthtcd1px2MoNpezopTFRf/jdns7MjJ+p0tZZYtZvmOmrF+Bzm8RhJvdbXs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756171105; c=relaxed/simple; bh=hL9mltfftDdhyr3JIZVINIYCy/VR/EQG9mB/RL8BnaM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=siNx1RHqroJnkyajONde+34Sgu/WeMjfYDVhqf4Y1bsrjAB4vc1D3c7lJYKw+mlK0Tdl0R+96Ad7WtXTr61OTDiqNKO6+PhFLVJXbXXkpM/yN+UsyAa2w27s92WZ9ChvTEut/aEVlTGhB0BmwKhBPDTDSd37TIsPJKm3y7Ifni8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=Dut2otsU; arc=none smtp.client-ip=91.218.175.186 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="Dut2otsU" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1756171101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7Tn3zWMTJJQP7Xzz39H0ZWx4y0PLkIqOLwrlEDbEtxA=; b=Dut2otsUWWfebnBkB4evJKtQuYlSs5lWQY0MSXZ7jLuoWaErgFC/D6MUho84Y5focio0E2 f43mIEZ98eFUx3k//6dpVZ6TLwBX2cUA1Wh0+hHD96fHklufmpftcdFxs5N2amyttaZ7lV XOnmKl8csCCiXhDs+Gco/OPJMOLKDpI= From: Youling Tang To: Huacai Chen Cc: WANG Xuerui , Baoquan He , Yao Zi , kexec@lists.infradead.org, loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, youling.tang@linux.dev, Youling Tang Subject: [PATCH v3 3/6] LoongArch/kexec_file: Support loading EFI binary file Date: Tue, 26 Aug 2025 09:17:19 +0800 Message-Id: <20250826011722.82391-4-youling.tang@linux.dev> In-Reply-To: <20250826011722.82391-1-youling.tang@linux.dev> References: <20250826011722.82391-1-youling.tang@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" From: Youling Tang This patch creates kexec_efi_ops to load EFI binary file for kexec_file_load() syscall. The efi_kexec_load() as two parts: - the first part loads the kernel image (vmlinuz.efi or vmlinux.efi) - the second part loads other segments (eg: initrd, cmdline) Currently, pez(vmlinuz.efi) and pei(vmlinux.efi) format images are supported. Signed-off-by: Youling Tang --- arch/loongarch/include/asm/image.h | 17 +++ arch/loongarch/include/asm/kexec.h | 1 + arch/loongarch/kernel/Makefile | 2 +- arch/loongarch/kernel/kexec_efi.c | 114 +++++++++++++++++++++ arch/loongarch/kernel/machine_kexec_file.c | 1 + 5 files changed, 134 insertions(+), 1 deletion(-) create mode 100644 arch/loongarch/kernel/kexec_efi.c diff --git a/arch/loongarch/include/asm/image.h b/arch/loongarch/include/as= m/image.h index 1f090736e71d..655d5836c4e8 100644 --- a/arch/loongarch/include/asm/image.h +++ b/arch/loongarch/include/asm/image.h @@ -36,5 +36,22 @@ struct loongarch_image_header { uint32_t pe_header; }; =20 +static const uint8_t loongarch_image_pe_sig[2] =3D {'M', 'Z'}; + +/** + * loongarch_header_check_pe_sig - Helper to check the loongarch image hea= der. + * + * Returns non-zero if 'MZ' signature is found. + */ + +static inline int loongarch_header_check_pe_sig(const struct loongarch_ima= ge_header *h) +{ + if (!h) + return 0; + + return (h->pe_sig[0] =3D=3D loongarch_image_pe_sig[0] + && h->pe_sig[1] =3D=3D loongarch_image_pe_sig[1]); +} + #endif /* __ASSEMBLY__ */ #endif /* __ASM_IMAGE_H */ diff --git a/arch/loongarch/include/asm/kexec.h b/arch/loongarch/include/as= m/kexec.h index ed7e3fc8571e..34799db933fb 100644 --- a/arch/loongarch/include/asm/kexec.h +++ b/arch/loongarch/include/asm/kexec.h @@ -42,6 +42,7 @@ struct kimage_arch { }; =20 #ifdef CONFIG_KEXEC_FILE +extern const struct kexec_file_ops kexec_efi_ops; =20 int arch_kimage_file_post_load_cleanup(struct kimage *image); #define arch_kimage_file_post_load_cleanup arch_kimage_file_post_load_clea= nup diff --git a/arch/loongarch/kernel/Makefile b/arch/loongarch/kernel/Makefile index 67b9b214d212..dd6183f353e6 100644 --- a/arch/loongarch/kernel/Makefile +++ b/arch/loongarch/kernel/Makefile @@ -62,7 +62,7 @@ obj-$(CONFIG_MAGIC_SYSRQ) +=3D sysrq.o obj-$(CONFIG_RELOCATABLE) +=3D relocate.o =20 obj-$(CONFIG_KEXEC_CORE) +=3D machine_kexec.o relocate_kernel.o -obj-$(CONFIG_KEXEC_FILE) +=3D machine_kexec_file.o +obj-$(CONFIG_KEXEC_FILE) +=3D machine_kexec_file.o kexec_efi.o obj-$(CONFIG_CRASH_DUMP) +=3D crash_dump.o =20 obj-$(CONFIG_UNWINDER_GUESS) +=3D unwind_guess.o diff --git a/arch/loongarch/kernel/kexec_efi.c b/arch/loongarch/kernel/kexe= c_efi.c new file mode 100644 index 000000000000..5e2d424548d9 --- /dev/null +++ b/arch/loongarch/kernel/kexec_efi.c @@ -0,0 +1,114 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Load EFI vmlinux file for the kexec_file_load syscall. + * + * Author: Youling Tang + * Copyright (C) 2025 KylinSoft Corporation. + */ + +#define pr_fmt(fmt) "kexec_file(EFI): " fmt + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static int efi_kexec_probe(const char *kernel_buf, unsigned long kernel_le= n) +{ + const struct loongarch_image_header *h =3D (const struct loongarch_image_= header *)kernel_buf; + + if (!h || (kernel_len < sizeof(*h))) { + pr_err("No loongarch image header.\n"); + return -EINVAL; + } + + if (!loongarch_header_check_pe_sig(h)) { + pr_warn("No loongarch PE image header.\n"); + return -EINVAL; + } + + return 0; +} + +static void *efi_kexec_load(struct kimage *image, + char *kernel, unsigned long kernel_len, + char *initrd, unsigned long initrd_len, + char *cmdline, unsigned long cmdline_len) +{ + struct loongarch_image_header *h; + struct kexec_buf kbuf; + unsigned long text_offset, kernel_segment_number; + struct kexec_segment *kernel_segment; + int ret; + + h =3D (struct loongarch_image_header *)kernel; + if (!h->image_size) + return ERR_PTR(-EINVAL); + + /* + * Load the kernel + * FIXME: Non-relocatable kernel rejected for kexec_file (require CONFIG_= RELOCATABLE) + */ + kbuf.image =3D image; + kbuf.buf_max =3D ULONG_MAX; + kbuf.top_down =3D false; + + kbuf.buffer =3D kernel; + kbuf.bufsz =3D kernel_len; + kbuf.mem =3D KEXEC_BUF_MEM_UNKNOWN; + kbuf.memsz =3D le64_to_cpu(h->image_size); + text_offset =3D le64_to_cpu(h->text_offset); + kbuf.buf_min =3D text_offset; + kbuf.buf_align =3D SZ_2M; + + kernel_segment_number =3D image->nr_segments; + + /* + * The location of the kernel segment may make it impossible to satisfy + * the other segment requirements, so we try repeatedly to find a + * location that will work. + */ + while ((ret =3D kexec_add_buffer(&kbuf)) =3D=3D 0) { + /* Try to load additional data */ + kernel_segment =3D &image->segment[kernel_segment_number]; + ret =3D load_other_segments(image, kernel_segment->mem, + kernel_segment->memsz, initrd, + initrd_len, cmdline, cmdline_len); + if (!ret) + break; + + /* + * We couldn't find space for the other segments; erase the + * kernel segment and try the next available hole. + */ + image->nr_segments -=3D 1; + kbuf.buf_min =3D kernel_segment->mem + kernel_segment->memsz; + kbuf.mem =3D KEXEC_BUF_MEM_UNKNOWN; + } + + if (ret) { + pr_err("Could not find any suitable kernel location!"); + return ERR_PTR(ret); + } + + kernel_segment =3D &image->segment[kernel_segment_number]; + + /* Make sure the second kernel jumps to the correct "kernel_entry". */ + image->start =3D kernel_segment->mem + h->kernel_entry - text_offset; + + kexec_dprintk("Loaded kernel at 0x%lx bufsz=3D0x%lx memsz=3D0x%lx\n", + kernel_segment->mem, kbuf.bufsz, + kernel_segment->memsz); + + return NULL; +} + +const struct kexec_file_ops kexec_efi_ops =3D { + .probe =3D efi_kexec_probe, + .load =3D efi_kexec_load, +}; diff --git a/arch/loongarch/kernel/machine_kexec_file.c b/arch/loongarch/ke= rnel/machine_kexec_file.c index 7fe3f182a632..a713acf32db8 100644 --- a/arch/loongarch/kernel/machine_kexec_file.c +++ b/arch/loongarch/kernel/machine_kexec_file.c @@ -21,6 +21,7 @@ #include =20 const struct kexec_file_ops * const kexec_file_loaders[] =3D { + &kexec_efi_ops, NULL }; =20 --=20 2.43.0