Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fc95d5a authored by Hari Bathini's avatar Hari Bathini Committed by Greg Kroah-Hartman
Browse files

powerpc/kdump: Handle crashkernel memory reservation failure 



[ Upstream commit 8950329c4a64c6d3ca0bc34711a1afbd9ce05657 ]

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: default avatarHari Bathini <hbathini@linux.ibm.com>
Tested-by: default avatarDavid Gibson <dgibson@redhat.com>
Reviewed-by: default avatarDave Young <dyoung@redhat.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 084dad95

arch/powerpc/kernel/machine_kexec.c

+6 −1
Original line number Diff line number Diff line
@@ -186,7 +186,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)) {

		pr_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)