From: takahiro.akashi@linaro.org (AKASHI Takahiro)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v12 13/16] arm64: kdump: add kdump support
Date: Wed, 16 Dec 2015 14:41:35 +0900 [thread overview]
Message-ID: <5670F98F.7030104@linaro.org> (raw)
In-Reply-To: <20151215174555.GE353@arm.com>
On 12/16/2015 02:45 AM, Will Deacon wrote:
> On Tue, Nov 24, 2015 at 10:25:34PM +0000, Geoff Levand wrote:
>> From: AKASHI Takahiro <takahiro.akashi@linaro.org>
>>
>> On crash dump kernel, all the information about primary kernel's core
>> image is available in elf core header specified by "elfcorehdr=" boot
>> parameter. reserve_elfcorehdr() will set aside the region to avoid any
>> corruption by crash dump kernel.
>>
>> Crash dump kernel will access the system memory of primary kernel via
>> copy_oldmem_page(), which reads one page by ioremap'ing it since it does
>> not reside in linear mapping on crash dump kernel.
>> Please note that we should add "mem=X[MG]" boot parameter to limit the
>> memory size and avoid the following assertion at ioremap():
>> if (WARN_ON(pfn_valid(__phys_to_pfn(phys_addr))))
>> return NULL;
>> when accessing any pages beyond the usable memories of crash dump kernel.
>>
>> We also need our own elfcorehdr_read() here since the weak definition of
>> elfcorehdr_read() utilizes copy_oldmem_page() and will hit the assertion
>> above on arm64.
>>
>> Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
>> ---
>> arch/arm64/Kconfig | 12 +++++++
>> arch/arm64/kernel/Makefile | 1 +
>> arch/arm64/kernel/crash_dump.c | 71 ++++++++++++++++++++++++++++++++++++++++++
>> arch/arm64/mm/init.c | 29 +++++++++++++++++
>> 4 files changed, 113 insertions(+)
>> create mode 100644 arch/arm64/kernel/crash_dump.c
>>
>> diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
>> index c23fd77..4bac7dc 100644
>> --- a/arch/arm64/Kconfig
>> +++ b/arch/arm64/Kconfig
>> @@ -545,6 +545,18 @@ config KEXEC
>> but it is independent of the system firmware. And like a reboot
>> you can start any kernel with it, not just Linux.
>>
>> +config CRASH_DUMP
>> + bool "Build kdump crash kernel"
>> + help
>> + Generate crash dump after being started by kexec. This should
>> + be normally only set in special crash dump kernels which are
>> + loaded in the main kernel with kexec-tools into a specially
>> + reserved region and then later executed after a crash by
>> + kdump/kexec. The crash dump kernel must be compiled to a
>> + memory address not used by the main kernel.
>
> What does this even mean? How do I "compile to a memory address not used
> by the main kernel"?
Well, it's just a copy from arm, but right, it's ambiguous.
I will remove that text.
>> diff --git a/arch/arm64/kernel/crash_dump.c b/arch/arm64/kernel/crash_dump.c
>> new file mode 100644
>> index 0000000..3d86c0a
>> --- /dev/null
>> +++ b/arch/arm64/kernel/crash_dump.c
>> @@ -0,0 +1,71 @@
>> +/*
>> + * Routines for doing kexec-based kdump
>> + *
>> + * Copyright (C) 2014 Linaro Limited
>> + * Author: AKASHI Takahiro <takahiro.akashi@linaro.org>
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License version 2 as
>> + * published by the Free Software Foundation.
>> + */
>> +
>> +#include <linux/crash_dump.h>
>> +#include <linux/errno.h>
>> +#include <linux/io.h>
>> +#include <linux/memblock.h>
>> +#include <linux/uaccess.h>
>> +#include <asm/memory.h>
>> +
>> +/**
>> + * copy_oldmem_page() - copy one page from old kernel memory
>> + * @pfn: page frame number to be copied
>> + * @buf: buffer where the copied page is placed
>> + * @csize: number of bytes to copy
>> + * @offset: offset in bytes into the page
>> + * @userbuf: if set, @buf is in a user address space
>> + *
>> + * This function copies one page from old kernel memory into buffer pointed by
>> + * @buf. If @buf is in userspace, set @userbuf to %1. Returns number of bytes
>> + * copied or negative error in case of failure.
>> + */
>> +ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
>> + size_t csize, unsigned long offset,
>> + int userbuf)
>> +{
>> + void *vaddr;
>> +
>> + if (!csize)
>> + return 0;
>> +
>> + vaddr = ioremap_cache(pfn << PAGE_SHIFT, PAGE_SIZE);
>
> pfn_to_page
Maybe __pfn_to_phsy()?
>> + if (!vaddr)
>> + return -ENOMEM;
>> +
>> + if (userbuf) {
>> + if (copy_to_user(buf, vaddr + offset, csize)) {
>> + iounmap(vaddr);
>> + return -EFAULT;
>> + }
>> + } else {
>> + memcpy(buf, vaddr + offset, csize);
>> + }
>> +
>> + iounmap(vaddr);
>> +
>> + return csize;
>> +}
>> +
>> +/**
>> + * elfcorehdr_read - read from ELF core header
>> + * @buf: buffer where the data is placed
>> + * @csize: number of bytes to read
>> + * @ppos: address in the memory
>> + *
>> + * This function reads @count bytes from elf core header which exists
>> + * on crash dump kernel's memory.
>> + */
>> +ssize_t elfcorehdr_read(char *buf, size_t count, u64 *ppos)
>> +{
>> + memcpy(buf, phys_to_virt((phys_addr_t)*ppos), count);
>> + return count;
>> +}
>
> I know you say that we have to override this function so that we don't
> hit the pfn_valid warning in ioremap, but what guarantees that the ELF
> header of the crashed kernel is actually mapped in our linear mapping?
Well, in fact, it depends on kexec-tools.
In the current implementation for arm64, the elf core header is allocated
within the usable memory of crash dump kernel.
Should we add some check here?
>> diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
>> index 24f0a1c..52a1469 100644
>> --- a/arch/arm64/mm/init.c
>> +++ b/arch/arm64/mm/init.c
>> @@ -35,6 +35,7 @@
>> #include <linux/efi.h>
>> #include <linux/swiotlb.h>
>> #include <linux/kexec.h>
>> +#include <linux/crash_dump.h>
>>
>> #include <asm/fixmap.h>
>> #include <asm/memory.h>
>> @@ -116,6 +117,31 @@ static void __init reserve_crashkernel(void)
>> }
>> #endif /* CONFIG_KEXEC */
>>
>> +#ifdef CONFIG_CRASH_DUMP
>> +/*
>> + * reserve_elfcorehdr() - reserves memory for elf core header
>> + *
>> + * This function reserves elf core header given in "elfcorehdr=" kernel
>> + * command line parameter. This region contains all the information about
>> + * primary kernel's core image and is used by a dump capture kernel to
>> + * access the system memory on primary kernel.
>> + */
>> +static void __init reserve_elfcorehdr(void)
>> +{
>> + if (!elfcorehdr_size)
>> + return;
>> +
>> + if (memblock_is_region_reserved(elfcorehdr_addr, elfcorehdr_size)) {
>> + pr_warn("elfcorehdr is overlapped\n");
>> + return;
>> + }
>> +
>> + memblock_reserve(elfcorehdr_addr, elfcorehdr_size);
>> +
>> + pr_info("Reserving %lldKB of memory at %lldMB for elfcorehdr\n",
>> + elfcorehdr_size >> 10, elfcorehdr_addr >> 20);
>
> I'd have thought it would be more useful to print the address as an
> address rather than a size.
Yeah, I totally agree, but all the other archs, including x86 and arm,
print the address in "%lldMB" format.
If you like, I can fix it.
>> +}
>
> Similar #else trick here.
Sure.
Thanks,
-Takahiro AKASHI
> Will
>
prev parent reply other threads:[~2015-12-16 5:41 UTC|newest]
Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-24 22:25 [PATCH v12 00/16] arm64 kexec kernel patches v12 Geoff Levand
2015-11-24 22:25 ` [PATCH v12 02/16] arm64: Convert hcalls to use HVC immediate value Geoff Levand
2015-11-24 22:25 ` [PATCH v12 04/16] arm64: kvm: allows kvm cpu hotplug Geoff Levand
2015-11-27 13:54 ` Marc Zyngier
2015-12-02 22:40 ` Ashwin Chaugule
2015-12-03 13:55 ` Ashwin Chaugule
2015-12-03 13:58 ` Marc Zyngier
2015-12-10 18:31 ` Geoff Levand
2015-12-11 16:31 ` Will Deacon
2015-12-15 8:48 ` AKASHI Takahiro
2015-12-10 18:44 ` Shi, Yang
2015-12-11 8:09 ` AKASHI Takahiro
2015-12-14 18:00 ` Shi, Yang
2015-12-11 8:06 ` AKASHI Takahiro
2015-12-11 13:00 ` Shanker Donthineni
2015-12-11 16:28 ` Marc Zyngier
2015-12-11 18:00 ` Shanker Donthineni
2015-12-11 18:11 ` Marc Zyngier
2015-12-11 19:11 ` Shanker Donthineni
2015-12-11 20:13 ` Ashwin Chaugule
2015-12-14 7:33 ` AKASHI Takahiro
2015-12-14 17:33 ` Marc Zyngier
2015-12-15 7:51 ` AKASHI Takahiro
2015-12-15 8:45 ` Marc Zyngier
2015-12-15 9:51 ` AKASHI Takahiro
2015-12-15 10:13 ` Marc Zyngier
2015-11-24 22:25 ` [PATCH v12 01/16] arm64: Fold proc-macros.S into assembler.h Geoff Levand
2015-11-24 22:25 ` [PATCH v12 06/16] Revert "arm64: mm: remove unused cpu_set_idmap_tcr_t0sz function" Geoff Levand
2015-11-24 22:25 ` [PATCH v12 07/16] Revert "arm64: remove dead code" Geoff Levand
2015-11-24 22:25 ` [PATCH v12 05/16] arm64: Add back cpu_reset routines Geoff Levand
2015-11-27 14:19 ` Marc Zyngier
2015-11-30 5:28 ` Pratyush Anand
2015-11-30 10:40 ` Marc Zyngier
2015-12-02 22:57 ` Geoff Levand
2015-12-03 9:32 ` Will Deacon
2015-12-10 0:49 ` Geoff Levand
2015-12-10 10:17 ` Will Deacon
2015-11-30 20:03 ` Geoff Levand
2015-12-01 9:38 ` Marc Zyngier
2015-11-24 22:25 ` [PATCH v12 03/16] arm64: Add new hcall HVC_CALL_FUNC Geoff Levand
2015-11-24 22:25 ` [PATCH v12 08/16] arm64/kexec: Add core kexec support Geoff Levand
2015-11-27 13:13 ` Pratyush Anand
2015-11-30 18:51 ` Geoff Levand
2015-12-01 2:16 ` Pratyush Anand
2015-12-01 18:32 ` Azriel Samson
2015-12-02 22:49 ` Geoff Levand
2015-12-03 4:37 ` Azriel Samson
2015-12-03 19:56 ` Geoff Levand
2015-12-04 0:39 ` Azriel Samson
2015-12-04 3:54 ` Pratyush Anand
2015-12-07 18:47 ` Geoff Levand
2015-12-03 6:09 ` Pratyush Anand
2015-12-01 19:03 ` Mark Rutland
2015-12-02 21:08 ` Geoff Levand
2015-12-03 16:06 ` Mark Rutland
2015-12-15 18:29 ` Will Deacon
2015-12-16 0:14 ` Geoff Levand
2015-12-16 7:18 ` Pratyush Anand
2015-12-16 9:30 ` James Morse
2015-12-16 10:32 ` Pratyush Anand
2015-12-16 0:14 ` [PATCH v12.4] " Geoff Levand
2015-11-24 22:25 ` [PATCH v12 14/16] arm64: kdump: update a kernel doc Geoff Levand
2015-12-15 17:17 ` Will Deacon
2015-12-16 5:48 ` AKASHI Takahiro
2015-11-24 22:25 ` [PATCH v12 16/16] arm64: kdump: relax BUG_ON() if more than one cpus are still active Geoff Levand
2015-12-15 17:05 ` Will Deacon
2015-12-16 5:51 ` AKASHI Takahiro
2015-11-24 22:25 ` [PATCH v12 15/16] arm64: kdump: enable kdump in the arm64 defconfig Geoff Levand
2015-11-24 22:25 ` [PATCH v12 12/16] arm64: kdump: implement machine_crash_shutdown() Geoff Levand
2015-11-27 14:39 ` Marc Zyngier
2015-12-10 11:34 ` AKASHI Takahiro
2015-12-10 11:44 ` Marc Zyngier
2015-12-10 12:55 ` AKASHI Takahiro
2015-12-10 13:43 ` Marc Zyngier
2015-12-03 4:15 ` Pratyush Anand
2015-12-10 11:42 ` AKASHI Takahiro
2015-12-10 11:50 ` Pratyush Anand
2015-11-24 22:25 ` [PATCH v12 10/16] arm64/kexec: Enable kexec in the arm64 defconfig Geoff Levand
2015-11-24 22:25 ` [PATCH v12 11/16] arm64: kdump: reserve memory for crash dump kernel Geoff Levand
2015-12-15 17:29 ` Will Deacon
2015-12-16 5:19 ` AKASHI Takahiro
2015-12-16 7:36 ` Pratyush Anand
2015-11-24 22:25 ` [PATCH v12 09/16] arm64/kexec: Add pr_devel output Geoff Levand
2015-12-15 17:15 ` Will Deacon
2015-12-16 0:45 ` Geoff Levand
2015-12-16 0:46 ` [PATCH v12.4] arm64/kexec: Add pr_debug output Geoff Levand
2015-11-24 22:25 ` [PATCH v12 13/16] arm64: kdump: add kdump support Geoff Levand
2015-12-15 17:45 ` Will Deacon
2015-12-16 5:41 ` AKASHI Takahiro [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5670F98F.7030104@linaro.org \
--to=takahiro.akashi@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).