Commit 2d0af224 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky

s390/kexec: fix update of os_info crash kernel size

Implement an s390 version of the weak crash_free_reserved_phys_range
function. This allows us to update the size of the reserved crash
kernel memory if it will be resized.

This was previously done with a call to crash_unmap_reserved_pages
from crash_shrink_memory which was removed with ("s390/kexec:
consolidate crash_map/unmap_reserved_pages() and
arch_kexec_protect(unprotect)_crashkres()")

Fixes: 7a0058ec ("s390/kexec: consolidate crash_map/unmap_reserved_pages() and arch_kexec_protect(unprotect)_crashkres()")
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 0ccb32c9
...@@ -150,6 +150,19 @@ static int kdump_csum_valid(struct kimage *image) ...@@ -150,6 +150,19 @@ static int kdump_csum_valid(struct kimage *image)
#ifdef CONFIG_CRASH_DUMP #ifdef CONFIG_CRASH_DUMP
void crash_free_reserved_phys_range(unsigned long begin, unsigned long end)
{
unsigned long addr, size;
for (addr = begin; addr < end; addr += PAGE_SIZE)
free_reserved_page(pfn_to_page(addr >> PAGE_SHIFT));
size = begin - crashk_res.start;
if (size)
os_info_crashkernel_add(crashk_res.start, size);
else
os_info_crashkernel_add(0, 0);
}
/* /*
* Map or unmap crashkernel memory * Map or unmap crashkernel memory
*/ */
...@@ -161,13 +174,8 @@ static void crash_map_pages(int enable) ...@@ -161,13 +174,8 @@ static void crash_map_pages(int enable)
size % KEXEC_CRASH_MEM_ALIGN); size % KEXEC_CRASH_MEM_ALIGN);
if (enable) if (enable)
vmem_add_mapping(crashk_res.start, size); vmem_add_mapping(crashk_res.start, size);
else {
vmem_remove_mapping(crashk_res.start, size);
if (size)
os_info_crashkernel_add(crashk_res.start, size);
else else
os_info_crashkernel_add(0, 0); vmem_remove_mapping(crashk_res.start, size);
}
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment