powerpc/vmemmap: Fix memory leak with vmemmap list allocation failures.
PATCH 1/2 powerpc/vmemmap: Fix memory leak with vmemmap list allocation failures.
If we fail to allocate vmemmap list, we don't keep track of allocated vmemmap block buf. Hence on section deactivate we skip vmemmap block buf free. This results in memory leak.
--- arch/powerpc/mm/init_64.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-)
arch/powerpc/mm/init_64.c +28 -7
@@ -162,16 +162,16 @@ static __meminit struct vmemmap_backing * vmemmap_list_alloc(int node)return next++; } -static __meminit void vmemmap_list_populate (unsigned long phys, -unsigned long start, -int node) +static __meminit int vmemmap_list_populate (unsigned long phys, +unsigned long start, +int node) {struct vmemmap_backing *vmem_back; vmem_back =vmemmap_list_alloc (node);if (unlikely (!vmem_back)) { -WARN_ON (1 ); -return ; +pr_debug ("vmemap list allocation failed\n" ); +return -ENOMEM ; } vmem_back->phys = phys;
@@ -179,6 +179,7 @@ static __meminit void vmemmap_list_populate(unsigned long phys, vmem_back->list = vmemmap_list; vmemmap_list = vmem_back; +return 0 ; } static bool altmap_cross_boundary(struct vmem_altmap *altmap, unsigned long start,
@@ -199,6 +200,7 @@ static bool altmap_cross_boundary(struct vmem_altmap *altmap, unsigned long starint __meminit vmemmap_populate (unsigned long start,unsigned long end,int node,struct vmem_altmap *altmap) { +bool altmap_alloc;unsigned long page_size =1 << mmu_psize_defs[mmu_vmemmap_psize].shift;/* Align to the page size of the linear mapping. */
@@ -228,13 +230,32 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node, p =altmap_alloc_block_buf (page_size, altmap);if (!p)pr_debug ("altmap block allocation failed, falling back to system memory" ); +else + altmap_alloc = true; } -if (!p) +if (!p) { p =vmemmap_alloc_block_buf (page_size, node); + altmap_alloc = false; + }if (!p)return -ENOMEM ; -vmemmap_list_populate (__pa (p), start, node); +if (vmemmap_list_populate (__pa (p), start, node)) { +/* +* If we don't populate vmemap list, we don't have +* the ability to free the allocated vmemmap +* pages in section_deactivate. Hence free them +* here. +*/ +int nr_pfns = page_size >>PAGE_SHIFT ; +unsigned long page_order =get_order (page_size); + +if (altmap_alloc) +vmem_altmap_free (altmap, nr_pfns); +else +free_pages ((unsigned long )p, page_order); +return -ENOMEM ; + }pr_debug (" * %016lx..%016lx allocated at %p\n" , start, start + page_size, p);
Signature · 1 line
2.26.2
PATCH 2/2 powerpc/vmemmap: Don't warn if we don't find a mapping vmemmap list entry
Now that we are handling vmemmap list allocation failure correctly, don't WARN in section deactivate when we don't find a mapping vmemmap list entry.
--- arch/powerpc/mm/init_64.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/powerpc/mm/init_64.c +1 -3
@@ -285,10 +285,8 @@ static unsigned long vmemmap_list_free(unsigned long start) vmem_back_prev = vmem_back; } -if (unlikely (!vmem_back)) { -WARN_ON (1 ); +if (unlikely (!vmem_back))return 0 ; - }/* remove it from vmemmap_list */ if (vmem_back == vmemmap_list)/* remove head */
Signature · 1 line
2.26.2
Michael Ellerman
AppliedQuoted 3 lines · Aneesh Kumar K.V
If we fail to allocate vmemmap list, we don't keep track of allocated vmemmap block buf. Hence on section deactivate we skip vmemmap block buf free. This results in memory leak.
Applied to powerpc/next.
[1/2] powerpc/vmemmap: Fix memory leak with vmemmap list allocation failures.
https://git.kernel.org/powerpc/c/ccaea15296f9773abd43aaa17ee4b88848e4a505 [2/2] powerpc/vmemmap: Don't warn if we don't find a mapping vmemmap list entry https://git.kernel.org/powerpc/c/1c0a7ac0ec63ee626f669c9a4e278f6ae1dbfcf2
cheers