mm/sparse.c: improve the error handling for sparse_add_one_section() (bbd06825) · Commits · 戴 / test

Improve the error handling for mm/sparse.c::sparse_add_one_section(). And I see no reason to check 'usemap' until holding the 'pgdat_resize_lock'. [geoffrey.levand@am.sony.com: sparse_index_init() returns -EEXIST] Cc: Christoph Lameter <clameter@sgi.com> Acked-by:

Dave Hansen <haveblue@us.ibm.com> Cc: Rik van Riel <riel@redhat.com> Acked-by:

Yasunori Goto <y-goto@jp.fujitsu.com> Cc: Andy Whitcroft <apw@shadowen.org> Signed-off-by:

WANG Cong <xiyou.wangcong@gmail.com> Signed-off-by:

Geoff Levand <geoffrey.levand@am.sony.com> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

mm/sparse.c

+12 −6

Original line number	Diff line number	Diff line
		@@ -391,9 +391,17 @@ int sparse_add_one_section(struct zone *zone, unsigned long start_pfn,
		* no locking for this, because it does its own
		* plus, it does a kmalloc
		*/
		sparse_index_init(section_nr, pgdat->node_id);
		ret = sparse_index_init(section_nr, pgdat->node_id);
		if (ret < 0 && ret != -EEXIST)
		return ret;
		memmap = kmalloc_section_memmap(section_nr, pgdat->node_id, nr_pages);
		if (!memmap)
		return -ENOMEM;
		usemap = __kmalloc_section_usemap();
		if (!usemap) {
		__kfree_section_memmap(memmap, nr_pages);
		return -ENOMEM;
		}

		pgdat_resize_lock(pgdat, &flags);

		@@ -403,18 +411,16 @@ int sparse_add_one_section(struct zone *zone, unsigned long start_pfn,
		goto out;
		}

		if (!usemap) {
		ret = -ENOMEM;
		goto out;
		}
		ms->section_mem_map \|= SECTION_MARKED_PRESENT;

		ret = sparse_init_one_section(ms, section_nr, memmap, usemap);

		out:
		pgdat_resize_unlock(pgdat, &flags);
		if (ret <= 0)
		if (ret <= 0) {
		kfree(usemap);
		__kfree_section_memmap(memmap, nr_pages);
		}
		return ret;
		}
		#endif

Admin message