Account for nkmempages as well in the pmap_growkernel() call during

initalisation. This way there is enough KVA mapped that kmeminit()
succeeds even with large nkmempages. This is similar to e.g. alpha.
OK miod@ kettenis@

diff --git a/sys/arch/arm64/arm64/machdep.c b/sys/arch/arm64/arm64/machdep.c
index d0c1601..69dc76a 100644 (file)
--- a/sys/arch/arm64/arm64/machdep.c
+++ b/sys/arch/arm64/arm64/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.84 2023/08/10 21:01:50 kettenis Exp $ */
+/* $OpenBSD: machdep.c,v 1.85 2023/12/04 15:00:09 claudio Exp $ */
 /*
  * Copyright (c) 2014 Patrick Wildt <patrick@blueri.se>
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
@@ -1067,13 +1067,15 @@ initarm(struct arm64_bootparams *abp)
                physmem += atop(end - start);
        }
 
+       kmeminit_nkmempages();
+
        /*
         * Make sure that we have enough KVA to initialize UVM.  In
         * particular, we need enough KVA to be able to allocate the
-        * vm_page structures.
+        * vm_page structures and nkmempages for malloc(9).
         */
        pmap_growkernel(VM_MIN_KERNEL_ADDRESS + 1024 * 1024 * 1024 +
-           physmem * sizeof(struct vm_page));
+           physmem * sizeof(struct vm_page) + ptoa(nkmempages));
 
 #ifdef DDB
        db_machine_init();

diff --git a/sys/arch/riscv64/riscv64/machdep.c b/sys/arch/riscv64/riscv64/machdep.c
index b684371..eb7778d 100644 (file)
--- a/sys/arch/riscv64/riscv64/machdep.c
+++ b/sys/arch/riscv64/riscv64/machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: machdep.c,v 1.32 2023/08/14 13:49:42 miod Exp $       */
+/*     $OpenBSD: machdep.c,v 1.33 2023/12/04 15:00:09 claudio Exp $    */
 
 /*
  * Copyright (c) 2014 Patrick Wildt <patrick@blueri.se>
@@ -813,13 +813,15 @@ initriscv(struct riscv_bootparams *rbp)
                    atop(start), atop(end), 0);
        }
 
+       kmeminit_nkmempages();
+
        /*
         * Make sure that we have enough KVA to initialize UVM.  In
         * particular, we need enough KVA to be able to allocate the
-        * vm_page structures.
+        * vm_page structures and nkmempages for malloc(9).
         */
        pmap_growkernel(VM_MIN_KERNEL_ADDRESS + 1024 * 1024 * 1024 +
-           physmem * sizeof(struct vm_page));
+           physmem * sizeof(struct vm_page) + ptoa(nkmempages));
 
 #ifdef DDB
        db_machine_init();