Skip to content

Commit 0217975

Browse files
sourabhjainssmb49
authored andcommitted
powerpc: Set crashkernel offset to mid of RMA region
BugLink: https://bugs.launchpad.net/bugs/1971497 [ Upstream commit 7c5ed82 ] On large config LPARs (having 192 and more cores), Linux fails to boot due to insufficient memory in the first memblock. It is due to the memory reservation for the crash kernel which starts at 128MB offset of the first memblock. This memory reservation for the crash kernel doesn't leave enough space in the first memblock to accommodate other essential system resources. The crash kernel start address was set to 128MB offset by default to ensure that the crash kernel get some memory below the RMA region which is used to be of size 256MB. But given that the RMA region size can be 512MB or more, setting the crash kernel offset to mid of RMA size will leave enough space for the kernel to allocate memory for other system resources. Since the above crash kernel offset change is only applicable to the LPAR platform, the LPAR feature detection is pushed before the crash kernel reservation. The rest of LPAR specific initialization will still be done during pseries_probe_fw_features as usual. This patch is dependent on changes to paca allocation for boot CPU. It expect boot CPU to discover 1T segment support which is introduced by the patch posted here: https://lists.ozlabs.org/pipermail/linuxppc-dev/2022-January/239175.html Reported-by: Abdul haleem <abdhalee@linux.vnet.ibm.com> Signed-off-by: Sourabh Jain <sourabhjain@linux.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20220204085601.107257-1-sourabhjain@linux.ibm.com Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
1 parent 98fa2c0 commit 0217975

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

arch/powerpc/kernel/machine_kexec.c

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,18 @@ void __init reserve_crashkernel(void)
146146
if (!crashk_res.start) {
147147
#ifdef CONFIG_PPC64
148148
/*
149-
* On 64bit we split the RMO in half but cap it at half of
150-
* a small SLB (128MB) since the crash kernel needs to place
151-
* itself and some stacks to be in the first segment.
149+
* On the LPAR platform place the crash kernel to mid of
150+
* RMA size (512MB or more) to ensure the crash kernel
151+
* gets enough space to place itself and some stack to be
152+
* in the first segment. At the same time normal kernel
153+
* also get enough space to allocate memory for essential
154+
* system resource in the first segment. Keep the crash
155+
* kernel starts at 128MB offset on other platforms.
152156
*/
153-
crashk_res.start = min(0x8000000ULL, (ppc64_rma_size / 2));
157+
if (firmware_has_feature(FW_FEATURE_LPAR))
158+
crashk_res.start = ppc64_rma_size / 2;
159+
else
160+
crashk_res.start = min(0x8000000ULL, (ppc64_rma_size / 2));
154161
#else
155162
crashk_res.start = KDUMP_KERNELBASE;
156163
#endif

arch/powerpc/kernel/rtas.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,6 +1244,12 @@ int __init early_init_dt_scan_rtas(unsigned long node,
12441244
entryp = of_get_flat_dt_prop(node, "linux,rtas-entry", NULL);
12451245
sizep = of_get_flat_dt_prop(node, "rtas-size", NULL);
12461246

1247+
#ifdef CONFIG_PPC64
1248+
/* need this feature to decide the crashkernel offset */
1249+
if (of_get_flat_dt_prop(node, "ibm,hypertas-functions", NULL))
1250+
powerpc_firmware_features |= FW_FEATURE_LPAR;
1251+
#endif
1252+
12471253
if (basep && entryp && sizep) {
12481254
rtas.base = *basep;
12491255
rtas.entry = *entryp;

0 commit comments

Comments
 (0)