From: takahiro.akashi@linaro.org (AKASHI Takahiro)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v22 1/8] arm64: kdump: reserve memory for crash dump kernel
Date: Thu, 14 Jul 2016 00:42:26 +0900 [thread overview]
Message-ID: <20160713154225.GA25403@porco> (raw)
In-Reply-To: <e7034684-00ec-c441-c806-ae090d10cceb@arm.com>
Hi,
On Wed, Jul 13, 2016 at 10:12:12AM +0100, Suzuki K Poulose wrote:
> On 12/07/16 06:05, AKASHI Takahiro wrote:
> >On the startup of primary kernel, the memory region used by crash dump
> >kernel must be specified by "crashkernel=" kernel parameter.
> >reserve_crashkernel() will allocate and reserve the region for later use.
> >
> >User space tools, like kexec-tools, will be able to find that region as
> > - "Crash kernel" in /proc/iomem, or
> > - "linux,crashkernel-base" and "linux,crashkernel-size" under
> > /sys/firmware/devicetree/base/chosen
> >
> >Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
> >Signed-off-by: Mark Salter <msalter@redhat.com>
> >Signed-off-by: Pratyush Anand <panand@redhat.com>
> >Reviewed-by: James Morse <james.morse@arm.com>
>
> Minor nits below.
>
> >---
> > arch/arm64/kernel/setup.c | 7 ++-
> > arch/arm64/mm/init.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++
> > 2 files changed, 121 insertions(+), 1 deletion(-)
> >
> >diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
> >index c1509e6..cb5eee0 100644
> >--- a/arch/arm64/kernel/setup.c
> >+++ b/arch/arm64/kernel/setup.c
> >@@ -31,7 +31,6 @@
> > #include <linux/screen_info.h>
> > #include <linux/init.h>
> > #include <linux/kexec.h>
> >-#include <linux/crash_dump.h>
> > #include <linux/root_dev.h>
> > #include <linux/cpu.h>
> > #include <linux/interrupt.h>
> >@@ -222,6 +221,12 @@ static void __init request_standard_resources(void)
> > kernel_data.end <= res->end)
> > request_resource(res, &kernel_data);
> > }
> >+
> >+#ifdef CONFIG_KEXEC_CORE
> >+ /* User space tools will find "Crash kernel" region in /proc/iomem. */
> >+ if (crashk_res.end)
> >+ insert_resource(&iomem_resource, &crashk_res);
> >+#endif
>
> nit: Could we not do this from reserve_crashkernel() ?
Reserve_crashkernel() should be called before arm64_memblock_init().
If the code above is put in reserve_crashkernel(), the inserted
resource will be gone later by calling request_resource() in
request_standard_resource() because the crashkernel memory is part of
System RAM.
> >
> > #include <asm/boot.h>
> > #include <asm/fixmap.h>
> >@@ -76,6 +78,117 @@ static int __init early_initrd(char *p)
> > early_param("initrd", early_initrd);
> > #endif
> >
> >+#ifdef CONFIG_KEXEC_CORE
> >+static unsigned long long crash_size, crash_base;
> >+static struct property crash_base_prop = {
> >+ .name = "linux,crashkernel-base",
> >+ .length = sizeof(u64),
> >+ .value = &crash_base
> >+};
> >+static struct property crash_size_prop = {
> >+ .name = "linux,crashkernel-size",
> >+ .length = sizeof(u64),
> >+ .value = &crash_size,
> >+};
> >+
>
> >+
> >+/*
> >+ * reserve_crashkernel() - reserves memory for crash kernel
> >+ *
> >+ * This function reserves memory area given in "crashkernel=" kernel command
> >+ * line parameter. The memory reserved is used by dump capture kernel when
> >+ * primary kernel is crashing.
> >+ */
> >+static void __init reserve_crashkernel(void)
> >+{
> >+ int ret;
> >+
> >+ ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),
> >+ &crash_size, &crash_base);
> >+ /* no crashkernel= or invalid value specified */
> >+ if (ret || !crash_size)
> >+ return;
> >+
> >+ if (crash_base == 0) {
>
> ...
>
> >+ memblock_reserve(crash_base, crash_size);
> >+
> >+ } else {
>
> ...
>
> >+
> >+ memblock_reserve(crash_base, crash_size);
>
> >+ }
>
> Nit: you could move the memblock_reserve() here to a single place.
Sure.
Thanks,
-Takahiro AKASHI
> >+
> >+ pr_info("Reserving %lldMB of memory at %lldMB for crashkernel\n",
> >+ crash_size >> 20, crash_base >> 20);
> >+
> >+ crashk_res.start = crash_base;
> >+ crashk_res.end = crash_base + crash_size - 1;
>
> As mentioned above, may be we could move the insert_resource() here, which
> would keep the generic setup.c code cleaner and is a bit more reader friendly.
>
> >+}
> >+#else
>
> Suzuki
>
next prev parent reply other threads:[~2016-07-13 15:42 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-12 5:05 [PATCH v22 0/8] arm64: add kdump support AKASHI Takahiro
2016-07-12 5:05 ` [PATCH v22 1/8] arm64: kdump: reserve memory for crash dump kernel AKASHI Takahiro
2016-07-13 9:12 ` Suzuki K Poulose
2016-07-13 15:42 ` AKASHI Takahiro [this message]
2016-07-19 9:39 ` Dennis Chen
2016-07-19 10:28 ` AKASHI Takahiro
2016-07-19 10:41 ` Dennis Chen
2016-07-19 12:48 ` Mark Salter
2016-07-19 13:27 ` Mark Rutland
2016-07-20 2:17 ` AKASHI Takahiro
2016-07-20 3:48 ` Dennis Chen
2016-07-19 23:34 ` AKASHI Takahiro
2016-07-12 5:05 ` [PATCH v22 2/8] arm64: limit memory regions based on DT property, usable-memory-range AKASHI Takahiro
2016-07-18 18:04 ` James Morse
2016-07-19 8:35 ` AKASHI Takahiro
2016-07-19 10:06 ` Dennis Chen
2016-07-19 11:01 ` AKASHI Takahiro
2016-07-20 3:39 ` Dennis Chen
2016-07-20 4:22 ` AKASHI Takahiro
2016-07-20 4:36 ` Dennis Chen
2016-07-21 0:57 ` AKASHI Takahiro
2016-07-22 13:55 ` James Morse
2016-07-25 5:27 ` AKASHI Takahiro
2016-08-04 6:21 ` AKASHI Takahiro
2016-08-09 16:22 ` James Morse
2016-07-12 5:05 ` [PATCH v22 3/8] arm64: kdump: implement machine_crash_shutdown() AKASHI Takahiro
2016-07-13 9:32 ` Suzuki K Poulose
2016-07-13 16:00 ` AKASHI Takahiro
2016-07-12 5:05 ` [PATCH v22 4/8] arm64: kdump: add kdump support AKASHI Takahiro
2016-07-12 5:05 ` [PATCH v22 5/8] arm64: kdump: add VMCOREINFO's for user-space coredump tools AKASHI Takahiro
2016-07-12 5:05 ` [PATCH v22 6/8] arm64: kdump: enable kdump in the arm64 defconfig AKASHI Takahiro
2016-07-12 5:05 ` [PATCH v22 7/8] arm64: kdump: update a kernel doc AKASHI Takahiro
2016-07-12 5:05 ` [PATCH v22 8/8] Documentation: dt: chosen properties for arm64 kdump AKASHI Takahiro
2016-07-12 10:07 ` Mark Rutland
2016-07-13 15:14 ` AKASHI Takahiro
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=20160713154225.GA25403@porco \
--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).