#endif
 }
 
+/*
+ * Pre-allocates page-table pages for the vmalloc area in the kernel page-table.
+ * Only the level which needs to be synchronized between all page-tables is
+ * allocated because the synchronization can be expensive.
+ */
+static void __init preallocate_vmalloc_pages(void)
+{
+       unsigned long addr;
+       const char *lvl;
+
+       for (addr = VMALLOC_START; addr <= VMALLOC_END; addr = ALIGN(addr + 1, PGDIR_SIZE)) {
+               pgd_t *pgd = pgd_offset_k(addr);
+               p4d_t *p4d;
+               pud_t *pud;
+
+               p4d = p4d_offset(pgd, addr);
+               if (p4d_none(*p4d)) {
+                       /* Can only happen with 5-level paging */
+                       p4d = p4d_alloc(&init_mm, pgd, addr);
+                       if (!p4d) {
+                               lvl = "p4d";
+                               goto failed;
+                       }
+               }
+
+               if (pgtable_l5_enabled())
+                       continue;
+
+               pud = pud_offset(p4d, addr);
+               if (pud_none(*pud)) {
+                       /* Ends up here only with 4-level paging */
+                       pud = pud_alloc(&init_mm, p4d, addr);
+                       if (!pud) {
+                               lvl = "pud";
+                               goto failed;
+                       }
+               }
+       }
+
+       return;
+
+failed:
+
+       /*
+        * The pages have to be there now or they will be missing in
+        * process page-tables later.
+        */
+       panic("Failed to pre-allocate %s pages for vmalloc area\n", lvl);
+}
+
 void __init mem_init(void)
 {
        pci_iommu_alloc();
        if (get_gate_vma(&init_mm))
                kclist_add(&kcore_vsyscall, (void *)VSYSCALL_ADDR, PAGE_SIZE, KCORE_USER);
 
+       preallocate_vmalloc_pages();
+
        mem_init_print_info(NULL);
 }