Wed Apr 24 06:37:31 2019 UTC ()

In fdt_add_boot_physmem make sure the memory range has pages available
before adding it to the fdt_physmem array.

Fixes a problem that jmcneill@ pointed out to me.


(skrll)

diff -r1.61 -r1.62 src/sys/arch/evbarm/fdt/fdt_machdep.c

--- src/sys/arch/evbarm/fdt/fdt_machdep.c 2019/03/30 13:17:23	1.61
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c 2019/04/24 06:37:31	1.62

 @@ -1,14 +1,14 @@
-/* $NetBSD: fdt_machdep.c,v 1.61 2019/03/30 13:17:23 jmcneill Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.62 2019/04/24 06:37:31 skrll Exp $ */
 /*-
  * Copyright (c) 2015-2017 Jared McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.61 2019/03/30 13:17:23 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.62 2019/04/24 06:37:31 skrll Exp $");
 #include "opt_machdep.h"
 #include "opt_bootconfig.h"
 #include "opt_ddb.h"
 #include "opt_md.h"
 #include "opt_arm_debug.h"
 #include "opt_multiprocessor.h"
 #include "opt_cpuoptions.h"
 #include "opt_efi.h"
 #include "ukbd.h"
 #include "wsdisplay.h"
 @@ -241,34 +241,42 @@ fdt_add_dram_blocks(const struct fdt_mem
 	bc->dram[bc->dramblocks].address = m->start;
 	bc->dram[bc->dramblocks].pages =
 	    (m->end - m->start) / PAGE_SIZE;
 	bc->dramblocks++;
+}
 #define MAX_PHYSMEM 64
 static int nfdt_physmem = 0;
 static struct boot_physmem fdt_physmem[MAX_PHYSMEM];
 static void
 fdt_add_boot_physmem(const struct fdt_memory *m, void *arg)
+{
-	struct boot_physmem *bp = &fdt_physmem[nfdt_physmem++];
+	const paddr_t saddr = round_page(m->start);
 	const paddr_t eaddr = trunc_page(m->end);
-	VPRINTF("  %" PRIx64 " - %" PRIx64 "\n", m->start, m->end - 1);
+	VPRINTF("  %" PRIx64 " - %" PRIx64, m->start, m->end - 1);
 	if (saddr >= eaddr) {
 		VPRINTF(" skipped\n");
 		return;
+	}
 	VPRINTF("\n");
 	struct boot_physmem *bp = &fdt_physmem[nfdt_physmem++];
 	KASSERT(nfdt_physmem <= MAX_PHYSMEM);
-	bp->bp_start = atop(round_page(m->start));
+	bp->bp_start = atop(saddr);
-	bp->bp_pages = atop(trunc_page(m->end)) - bp->bp_start;
+	bp->bp_pages = atop(eaddr) - bp->bp_start;
 	bp->bp_freelist = VM_FREELIST_DEFAULT;
 #ifdef _LP64
 	if (m->end > 0x100000000)
 		bp->bp_freelist = VM_FREELIST_HIGHMEM;
 #endif
 #ifdef PMAP_NEED_ALLOC_POOLPAGE
 	const uint64_t memory_size = *(uint64_t *)arg;
 	if (atop(memory_size) > bp->bp_pages) {
 		arm_poolpage_vmfreelist = VM_FREELIST_DIRECTMAP;
 		bp->bp_freelist = VM_FREELIST_DIRECTMAP;
+	}