From patchwork Mon Dec 9 03:03:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 180980 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp3801206ile; Sun, 8 Dec 2019 19:02:37 -0800 (PST) X-Google-Smtp-Source: APXvYqzkSmz18afRLRlATHQ9AE+6B3RaHuV/bIg5rGSwwoSDmLAZnSBocJ1uXu3sd6yl/QTKl0cm X-Received: by 2002:a05:6808:618:: with SMTP id y24mr21597384oih.86.1575860556926; Sun, 08 Dec 2019 19:02:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575860556; cv=none; d=google.com; s=arc-20160816; b=og2f77+vC/pQE3kWmPgucL7XQWYVFz6PgJYg1BNU9CaPjIuUo7K2pU4yJtcKgUyeob 2ztl0QEosgQ32iNwo3uRDJYsPLnEE+aAXzeatK7/3bp0mmqEYdrQmbkwLWW/1c5DXuGY 2iA2Su95EkF5g9Di9Kh2iQmCshy6Mmg6xhY55y5GraF+T9FRVYg05AGd58OSrhIwh1Jy Q3opDpf9hWxDaiAwJynA/td8D85cgZ2XdT/lxcRoMCrQfG3PUnQX1OyL4OmbSE6kjYWy jMssAdZmgr0vpqeM0Hr72LsO8QM3IY8lVZyw+FN27iZcETWsW8d6oe1blcvop8TrCrQT GzuQ== 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=K1LLOVeJtONoqpWzLiZzppWNSNBZ0v/NxRhgPKC4b2k=; b=taoh2NQD8uWzXISgW8lLKeUZMuSuv3KqRG4XVoluXbsOOFy2NYccgrRZss47a00gRj SGawS8eJyQdO0HR7D3sadxFlCIeME3t4iU0J2yofSDm593JGMvd9rAj+uAXo1oTF8Sr4 D0KobKLOcGMaIeDmXNs9J/0fctkqt88yLR8drXYXHk+QRcKyLw4wYFRaBzgc/optRHLp fM0wxWKHiExAoli7t6SqMzKE9TWv6peGzVNx0uEM3EqCLNWx0b1+eTmShYWSOihm1ZZG XUDVvv/Db/WAq/fUSd++4SoNFNR+POMbpBw+Vaiyhdj73FWPXNBny6ohiltNYzVxSkah Lt6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=O7dFI6rD; 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 l2si11472254oti.303.2019.12.08.19.02.36; Sun, 08 Dec 2019 19:02:36 -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=O7dFI6rD; 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 S1727015AbfLIDCY (ORCPT + 27 others); Sun, 8 Dec 2019 22:02:24 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:43629 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726669AbfLIDCY (ORCPT ); Sun, 8 Dec 2019 22:02:24 -0500 Received: by mail-pl1-f193.google.com with SMTP id q16so5159550plr.10 for ; Sun, 08 Dec 2019 19:02:23 -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=K1LLOVeJtONoqpWzLiZzppWNSNBZ0v/NxRhgPKC4b2k=; b=O7dFI6rD2zZnI2kre5EzJMO+Bw36s1NGTVWnohQAwFMBsg/xt8z9WShTKOKuP4qDJ9 F0kZkuBVevWNnPNkQXqblak50hDfM/Crlj2vR6U/6aNTwc5FTvde+cCcdeSc2mfEtKt+ 8PIWMj0rPUhWUPX2YgMecsL05uwxCVpP0XUO/9B4dmesxsn4eVeKp0dBdGn6A2PE/4Yq /bAxZQL43RAUrYfrSozwIyyxIz/A59jgQkqOFJnyoIOwxwoYmbTasHpUb2WW75PyGH5o VG2f4CBmngK6zm0RIhDF4sCr8wJNMGeBQBBfSW0f6hlcmf+LNVE+X6UZqM581U1V7Nv3 TjTA== 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=K1LLOVeJtONoqpWzLiZzppWNSNBZ0v/NxRhgPKC4b2k=; b=KU/XFsp97UlE0fKe4w41gpjZtkaDNOPns9/kmRbS26qsrI6bppCqLzt4rULszIDyvE NZ3FlNfRsRq26e+Mx783PhEgUDf6hLlp6AdfmhQVO1ttkaIj8bmewsBFLVT4gZkU7p1K UbwhvoU7A6tl+9MeveZY9QSULUP6svL7Z9+MZQCwcK/3Rzeqfz3IWAZPKp24ZAO/gDlg UyIn9zqlbF20sq5NAmjozRi3aEnf/dckelFT0zF8+BO5f+Ihe7KScf6YTlhbls63Nbg4 q5m9JO8/8p3iCldqG9v6V6s2erJeuDviOW8ErZHYFnpL6rd0vK9lxfImK3eTY4O/k8Vp 7blw== X-Gm-Message-State: APjAAAVgdYA+lQEQt1kWWHyicd6Dpcyz9AeCC3k0ko0287tUxLWq2yCZ 3uuk0wcY7wtbEoxnmJrGYe/QJA== X-Received: by 2002:a17:902:ab86:: with SMTP id f6mr24215136plr.78.1575860543219; Sun, 08 Dec 2019 19:02:23 -0800 (PST) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id b2sm7497299pjq.3.2019.12.08.19.02.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Dec 2019 19:02:22 -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, kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, AKASHI Takahiro Subject: [PATCH v3 2/2] arm64: kexec_file: add crash dump support Date: Mon, 9 Dec 2019 12:03:45 +0900 Message-Id: <20191209030345.5735-3-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191209030345.5735-1-takahiro.akashi@linaro.org> References: <20191209030345.5735-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 --- 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..f1d1bb895fd2 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 = 0; + 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;