s390/vmemmap: cleanup when vmemmap_populate() fails

davidhildenbrand · hcahca · commit c00f05a92424 · 2020-07-27T10:33:46.000+02:00
Cleanup what we partially added in case vmemmap_populate() fails. For
vmem, this is already handled by vmem_add_mapping().

Cc: Vasily Gorbik &lt;gor@linux.ibm.com&gt;
Cc: Christian Borntraeger &lt;borntraeger@de.ibm.com&gt;
Cc: Gerald Schaefer &lt;gerald.schaefer@de.ibm.com&gt;
Signed-off-by: David Hildenbrand &lt;david@redhat.com&gt;
Message-Id: &lt;20200722094558.9828-5-david@redhat.com&gt;
Signed-off-by: Heiko Carstens &lt;hca@linux.ibm.com&gt;
diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c
@@ -332,8 +332,13 @@ static void vmem_remove_range(unsigned long start, unsigned long size)
 int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,
 		struct vmem_altmap *altmap)
 {
+	int ret;
+
 	/* We don't care about the node, just use NUMA_NO_NODE on allocations */
-	return add_pagetable(start, end, false);
+	ret = add_pagetable(start, end, false);
+	if (ret)
+		remove_pagetable(start, end, false);
+	return ret;
 }
 
 void vmemmap_free(unsigned long start, unsigned long end,

Original file line number	Diff line number	Diff line change
`@@ -332,8 +332,13 @@ static void vmem_remove_range(unsigned long start, unsigned long size)`
`332`	`332`	`int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,`
`333`	`333`	`struct vmem_altmap *altmap)`
`334`	`334`	`{`
	`335`	`+ int ret;`
	`336`	`+`
`335`	`337`	`/* We don't care about the node, just use NUMA_NO_NODE on allocations */`
`336`		`- return add_pagetable(start, end, false);`
	`338`	`+ ret = add_pagetable(start, end, false);`
	`339`	`+ if (ret)`
	`340`	`+ remove_pagetable(start, end, false);`
	`341`	`+ return ret;`
`337`	`342`	`}`
`338`	`343`
`339`	`344`	`void vmemmap_free(unsigned long start, unsigned long end,`