From: Youling Tang <youling.tang@linux.dev>
To: Simon Horman <horms@verge.net.au>
Cc: Simon Horman <horms@kernel.org>,
Huacai Chen <chenhuacai@kernel.org>,
kexec@lists.infradead.org, youling.tang@linux.dev,
Youling Tang <tangyouling@kylinos.cn>
Subject: [PATCH v2 08/10] LoongArch/pez: Fix kernel_fd handling when kexec_file is supported
Date: Tue, 16 Sep 2025 09:46:53 +0800 [thread overview]
Message-ID: <20250916014655.841632-9-youling.tang@linux.dev> (raw)
In-Reply-To: <20250916014655.841632-1-youling.tang@linux.dev>
From: Youling Tang <tangyouling@kylinos.cn>
After the current pez kernel image is decompressed and loaded, this kernel_fd
will be released. When kexec_file is added subsequently, the kernel detects
that the content in kernel_fd is empty, causing the kernel loading to fail.
Therefore, kernel_fd is rewritten for processing.
Signed-off-by: Youling Tang <tangyouling@kylinos.cn>
---
kexec/arch/loongarch/kexec-pez-loongarch.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/kexec/arch/loongarch/kexec-pez-loongarch.c b/kexec/arch/loongarch/kexec-pez-loongarch.c
index 942a47c..e78909c 100644
--- a/kexec/arch/loongarch/kexec-pez-loongarch.c
+++ b/kexec/arch/loongarch/kexec-pez-loongarch.c
@@ -64,13 +64,17 @@ int pez_loongarch_load(int argc, char **argv, const char *buf, off_t len,
if (kernel_fd > 0 && decompressed_size > 0) {
char *kbuf;
off_t nread;
+ int fd;
+ if (info->kernel_fd > 0)
+ close(info->kernel_fd);
info->kernel_fd = kernel_fd;
- /*
- * slurp_fd will close kernel_fd, but it is safe here
- * due to no kexec_file_load support.
- */
- kbuf = slurp_fd(kernel_fd, NULL, decompressed_size, &nread);
+ fd = dup(kernel_fd);
+ if (fd < 0) {
+ dbgprintf("%s: dup fd failed.\n", __func__);
+ return -1;
+ }
+ kbuf = slurp_fd(fd, NULL, decompressed_size, &nread);
if (!kbuf || nread != decompressed_size) {
dbgprintf("%s: slurp_fd failed.\n", __func__);
return -1;
--
2.34.1
next prev parent reply other threads:[~2025-09-16 1:53 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-16 1:46 [PATCH v2 00/10] Fix and improve the LoongArch implementation Youling Tang
2025-09-16 1:46 ` [PATCH v2 01/10] kexec: Handle removal of multiple 'crashkernel' parameters Youling Tang
2025-09-16 1:46 ` [PATCH v2 02/10] LoongArch: Fix comments Youling Tang
2025-09-16 1:46 ` [PATCH v2 03/10] LoongArch: Terminate the cmdline string using '\0' Youling Tang
2025-09-16 1:46 ` [PATCH v2 04/10] LoongArch: Enforce relocatable kernel check for crash dump Youling Tang
2025-09-16 1:46 ` [PATCH v2 05/10] LoongArch: Change initrd allocation to top-down Youling Tang
2025-09-16 1:46 ` [PATCH v2 06/10] LoongArch: Fix the use of loongarch_image_header in ELF format Youling Tang
2025-09-16 1:46 ` [PATCH v2 07/10] LoongArch: Add pe_hdr->machine check for pei format images Youling Tang
2025-09-16 1:46 ` Youling Tang [this message]
2025-09-16 1:46 ` [PATCH v2 09/10] LoongArch: Add kexec_file_load syscall Youling Tang
2025-09-16 1:46 ` [PATCH v2 10/10] LoongArch: Remove 'kexec_file' cmdline parameters when using --reuse-cmdline option Youling Tang
2025-09-23 16:51 ` [PATCH v2 00/10] Fix and improve the LoongArch implementation Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250916014655.841632-9-youling.tang@linux.dev \
--to=youling.tang@linux.dev \
--cc=chenhuacai@kernel.org \
--cc=horms@kernel.org \
--cc=horms@verge.net.au \
--cc=kexec@lists.infradead.org \
--cc=tangyouling@kylinos.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.