]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
book3s64/radix : Handle error conditions properly in radix_vmemmap_populate
authorDonet Tom <donettom@linux.ibm.com>
Sun, 22 Jun 2025 12:01:24 +0000 (07:01 -0500)
committerMadhavan Srinivasan <maddy@linux.ibm.com>
Mon, 23 Jun 2025 04:32:01 +0000 (10:02 +0530)
Error conditions are not handled properly if altmap is not present
and PMD_SIZE vmemmap_alloc_block_buf fails.

In this patch, if vmemmap_alloc_block_buf fails in the non-altmap
case, we will fall back to the base mapping.

Reviewed-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com>
Signed-off-by: Donet Tom <donettom@linux.ibm.com>
Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com>
Link: https://patch.msgid.link/7f95fe91c827a2fb76367a58dbea724e811fb152.1750593372.git.donettom@linux.ibm.com
arch/powerpc/mm/book3s64/radix_pgtable.c

index 9f764bc42b8cc8feb7185e555be364ddf9202491..3d67aee8c8cab6d747d6b2d2a22782badffd8e1e 100644 (file)
@@ -1173,7 +1173,7 @@ int __meminit radix__vmemmap_populate(unsigned long start, unsigned long end, in
                                vmemmap_set_pmd(pmd, p, node, addr, next);
                                pr_debug("PMD_SIZE vmemmap mapping\n");
                                continue;
-                       } else if (altmap) {
+                       } else {
                                /*
                                 * A vmemmap block allocation can fail due to
                                 * alignment requirements and we trying to align