kho: make sure scratch size is always aligned by CMA_MIN_ALIGNMENT_BYTES
Subsystems (3)
Pratyush Yadav
maintainerPATCH 1/1 kho: make sure scratch size is always aligned by CMA_MIN_ALIGNMENT_BYTES
From: "Pratyush Yadav (Google)" <[email protected]>
When using scratch_scale, the scratch sizes are rounded up to CMA_MIN_ALIGNMENT_BYTES since they will be released as MIGRATE_CMA. This is not done when using fixed scratch sizes via command line. This can result in user specifying a size which is not aligned, and thus kernel releasing a pageblock that is only partially scratch.
Do the rounding up for both cases in scratch_size_update().
--- kernel/liveupdate/kexec_handover.c | 32 ++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 11 deletions(-)
kernel/liveupdate/kexec_handover.c +21 -11
@@ -607,20 +607,30 @@ early_param("kho_scratch", kho_parse_scratch_size);static void __init scratch_size_update (void ) { -phys_addr_t size; +/* +* If fixed sizes are not provided via command line, calculate them +* now. +*/ +if (scratch_scale) { +phys_addr_t size; -if (!scratch_scale) -return ; + size =memblock_reserved_kern_size (ARCH_LOW_ADDRESS_LIMIT , +NUMA_NO_NODE ); + size = size * scratch_scale /100 ; + scratch_size_lowmem = size; - size =memblock_reserved_kern_size (ARCH_LOW_ADDRESS_LIMIT , -NUMA_NO_NODE ); - size = size * scratch_scale /100 ; - scratch_size_lowmem =round_up (size,CMA_MIN_ALIGNMENT_BYTES ); + size =memblock_reserved_kern_size (MEMBLOCK_ALLOC_ANYWHERE , +NUMA_NO_NODE ); + size = size * scratch_scale /100 - scratch_size_lowmem; + scratch_size_global = size; + } - size =memblock_reserved_kern_size (MEMBLOCK_ALLOC_ANYWHERE , -NUMA_NO_NODE ); - size = size * scratch_scale /100 - scratch_size_lowmem; - scratch_size_global =round_up (size,CMA_MIN_ALIGNMENT_BYTES ); +/* +* Scratch areas are released as MIGRATE_CMA. Round them up to the right +* size. +*/ + scratch_size_lowmem =round_up (scratch_size_lowmem,CMA_MIN_ALIGNMENT_BYTES ); + scratch_size_global =round_up (scratch_size_global,CMA_MIN_ALIGNMENT_BYTES ); }static phys_addr_t __init scratch_size_node (int nid)
base-commit: b1378127003b61930ce30064328640503ad3ef6d
Signature · 1 line
2.54.0.563.g4f69b47b94-goog
Quoted 9 lines · Pratyush Yadav
When using
scratch_scale, the scratch sizes are rounded up toCMA_MIN_ALIGNMENT_BYTESsince they will be released asMIGRATE_CMA. This is not done when using fixed scratch sizes via command line. This can result in user specifying a size which is not aligned, and thus kernel releasing a pageblock that is only partially scratch.Do the rounding up for both cases in
scratch_size_update().[...]
Applied, thanks!
[1/1] kho: make sure scratch size is always aligned by CMA_MIN_ALIGNMENT_BYTES
commit: 4129715f7ac5b71183350f1983023caf0464cb9b
Best regards,
Signature · 1 line
Pasha Tatashin <[email protected]>