mm-cma-fix-potential-memory-loss-on-cma_declare_contiguous_nid.patch removed from -mm tree
The quilt patch titled
Subject: mm/cma: fix potential memory loss on cma_declare_contiguous_nid
has been removed from the -mm tree. Its filename was
mm-cma-fix-potential-memory-loss-on-cma_declare_contiguous_nid.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Levi Yun <[email protected]>
Subject: mm/cma: fix potential memory loss on cma_declare_contiguous_nid
Date: Wed, 18 Jan 2023 17:05:23 +0900
Suppose memblock_alloc_range_nid() with highmem_start succeeds when cma_declare_contiguous_nid is called with !fixed on a 32-bit system with PHYS_ADDR_T_64BIT enabled with memblock.bottom_up == false.
But the next trial to memblock_alloc_range_nid() to allocate in [SIZE_4G, limits) nullifies former successfully allocated addr and it retries memblock_alloc_ragne_nid().
In this situation, the first successfully allocated address area is lost.
Change the order of allocation (SIZE_4G, high_memory and base) and check whether the allocated succeeded to prevent potential memory loss.
---
mm/cma.c renamed from mm/cma.c~mm-cma-fix-potential-memory-loss-on-cma_declare_contiguous_nid +12 -12
@@ -322,18 +322,6 @@ int __init cma_declare_contiguous_nid(phphys_addr_t addr =0 ;/* -* All pages in the reserved area must come from the same zone. -* If the requested region crosses the low/high memory boundary, -* try allocating from high memory first and fall back to low -* memory in case of failure. -*/ -if (base < highmem_start && limit > highmem_start) { - addr =memblock_alloc_range_nid (size, alignment, - highmem_start, limit, nid, true); - limit = highmem_start; - } - -/* * If there is enough memory, try a bottom-up allocation first. * It will place the new cma area close to the start of the node * and guarantee that the compaction is moving pages out of the
@@ -350,6 +338,18 @@ int __init cma_declare_contiguous_nid(ph }#endif +/* +* All pages in the reserved area must come from the same zone. +* If the requested region crosses the low/high memory boundary, +* try allocating from high memory first and fall back to low +* memory in case of failure. +*/ +if (!addr && base < highmem_start && limit > highmem_start) { + addr =memblock_alloc_range_nid (size, alignment, + highmem_start, limit, nid, true); + limit = highmem_start; + } +if (!addr) { addr =memblock_alloc_range_nid (size, alignment, base, limit, nid, true);
_
Patches currently in -mm which might be from [email protected] are