Module Name: src
Committed By: skrll
Date: Fri Sep 30 12:10:41 UTC 2016
Modified Files:
src/sys/uvm/pmap: pmap.c
Log Message:
Increment resident_count if we're remapping onto new PA as
pmap_remove -> pmap_pte_remote will decrement it
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/uvm/pmap/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/uvm/pmap/pmap.c
diff -u src/sys/uvm/pmap/pmap.c:1.22 src/sys/uvm/pmap/pmap.c:1.23
--- src/sys/uvm/pmap/pmap.c:1.22 Fri Sep 16 17:27:09 2016
+++ src/sys/uvm/pmap/pmap.c Fri Sep 30 12:10:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.22 2016/09/16 17:27:09 matt Exp $ */
+/* $NetBSD: pmap.c,v 1.23 2016/09/30 12:10:40 skrll Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.22 2016/09/16 17:27:09 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.23 2016/09/30 12:10:40 skrll Exp $");
/*
* Manages physical address maps.
@@ -1272,16 +1272,19 @@ pmap_enter(pmap_t pmap, vaddr_t va, padd
UVMHIST_LOG(*histp, "new pte %#"PRIxPTE" (pa %#"PRIxPADDR")",
pte_value(npte), pa, 0, 0);
- if (pte_valid_p(opte) && pte_to_paddr(opte) != pa) {
- pmap_remove(pmap, va, va + NBPG);
- PMAP_COUNT(user_mappings_changed);
- }
-
KASSERT(pte_valid_p(npte));
const bool resident = pte_valid_p(opte);
+ bool remap = false;
if (resident) {
+ if (pte_to_paddr(opte) != pa) {
+ pmap_remove(pmap, va, va + NBPG);
+ PMAP_COUNT(user_mappings_changed);
+ remap = true;
+ }
update_flags |= PMAP_TLB_NEED_IPI;
- } else {
+ }
+
+ if (!resident || remap) {
pmap->pm_stats.resident_count++;
}
