powerpc/mm: Handle hypervisor pte insert failure in __hash_page_huge

PATCH New Anton Blanchard 1 participant 1 message Jul 15, 2010 PowerPC

Share & tools

Anton Blanchard

author

2010-07-15 05:31 UTC #0 lore raw

PATCH 1/1 powerpc/mm: Handle hypervisor pte insert failure in __hash_page_huge

If the hypervisor gives us an error on a hugepage insert we panic. The normal page code already handles this by returning an error instead and we end calling low_hash_fault which will just kill the task if possible.

The patch below does a similar thing for the hugepage case.

Signed-off-by Anton Blanchard <[email protected]>

---

arch/powerpc/mm/hugetlbpage-hash64.c +9 -2

Index: powerpc.git/arch/powerpc/mm/hugetlbpage-hash64.c
===================================================================
@@ -121,8 +121,15 @@ repeat:
                         }
 		}
 
-		if (unlikely(slot == -2))
-			panic("hash_huge_page: pte_insert failed\n");
+		/*
+		 * Hypervisor failure. Restore old pte and return -1
+		 * similar to __hash_page_*
+		 */
+		if (unlikely(slot == -2)) {
+			*ptep = __pte(old_pte);
+			err = -1;
+			goto out;
+		}
 
 		new_pte |= (slot << 12) & (_PAGE_F_SECOND | _PAGE_F_GIX);
 	}