From patchwork Fri Sep 15 10:59:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 112718 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp471163qgf; Fri, 15 Sep 2017 03:58:42 -0700 (PDT) X-Received: by 10.98.61.156 with SMTP id x28mr24266798pfj.295.1505473122582; Fri, 15 Sep 2017 03:58:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505473122; cv=none; d=google.com; s=arc-20160816; b=0J7XY8E9bLDj/0Gjf9802ATeAVs6iZeTso3sR2DH1P5/WQTwxjXIgvcwPJoJQXLIhi HOKaEhE/tm2R8Imjn9stji6M8yhaYVTpo6GmpsH9hbhHlir/lYwiBe6H/Fw+Ply+VgeJ rn87F8uXsiPlED3bZ5lrnch4YwjYLRIz3GLBWCgOAxw+FDoWEwL2CNQ71nRrrOakK77W BvXyFkayuwfn1HmVltcnceDNvqku+JffPlTcT33t9Ietrd/EyLE9SVls1pxqMlTx0Clj Xb/vJMMBMWjQheyju3pFjETiqx7ZZ8fh9BDnWUTGRFXTgSNXUII5Ue57RE+7cWZJrEkF Fv0g== 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=vU3bJbVRQ6O+Bg7t4tZq2JCPlwk3UkAti/RfJLhOxQc=; b=dcE24Hqau4zTGOGT6wc3eybrQf646hcGWNAuczMgmkvnJxVFiqvrN01OwqnR456Ktf fNpHNJPiZ+NPq+JEQXF6a+rgOpLa9SnszHt5yaIZq+lU2fjJbiH/RNaDAcEt3hB4ekyA jq+a5tOC89D5RSL9xVDisC9yAGxFooQKr+V0Jh/ZJKfxVvKdeTweZ1VhuCmLeiWhtnfJ UFdgsNNAnzQT6Q1OovOdP413GZGpYNf+pUh1l8sFlMNBaUjTxic7tGj6UBKOm7/niagt A667/2tn4HIQ6V/1I3vC0nGUmadWYz78earNEFUgCaeWvXC+lflS0VnjbOXPIPOCXTej ciYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ewj3qusx; 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 f61si525910plb.25.2017.09.15.03.58.42; Fri, 15 Sep 2017 03:58:42 -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=ewj3qusx; 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 S1751722AbdIOK6i (ORCPT + 26 others); Fri, 15 Sep 2017 06:58:38 -0400 Received: from mail-pg0-f45.google.com ([74.125.83.45]:53961 "EHLO mail-pg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751619AbdIOK6g (ORCPT ); Fri, 15 Sep 2017 06:58:36 -0400 Received: by mail-pg0-f45.google.com with SMTP id j70so1300336pgc.10 for ; Fri, 15 Sep 2017 03:58:36 -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=vU3bJbVRQ6O+Bg7t4tZq2JCPlwk3UkAti/RfJLhOxQc=; b=ewj3qusxnF7xwIVYUyfh3gW3yZJudIApnL9Zo7KdkOObEUJuJkE4mQ6pZlPlQ7c2QN jWVWadqe0tnqhwDDR6zmTFodU0UgycO1PFJ3vd3i0i5yUzXivgbj4wEVy9ITRHmHfm1Y /4bWCe5y4X4vJppt/SxRVyvTn6iSsINaSwc9Q= 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=vU3bJbVRQ6O+Bg7t4tZq2JCPlwk3UkAti/RfJLhOxQc=; b=eNsEENa22907wYBq0yE67vb7+SGSB/l5L5uvwM77JjO8Um8UO+MZ1/PTqVYarrDVnP EVWv7Aiovuufqpc8mkJLwSAh5qryFhM36bY5YUTIo1HJNlZcO2vo+Q8DOSzCLxHw9vgv TwCffFcZLtmHP2vetxjRSxy21cZyYGLy5BuiXcMBEN8ZAsHbrw3KrZWabTIxqEGFkznP RnQl6XKcEdR5N59/pzH60oAEBMS4cEqrdUq/BWMMJTlO1bZ5iOWmr5E1/B2YeYkH0qkD LkAX3FNKLpkSxFTxE90MGAmMBx1y/JDic61XY9Etpt7a55FXbKtbY+qhMrk2cnxUe5b6 N2aA== X-Gm-Message-State: AHPjjUhOf+Tu5MhPGe1/I42qx9ZD3FZM5aekKXJy9YVt/w19lANVT7nF xmfla4sKkNOWdG9P X-Google-Smtp-Source: ADKCNb5gbjGf9smjm6uOjuIsdlX/ojXxVswdiIVNoKew1L6GzOk4I5oVR9dvyDoEnpZ1Sql99DsYGw== X-Received: by 10.99.120.8 with SMTP id t8mr18075866pgc.122.1505473115750; Fri, 15 Sep 2017 03:58:35 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id c85sm1896816pfj.118.2017.09.15.03.58.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Sep 2017 03:58:35 -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 Cc: kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, AKASHI Takahiro Subject: [PATCH v3 08/10] arm64: kexec_file: set up for crash dump adding elf core header Date: Fri, 15 Sep 2017 19:59:30 +0900 Message-Id: <20170915105932.25338-9-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170915105932.25338-1-takahiro.akashi@linaro.org> References: <20170915105932.25338-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 | 149 +++++++++++++++++++++++++++++++++ kernel/kexec_file.c | 2 +- 3 files changed, 155 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 09be2674c2ab..e4671610fb12 100644 --- a/arch/arm64/kernel/machine_kexec_file.c +++ b/arch/arm64/kernel/machine_kexec_file.c @@ -32,6 +32,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 kexec_kernel_post_load_cleanup(image); } @@ -48,6 +52,77 @@ 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; + int i; + + if (cells == 1) { + val32 = cpu_to_fdt32((u32)val64); + memcpy(buf, &val32, sizeof(val32)); + } else { + for (i = 0; i < (cells * sizeof(u32) - sizeof(u64)); i++) + *(char *)buf++ = 0; + + 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) +{ + u64 range[2]; + void *prop; + size_t buf_size; + int result; + + prop = range; + buf_size = (__dt_root_addr_cells + __dt_root_size_cells) * sizeof(u32); + + fill_property(prop, addr, __dt_root_addr_cells); + prop += __dt_root_addr_cells * sizeof(u32); + + fill_property(prop, size, __dt_root_size_cells); + prop += __dt_root_size_cells * sizeof(u32); + + result = fdt_setprop(fdt, nodeoffset, name, range, buf_size); + + 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 +135,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 +176,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 +319,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 6a0e31e175af..6b206883f429 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -1317,7 +1317,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);