On 06/28/18 at 10:49am, Hari Bathini wrote:
> Memory reservation for crashkernel could fail if there are holes around
> kdump kernel offset (128M). Fail gracefully in such cases and print an
> error message.
> 
> Signed-off-by: Hari Bathini <[email protected]>
> ---
>  arch/powerpc/kernel/machine_kexec.c |    7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/powerpc/kernel/machine_kexec.c 
> b/arch/powerpc/kernel/machine_kexec.c
> index 936c7e2..6181442 100644
> --- a/arch/powerpc/kernel/machine_kexec.c
> +++ b/arch/powerpc/kernel/machine_kexec.c
> @@ -188,7 +188,12 @@ void __init reserve_crashkernel(void)
>                       (unsigned long)(crashk_res.start >> 20),
>                       (unsigned long)(memblock_phys_mem_size() >> 20));
>  
> -     memblock_reserve(crashk_res.start, crash_size);
> +     if (!memblock_is_region_memory(crashk_res.start, crash_size) ||
> +         memblock_reserve(crashk_res.start, crash_size)) {
> +             printk(KERN_ERR "Failed to reserve memory for crashkernel!\n");
> +             crashk_res.start = crashk_res.end = 0;
> +             return;
> +     }
>  }
>  
>  int overlaps_crashkernel(unsigned long start, unsigned long size)
> 

It would be better to print a separate error message for 
!memblock_is_region_memory
But I think memblock_reserve is unlikly to fail so this patch is also
good.

Reviewed-by: Dave Young <[email protected]>

Thanks
Dave

Reply via email to