Thread (20 messages) 20 messages, 5 authors, 2021-05-25
STALE1855d
Revisions (2)
  1. v1 current
  2. v2 [diff vs current]

[PATCH 2/5] mm/sparse: free section usage memory in case populate_section_memmap failed

From: Dong Aisheng <aisheng.dong@nxp.com>
Date: 2021-05-17 11:21:58
Also in: lkml
Subsystem: memory management, memory management - core, the rest · Maintainers: Andrew Morton, David Hildenbrand, Linus Torvalds

Free section usage memory in case populate_section_memmap failed.
We use map_count to track the remain unused memory to be freed.

Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
---
 mm/sparse.c | 2 ++
 1 file changed, 2 insertions(+)
diff --git a/mm/sparse.c b/mm/sparse.c
index 7ac481353b6b..98bfacc763da 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -549,12 +549,14 @@ static void __init sparse_init_nid(int nid, unsigned long pnum_begin,
 			       __func__, nid);
 			pnum_begin = pnum;
 			sparse_buffer_fini();
+			memblock_free_early(__pa(usage), map_count * mem_section_usage_size());
 			goto failed;
 		}
 		check_usemap_section_nr(nid, usage);
 		sparse_init_one_section(__nr_to_section(pnum), pnum, map, usage,
 				SECTION_IS_EARLY);
 		usage = (void *) usage + mem_section_usage_size();
+		map_count--;
 	}
 	sparse_buffer_fini();
 	return;
-- 
2.25.1

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help