Merge tag 'io_uring-5.6-2020-02-05' of git://git.kernel.dk/linux-block

[linux.git] / mm / kasan / init.c

diff --git a/mm/kasan/init.c b/mm/kasan/init.c
index fcaa1ca031754018260ff53ab87c67e9fdd944c2..ce45c491ebcdbde1a0d3c5cc374d381c405b4823 100644 (file)
--- a/mm/kasan/init.c
+++ b/mm/kasan/init.c
@@ -83,8 +83,14 @@ static inline bool kasan_early_shadow_page_entry(pte_t pte)
 
 static __init void *early_alloc(size_t size, int node)
 {
-       return memblock_alloc_try_nid(size, size, __pa(MAX_DMA_ADDRESS),
-                                       MEMBLOCK_ALLOC_ACCESSIBLE, node);
+       void *ptr = memblock_alloc_try_nid(size, size, __pa(MAX_DMA_ADDRESS),
+                                          MEMBLOCK_ALLOC_ACCESSIBLE, node);
+
+       if (!ptr)
+               panic("%s: Failed to allocate %zu bytes align=%zx nid=%d from=%llx\n",
+                     __func__, size, size, node, (u64)__pa(MAX_DMA_ADDRESS));
+
+       return ptr;
 }
 
 static void __ref zero_pte_populate(pmd_t *pmd, unsigned long addr,