* [PATCH] powerpc/kexec_file: account hot-pluggable memory while estimating FDT size
@ 2022-12-15 8:38 Sourabh Jain
2022-12-16 6:15 ` Hari Bathini
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Sourabh Jain @ 2022-12-15 8:38 UTC (permalink / raw)
To: linuxppc-dev, mpe; +Cc: mahesh, hbathini
On Systems where online memory is lesser compared to max memory, the
kexec_file_load system call may fail to load the kdump kernel with the
below errors:
"Failed to update fdt with linux,drconf-usable-memory property"
"Error setting up usable-memory property for kdump kernel"
This happens because the size estimation for usable memory properties
for the kdump kernel's FDT is based on the online memory whereas the
usable memory properties include max memory. In short, the hot-pluggable
memory is not accounted for while estimating the size of the usable
memory properties.
The issue is addressed by calculating usable memory property size using
max hotplug address instead of the last online memory address.
Fixes: 2377c92e37fe ("powerpc/kexec_file: fix FDT size estimation for kdump kernel")
Signed-off-by: Sourabh Jain <sourabhjain@linux.ibm.com>
---
arch/powerpc/kexec/file_load_64.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_load_64.c
index 349a781cea0b3..2c3fd6fe6bc94 100644
--- a/arch/powerpc/kexec/file_load_64.c
+++ b/arch/powerpc/kexec/file_load_64.c
@@ -947,7 +947,7 @@ unsigned int kexec_extra_fdt_size_ppc64(struct kimage *image)
* linux,drconf-usable-memory properties. Get an approximate on the
* number of usable memory entries and use for FDT size estimation.
*/
- usm_entries = ((memblock_end_of_DRAM() / drmem_lmb_size()) +
+ usm_entries = ((memory_hotplug_max() / drmem_lmb_size()) +
(2 * (resource_size(&crashk_res) / drmem_lmb_size())));
return (unsigned int)(usm_entries * sizeof(u64));
}
--
2.38.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] powerpc/kexec_file: account hot-pluggable memory while estimating FDT size
2022-12-15 8:38 [PATCH] powerpc/kexec_file: account hot-pluggable memory while estimating FDT size Sourabh Jain
@ 2022-12-16 6:15 ` Hari Bathini
2022-12-16 10:25 ` Sourabh Jain
2023-01-27 5:56 ` Sourabh Jain
2023-01-30 3:04 ` Michael Ellerman
2 siblings, 1 reply; 6+ messages in thread
From: Hari Bathini @ 2022-12-16 6:15 UTC (permalink / raw)
To: Sourabh Jain, linuxppc-dev, mpe; +Cc: mahesh
On 15/12/22 2:08 pm, Sourabh Jain wrote:
> On Systems where online memory is lesser compared to max memory, the
> kexec_file_load system call may fail to load the kdump kernel with the
> below errors:
>
> "Failed to update fdt with linux,drconf-usable-memory property"
> "Error setting up usable-memory property for kdump kernel"
>
> This happens because the size estimation for usable memory properties
> for the kdump kernel's FDT is based on the online memory whereas the
> usable memory properties include max memory. In short, the hot-pluggable
> memory is not accounted for while estimating the size of the usable
> memory properties.
>
> The issue is addressed by calculating usable memory property size using
> max hotplug address instead of the last online memory address.
>
> Fixes: 2377c92e37fe ("powerpc/kexec_file: fix FDT size estimation for kdump kernel")
> Signed-off-by: Sourabh Jain <sourabhjain@linux.ibm.com>
Thanks for the fix, Sourabh. Looks good to me.
Acked-by: Hari Bathini <hbathini@linux.ibm.com>
> ---
> arch/powerpc/kexec/file_load_64.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_load_64.c
> index 349a781cea0b3..2c3fd6fe6bc94 100644
> --- a/arch/powerpc/kexec/file_load_64.c
> +++ b/arch/powerpc/kexec/file_load_64.c
> @@ -947,7 +947,7 @@ unsigned int kexec_extra_fdt_size_ppc64(struct kimage *image)
> * linux,drconf-usable-memory properties. Get an approximate on the
> * number of usable memory entries and use for FDT size estimation.
> */
> - usm_entries = ((memblock_end_of_DRAM() / drmem_lmb_size()) +
> + usm_entries = ((memory_hotplug_max() / drmem_lmb_size()) +
> (2 * (resource_size(&crashk_res) / drmem_lmb_size())));
> return (unsigned int)(usm_entries * sizeof(u64));
> }
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] powerpc/kexec_file: account hot-pluggable memory while estimating FDT size
2022-12-16 6:15 ` Hari Bathini
@ 2022-12-16 10:25 ` Sourabh Jain
0 siblings, 0 replies; 6+ messages in thread
From: Sourabh Jain @ 2022-12-16 10:25 UTC (permalink / raw)
To: Hari Bathini, linuxppc-dev, mpe; +Cc: mahesh
On 16/12/22 11:45, Hari Bathini wrote:
>
>
> On 15/12/22 2:08 pm, Sourabh Jain wrote:
>> On Systems where online memory is lesser compared to max memory, the
>> kexec_file_load system call may fail to load the kdump kernel with the
>> below errors:
>>
>> "Failed to update fdt with linux,drconf-usable-memory property"
>> "Error setting up usable-memory property for kdump kernel"
>>
>> This happens because the size estimation for usable memory properties
>> for the kdump kernel's FDT is based on the online memory whereas the
>> usable memory properties include max memory. In short, the hot-pluggable
>> memory is not accounted for while estimating the size of the usable
>> memory properties.
>>
>> The issue is addressed by calculating usable memory property size using
>> max hotplug address instead of the last online memory address.
>>
>> Fixes: 2377c92e37fe ("powerpc/kexec_file: fix FDT size estimation for
>> kdump kernel")
>> Signed-off-by: Sourabh Jain <sourabhjain@linux.ibm.com>
>
> Thanks for the fix, Sourabh. Looks good to me.
>
> Acked-by: Hari Bathini <hbathini@linux.ibm.com>
Thanks Hari.
- Sourabh Jain
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] powerpc/kexec_file: account hot-pluggable memory while estimating FDT size
2022-12-15 8:38 [PATCH] powerpc/kexec_file: account hot-pluggable memory while estimating FDT size Sourabh Jain
2022-12-16 6:15 ` Hari Bathini
@ 2023-01-27 5:56 ` Sourabh Jain
2023-01-30 3:04 ` Michael Ellerman
2 siblings, 0 replies; 6+ messages in thread
From: Sourabh Jain @ 2023-01-27 5:56 UTC (permalink / raw)
To: linuxppc-dev, mpe; +Cc: mahesh, hbathini
Gentle reminder, any comments and suggestions on this fix.
- Sourabh
On 15/12/22 14:08, Sourabh Jain wrote:
> On Systems where online memory is lesser compared to max memory, the
> kexec_file_load system call may fail to load the kdump kernel with the
> below errors:
>
> "Failed to update fdt with linux,drconf-usable-memory property"
> "Error setting up usable-memory property for kdump kernel"
>
> This happens because the size estimation for usable memory properties
> for the kdump kernel's FDT is based on the online memory whereas the
> usable memory properties include max memory. In short, the hot-pluggable
> memory is not accounted for while estimating the size of the usable
> memory properties.
>
> The issue is addressed by calculating usable memory property size using
> max hotplug address instead of the last online memory address.
>
> Fixes: 2377c92e37fe ("powerpc/kexec_file: fix FDT size estimation for kdump kernel")
> Signed-off-by: Sourabh Jain <sourabhjain@linux.ibm.com>
> ---
> arch/powerpc/kexec/file_load_64.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_load_64.c
> index 349a781cea0b3..2c3fd6fe6bc94 100644
> --- a/arch/powerpc/kexec/file_load_64.c
> +++ b/arch/powerpc/kexec/file_load_64.c
> @@ -947,7 +947,7 @@ unsigned int kexec_extra_fdt_size_ppc64(struct kimage *image)
> * linux,drconf-usable-memory properties. Get an approximate on the
> * number of usable memory entries and use for FDT size estimation.
> */
> - usm_entries = ((memblock_end_of_DRAM() / drmem_lmb_size()) +
> + usm_entries = ((memory_hotplug_max() / drmem_lmb_size()) +
> (2 * (resource_size(&crashk_res) / drmem_lmb_size())));
> return (unsigned int)(usm_entries * sizeof(u64));
> }
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] powerpc/kexec_file: account hot-pluggable memory while estimating FDT size
2022-12-15 8:38 [PATCH] powerpc/kexec_file: account hot-pluggable memory while estimating FDT size Sourabh Jain
2022-12-16 6:15 ` Hari Bathini
2023-01-27 5:56 ` Sourabh Jain
@ 2023-01-30 3:04 ` Michael Ellerman
2023-01-30 4:49 ` Sourabh Jain
2 siblings, 1 reply; 6+ messages in thread
From: Michael Ellerman @ 2023-01-30 3:04 UTC (permalink / raw)
To: Sourabh Jain, linuxppc-dev; +Cc: mahesh, hbathini
Sourabh Jain <sourabhjain@linux.ibm.com> writes:
> On Systems where online memory is lesser compared to max memory, the
> kexec_file_load system call may fail to load the kdump kernel with the
> below errors:
>
> "Failed to update fdt with linux,drconf-usable-memory property"
> "Error setting up usable-memory property for kdump kernel"
>
> This happens because the size estimation for usable memory properties
> for the kdump kernel's FDT is based on the online memory whereas the
> usable memory properties include max memory. In short, the hot-pluggable
> memory is not accounted for while estimating the size of the usable
> memory properties.
>
> The issue is addressed by calculating usable memory property size using
> max hotplug address instead of the last online memory address.
>
> Fixes: 2377c92e37fe ("powerpc/kexec_file: fix FDT size estimation for kdump kernel")
> Signed-off-by: Sourabh Jain <sourabhjain@linux.ibm.com>
> ---
> arch/powerpc/kexec/file_load_64.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Can you please rebase it on top of the fix I posted.
http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20230130014707.541110-1-mpe@ellerman.id.au/
cheers
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] powerpc/kexec_file: account hot-pluggable memory while estimating FDT size
2023-01-30 3:04 ` Michael Ellerman
@ 2023-01-30 4:49 ` Sourabh Jain
0 siblings, 0 replies; 6+ messages in thread
From: Sourabh Jain @ 2023-01-30 4:49 UTC (permalink / raw)
To: Michael Ellerman, linuxppc-dev; +Cc: mahesh, hbathini
On 30/01/23 08:34, Michael Ellerman wrote:
> Sourabh Jain <sourabhjain@linux.ibm.com> writes:
>> On Systems where online memory is lesser compared to max memory, the
>> kexec_file_load system call may fail to load the kdump kernel with the
>> below errors:
>>
>> "Failed to update fdt with linux,drconf-usable-memory property"
>> "Error setting up usable-memory property for kdump kernel"
>>
>> This happens because the size estimation for usable memory properties
>> for the kdump kernel's FDT is based on the online memory whereas the
>> usable memory properties include max memory. In short, the hot-pluggable
>> memory is not accounted for while estimating the size of the usable
>> memory properties.
>>
>> The issue is addressed by calculating usable memory property size using
>> max hotplug address instead of the last online memory address.
>>
>> Fixes: 2377c92e37fe ("powerpc/kexec_file: fix FDT size estimation for kdump kernel")
>> Signed-off-by: Sourabh Jain <sourabhjain@linux.ibm.com>
>> ---
>> arch/powerpc/kexec/file_load_64.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
> Can you please rebase it on top of the fix I posted.
>
> http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20230130014707.541110-1-mpe@ellerman.id.au/
Sure I will rebase it and send the next version.
Thanks,
Sourabh
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-01-30 4:50 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-15 8:38 [PATCH] powerpc/kexec_file: account hot-pluggable memory while estimating FDT size Sourabh Jain
2022-12-16 6:15 ` Hari Bathini
2022-12-16 10:25 ` Sourabh Jain
2023-01-27 5:56 ` Sourabh Jain
2023-01-30 3:04 ` Michael Ellerman
2023-01-30 4:49 ` Sourabh Jain
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).