iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/fadump: avoid holes in boot memory area when fadump is registered

Browse Source 
To register fadump, boot memory area - the size of low memory chunk that
is required for a kernel to boot successfully when booted with restricted
memory, is assumed to have no holes. But this memory area is currently
not protected from hot-remove operations. So, fadump could fail to
re-register after a memory hot-remove operation, if memory is removed
from boot memory area. To avoid this, ensure that memory from boot
memory area is not hot-removed when fadump is registered.

Signed-off-by: Hari Bathini <hbathini@linux.vnet.ibm.com>
Reviewed-by: Mahesh J Salgaonkar <mahesh@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Hari Bathini 2017-06-01 22:51:26 +05:30 committed by Michael Ellerman
parent a77af552cc
commit eae0dfcc44
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/powerpc/include/asm/fadump.h
View File

@ -203,6 +203,7 @@ struct fad_crash_memory_ranges {
unsigned long long size; unsigned long long size;
}; };
extern int is_fadump_boot_memory_area(u64 addr, ulong size);
extern int early_init_dt_scan_fw_dump(unsigned long node, extern int early_init_dt_scan_fw_dump(unsigned long node,
const char *uname, int depth, void *data); const char *uname, int depth, void *data);
extern int fadump_reserve_mem(void); extern int fadump_reserve_mem(void);

12
arch/powerpc/kernel/fadump.c
View File

@ -113,6 +113,18 @@ int __init early_init_dt_scan_fw_dump(unsigned long node,
return 1; return 1;
} }
/*
* If fadump is registered, check if the memory provided
* falls within boot memory area.
*/
int is_fadump_boot_memory_area(u64 addr, ulong size)
{
if (!fw_dump.dump_registered)
return 0;
return (addr + size) > RMA_START && addr <= fw_dump.boot_memory_size;
}
int is_fadump_active(void) int is_fadump_active(void)
{ {
return fw_dump.dump_active; return fw_dump.dump_active;

7
arch/powerpc/platforms/pseries/hotplug-memory.c
View File

@ -22,6 +22,7 @@
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/prom.h> #include <asm/prom.h>
#include <asm/sparsemem.h> #include <asm/sparsemem.h>
#include <asm/fadump.h>
#include "pseries.h" #include "pseries.h"
static bool rtas_hp_event; static bool rtas_hp_event;
@ -406,6 +407,12 @@ static bool lmb_is_removable(struct of_drconf_cell *lmb)
scns_per_block = block_sz / MIN_MEMORY_BLOCK_SIZE; scns_per_block = block_sz / MIN_MEMORY_BLOCK_SIZE;
phys_addr = lmb->base_addr; phys_addr = lmb->base_addr;
#ifdef CONFIG_FA_DUMP
/* Don't hot-remove memory that falls in fadump boot memory area */
if (is_fadump_boot_memory_area(phys_addr, block_sz))
return false;
#endif
for (i = 0; i < scns_per_block; i++) { for (i = 0; i < scns_per_block; i++) {
pfn = PFN_DOWN(phys_addr); pfn = PFN_DOWN(phys_addr);
if (!pfn_present(pfn)) if (!pfn_present(pfn))