samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/mm: Check return value from memblock_phys_alloc_range()

Browse Source 
[ Upstream commit 631ca8909fd5c62b9fda9edda93924311a78a9c4 ]

At least with CONFIG_PHYSICAL_START=0x100000, if there is < 4 MiB of
contiguous free memory available at this point, the kernel will crash
and burn because memblock_phys_alloc_range() returns 0 on failure,
which leads memblock_phys_free() to throw the first 4 MiB of physical
memory to the wolves.

At a minimum it should fail gracefully with a meaningful diagnostic,
but in fact everything seems to work fine without the weird reserve
allocation.

Signed-off-by: Philip Redkin <me@rarity.fan>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Rik van Riel <riel@surriel.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Link: https://lore.kernel.org/r/94b3e98f-96a7-3560-1f76-349eb95ccf7f@rarity.fan
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Philip Redkin
2024-11-15 20:36:59 +03:00
committed by Greg Kroah-Hartman
parent 7124a9b682
commit bffd5f2815
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/x86/mm/init.c
View File

@@ -644,8 +644,13 @@ static void __init memory_map_top_down(unsigned long map_start,
*/ */
addr = memblock_phys_alloc_range(PMD_SIZE, PMD_SIZE, map_start, addr = memblock_phys_alloc_range(PMD_SIZE, PMD_SIZE, map_start,
map_end); map_end);
memblock_phys_free(addr, PMD_SIZE); if (!addr) {
real_end = addr + PMD_SIZE; pr_warn("Failed to release memory for alloc_low_pages()");
real_end = max(map_start, ALIGN_DOWN(map_end, PMD_SIZE));
} else {
memblock_phys_free(addr, PMD_SIZE);
real_end = addr + PMD_SIZE;
}
/* step_size need to be small so pgt_buf from BRK could cover it */ /* step_size need to be small so pgt_buf from BRK could cover it */
step_size = PMD_SIZE; step_size = PMD_SIZE;