Sat Jan 25 16:19:30 2020 UTC ()

A fix and an optimisation to pmap_l1tt_free
- in the !__HAVE_MM_MD_DIRECT_MAPPED_PHYS case pass UVM_KMF_WIRED so that
  the mappings are removed and the KVA is released.  Fixes the KASSERT
  seen in the automated test runs.
- in the __HAVE_MM_MD_DIRECT_MAPPED_PHYS case we can work out pa much
  easier than caling pmap_extract.


(skrll)

diff -r1.381 -r1.382 src/sys/arch/arm/arm32/pmap.c

--- src/sys/arch/arm/arm32/pmap.c 2020/01/19 10:59:56	1.381
+++ src/sys/arch/arm/arm32/pmap.c 2020/01/25 16:19:29	1.382

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.381 2020/01/19 10:59:56 skrll Exp $	*/
+/*	$NetBSD: pmap.c,v 1.382 2020/01/25 16:19:29 skrll Exp $	*/
 /*
  * Copyright 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Steve C. Woodford for Wasabi Systems, Inc.
+ *
  * 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
 @@ -211,27 +211,27 @@
 #include <sys/bus.h>
 #include <sys/atomic.h>
 #include <sys/kernhist.h>
 #include <uvm/uvm.h>
 #include <uvm/pmap/pmap_pvt.h>
 #include <arm/locore.h>
 #ifdef DDB
 #include <arm/db_machdep.h>
 #endif
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.381 2020/01/19 10:59:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.382 2020/01/25 16:19:29 skrll Exp $");
 //#define PMAP_DEBUG
 #ifdef PMAP_DEBUG
 /* XXX need to get rid of all refs to this */
 int pmap_debug_level = 0;
 /*
  * for switching to potentially finer grained debugging
  */
 #define	PDB_FOLLOW	0x0001
 #define	PDB_INIT	0x0002
 #define	PDB_ENTER	0x0004
 @@ -6617,32 +6617,33 @@ pmap_l1tt_alloc(struct pool *pp, int fla
 	KASSERT(ok);
 	KASSERT(va >= KERNEL_BASE);
 #endif
 	return (void *)va;
+}
 static void
 pmap_l1tt_free(struct pool *pp, void *v)
+{
 	vaddr_t va = (vaddr_t)v;
 #if !defined( __HAVE_MM_MD_DIRECT_MAPPED_PHYS)
-	uvm_km_free(kernel_map, va, L1TT_SIZE, 0);
+	uvm_km_free(kernel_map, va, L1TT_SIZE, UVM_KMF_WIRED);
 #else
-	paddr_t pa;
+#if defined(KERNEL_BASE_VOFFSET)
 	paddr_t pa = va - KERNEL_BASE_VOFFSET;
-	bool ok = pmap_extract(pmap_kernel(), va, &pa);
+#else
-	KASSERT(ok);
+	paddr_t pa = va - KERNEL_BASE + physical_start;
 #endif
 	const paddr_t epa = pa + L1TT_SIZE;
 	for (; pa < epa; pa += PAGE_SIZE) {
 		struct vm_page *pg = PHYS_TO_VM_PAGE(pa);
 		uvm_pagefree(pg);
+	}
 #endif
+}
 #endif
 /*
  * pmap_postinit()
+ *