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 B4A2FCA0EC1 for ; Mon, 11 Aug 2025 09:28:26 +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=bptUG6+6W2TjiSNT88rR5MzDy6r8MtSXxrLcyKgaTpk=; b=mi7zBARQIAfFbGWdFV3ZI1OlM/ gbQlGQX4Sp+2JLH80fqJ+LO6rKoPWupLmmBpRf9SbvSE0oMhdCAgZPVCacSu6V0RZOGTe9WjoUoJm jJjk3OYPyb47Un2k0bLc5MVpluRiZtjZV4FH0BIx0/T15vav341m7rpeV8+d127bT6A9vGrv6o++4 8DNu6ZALSh+ZSEGmQshsyte4UOp8ri61nEm8eT1owvb7UWIUwNKkPPTQQ9F6vLaZz5K4kbQ/8zHwr SvtN3oomSeb8U0COC87nc9cibCCg91jULhgojkv5Oyf1EOYed7A1B+XxhXDcghVSo2fhfjquH0Vzn 7XH2sjiA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1ulOpO-000000076t8-1lUQ; Mon, 11 Aug 2025 09:28:26 +0000 Received: from out-182.mta1.migadu.com ([2001:41d0:203:375::b6]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1ulOpL-000000076qo-2xOn for kexec@lists.infradead.org; Mon, 11 Aug 2025 09:28:24 +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=1754904502; 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=bptUG6+6W2TjiSNT88rR5MzDy6r8MtSXxrLcyKgaTpk=; b=BGP3zFfNqnFS8+fpFseO1BHiuuPXajlLtT/byV8ZH/dAlGG12DovvVEOyLyVFPBzOLr4he ZRiw+HgQ5QfS5E9OfmDEtHKiLwpOFWruToeC6/vvh2sr+A7INlnAyj415vCp8/J6baigZb MEbSrUnG6tPvCIGJb3um4O7MI749nfY= 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 4/6] LoongArch/kexec_file: Add crash dump support Date: Mon, 11 Aug 2025 17:26:57 +0800 Message-Id: <20250811092659.14903-5-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_022823_883753_05E5E584 X-CRM114-Status: GOOD ( 12.58 ) 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 Enabling crash dump (kdump) includes: - prepare contents of ELF header of a core dump file, /proc/vmcore, using crash_prepare_elf64_headers(). - add "elfcorehdr=size@start" to command line. Signed-off-by: Youling Tang --- arch/loongarch/kernel/machine_kexec_file.c | 93 ++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/arch/loongarch/kernel/machine_kexec_file.c b/arch/loongarch/kernel/machine_kexec_file.c index e1240644f529..06def654cc09 100644 --- a/arch/loongarch/kernel/machine_kexec_file.c +++ b/arch/loongarch/kernel/machine_kexec_file.c @@ -34,6 +34,63 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image) return kexec_image_post_load_cleanup_default(image); } +#ifdef CONFIG_CRASH_DUMP + +static int prepare_elf_headers(void **addr, unsigned long *sz) +{ + struct crash_mem *cmem; + unsigned int nr_ranges; + int ret; + u64 i; + phys_addr_t start, end; + + nr_ranges = 2; /* for exclusion of crashkernel region */ + for_each_mem_range(i, &start, &end) + nr_ranges++; + + cmem = kmalloc(struct_size(cmem, ranges, nr_ranges), GFP_KERNEL); + if (!cmem) + return -ENOMEM; + + cmem->max_nr_ranges = nr_ranges; + cmem->nr_ranges = 0; + for_each_mem_range(i, &start, &end) { + cmem->ranges[cmem->nr_ranges].start = start; + cmem->ranges[cmem->nr_ranges].end = end - 1; + cmem->nr_ranges++; + } + + /* Exclude crashkernel region */ + ret = crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end); + if (ret) + goto out; + + if (crashk_low_res.end) { + ret = crash_exclude_mem_range(cmem, crashk_low_res.start, crashk_low_res.end); + if (ret) + goto out; + } + + ret = crash_prepare_elf64_headers(cmem, true, addr, sz); + +out: + kfree(cmem); + return ret; +} + +/* Adds the "elfcorehdr=size@start" command line parameter to command line. */ +static void cmdline_add_elfcorehdr(struct kimage *image, unsigned long *cmdline_tmplen, + char *modified_cmdline, unsigned long elfcorehdr_sz) +{ + int elfcorehdr_strlen = 0; + + elfcorehdr_strlen = sprintf(modified_cmdline + (*cmdline_tmplen), "elfcorehdr=0x%lx@0x%lx ", + elfcorehdr_sz, image->elf_load_addr); + *cmdline_tmplen += elfcorehdr_strlen; +} + +#endif + /* 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) @@ -75,6 +132,42 @@ int load_other_segments(struct kimage *image, /* Ensure it's nul terminated */ modified_cmdline[COMMAND_LINE_SIZE - 1] = '\0'; +#ifdef CONFIG_CRASH_DUMP + /* load elf core header */ + void *headers; + unsigned long headers_sz; + if (image->type == KEXEC_TYPE_CRASH) { + ret = prepare_elf_headers(&headers, &headers_sz); + if (ret) { + pr_err("Preparing elf core header failed\n"); + goto out_err; + } + + kbuf.buffer = headers; + kbuf.bufsz = headers_sz; + kbuf.mem = KEXEC_BUF_MEM_UNKNOWN; + kbuf.memsz = headers_sz; + kbuf.buf_align = SZ_64K; /* largest supported page size */ + kbuf.buf_max = ULONG_MAX; + kbuf.top_down = true; + + ret = kexec_add_buffer(&kbuf); + if (ret) { + vfree(headers); + goto out_err; + } + image->elf_headers = headers; + image->elf_load_addr = kbuf.mem; + image->elf_headers_sz = headers_sz; + + kexec_dprintk("Loaded elf core header at 0x%lx bufsz=0x%lx memsz=0x%lx\n", + image->elf_load_addr, kbuf.bufsz, kbuf.memsz); + + /* Add the elfcorehdr=size@start parameter to the command line */ + cmdline_add_elfcorehdr(image, &cmdline_tmplen, modified_cmdline, headers_sz); + } +#endif + /* load initrd */ if (initrd) { kbuf.buffer = initrd; -- 2.34.1