Module Name: src
Committed By: martin
Date: Fri Jun 10 17:16:54 UTC 2022
Modified Files:
src/sys/arch/hppa/hppa [netbsd-9]: pmap.c
src/sys/arch/hppa/include [netbsd-9]: pmap.h
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1467):
sys/arch/hppa/include/pmap.h: revision 1.41
sys/arch/hppa/hppa/pmap.c: revision 1.117
port-hppa/56849: Wacko kernel memory accounting in current/hppa
Two fixes:
- Don't include direct mapped memory in pmap statistics
- Decrement pmap statistics counts in pmap_kremove
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.100.20.1 src/sys/arch/hppa/hppa/pmap.c
cvs rdiff -u -r1.37 -r1.37.42.1 src/sys/arch/hppa/include/pmap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/hppa/pmap.c
diff -u src/sys/arch/hppa/hppa/pmap.c:1.100 src/sys/arch/hppa/hppa/pmap.c:1.100.20.1
--- src/sys/arch/hppa/hppa/pmap.c:1.100 Thu Dec 22 14:47:57 2016
+++ src/sys/arch/hppa/hppa/pmap.c Fri Jun 10 17:16:54 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.100 2016/12/22 14:47:57 cherry Exp $ */
+/* $NetBSD: pmap.c,v 1.100.20.1 2022/06/10 17:16:54 martin Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.100 2016/12/22 14:47:57 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.100.20.1 2022/06/10 17:16:54 martin Exp $");
#include "opt_cputype.h"
@@ -975,7 +975,7 @@ pmap_bootstrap(vaddr_t vstart)
else if (va == uvm_lwp_getuarea(&lwp0) + USPACE - PAGE_SIZE)
prot = UVM_PROT_NONE;
#endif
- pmap_kenter_pa(va, va, prot, 0);
+ pmap_kenter_pa(va, va, prot, PMAP_DIRECTMAP);
}
/* XXXNH update */
@@ -1777,8 +1777,11 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, v
pmap_prot(pmap_kernel(), prot & VM_PROT_ALL));
if (IS_IOPAGE_P(pa) || (flags & PMAP_NOCACHE))
pte |= PTE_PROT(TLB_UNCACHEABLE);
- pmap_kernel()->pm_stats.wired_count++;
- pmap_kernel()->pm_stats.resident_count++;
+
+ if ((flags & PMAP_DIRECTMAP) == 0) {
+ pmap_kernel()->pm_stats.wired_count++;
+ pmap_kernel()->pm_stats.resident_count++;
+ }
if (opte)
pmap_pte_flush(pmap_kernel(), va, opte);
@@ -1865,6 +1868,9 @@ pmap_kremove(vaddr_t va, vsize_t size)
pmap_pte_flush(pmap, va, pte);
pmap_pte_set(pde, va, 0);
+ pmap->pm_stats.wired_count--;
+ pmap->pm_stats.resident_count--;
+
pg = pmap_initialized ? PHYS_TO_VM_PAGE(PTE_PAGE(pte)) : NULL;
if (pg != NULL) {
pve = pmap_pv_remove(pg, pmap, va);
Index: src/sys/arch/hppa/include/pmap.h
diff -u src/sys/arch/hppa/include/pmap.h:1.37 src/sys/arch/hppa/include/pmap.h:1.37.42.1
--- src/sys/arch/hppa/include/pmap.h:1.37 Mon Jan 7 16:57:28 2013
+++ src/sys/arch/hppa/include/pmap.h Fri Jun 10 17:16:54 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.37 2013/01/07 16:57:28 chs Exp $ */
+/* $NetBSD: pmap.h,v 1.37.42.1 2022/06/10 17:16:54 martin Exp $ */
/* $OpenBSD: pmap.h,v 1.35 2007/12/14 18:32:23 deraadt Exp $ */
@@ -72,6 +72,8 @@ struct pmap {
#define HPPA_MAX_PID 0xfffa
#define HPPA_SID_MAX 0x7ffd
+#define PMAP_DIRECTMAP 0x10000000 /* kenter_pa */
+
/*
* DON'T CHANGE THIS - this is assumed in lots of places.
*/
