| Message ID | 159466101903.24747.7234708045729315954.stgit@hbathini.in.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ppc64: enable kdump support for kexec_file_load syscall | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (71d6070a8e0e0a1ed82365544f97b86475cb161e) |
| snowpatch_ozlabs/build-ppc64le | warning | Build succeeded but added 3 new sparse warnings |
| snowpatch_ozlabs/build-ppc64be | warning | Build succeeded but added 3 new sparse warnings |
| snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
| snowpatch_ozlabs/build-pmac32 | success | Build succeeded |
| snowpatch_ozlabs/checkpatch | warning | total: 0 errors, 0 warnings, 1 checks, 53 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
Hari Bathini <hbathini@linux.ibm.com> writes: > The kexec purgatory has to run in real mode. Only the first memory > block maybe accessible in real mode. And, unlike the case with panic > kernel, no memory is set aside for regular kexec load. Another thing > to note is, the memory for crashkernel is reserved at an offset of > 128MB. So, when crashkernel memory is reserved, the memory ranges to > load kexec segments shrink further as the generic code only looks for > memblock free memory ranges and in all likelihood only a tiny bit of > memory from 0 to 128MB would be available to load kexec segments. > > With kdump being used by default in general, kexec file load is likely > to fail almost always. Ah. I wasn't aware of this problem. > This can be fixed by changing the memory hole > lookup logic for regular kexec to use the same method as kdump. Right. It doesn't make that much sense to use memblock to find free memory areas for the kexec kernel, because memblock tracks which memory areas are free for the currently running kernel. But that's not what matters for the kernel that will be kexec'd into. In this case, regions which may be reserved for the current OS instance may well be free for a freshly started kernel. The kdump method is better at knowing which memory regions are actually reserved by the firmware/hardware. > This > would mean that most kexec segments will overlap with crashkernel > memory region. That should still be ok as the pages, whose destination > address isn't available while loading, are placed in an intermediate > location till a flush to the actual destination address happens during > kexec boot sequence. Yes, since the kdump kernel and the "regular" kexec kernel can't be both booted at the same time, it's not a problem if both plan to use the same region of memory. > > Signed-off-by: Hari Bathini <hbathini@linux.ibm.com> > Tested-by: Pingfan Liu <piliu@redhat.com> Reviewed-by: Thiago Jung Bauermann <bauerman@linux.ibm.com> > --- > > v2 -> v3: > * Unchanged. Added Tested-by tag from Pingfan. > > v1 -> v2: > * New patch to fix locating memory hole for kexec_file_load (kexec -s -l) > when memory is reserved for crashkernel. > > > arch/powerpc/kexec/file_load_64.c | 33 ++++++++++++++------------------- > 1 file changed, 14 insertions(+), 19 deletions(-)
diff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_load_64.c index 29e5d11..b79d62bc 100644 --- a/arch/powerpc/kexec/file_load_64.c +++ b/arch/powerpc/kexec/file_load_64.c @@ -1328,13 +1328,6 @@ int arch_kexec_locate_mem_hole(struct kexec_buf *kbuf) u64 buf_min, buf_max; int ret; - /* - * Use the generic kexec_locate_mem_hole for regular - * kexec_file_load syscall - */ - if (kbuf->image->type != KEXEC_TYPE_CRASH) - return kexec_locate_mem_hole(kbuf); - /* Look up the exclude ranges list while locating the memory hole */ emem = &(kbuf->image->arch.exclude_ranges); if (!(*emem) || ((*emem)->nr_ranges == 0)) { @@ -1342,11 +1335,15 @@ int arch_kexec_locate_mem_hole(struct kexec_buf *kbuf) return kexec_locate_mem_hole(kbuf); } + buf_min = kbuf->buf_min; + buf_max = kbuf->buf_max; /* Segments for kdump kernel should be within crashkernel region */ - buf_min = (kbuf->buf_min < crashk_res.start ? - crashk_res.start : kbuf->buf_min); - buf_max = (kbuf->buf_max > crashk_res.end ? - crashk_res.end : kbuf->buf_max); + if (kbuf->image->type == KEXEC_TYPE_CRASH) { + buf_min = (buf_min < crashk_res.start ? + crashk_res.start : buf_min); + buf_max = (buf_max > crashk_res.end ? + crashk_res.end : buf_max); + } if (buf_min > buf_max) { pr_err("Invalid buffer min and/or max values\n"); @@ -1476,15 +1473,13 @@ int arch_kexec_apply_relocations_add(struct purgatory_info *pi, int arch_kexec_kernel_image_probe(struct kimage *image, void *buf, unsigned long buf_len) { - if (image->type == KEXEC_TYPE_CRASH) { - int ret; + int ret; - /* Get exclude memory ranges needed for setting up kdump segments */ - ret = get_exclude_memory_ranges(&(image->arch.exclude_ranges)); - if (ret) { - pr_err("Failed to setup exclude memory ranges for buffer lookup\n"); - return ret; - } + /* Get exclude memory ranges needed for setting up kexec segments */ + ret = get_exclude_memory_ranges(&(image->arch.exclude_ranges)); + if (ret) { + pr_err("Failed to setup exclude memory ranges for buffer lookup\n"); + return ret; } return kexec_image_probe_default(image, buf, buf_len);