On 2021/12/14 19:40, Leizhen (ThunderTown) wrote:
>
>
> On 2021/12/10 14:55, Zhen Lei wrote:
>> From: Chen Zhou <chenzhou10@xxxxxxxxxx>
>>
>> We will make the functions reserve_crashkernel() as generic, the
>> xen_pv_domain() check in reserve_crashkernel() is relevant only to
>> x86, the same as insert_resource() in reserve_crashkernel[_low]().
>> So move xen_pv_domain() check and insert_resource() to setup_arch()
>> to keep them in x86.
>>
>> Suggested-by: Mike Rapoport <rppt@xxxxxxxxxx>
>> Signed-off-by: Chen Zhou <chenzhou10@xxxxxxxxxx>
>> Signed-off-by: Zhen Lei <thunder.leizhen@xxxxxxxxxx>
>> Tested-by: John Donnelly <John.p.donnelly@xxxxxxxxxx>
>> Tested-by: Dave Kleikamp <dave.kleikamp@xxxxxxxxxx>
>> Acked-by: Baoquan He <bhe@xxxxxxxxxx>
>> ---
>> arch/x86/kernel/setup.c | 19 +++++++++++--------
>> 1 file changed, 11 insertions(+), 8 deletions(-)
>>
>> diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
>> index bb2a0973b98059e..7ae00716a208f82 100644
>> --- a/arch/x86/kernel/setup.c
>> +++ b/arch/x86/kernel/setup.c
>> @@ -456,7 +456,6 @@ static int __init reserve_crashkernel_low(void)
>>
>> crashk_low_res.start = low_base;
>> crashk_low_res.end = low_base + low_size - 1;
>> - insert_resource(&iomem_resource, &crashk_low_res);
>> #endif
>> return 0;
>> }
>> @@ -480,11 +479,6 @@ static void __init reserve_crashkernel(void)
>> high = true;
>> }
>>
>> - if (xen_pv_domain()) {
>> - pr_info("Ignoring crashkernel for a Xen PV domain\n");
>> - return;
>> - }
>> -
>> /* 0 means: find the address automatically */
>> if (!crash_base) {
>> /*
>> @@ -531,7 +525,6 @@ static void __init reserve_crashkernel(void)
>>
>> crashk_res.start = crash_base;
>> crashk_res.end = crash_base + crash_size - 1;
>> - insert_resource(&iomem_resource, &crashk_res);
>> }
>> #else
>> static void __init reserve_crashkernel(void)
>> @@ -1143,7 +1136,17 @@ void __init setup_arch(char **cmdline_p)
>> * Reserve memory for crash kernel after SRAT is parsed so that it
>> * won't consume hotpluggable memory.
>> */
>> - reserve_crashkernel();
>
> Hi Baoquan:
> How about move "#ifdef CONFIG_KEXEC_CORE" here, so that we can remove the
> empty reserve_crashkernel(). In fact, xen_pv_domain() is invoked only
> when CONFIG_KEXEC_CORE is enabled before.
Hi Baoquan:
Did you miss this email? If no reply, I will keep it no change.
>
>> + if (xen_pv_domain())
>> + pr_info("Ignoring crashkernel for a Xen PV domain\n");
>> + else {
>> + reserve_crashkernel();
>> +#ifdef CONFIG_KEXEC_CORE
>> + if (crashk_res.end > crashk_res.start)
>> + insert_resource(&iomem_resource, &crashk_res);
>> + if (crashk_low_res.end > crashk_low_res.start)
>> + insert_resource(&iomem_resource, &crashk_low_res);
>> +#endif
>> + }
>>
>> memblock_find_dma_reserve();
>>
>>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> .
>
