linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: will.deacon@arm.com (Will Deacon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v12 11/16] arm64: kdump: reserve memory for crash dump kernel
Date: Tue, 15 Dec 2015 17:29:54 +0000	[thread overview]
Message-ID: <20151215172953.GD353@arm.com> (raw)
In-Reply-To: <bc962621bd537244b54fc35627a456ab40bc6d26.1448403503.git.geoff@infradead.org>

On Tue, Nov 24, 2015 at 10:25:34PM +0000, Geoff Levand wrote:
> From: AKASHI Takahiro <takahiro.akashi@linaro.org>
> 
> On primary kernel, the memory region used by crash dump kernel must be
> specified by "crashkernel=" boot parameter. reserve_crashkernel()
> will allocate and reserve the region for later use.
> 
> User space tools will be able to find the region marked as "Crash kernel"
> in /proc/iomem.
> 
> Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
> ---
>  arch/arm64/kernel/setup.c |  7 +++++-
>  arch/arm64/mm/init.c      | 54 +++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 60 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
> index 8119479..f9fffc9 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>
> @@ -221,6 +220,12 @@ static void __init request_standard_resources(void)
>  		    kernel_data.end <= res->end)
>  			request_resource(res, &kernel_data);
>  	}
> +
> +#ifdef CONFIG_KEXEC
> +	/* User space tools will find "Crash kernel" region in /proc/iomem. */
> +	if (crashk_res.end)
> +		insert_resource(&iomem_resource, &crashk_res);
> +#endif

Why can't this bit be moved into reserved_crashkernel, at the end?

>  }
>  
>  #ifdef CONFIG_BLK_DEV_INITRD
> diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
> index 17bf39a..24f0a1c 100644
> --- a/arch/arm64/mm/init.c
> +++ b/arch/arm64/mm/init.c
> @@ -34,6 +34,7 @@
>  #include <linux/dma-contiguous.h>
>  #include <linux/efi.h>
>  #include <linux/swiotlb.h>
> +#include <linux/kexec.h>
>  
>  #include <asm/fixmap.h>
>  #include <asm/memory.h>
> @@ -66,6 +67,55 @@ static int __init early_initrd(char *p)
>  early_param("initrd", early_initrd);
>  #endif
>  
> +#ifdef CONFIG_KEXEC
> +/*
> + * 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)
> +{
> +	unsigned long long crash_size = 0, crash_base = 0;
> +	int ret;
> +
> +	ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),
> +				&crash_size, &crash_base);
> +	if (ret)
> +		return;

What's the point in ret?

> +
> +	if (crash_base == 0) {
> +		crash_base = memblock_alloc(crash_size, 1 << 21);

What is this magic number? How about SZ_2M and a comment mentioning the
arm64 boot protocol?

> +		if (crash_base == 0) {
> +			pr_warn("Unable to allocate crashkernel (size:%llx)\n",
> +				crash_size);
> +			return;
> +		}
> +	} else {
> +		/* User specifies base address explicitly. */
> +		if (!memblock_is_region_memory(crash_base, crash_size) ||
> +			memblock_is_region_reserved(crash_base, crash_size)) {
> +			pr_warn("crashkernel has wrong address or size\n");
> +			return;
> +		}
> +
> +		if (crash_base & ((1 << 21) - 1)) {

IS_ALIGNED

> +			pr_warn("crashkernel base address is not 2MB aligned\n");
> +			return;
> +		}
> +
> +		memblock_reserve(crash_base, crash_size);
> +	}
> +
> +	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;
> +}

#else

static void __init reserve_crashkernel(void) {};

Will

  reply	other threads:[~2015-12-15 17:29 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 03/16] arm64: Add new hcall HVC_CALL_FUNC 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 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 [this message]
2015-12-16  5:19     ` AKASHI Takahiro
2015-12-16  7:36       ` Pratyush Anand
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
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

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=20151215172953.GD353@arm.com \
    --to=will.deacon@arm.com \
    --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).