From: takahiro.akashi@linaro.org (AKASHI Takahiro) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v19 06/13] arm64: kdump: reserve memory for crash dump kernel Date: Tue, 21 Jun 2016 10:23:42 +0900 [thread overview] Message-ID: <20160621012337.GV20774@linaro.org> (raw) In-Reply-To: <576814AF.5060307@arm.com> On Mon, Jun 20, 2016 at 05:07:11PM +0100, James Morse wrote: > Hi, > > On 17/06/16 00:48, Geoff Levand wrote: > > From: AKASHI Takahiro <takahiro.akashi@linaro.org> > > > > 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 marked > > as "Crash kernel" in /proc/iomem. > > > diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c > > index d45f862..45f1319 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/boot.h> > > #include <asm/fixmap.h> > > @@ -76,6 +77,65 @@ static int __init early_initrd(char *p) > > early_param("initrd", early_initrd); > > #endif > > > > +#ifdef CONFIG_KEXEC_CORE > > +/* > > + * 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); > > + /* no crashkernel= or invalid value specified */ > > + if (!crash_size) > > + return; > > Should we check ret too? I thought that it was almost OK, but there is the only erroneous case, "crashkernel=SIZE@". Will fix it. > > > + > > + if (crash_base == 0) { > > + /* Current arm64 boot protocol requires 2MB alignment */ > > + crash_base = memblock_find_in_range(0, > > + MEMBLOCK_ALLOC_ACCESSIBLE, crash_size, SZ_2M); > > + if (crash_base == 0) { > > + pr_warn("Unable to allocate crashkernel (size:%llx)\n", > > + crash_size); > > + return; > > + } > > + memblock_reserve(crash_base, crash_size); > > What if memblock_reserve() fails? I don't think it fails because the region has been allocated by memblock_find_in_range() just before. > > > + > > + } 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 (IS_ALIGNED(crash_base, SZ_2M)) { > > !IS_ALIGNED()... Oops, will fix it. > > > + pr_warn("crashkernel base address is not 2MB aligned\n"); > > + return; > > + } > > + > > + memblock_reserve(crash_base, crash_size); > > What if memblock_reserve() fails? The region has been checked with memblock_is_region_reserved(). > > > + } > > + > > + 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) > > +{ > > + ; > > +} > > +#endif /* CONFIG_KEXEC_CORE */ > > + > > /* > > * Return the maximum physical address for ZONE_DMA (DMA_BIT_MASK(32)). It > > * currently assumes that for memory starting above 4G, 32-bit devices will > > @@ -291,6 +351,8 @@ void __init arm64_memblock_init(void) > > } > > #endif > > > > + reserve_crashkernel(); > > + > > early_init_fdt_scan_reserved_mem(); > > > > /* 4GB maximum for 32-bit only capable devices */ > > > > > With those, > Reviewed-by: James Morse <james.morse@arm.com> Thanks, -Takahiro AKASHI > > Thanks, > > James >
WARNING: multiple messages have this Message-ID (diff)
From: AKASHI Takahiro <takahiro.akashi@linaro.org> To: James Morse <james.morse@arm.com> Cc: Mark Rutland <mark.rutland@arm.com>, Geoff Levand <geoff@infradead.org>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, marc.zyngier@arm.com, kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v19 06/13] arm64: kdump: reserve memory for crash dump kernel Date: Tue, 21 Jun 2016 10:23:42 +0900 [thread overview] Message-ID: <20160621012337.GV20774@linaro.org> (raw) In-Reply-To: <576814AF.5060307@arm.com> On Mon, Jun 20, 2016 at 05:07:11PM +0100, James Morse wrote: > Hi, > > On 17/06/16 00:48, Geoff Levand wrote: > > From: AKASHI Takahiro <takahiro.akashi@linaro.org> > > > > 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 marked > > as "Crash kernel" in /proc/iomem. > > > diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c > > index d45f862..45f1319 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/boot.h> > > #include <asm/fixmap.h> > > @@ -76,6 +77,65 @@ static int __init early_initrd(char *p) > > early_param("initrd", early_initrd); > > #endif > > > > +#ifdef CONFIG_KEXEC_CORE > > +/* > > + * 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); > > + /* no crashkernel= or invalid value specified */ > > + if (!crash_size) > > + return; > > Should we check ret too? I thought that it was almost OK, but there is the only erroneous case, "crashkernel=SIZE@". Will fix it. > > > + > > + if (crash_base == 0) { > > + /* Current arm64 boot protocol requires 2MB alignment */ > > + crash_base = memblock_find_in_range(0, > > + MEMBLOCK_ALLOC_ACCESSIBLE, crash_size, SZ_2M); > > + if (crash_base == 0) { > > + pr_warn("Unable to allocate crashkernel (size:%llx)\n", > > + crash_size); > > + return; > > + } > > + memblock_reserve(crash_base, crash_size); > > What if memblock_reserve() fails? I don't think it fails because the region has been allocated by memblock_find_in_range() just before. > > > + > > + } 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 (IS_ALIGNED(crash_base, SZ_2M)) { > > !IS_ALIGNED()... Oops, will fix it. > > > + pr_warn("crashkernel base address is not 2MB aligned\n"); > > + return; > > + } > > + > > + memblock_reserve(crash_base, crash_size); > > What if memblock_reserve() fails? The region has been checked with memblock_is_region_reserved(). > > > + } > > + > > + 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) > > +{ > > + ; > > +} > > +#endif /* CONFIG_KEXEC_CORE */ > > + > > /* > > * Return the maximum physical address for ZONE_DMA (DMA_BIT_MASK(32)). It > > * currently assumes that for memory starting above 4G, 32-bit devices will > > @@ -291,6 +351,8 @@ void __init arm64_memblock_init(void) > > } > > #endif > > > > + reserve_crashkernel(); > > + > > early_init_fdt_scan_reserved_mem(); > > > > /* 4GB maximum for 32-bit only capable devices */ > > > > > With those, > Reviewed-by: James Morse <james.morse@arm.com> Thanks, -Takahiro AKASHI > > Thanks, > > James > _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2016-06-21 1:23 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-16 23:48 [PATCH v19 00/13] arm64 kexec kernel patches Geoff Levand 2016-06-16 23:48 ` Geoff Levand 2016-06-16 23:48 ` [PATCH v19 05/13] arm64/kexec: Add pr_debug output Geoff Levand 2016-06-16 23:48 ` Geoff Levand 2016-06-20 16:06 ` James Morse 2016-06-20 16:06 ` James Morse 2016-06-20 16:50 ` Geoff Levand 2016-06-20 16:50 ` Geoff Levand 2016-06-16 23:48 ` [PATCH v19 02/13] arm64: Add back cpu reset routines Geoff Levand 2016-06-16 23:48 ` Geoff Levand 2016-06-16 23:48 ` [PATCH v19 04/13] arm64/kexec: Enable kexec in the arm64 defconfig Geoff Levand 2016-06-16 23:48 ` Geoff Levand 2016-06-16 23:48 ` [PATCH v19 01/13] arm64: Add cpus_are_stuck_in_kernel Geoff Levand 2016-06-16 23:48 ` Geoff Levand 2016-06-16 23:48 ` [PATCH v19 03/13] arm64/kexec: Add core kexec support Geoff Levand 2016-06-16 23:48 ` Geoff Levand 2016-06-20 15:36 ` James Morse 2016-06-20 15:36 ` James Morse 2016-06-20 16:49 ` Geoff Levand 2016-06-20 16:49 ` Geoff Levand 2016-06-16 23:48 ` [PATCH v19 11/13] arm64: kdump: enable kdump in the arm64 defconfig Geoff Levand 2016-06-16 23:48 ` Geoff Levand 2016-06-16 23:48 ` [PATCH v19 13/13] Documentation: dt: usable-memory and elfcorehdr nodes for arm64 kexec Geoff Levand 2016-06-16 23:48 ` Geoff Levand 2016-06-16 23:48 ` [PATCH v19 12/13] arm64: kdump: update a kernel doc Geoff Levand 2016-06-16 23:48 ` Geoff Levand 2016-06-16 23:48 ` [PATCH v19 10/13] arm64: kdump: add VMCOREINFO's for user-space coredump tools Geoff Levand 2016-06-16 23:48 ` Geoff Levand 2016-06-20 5:32 ` Pratyush Anand 2016-06-20 5:32 ` Pratyush Anand 2016-06-22 5:59 ` AKASHI Takahiro 2016-06-22 5:59 ` AKASHI Takahiro 2016-06-23 7:14 ` Pratyush Anand 2016-06-23 7:14 ` Pratyush Anand 2016-06-23 8:42 ` AKASHI Takahiro 2016-06-23 8:42 ` AKASHI Takahiro 2016-06-23 15:46 ` Pratyush Anand 2016-06-23 15:46 ` Pratyush Anand 2016-06-30 0:44 ` AKASHI Takahiro 2016-06-30 0:44 ` AKASHI Takahiro 2016-06-16 23:48 ` [PATCH v19 07/13] arm64: limit memory regions based on DT property, usable-memory Geoff Levand 2016-06-16 23:48 ` Geoff Levand 2016-06-16 23:48 ` [PATCH v19 08/13] arm64: kdump: implement machine_crash_shutdown() Geoff Levand 2016-06-16 23:48 ` Geoff Levand 2016-06-16 23:48 ` [PATCH v19 06/13] arm64: kdump: reserve memory for crash dump kernel Geoff Levand 2016-06-16 23:48 ` Geoff Levand 2016-06-20 16:07 ` James Morse 2016-06-20 16:07 ` James Morse 2016-06-21 1:23 ` AKASHI Takahiro [this message] 2016-06-21 1:23 ` AKASHI Takahiro 2016-06-16 23:48 ` [PATCH v19 09/13] arm64: kdump: add kdump support Geoff Levand 2016-06-16 23:48 ` 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=20160621012337.GV20774@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.