From patchwork Mon Dec 16 02:12:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 181633 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp3761336ile; Sun, 15 Dec 2019 18:11:05 -0800 (PST) X-Google-Smtp-Source: APXvYqzvw1+rB3g1bo2A6DxOW2ubUtXBwb7DDVkUF/ymr97i1RHsa/OU6K73Xo7fFNSNs5QUEfTN X-Received: by 2002:a05:6830:1d6:: with SMTP id r22mr29882061ota.196.1576462265325; Sun, 15 Dec 2019 18:11:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576462265; cv=none; d=google.com; s=arc-20160816; b=NKT3PandtURhS0ER3jhPa92zkyufXJm/pZ0wC7t4IlbhX9pB/+kvDdImbSgiWgurv1 KI8RR+3yiQyXXFoyWcptXP/eEeD5ePNFf0PK5eNnrUTm/cao4+AXKaHLfJooTC1i7uLD zckuss6KYFfZzkgP3Ay6TG7XYZD3Gq+NVJOO2nEjVn0VS/lJFihnWhtugJWyUORDQwB/ ph7XmjycXjEb/6CLgIkexyfh2IDgnqS5GE3TQ4Wt1J/OXNw8tPVD/Yl+1s+M0C02zE1c SHTKUVw2SGKAmPiJ7cXYW7rj3wEgepHAOb02WVWRgd+8hElFzGPzRKLuTa4HNFdeHv6+ Ri1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=3FqOO3wE0tn2QZf6UyRIRojyX4xpI+NMDGsdK9w/Ap4=; b=sM77l0BXccPvHIBLqKhUfWe1OT8Ins1PcT4Z3ytd6uANvnlXsZWIOdqIOp6tSN+cbB 6xw4k60MHhf33T4+RG75MvCr5lsJZA7C++FXOPkoq7HtRXtwjpgQB+2b2l+hMQ+CplSH YuwOCSnxET5aK4GkmsdvkVc9/8p+LWgUtGsHhxAK9/CNdmb5G5aS6n+fEqMCd7WVHgTM 7hKACdoWWaNuejmNRoAJ6J5diSuwSzX7yPIjTRqjg5yJKLx53Chy+a6vy8YJHlY9bVU2 0sMLX60vsD/pzX4sT5tq2vQOBfLioLycD+Fnap4dC6GSM7GPEd3O6dysxFhFJJoeLSA5 d1sw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wGyoF6jR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x7si9777706oia.165.2019.12.15.18.11.05; Sun, 15 Dec 2019 18:11:05 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wGyoF6jR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726637AbfLPCK7 (ORCPT + 27 others); Sun, 15 Dec 2019 21:10:59 -0500 Received: from mail-pj1-f67.google.com ([209.85.216.67]:33877 "EHLO mail-pj1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726373AbfLPCK6 (ORCPT ); Sun, 15 Dec 2019 21:10:58 -0500 Received: by mail-pj1-f67.google.com with SMTP id j11so2282472pjs.1 for ; Sun, 15 Dec 2019 18:10:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3FqOO3wE0tn2QZf6UyRIRojyX4xpI+NMDGsdK9w/Ap4=; b=wGyoF6jRoSwSqw+ChtmsGgyLywamuwnCySkdQERJLwj6c5L5qb0fdxqrFu931tlm6N 8yVFrAfggJMKfdNHQsaLv8RR/v0oqSdDn7G6b4zu0f7F3ZHMCgOEBRNBDYfo1EvnNJ5S tbUvpunr92twBkFUM63SSt+pRBt8o1HUUaol7gl/QKAx+uOE6avNdSaIfuNvf9TRBeoE tMHoF2u8UktPVgVuCRHiXaV3jEFrAx2XCB8Jo8yDsILDJJu7T+Tt7Ld/7/1ZkOXISopf B89pLzreYs2xQKOOj0VmCUR6VPJ8g43mhhEKBO+tHUgicS+W5JXVB8Op5XgmE3iPFIJ9 l/QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3FqOO3wE0tn2QZf6UyRIRojyX4xpI+NMDGsdK9w/Ap4=; b=ZZ1eT9YvVtFp0H38b+bcAVuifbdsmuMXIdh6ZRmOgZLV/XXIdisa0Pbs75sK1l96cM vRfXLpI0+w7pELiPeRfGsfqiumQfZWWwbHBmRVlHvUEiowlmvLgJP29YQrGkrFxcRA28 xQGJl6EUFp/2r5EW6QZ0opFyRkCuDfiIig5Bf9OkXTdSMwjBSNt7juCZYDc/6pe8d0A4 +i96GKAB3F9ttzPgLUmV/JTSF6cvEk3qbp3fNh+QUQ3j2DXf5FbvBlnL4ApgPPFsFiSc 1XFKPUoSc3vZFHGkY3C/MaETSz71+TllibVWOO6F40ALOMP82tBvA3zLUMrgJqv1xD9j w4yw== X-Gm-Message-State: APjAAAWEsFbUkE1hCKGA6zOK1M1QdgVHoj3G5MlHMW72e9X0ny5PTZP2 6sWyOK5mOdXhIivdIjZflS+5+w== X-Received: by 2002:a17:90a:fa92:: with SMTP id cu18mr15301981pjb.114.1576462257870; Sun, 15 Dec 2019 18:10:57 -0800 (PST) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id p5sm18997185pgs.28.2019.12.15.18.10.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Dec 2019 18:10:57 -0800 (PST) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com, robh+dt@kernel.org, frowand.list@gmail.com Cc: james.morse@arm.com, bhsharma@redhat.com, kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, AKASHI Takahiro Subject: [PATCH v4 1/2] libfdt: include fdt_addresses.c Date: Mon, 16 Dec 2019 11:12:46 +0900 Message-Id: <20191216021247.24950-2-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191216021247.24950-1-takahiro.akashi@linaro.org> References: <20191216021247.24950-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In the implementation of kexec_file_loaded-based kdump for arm64, fdt_appendprop_addrrange() will be needed. So include fdt_addresses.c in making libfdt. Signed-off-by: AKASHI Takahiro Cc: Rob Herring Cc: Frank Rowand --- lib/Makefile | 2 +- lib/fdt_addresses.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 lib/fdt_addresses.c -- 2.24.0 diff --git a/lib/Makefile b/lib/Makefile index 93217d44237f..c20b1debe9b4 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -223,7 +223,7 @@ KASAN_SANITIZE_stackdepot.o := n KCOV_INSTRUMENT_stackdepot.o := n libfdt_files = fdt.o fdt_ro.o fdt_wip.o fdt_rw.o fdt_sw.o fdt_strerror.o \ - fdt_empty_tree.o + fdt_empty_tree.o fdt_addresses.o $(foreach file, $(libfdt_files), \ $(eval CFLAGS_$(file) = -I $(srctree)/scripts/dtc/libfdt)) lib-$(CONFIG_LIBFDT) += $(libfdt_files) diff --git a/lib/fdt_addresses.c b/lib/fdt_addresses.c new file mode 100644 index 000000000000..23610bcf390b --- /dev/null +++ b/lib/fdt_addresses.c @@ -0,0 +1,2 @@ +#include +#include "../scripts/dtc/libfdt/fdt_addresses.c" From patchwork Mon Dec 16 02:12:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 181634 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp3761343ile; Sun, 15 Dec 2019 18:11:05 -0800 (PST) X-Google-Smtp-Source: APXvYqyedo8PI8FLfUlCN+A0EL+lDFBsBPAMBdN5sHXrjMIaCiH02hJBAGtU9rAdTojxkhCA3scE X-Received: by 2002:a05:6830:603:: with SMTP id w3mr28920888oti.217.1576462265668; Sun, 15 Dec 2019 18:11:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576462265; cv=none; d=google.com; s=arc-20160816; b=bWsdkvssn+kAxe4ZZdlbzEGRPrrOIsBt2W313a/VoobVlrvR6VeWB/DrZkcSSFy23O H+0gJq9jkAwipleCpdoleOO5A+TuS0y3yQoYyCh8eQ7DUTGHc8kwBWblbrvlDKvm4x4i FFYLayubC9H+ToJ+fLdjV4+HTacuL8Lq6yf6vnVpW/Eqrxww3320GjamH+Kci3i4IvHt 0RPCcmWwXW30sn0icDlNib/aQSRNJj94wn4NGshme9rDDrghjoiVcMH1Y4DKaxPE9UCT f1UO/cMzJICd/gRY8/RLvD4r12QXLIfzo5KygF3J4KfUI3kMkenfNYcXhenaenUtcwOS 89bA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=rouuj09csn2DMCPTLoONYfkkA03lZ638co9mw+fOrww=; b=ozfxod8hHoJ2+xMu5jC1ta6gCIdQ0ZJzNV1t2fbA5XTP9nr0uQ8hlCcWdMErOt6hoh SFGev2YEAOf6ObpHNo6AYsQ/wcLaDmmFQk0Vwu/tfgZ92DpBgx36jlgs+bh8f2dHyosg IhvPe8+GJnPZIgzYrraQG0/Ug9RUPvL9lWDHYhlAVSx7C1dmb/OM9A6+p4oQDTORspU9 +HcvRmgXL+6Us8GaammLOtXknaSAShd3a0i7W5BDXZ4LGcqgoDVEiWB8Y8++nsof5J+T 0GsGy9uIvEaHR9cZhvwauqFNSBw+MqCjSQEL//kQ+3uqrgvawprtibrHDnM5GgB/RxW0 xBTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gPcvLo1s; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x7si9777706oia.165.2019.12.15.18.11.05; Sun, 15 Dec 2019 18:11:05 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gPcvLo1s; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726695AbfLPCLC (ORCPT + 27 others); Sun, 15 Dec 2019 21:11:02 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:45575 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726373AbfLPCLB (ORCPT ); Sun, 15 Dec 2019 21:11:01 -0500 Received: by mail-pf1-f195.google.com with SMTP id 2so4711012pfg.12 for ; Sun, 15 Dec 2019 18:11:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rouuj09csn2DMCPTLoONYfkkA03lZ638co9mw+fOrww=; b=gPcvLo1sEZC65zlj2YVQF5YP2VbweT+rSoVFIUvpg8G8bf8ftaINGHlAvM8+NxGtF4 b/R85r8yD1hWVZydnMwMbsz6AZI0QgEnpLLBaIslO4msjO5ycygiak/gPUvfjkJ1CLMq dtPcG6dES2iSxEI/QYHZ+dQF1Td2r7pf+oesnNkberseieIZDMrBENWwDhcW4TvX/OST vIEtoWxHezDFjlFcu5WdpV5OV0cn5PjpXTQmbtVyCO+AVWG9R8NlPsGkPYsSp8PngmOO WMp+Or8DFkANt2cd2NGXT3x2oJVCXnQolpsKsTu9zo897GOqpb/j/cKQ6WpFPRL2povX 5++A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rouuj09csn2DMCPTLoONYfkkA03lZ638co9mw+fOrww=; b=Pf1tvkg0lZkPDYFwo4fIdbEOq6h3ajO9lI/lvPCSojEG4RUeHuxPCGwrPgdxGFm3JA hiwRocNld3WxEgN7bijd0a4C4cAe/1VI0X0DTXZdWSgkH+uT7SaReFrxHKELe09+eoza rnNKNl2dLqhxlv2/pzthOWbE1SHbj3TyfVjMNhsq2sY7clel99Uh1hMIhoQfd6yOxgP3 Q3BF6z0ANsiSFg3MqpVloSGnS4NGFjNyNFzslbHYraezcnqIez2mcEb2moR/4gjEsAti ovuoasUTRJQyb7JumMcDQx2xOLNwsHtTozVUhGvXKoPJd2LZ2J/B8a+tjIVQn30JGAtm mKnQ== X-Gm-Message-State: APjAAAWX8/IfxGso/sFtTHycPJIyS07Dn69HjXQQxAsKx4ukT16zxdln 2FGp1cKQTLQt7uK5XQxL4YeFZw== X-Received: by 2002:a63:4f54:: with SMTP id p20mr15428804pgl.246.1576462260969; Sun, 15 Dec 2019 18:11:00 -0800 (PST) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id o19sm18241044pjr.2.2019.12.15.18.11.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Dec 2019 18:11:00 -0800 (PST) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com, robh+dt@kernel.org, frowand.list@gmail.com Cc: james.morse@arm.com, bhsharma@redhat.com, kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, AKASHI Takahiro Subject: [PATCH v4 2/2] arm64: kexec_file: add crash dump support Date: Mon, 16 Dec 2019 11:12:47 +0900 Message-Id: <20191216021247.24950-3-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191216021247.24950-1-takahiro.akashi@linaro.org> References: <20191216021247.24950-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Enabling crash dump (kdump) includes * prepare contents of ELF header of a core dump file, /proc/vmcore, using crash_prepare_elf64_headers(), and * add two device tree properties, "linux,usable-memory-range" and "linux,elfcorehdr", which represent respectively a memory range to be used by crash dump kernel and the header's location Signed-off-by: AKASHI Takahiro Cc: Catalin Marinas Cc: Will Deacon Reviewed-by: James Morse Tested-and-reviewed-by: Bhupesh Sharma --- arch/arm64/include/asm/kexec.h | 4 + arch/arm64/kernel/kexec_image.c | 4 - arch/arm64/kernel/machine_kexec_file.c | 106 ++++++++++++++++++++++++- 3 files changed, 106 insertions(+), 8 deletions(-) -- 2.24.0 diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h index 12a561a54128..d24b527e8c00 100644 --- a/arch/arm64/include/asm/kexec.h +++ b/arch/arm64/include/asm/kexec.h @@ -96,6 +96,10 @@ static inline void crash_post_resume(void) {} struct kimage_arch { void *dtb; unsigned long dtb_mem; + /* Core ELF header buffer */ + void *elf_headers; + unsigned long elf_headers_mem; + unsigned long elf_headers_sz; }; extern const struct kexec_file_ops kexec_image_ops; diff --git a/arch/arm64/kernel/kexec_image.c b/arch/arm64/kernel/kexec_image.c index 29a9428486a5..af9987c154ca 100644 --- a/arch/arm64/kernel/kexec_image.c +++ b/arch/arm64/kernel/kexec_image.c @@ -47,10 +47,6 @@ static void *image_load(struct kimage *image, struct kexec_segment *kernel_segment; int ret; - /* We don't support crash kernels yet. */ - if (image->type == KEXEC_TYPE_CRASH) - return ERR_PTR(-EOPNOTSUPP); - /* * We require a kernel with an unambiguous Image header. Per * Documentation/arm64/booting.rst, this is the case when image_size diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c index 7b08bf9499b6..dd3ae8081b38 100644 --- a/arch/arm64/kernel/machine_kexec_file.c +++ b/arch/arm64/kernel/machine_kexec_file.c @@ -17,12 +17,15 @@ #include #include #include +#include #include #include #include #include /* relevant device tree properties */ +#define FDT_PROP_KEXEC_ELFHDR "linux,elfcorehdr" +#define FDT_PROP_MEM_RANGE "linux,usable-memory-range" #define FDT_PROP_INITRD_START "linux,initrd-start" #define FDT_PROP_INITRD_END "linux,initrd-end" #define FDT_PROP_BOOTARGS "bootargs" @@ -40,6 +43,10 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image) vfree(image->arch.dtb); image->arch.dtb = NULL; + vfree(image->arch.elf_headers); + image->arch.elf_headers = NULL; + image->arch.elf_headers_sz = 0; + return kexec_image_post_load_cleanup_default(image); } @@ -55,6 +62,31 @@ static int setup_dtb(struct kimage *image, off = ret; + ret = fdt_delprop(dtb, off, FDT_PROP_KEXEC_ELFHDR); + if (ret && ret != -FDT_ERR_NOTFOUND) + goto out; + ret = fdt_delprop(dtb, off, FDT_PROP_MEM_RANGE); + if (ret && ret != -FDT_ERR_NOTFOUND) + goto out; + + if (image->type == KEXEC_TYPE_CRASH) { + /* add linux,elfcorehdr */ + ret = fdt_appendprop_addrrange(dtb, 0, off, + FDT_PROP_KEXEC_ELFHDR, + image->arch.elf_headers_mem, + image->arch.elf_headers_sz); + if (ret) + return (ret == -FDT_ERR_NOSPACE ? -ENOMEM : -EINVAL); + + /* add linux,usable-memory-range */ + ret = fdt_appendprop_addrrange(dtb, 0, off, + FDT_PROP_MEM_RANGE, + crashk_res.start, + crashk_res.end - crashk_res.start + 1); + if (ret) + return (ret == -FDT_ERR_NOSPACE ? -ENOMEM : -EINVAL); + } + /* add bootargs */ if (cmdline) { ret = fdt_setprop_string(dtb, off, FDT_PROP_BOOTARGS, cmdline); @@ -125,8 +157,8 @@ static int setup_dtb(struct kimage *image, } /* - * More space needed so that we can add initrd, bootargs, kaslr-seed, and - * rng-seed. + * More space needed so that we can add initrd, bootargs, kaslr-seed, + * rng-seed, userable-memory-range and elfcorehdr. */ #define DTB_EXTRA_SPACE 0x1000 @@ -174,6 +206,43 @@ static int create_dtb(struct kimage *image, } } +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 = 1; /* for exclusion of crashkernel region */ + for_each_mem_range(i, &memblock.memory, NULL, NUMA_NO_NODE, + MEMBLOCK_NONE, &start, &end, NULL) + nr_ranges++; + + cmem = kmalloc(sizeof(struct crash_mem) + + sizeof(struct crash_mem_range) * nr_ranges, GFP_KERNEL); + if (!cmem) + return -ENOMEM; + + cmem->max_nr_ranges = nr_ranges; + cmem->nr_ranges = 0; + for_each_mem_range(i, &memblock.memory, NULL, NUMA_NO_NODE, + MEMBLOCK_NONE, &start, &end, NULL) { + 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) + ret = crash_prepare_elf64_headers(cmem, true, addr, sz); + + kfree(cmem); + return ret; +} + int load_other_segments(struct kimage *image, unsigned long kernel_load_addr, unsigned long kernel_size, @@ -181,14 +250,43 @@ int load_other_segments(struct kimage *image, char *cmdline) { struct kexec_buf kbuf; - void *dtb = NULL; - unsigned long initrd_load_addr = 0, dtb_len; + void *headers, *dtb = NULL; + unsigned long headers_sz, initrd_load_addr = 0, dtb_len; int ret = 0; kbuf.image = image; /* not allocate anything below the kernel */ kbuf.buf_min = kernel_load_addr + kernel_size; + /* load elf core header */ + 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->arch.elf_headers = headers; + image->arch.elf_headers_mem = kbuf.mem; + image->arch.elf_headers_sz = headers_sz; + + pr_debug("Loaded elf core header at 0x%lx bufsz=0x%lx memsz=0x%lx\n", + image->arch.elf_headers_mem, headers_sz, headers_sz); + } + /* load initrd */ if (initrd) { kbuf.buffer = initrd;