From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3C1ECC87FD2 for ; Mon, 11 Aug 2025 09:28:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=S1fZPuz6xxyXns5V9c+B6pAeL+oN23MEikk16JZKk2w=; b=yyOI+YdfooK+aXDINOqAHahkIV 1qcTxb7rzm9Zu3Mrjisxw88SVtMzPrPc0T0AK3RSh+qXDv1qc0Pa2wwrr3+RAeRAjPak4Xhqgmbim q2Aw1vM1kRa154gz5BbBETEHUUfbgJeKN8w45dCgfJmDMEheUC66ctq4McuwbqHHBBICVkSdYd4ht SZw9kXLm5d+q5MDl2ZkmdwlVyjK0+5fsOAWDmhfEjh+/odp/zcPdVJa9cSmc67dZgh0bvGeq5awqm AoMbCsNh8xwXXFAS87+v8QYozJx2jIJP12s3W+U+2/v57p9kRBAucT8Y+d5W5prpUqjC75koHbyur edFkJCWg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1ulOpM-000000076ru-3ttp; Mon, 11 Aug 2025 09:28:24 +0000 Received: from out-176.mta1.migadu.com ([95.215.58.176]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1ulOpK-000000076pX-0qaV for kexec@lists.infradead.org; Mon, 11 Aug 2025 09:28:23 +0000 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=1754904500; 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=S1fZPuz6xxyXns5V9c+B6pAeL+oN23MEikk16JZKk2w=; b=l5eXt6ERjCvzJ8rIOVvwNo2eM+PByJrlb98f/pBGcJB+DEWL0eNzEhSLrTUENgw/fAdPcW QC3tSk+dlAuXPU7LBzHcKZRN+IQklsx2sp0txteBTwTVrpj5apV3vayiheuAjFrr2oJXMR AidcjYtm3kXBxgm2xWBZ7UlRXbHxiGg= From: Youling Tang To: Huacai Chen Cc: WANG Xuerui , Baoquan He , kexec@lists.infradead.org, loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, youling.tang@linux.dev, Youling Tang Subject: [PATCH 3/6] LoongArch/kexec_file: Add initrd loading Date: Mon, 11 Aug 2025 17:26:56 +0800 Message-Id: <20250811092659.14903-4-youling.tang@linux.dev> In-Reply-To: <20250811092659.14903-1-youling.tang@linux.dev> References: <20250811092659.14903-1-youling.tang@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250811_022822_389302_8F36A90E X-CRM114-Status: GOOD ( 14.75 ) X-BeenThere: kexec@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "kexec" Errors-To: kexec-bounces+kexec=archiver.kernel.org@lists.infradead.org From: Youling Tang Add inird loading support and pass it to the second kernel via the cmdline 'initrd=start,size'. Signed-off-by: Youling Tang --- arch/loongarch/kernel/machine_kexec_file.c | 71 ++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/arch/loongarch/kernel/machine_kexec_file.c b/arch/loongarch/kernel/machine_kexec_file.c index bc91ae0afa4c..e1240644f529 100644 --- a/arch/loongarch/kernel/machine_kexec_file.c +++ b/arch/loongarch/kernel/machine_kexec_file.c @@ -34,13 +34,84 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image) return kexec_image_post_load_cleanup_default(image); } +/* Adds the "initrd=start,size" command line parameter to command line. */ +static void cmdline_add_initrd(struct kimage *image, unsigned long *cmdline_tmplen, + char *modified_cmdline, unsigned long initrd) +{ + int initrd_strlen; + + initrd_strlen = sprintf(modified_cmdline + (*cmdline_tmplen), "initrd=0x%lx,0x%lx ", + initrd, image->initrd_buf_len); + *cmdline_tmplen += initrd_strlen; +} + +/* + * Tries to add the initrd to the image. If it is not possible to find + * valid locations, this function will undo changes to the image and return non + * zero. + */ int load_other_segments(struct kimage *image, unsigned long kernel_load_addr, unsigned long kernel_size, char *initrd, unsigned long initrd_len, char *cmdline, unsigned long cmdline_len) { + struct kexec_buf kbuf; + unsigned long orig_segments = image->nr_segments; + char *modified_cmdline = NULL; + unsigned long cmdline_tmplen = 0; + unsigned long initrd_load_addr = 0; + int ret = 0; + + + kbuf.image = image; + /* not allocate anything below the kernel */ + kbuf.buf_min = kernel_load_addr + kernel_size; + + modified_cmdline = kzalloc(COMMAND_LINE_SIZE, GFP_KERNEL); + if (!modified_cmdline) + return -EINVAL; + + /* Ensure it's nul terminated */ + modified_cmdline[COMMAND_LINE_SIZE - 1] = '\0'; + + /* load initrd */ + if (initrd) { + kbuf.buffer = initrd; + kbuf.bufsz = initrd_len; + kbuf.mem = KEXEC_BUF_MEM_UNKNOWN; + kbuf.memsz = initrd_len; + kbuf.buf_align = 0; + /* within 1GB-aligned window of up to 32GB in size */ + kbuf.buf_max = round_down(kernel_load_addr, SZ_1G) + + (unsigned long)SZ_1G * 32; + kbuf.top_down = false; + + ret = kexec_add_buffer(&kbuf); + if (ret) + goto out_err; + initrd_load_addr = kbuf.mem; + + kexec_dprintk("Loaded initrd at 0x%lx bufsz=0x%lx memsz=0x%lx\n", + initrd_load_addr, kbuf.bufsz, kbuf.memsz); + + /* Add the initrd=start,size parameter to the command line */ + cmdline_add_initrd(image, &cmdline_tmplen, modified_cmdline, initrd_load_addr); + } + + if (cmdline_len + cmdline_tmplen > COMMAND_LINE_SIZE) { + pr_err("Appending kdump cmdline exceeds cmdline size\n"); + ret = -EINVAL; + goto out_err; + } + memcpy(modified_cmdline + cmdline_tmplen, cmdline, cmdline_len); + cmdline = modified_cmdline; image->arch.cmdline_ptr = (unsigned long)cmdline; return 0; + +out_err: + image->nr_segments = orig_segments; + kfree(modified_cmdline); + return ret; } -- 2.34.1