From patchwork Tue Oct 10 06:36:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 115356 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp3401623qgn; Mon, 9 Oct 2017 23:35:35 -0700 (PDT) X-Received: by 10.84.225.145 with SMTP id u17mr11217273plj.105.1507617335375; Mon, 09 Oct 2017 23:35:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507617335; cv=none; d=google.com; s=arc-20160816; b=dv5V4HyF/zXq8yCR7Xej7HpiGwrXLFhsRW3Hiy3793RaBWSdevigmGAZJiB70iQVLD ygYN9G+wpywpHXInwD9aZ+FiKzyfT99KSrjcvqRBrh3g83kec+17V+YKf19xWQbPaVuE KKGbW4s/dsJy2z6DVsr732ILfKFJS/NkTgC5GA0Tb6EstOIFWqPEu7Za38KcutLKzULb znEzAN0j+fhKl564zx6gIow6s9nAVqrze9hllTbfRcn+C7wBWPP7DwmrO9Ej9Solu36e z1cyuGXplhx4df2moSfGhfTIBxtda6RxuznKDn6HN5jnij7En0EW+r8XjKU/2/wTbMHC lVsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=cPZtZ8IQXG2Y0h9HI9/zgf2taW78lJ3+VyfWUMoaYVI=; b=l5vPmWOk7SKQndd5ltsCCEXRjcPy4jwY41GurqAqcgP8ye2VO9etzBQI5bVoUvacr2 z5tkNS173YnhAKg2Ltt12dwf+ONbyfwyEHlhVf/Bg0wDuv9XV0etlthdsbs2ShybbhSZ DOJcJY/n62FU31O1t8P4BV0m8qu2pIEG6v2MfcRLHPjrKzNzp1fH9E6L9W5PObD//kQX XmuTmS5eVUawdBXNjUiIBYPJXUq+q2Uc7Gj+dW6iF05XETGy1VLSyDFTdasko9SX3Sb/ d6scxlxLtaxywQhD/jPzGl3+iPDKjtOSTVwtaf9vtXQKEkTsH/LnIdJ3L7pFAJXgB6aA 934A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YbeRimKj; 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 v85si8447698pfk.276.2017.10.09.23.35.35; Mon, 09 Oct 2017 23:35:35 -0700 (PDT) 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=YbeRimKj; 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 S932122AbdJJGfd (ORCPT + 26 others); Tue, 10 Oct 2017 02:35:33 -0400 Received: from mail-pf0-f171.google.com ([209.85.192.171]:43556 "EHLO mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755450AbdJJGf2 (ORCPT ); Tue, 10 Oct 2017 02:35:28 -0400 Received: by mail-pf0-f171.google.com with SMTP id d2so13048403pfh.0 for ; Mon, 09 Oct 2017 23:35:28 -0700 (PDT) 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; bh=cPZtZ8IQXG2Y0h9HI9/zgf2taW78lJ3+VyfWUMoaYVI=; b=YbeRimKjg9Psw777u8MTjfQ1NyMDYVCUNWKV2dg9q9DYEkG10QpbbGXNkuBkA3tbSq aVjqav1pL332HaqmiZQ3F0ix00/VQgNlR6NuyIXAJNg2tpIeM72iQuTNls9kT4/3D9ym n6DnR2vgvRdLKJyYi6o6+D9MB5ullBaFt5udY= 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; bh=cPZtZ8IQXG2Y0h9HI9/zgf2taW78lJ3+VyfWUMoaYVI=; b=TFa0U8xSCr/fKvPZxYBIO1Rtp7zLaelLQnYzRFcIhXZj1AIHA+usrftYwfbtBo07jM iVF+9P7zcbOowzlIVM16hFSrjoI3ZZnAWS+bdUumtDNokkJ0Zqk2YNCO3QJ/ZVeyanyQ cCPB7y+24++huco435XYViGkT9AnxgxilUslAXeagXa4CZCJnRy3kGHvmbAs0z5nS41j nFgLwydp3LRc6qvZDZksGop0aau6njp7EqpRTcMCTON9yYg4mblsK4Q7xUMJl5ejCGfS oJRs9hGlkATxBQDznt42umuatiaOKFpkkioGvJ2+BcQPTfAbhMCca8BbM0G2qME6aKvv TnVg== X-Gm-Message-State: AMCzsaU9GQEQp891YevgI0oF2OIKaXwkoRTvRGIBER3Pd7hG3/tGAAgB x8bFYU92mLVxA7ap1KuyGHwmLQ== X-Google-Smtp-Source: AOwi7QCdS21kIoBNzt/aYFrleqU1uHapZAIZrajgnWNIm2cdHiC+uGbPXeeg61iAzrsrWzp7BVGYhg== X-Received: by 10.84.210.105 with SMTP id z96mr11280800plh.325.1507617328292; Mon, 09 Oct 2017 23:35:28 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id a78sm11781121pfl.122.2017.10.09.23.35.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Oct 2017 23:35:27 -0700 (PDT) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com, bauerman@linux.vnet.ibm.com, dhowells@redhat.com, vgoyal@redhat.com, herbert@gondor.apana.org.au, davem@davemloft.net, akpm@linux-foundation.org, mpe@ellerman.id.au, dyoung@redhat.com, bhe@redhat.com, arnd@arndb.de, ard.biesheuvel@linaro.org, julien.thierry@arm.com Cc: kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, AKASHI Takahiro Subject: [PATCH v5 08/10] arm64: kexec_file: set up for crash dump adding elf core header Date: Tue, 10 Oct 2017 15:36:17 +0900 Message-Id: <20171010063619.6303-9-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171010063619.6303-1-takahiro.akashi@linaro.org> References: <20171010063619.6303-1-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org load_crashdump_segments() creates and loads a memory segment of elf core header for crash dump. "linux,usable-memory-range" and "linux,elfcorehdr" will add to the 2nd kernel's device-tree blob. The logic of this cod is also from kexec-tools. Signed-off-by: AKASHI Takahiro Cc: Catalin Marinas Cc: Will Deacon --- arch/arm64/include/asm/kexec.h | 5 ++ arch/arm64/kernel/machine_kexec_file.c | 151 +++++++++++++++++++++++++++++++++ kernel/kexec_file.c | 2 +- 3 files changed, 157 insertions(+), 1 deletion(-) -- 2.14.1 diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h index 2fadd3cbf3af..edb702e64a8a 100644 --- a/arch/arm64/include/asm/kexec.h +++ b/arch/arm64/include/asm/kexec.h @@ -98,6 +98,10 @@ static inline void crash_post_resume(void) {} struct kimage_arch { void *dtb_buf; + /* Core ELF header buffer */ + void *elf_headers; + unsigned long elf_headers_sz; + unsigned long elf_load_addr; }; struct kimage; @@ -113,6 +117,7 @@ extern int load_other_segments(struct kimage *image, unsigned long kernel_load_addr, char *initrd, unsigned long initrd_len, char *cmdline, unsigned long cmdline_len); +extern int load_crashdump_segments(struct kimage *image); #endif #endif /* __ASSEMBLY__ */ diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c index 81af1602e149..cdedd4b05cac 100644 --- a/arch/arm64/kernel/machine_kexec_file.c +++ b/arch/arm64/kernel/machine_kexec_file.c @@ -19,6 +19,7 @@ #include #include #include +#include static int __dt_root_addr_cells; static int __dt_root_size_cells; @@ -32,6 +33,10 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image) vfree(image->arch.dtb_buf); image->arch.dtb_buf = NULL; + vfree(image->arch.elf_headers); + image->arch.elf_headers = NULL; + image->arch.elf_headers_sz = 0; + return _kimage_file_post_load_cleanup(image); } @@ -48,6 +53,78 @@ int arch_kexec_walk_mem(struct kexec_buf *kbuf, int (*func)(u64, u64, void *)) return walk_system_ram_res(0, ULONG_MAX, kbuf, func); } +static int __init arch_kexec_file_init(void) +{ + /* Those values are used later on loading the kernel */ + __dt_root_addr_cells = dt_root_addr_cells; + __dt_root_size_cells = dt_root_size_cells; + + return 0; +} +late_initcall(arch_kexec_file_init); + +#define FDT_ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1)) +#define FDT_TAGALIGN(x) (FDT_ALIGN((x), FDT_TAGSIZE)) + +static int fdt_prop_len(const char *prop_name, int len) +{ + return (strlen(prop_name) + 1) + + sizeof(struct fdt_property) + + FDT_TAGALIGN(len); +} + +static bool cells_size_fitted(unsigned long base, unsigned long size) +{ + /* if *_cells >= 2, cells can hold 64-bit values anyway */ + if ((__dt_root_addr_cells == 1) && (base >= (1ULL << 32))) + return false; + + if ((__dt_root_size_cells == 1) && (size >= (1ULL << 32))) + return false; + + return true; +} + +static void fill_property(void *buf, u64 val64, int cells) +{ + u32 val32; + + if (cells == 1) { + val32 = cpu_to_fdt32((u32)val64); + memcpy(buf, &val32, sizeof(val32)); + } else { + memset(buf, 0, cells * sizeof(u32) - sizeof(u64)); + buf += cells * sizeof(u32) - sizeof(u64); + + val64 = cpu_to_fdt64(val64); + memcpy(buf, &val64, sizeof(val64)); + } +} + +static int fdt_setprop_range(void *fdt, int nodeoffset, const char *name, + unsigned long addr, unsigned long size) +{ + void *buf, *prop; + size_t buf_size; + int result; + + buf_size = (__dt_root_addr_cells + __dt_root_size_cells) * sizeof(u32); + prop = buf = vmalloc(buf_size); + if (!buf) + return -ENOMEM; + + fill_property(prop, addr, __dt_root_addr_cells); + prop += __dt_root_addr_cells * sizeof(u32); + + fill_property(prop, size, __dt_root_size_cells); + + result = fdt_setprop(fdt, nodeoffset, name, buf, buf_size); + + vfree(buf); + + return result; +} + int setup_dtb(struct kimage *image, unsigned long initrd_load_addr, unsigned long initrd_len, char *cmdline, unsigned long cmdline_len, @@ -60,10 +137,26 @@ int setup_dtb(struct kimage *image, int range_len; int ret; + /* check ranges against root's #address-cells and #size-cells */ + if (image->type == KEXEC_TYPE_CRASH && + (!cells_size_fitted(image->arch.elf_load_addr, + image->arch.elf_headers_sz) || + !cells_size_fitted(crashk_res.start, + crashk_res.end - crashk_res.start + 1))) { + pr_err("Crash memory region doesn't fit into DT's root cell sizes.\n"); + ret = -EINVAL; + goto out_err; + } + /* duplicate dt blob */ buf_size = fdt_totalsize(initial_boot_params); range_len = (__dt_root_addr_cells + __dt_root_size_cells) * sizeof(u32); + if (image->type == KEXEC_TYPE_CRASH) + buf_size += fdt_prop_len("linux,elfcorehdr", range_len) + + fdt_prop_len("linux,usable-memory-range", + range_len); + if (initrd_load_addr) buf_size += fdt_prop_len("initrd-start", sizeof(u64)) + fdt_prop_len("initrd-end", sizeof(u64)); @@ -85,6 +178,23 @@ int setup_dtb(struct kimage *image, if (nodeoffset < 0) goto out_err; + if (image->type == KEXEC_TYPE_CRASH) { + /* add linux,elfcorehdr */ + ret = fdt_setprop_range(buf, nodeoffset, "linux,elfcorehdr", + image->arch.elf_load_addr, + image->arch.elf_headers_sz); + if (ret) + goto out_err; + + /* add linux,usable-memory-range */ + ret = fdt_setprop_range(buf, nodeoffset, + "linux,usable-memory-range", + crashk_res.start, + crashk_res.end - crashk_res.start + 1); + if (ret) + goto out_err; + } + /* add bootargs */ if (cmdline) { ret = fdt_setprop(buf, nodeoffset, "bootargs", @@ -211,3 +321,44 @@ int load_other_segments(struct kimage *image, unsigned long kernel_load_addr, image->arch.dtb_buf = NULL; return ret; } + +int load_crashdump_segments(struct kimage *image) +{ + void *elf_addr; + unsigned long elf_sz; + struct kexec_buf kbuf; + int ret; + + if (image->type != KEXEC_TYPE_CRASH) + return 0; + + /* Prepare elf headers and add a segment */ + ret = prepare_elf_headers(image, &elf_addr, &elf_sz); + if (ret) { + pr_err("Preparing elf core header failed\n"); + return ret; + } + + kbuf.image = image; + kbuf.buffer = elf_addr; + kbuf.bufsz = elf_sz; + kbuf.memsz = elf_sz; + kbuf.buf_align = PAGE_SIZE; + kbuf.buf_min = crashk_res.start; + kbuf.buf_max = crashk_res.end + 1; + kbuf.top_down = 1; + + ret = kexec_add_buffer(&kbuf); + if (ret) { + vfree(elf_addr); + return ret; + } + image->arch.elf_headers = elf_addr; + image->arch.elf_headers_sz = elf_sz; + image->arch.elf_load_addr = kbuf.mem; + + pr_debug("Loaded elf core header at 0x%lx bufsz=0x%lx memsz=0x%lx\n", + image->arch.elf_load_addr, elf_sz, elf_sz); + + return ret; +} diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index 2e21c3ab0165..fc791ba545cd 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -1336,7 +1336,7 @@ static int prepare_elf64_headers(struct crash_elf_data *ced, phdr->p_filesz = phdr->p_memsz = VMCOREINFO_NOTE_SIZE; (ehdr->e_phnum)++; -#ifdef CONFIG_X86_64 +#if defined(CONFIG_X86_64) || defined(CONFIG_ARM64) /* Prepare PT_LOAD type program header for kernel text region */ phdr = (Elf64_Phdr *)bufp; bufp += sizeof(Elf64_Phdr);