From: James Morse <james.morse@arm.com>
To: AKASHI Takahiro <takahiro.akashi@linaro.org>
Cc: catalin.marinas@arm.com, will.deacon@arm.com,
dhowells@redhat.com, vgoyal@redhat.com,
herbert@gondor.apana.org.au, davem@davemloft.net,
dyoung@redhat.com, bhe@redhat.com, arnd@arndb.de,
ard.biesheuvel@linaro.org, bhsharma@redhat.com,
kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v11 11/15] arm64: kexec_file: add crash dump support
Date: Wed, 18 Jul 2018 17:50:22 +0100 [thread overview]
Message-ID: <9efd0567-35dc-7435-74d6-1b540f3e5b9f@arm.com> (raw)
In-Reply-To: <20180711074203.3019-12-takahiro.akashi@linaro.org>
Hi Akashi,
On 11/07/18 08:41, AKASHI Takahiro wrote:
> 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
> diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h
> index 69333694e3e2..eeb5766928b0 100644
> --- a/arch/arm64/include/asm/kexec.h
> +++ b/arch/arm64/include/asm/kexec.h
> @@ -99,6 +99,10 @@ static inline void crash_post_resume(void) {}
> struct kimage_arch {
> phys_addr_t dtb_mem;
> void *dtb_buf;
> + /* Core ELF header buffer */
> + void *elf_headers;
Shouldn't this be a phys_addr_t if it comes from kbuf.mem?
(dtb_mem is, and they type tells us which way round the runtime/kexec-time
pointers are)
> + unsigned long elf_headers_sz;
> + unsigned long elf_load_addr;
> };
>
> /**
> diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
> index a0b44fe18b95..261564df7210 100644
> --- a/arch/arm64/kernel/machine_kexec_file.c
> +++ b/arch/arm64/kernel/machine_kexec_file.c
> @@ -132,6 +173,45 @@ static int setup_dtb(struct kimage *image,
> return ret;
> }
>
> +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, 0,
> + &start, &end, NULL)
Nit: flags = MEMBLOCK_NONE? Just to make it obvious this is how MEMBLOCK_NOMAP
regions are weeded out.
This is going to get interesting if we ever support hotpluggable memory... but
it works for now and implicitly removes the nomap regions.
> + 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, 0,
> + &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)
> + goto out;
> +
> + ret = crash_prepare_elf64_headers(cmem, true, addr, sz);
> +
> +out:
Nit: You could save the goto if you wrote this as:
| 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,
> @@ -139,11 +219,43 @@ int load_other_segments(struct kimage *image,
> char *cmdline, unsigned long cmdline_len)
> {
> struct kexec_buf kbuf;
> + void *hdrs_addr;
> + unsigned long hdrs_sz;
> unsigned long initrd_load_addr = 0;
> char *dtb = NULL;
> unsigned long dtb_len = 0;
> int ret = 0;
>
> + /* load elf core header */
> + if (image->type == KEXEC_TYPE_CRASH) {
> + ret = prepare_elf_headers(&hdrs_addr, &hdrs_sz);
> + if (ret) {
> + pr_err("Preparing elf core header failed\n");
> + goto out_err;
> + }
> +
> + kbuf.image = image;
> + kbuf.buffer = hdrs_addr;
> + kbuf.bufsz = hdrs_sz;
> + kbuf.memsz = hdrs_sz;
> + kbuf.buf_align = PAGE_SIZE;
Whose PAGE_SIZE?
Won't this break if the kdump kernel is 64K pages, but the first kernel uses 4K?
Should we change this to the largest supported PAGE_SIZE: SZ_64K?
> + kbuf.buf_min = crashk_res.start;
> + kbuf.buf_max = crashk_res.end + 1;
> + kbuf.top_down = true;
> +
> + ret = kexec_add_buffer(&kbuf);
> + if (ret) {
> + vfree(hdrs_addr);
> + goto out_err;
> + }
> + image->arch.elf_headers = hdrs_addr;
> + image->arch.elf_headers_sz = hdrs_sz;
> + image->arch.elf_load_addr = kbuf.mem;
> +
> + pr_debug("Loaded elf core header at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
> + image->arch.elf_load_addr, hdrs_sz, hdrs_sz);
> + }
> +
> kbuf.image = image;
> /* not allocate anything below the kernel */
> kbuf.buf_min = kernel_load_addr + kernel_size;
I think the initramfs can escape the crash kernel range because you add to the
buf_max region:
| /* within 1GB-aligned window of up to 32GB in size */
| kbuf.buf_max = round_down(kernel_load_addr, SZ_1G)
| + (unsigned long)SZ_1G * 32;
I think we need a helper to clamp these min/max ranges to within the crash
kernel range, as its needs doing in a few places.
Thanks,
James
next prev parent reply other threads:[~2018-07-18 16:50 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-11 7:41 [PATCH v11 00/15] subject: arm64: kexec: add kexec_file_load() support AKASHI Takahiro
2018-07-11 7:41 ` [PATCH v11 01/15] asm-generic: add kexec_file_load system call to unistd.h AKASHI Takahiro
2018-07-11 7:41 ` [PATCH v11 02/15] kexec_file: make kexec_image_post_load_cleanup_default() global AKASHI Takahiro
2018-07-11 7:41 ` [PATCH v11 03/15] powerpc, kexec_file: factor out memblock-based arch_kexec_walk_mem() AKASHI Takahiro
2018-07-14 1:52 ` Dave Young
2018-07-16 11:04 ` James Morse
2018-07-16 12:24 ` Dave Young
2018-07-17 5:31 ` AKASHI Takahiro
2018-07-17 7:49 ` Dave Young
2018-07-18 5:38 ` AKASHI Takahiro
2018-07-18 6:13 ` Dave Young
2018-07-18 6:40 ` AKASHI Takahiro
2018-07-18 6:45 ` Dave Young
2018-07-20 5:33 ` AKASHI Takahiro
2018-07-20 5:57 ` Dave Young
2018-07-20 6:25 ` AKASHI Takahiro
2018-07-16 12:26 ` Dave Young
2018-07-18 16:52 ` James Morse
2018-07-19 2:23 ` Dave Young
2018-07-11 7:41 ` [PATCH v11 04/15] kexec_file: kexec_walk_memblock() only walks a dedicated region at kdump AKASHI Takahiro
2018-07-11 7:41 ` [PATCH v11 05/15] of/fdt: add helper functions for handling properties AKASHI Takahiro
2018-07-11 7:41 ` [PATCH v11 06/15] arm64: add image head flag definitions AKASHI Takahiro
2018-07-11 7:41 ` [PATCH v11 07/15] arm64: cpufeature: add MMFR0 helper functions AKASHI Takahiro
2018-07-11 7:41 ` [PATCH v11 08/15] arm64: enable KEXEC_FILE config AKASHI Takahiro
2018-07-11 7:41 ` [PATCH v11 09/15] arm64: kexec_file: load initrd and device-tree AKASHI Takahiro
2018-07-17 16:57 ` James Morse
2018-07-18 5:56 ` AKASHI Takahiro
2018-07-11 7:41 ` [PATCH v11 10/15] arm64: kexec_file: allow for loading Image-format kernel AKASHI Takahiro
2018-07-18 16:47 ` James Morse
2018-07-20 6:14 ` AKASHI Takahiro
2018-07-11 7:41 ` [PATCH v11 11/15] arm64: kexec_file: add crash dump support AKASHI Takahiro
2018-07-18 16:50 ` James Morse [this message]
2018-07-23 5:39 ` AKASHI Takahiro
2018-07-23 17:04 ` James Morse
2018-07-11 7:42 ` [PATCH v11 12/15] arm64: kexec_file: invoke the kernel without purgatory AKASHI Takahiro
2018-07-11 7:42 ` [PATCH v11 13/15] include: pe.h: remove message[] from mz header definition AKASHI Takahiro
2018-07-11 7:42 ` [PATCH v11 14/15] arm64: kexec_file: add kernel signature verification support AKASHI Takahiro
2018-07-11 7:42 ` [PATCH v11 15/15] arm64: kexec_file: add kaslr support 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=9efd0567-35dc-7435-74d6-1b540f3e5b9f@arm.com \
--to=james.morse@arm.com \
--cc=ard.biesheuvel@linaro.org \
--cc=arnd@arndb.de \
--cc=bhe@redhat.com \
--cc=bhsharma@redhat.com \
--cc=catalin.marinas@arm.com \
--cc=davem@davemloft.net \
--cc=dhowells@redhat.com \
--cc=dyoung@redhat.com \
--cc=herbert@gondor.apana.org.au \
--cc=kexec@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=takahiro.akashi@linaro.org \
--cc=vgoyal@redhat.com \
--cc=will.deacon@arm.com \
/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).