Module Name: src
Committed By: ad
Date: Thu Jun 11 19:20:47 UTC 2020
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: arc.c
src/external/cddl/osnet/sys/kern: misc.c
src/sys/arch/alpha/alpha: machdep.c
src/sys/arch/atari/atari: machdep.c
src/sys/arch/cesfic/cesfic: machdep.c
src/sys/arch/emips/emips: machdep.c
src/sys/arch/evbppc/explora: machdep.c
src/sys/arch/evbppc/virtex: machdep.c
src/sys/arch/evbppc/walnut: machdep.c
src/sys/arch/ews4800mips/ews4800mips: machdep.c
src/sys/arch/hp300/hp300: machdep.c
src/sys/arch/hppa/hppa: machdep.c
src/sys/arch/luna68k/luna68k: machdep.c
src/sys/arch/mac68k/mac68k: machdep.c
src/sys/arch/mips/mips: cpu_subr.c
src/sys/arch/mvme68k/mvme68k: machdep.c
src/sys/arch/news68k/news68k: machdep.c
src/sys/arch/next68k/next68k: machdep.c
src/sys/arch/powerpc/booke: booke_machdep.c
src/sys/arch/powerpc/ibm4xx: ibm4xx_machdep.c
src/sys/arch/powerpc/oea: oea_machdep.c
src/sys/arch/riscv/riscv: riscv_machdep.c
src/sys/arch/sgimips/sgimips: machdep.c
src/sys/arch/sh3/sh3: sh3_machdep.c
src/sys/arch/sparc/sparc: machdep.c
src/sys/arch/sparc64/sparc64: machdep.c
src/sys/arch/sun2/sun2: machdep.c
src/sys/arch/sun3/sun3: machdep.c
src/sys/arch/sun3/sun3x: machdep.c
src/sys/arch/vax/vax: machdep.c
src/sys/arch/x68k/x68k: machdep.c
src/sys/compat/linux/common: linux_misc.c
src/sys/compat/linux32/common: linux32_sysinfo.c
src/sys/dev: ccd.c
src/sys/fs/tmpfs: tmpfs_mem.c
src/sys/kern: init_main.c kern_module.c kern_proc.c vfs_bio.c
src/sys/miscfs/procfs: procfs_linux.c
src/sys/rump/librump/rumpkern: vm.c
src/sys/ufs/chfs: chfs_subr.c
src/sys/ufs/lfs: lfs_bio.c
src/sys/uvm: uvm_extern.h uvm_glue.c uvm_meter.c uvm_page.c
uvm_pdaemon.c uvm_pdpolicy_clock.c uvm_pglist.c uvm_stat.c
Log Message:
uvm_availmem(): give it a boolean argument to specify whether a recent
cached value will do, or if the very latest total must be fetched. It can
be called thousands of times a second and fetching the totals impacts not
only the calling LWP but other CPUs doing unrelated activity in the VM
system.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c
cvs rdiff -u -r1.8 -r1.9 src/external/cddl/osnet/sys/kern/misc.c
cvs rdiff -u -r1.359 -r1.360 src/sys/arch/alpha/alpha/machdep.c
cvs rdiff -u -r1.182 -r1.183 src/sys/arch/atari/atari/machdep.c
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/cesfic/cesfic/machdep.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/emips/emips/machdep.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbppc/explora/machdep.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbppc/virtex/machdep.c
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/evbppc/walnut/machdep.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/ews4800mips/ews4800mips/machdep.c
cvs rdiff -u -r1.233 -r1.234 src/sys/arch/hp300/hp300/machdep.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hppa/hppa/machdep.c
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/luna68k/luna68k/machdep.c
cvs rdiff -u -r1.357 -r1.358 src/sys/arch/mac68k/mac68k/machdep.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/mips/mips/cpu_subr.c
cvs rdiff -u -r1.157 -r1.158 src/sys/arch/mvme68k/mvme68k/machdep.c
cvs rdiff -u -r1.107 -r1.108 src/sys/arch/news68k/news68k/machdep.c
cvs rdiff -u -r1.114 -r1.115 src/sys/arch/next68k/next68k/machdep.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/powerpc/booke/booke_machdep.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/powerpc/oea/oea_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/riscv/riscv/riscv_machdep.c
cvs rdiff -u -r1.149 -r1.150 src/sys/arch/sgimips/sgimips/machdep.c
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/sh3/sh3/sh3_machdep.c
cvs rdiff -u -r1.333 -r1.334 src/sys/arch/sparc/sparc/machdep.c
cvs rdiff -u -r1.297 -r1.298 src/sys/arch/sparc64/sparc64/machdep.c
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/sun2/sun2/machdep.c
cvs rdiff -u -r1.211 -r1.212 src/sys/arch/sun3/sun3/machdep.c
cvs rdiff -u -r1.138 -r1.139 src/sys/arch/sun3/sun3x/machdep.c
cvs rdiff -u -r1.195 -r1.196 src/sys/arch/vax/vax/machdep.c
cvs rdiff -u -r1.202 -r1.203 src/sys/arch/x68k/x68k/machdep.c
cvs rdiff -u -r1.249 -r1.250 src/sys/compat/linux/common/linux_misc.c
cvs rdiff -u -r1.11 -r1.12 src/sys/compat/linux32/common/linux32_sysinfo.c
cvs rdiff -u -r1.183 -r1.184 src/sys/dev/ccd.c
cvs rdiff -u -r1.12 -r1.13 src/sys/fs/tmpfs/tmpfs_mem.c
cvs rdiff -u -r1.526 -r1.527 src/sys/kern/init_main.c
cvs rdiff -u -r1.150 -r1.151 src/sys/kern/kern_module.c
cvs rdiff -u -r1.254 -r1.255 src/sys/kern/kern_proc.c
cvs rdiff -u -r1.295 -r1.296 src/sys/kern/vfs_bio.c
cvs rdiff -u -r1.84 -r1.85 src/sys/miscfs/procfs/procfs_linux.c
cvs rdiff -u -r1.189 -r1.190 src/sys/rump/librump/rumpkern/vm.c
cvs rdiff -u -r1.13 -r1.14 src/sys/ufs/chfs/chfs_subr.c
cvs rdiff -u -r1.147 -r1.148 src/sys/ufs/lfs/lfs_bio.c
cvs rdiff -u -r1.227 -r1.228 src/sys/uvm/uvm_extern.h
cvs rdiff -u -r1.179 -r1.180 src/sys/uvm/uvm_glue.c
cvs rdiff -u -r1.77 -r1.78 src/sys/uvm/uvm_meter.c
cvs rdiff -u -r1.238 -r1.239 src/sys/uvm/uvm_page.c
cvs rdiff -u -r1.127 -r1.128 src/sys/uvm/uvm_pdaemon.c
cvs rdiff -u -r1.37 -r1.38 src/sys/uvm/uvm_pdpolicy_clock.c
cvs rdiff -u -r1.82 -r1.83 src/sys/uvm/uvm_pglist.c
cvs rdiff -u -r1.43 -r1.44 src/sys/uvm/uvm_stat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c:1.18 src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c:1.19
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c:1.18 Tue Dec 31 13:07:09 2019
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c Thu Jun 11 19:20:42 2020
@@ -285,7 +285,7 @@ int arc_procfd;
#endif
//#define needfree (uvm_availmem() < uvmexp.freetarg ? uvmexp.freetarg : 0)
#define buf_init arc_buf_init
-#define freemem uvm_availmem()
+#define freemem uvm_availmem(false)
#define minfree uvmexp.freemin
#define desfree uvmexp.freetarg
#define lotsfree (desfree * 2)
Index: src/external/cddl/osnet/sys/kern/misc.c
diff -u src/external/cddl/osnet/sys/kern/misc.c:1.8 src/external/cddl/osnet/sys/kern/misc.c:1.9
--- src/external/cddl/osnet/sys/kern/misc.c:1.8 Wed Feb 19 16:11:19 2020
+++ src/external/cddl/osnet/sys/kern/misc.c Thu Jun 11 19:20:42 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.c,v 1.8 2020/02/19 16:11:19 riastradh Exp $ */
+/* $NetBSD: misc.c,v 1.9 2020/06/11 19:20:42 ad Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -130,7 +130,7 @@ kmem_reap(void)
int bufcnt;
struct pool *pp;
- bufcnt = uvmexp.freetarg - uvm_availmem();
+ bufcnt = uvmexp.freetarg - uvm_availmem(false);
if (bufcnt < 0)
bufcnt = 0;
Index: src/sys/arch/alpha/alpha/machdep.c
diff -u src/sys/arch/alpha/alpha/machdep.c:1.359 src/sys/arch/alpha/alpha/machdep.c:1.360
--- src/sys/arch/alpha/alpha/machdep.c:1.359 Sat Feb 22 20:29:15 2020
+++ src/sys/arch/alpha/alpha/machdep.c Thu Jun 11 19:20:42 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.359 2020/02/22 20:29:15 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.360 2020/06/11 19:20:42 ad Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2019 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.359 2020/02/22 20:29:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.360 2020/06/11 19:20:42 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -869,7 +869,7 @@ cpu_startup(void)
#if defined(DEBUG)
pmapdebug = opmapdebug;
#endif
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
#if 0
{
Index: src/sys/arch/atari/atari/machdep.c
diff -u src/sys/arch/atari/atari/machdep.c:1.182 src/sys/arch/atari/atari/machdep.c:1.183
--- src/sys/arch/atari/atari/machdep.c:1.182 Tue Dec 31 13:07:09 2019
+++ src/sys/arch/atari/atari/machdep.c Thu Jun 11 19:20:43 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.182 2019/12/31 13:07:09 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.183 2020/06/11 19:20:43 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.182 2019/12/31 13:07:09 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.183 2020/06/11 19:20:43 ad Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -211,7 +211,7 @@ cpu_startup(void)
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/cesfic/cesfic/machdep.c
diff -u src/sys/arch/cesfic/cesfic/machdep.c:1.70 src/sys/arch/cesfic/cesfic/machdep.c:1.71
--- src/sys/arch/cesfic/cesfic/machdep.c:1.70 Tue Dec 31 13:07:10 2019
+++ src/sys/arch/cesfic/cesfic/machdep.c Thu Jun 11 19:20:43 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.70 2019/12/31 13:07:10 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.71 2020/06/11 19:20:43 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.70 2019/12/31 13:07:10 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.71 2020/06/11 19:20:43 ad Exp $");
#include "opt_bufcache.h"
#include "opt_ddb.h"
@@ -260,7 +260,7 @@ cpu_startup(void)
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif
- printf("avail mem = %ld\n", ptoa(uvm_availmem()));
+ printf("avail mem = %ld\n", ptoa(uvm_availmem(false)));
}
/*
Index: src/sys/arch/emips/emips/machdep.c
diff -u src/sys/arch/emips/emips/machdep.c:1.16 src/sys/arch/emips/emips/machdep.c:1.17
--- src/sys/arch/emips/emips/machdep.c:1.16 Sun Jan 12 13:15:10 2020
+++ src/sys/arch/emips/emips/machdep.c Thu Jun 11 19:20:43 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.16 2020/01/12 13:15:10 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.17 2020/06/11 19:20:43 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.16 2020/01/12 13:15:10 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.17 2020/06/11 19:20:43 ad Exp $");
#include "opt_ddb.h"
@@ -460,7 +460,7 @@ cpu_startup(void)
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
}
Index: src/sys/arch/evbppc/explora/machdep.c
diff -u src/sys/arch/evbppc/explora/machdep.c:1.39 src/sys/arch/evbppc/explora/machdep.c:1.40
--- src/sys/arch/evbppc/explora/machdep.c:1.39 Tue Dec 31 13:07:10 2019
+++ src/sys/arch/evbppc/explora/machdep.c Thu Jun 11 19:20:43 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.39 2019/12/31 13:07:10 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.40 2020/06/11 19:20:43 ad Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.39 2019/12/31 13:07:10 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.40 2020/06/11 19:20:43 ad Exp $");
#include "opt_explora.h"
#include "opt_modular.h"
@@ -179,7 +179,7 @@ cpu_startup(void)
* pool pages.
*/
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/evbppc/virtex/machdep.c
diff -u src/sys/arch/evbppc/virtex/machdep.c:1.24 src/sys/arch/evbppc/virtex/machdep.c:1.25
--- src/sys/arch/evbppc/virtex/machdep.c:1.24 Tue Dec 31 13:07:10 2019
+++ src/sys/arch/evbppc/virtex/machdep.c Thu Jun 11 19:20:43 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.24 2019/12/31 13:07:10 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.25 2020/06/11 19:20:43 ad Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.24 2019/12/31 13:07:10 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.25 2020/06/11 19:20:43 ad Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -202,7 +202,7 @@ cpu_startup(void)
* pool pages.
*/
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/evbppc/walnut/machdep.c
diff -u src/sys/arch/evbppc/walnut/machdep.c:1.58 src/sys/arch/evbppc/walnut/machdep.c:1.59
--- src/sys/arch/evbppc/walnut/machdep.c:1.58 Tue Dec 31 13:07:10 2019
+++ src/sys/arch/evbppc/walnut/machdep.c Thu Jun 11 19:20:43 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.58 2019/12/31 13:07:10 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.59 2020/06/11 19:20:43 ad Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.58 2019/12/31 13:07:10 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.59 2020/06/11 19:20:43 ad Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -259,7 +259,7 @@ cpu_startup(void)
* pool pages.
*/
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/ews4800mips/ews4800mips/machdep.c
diff -u src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.30 src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.31
--- src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.30 Tue Dec 31 13:07:10 2019
+++ src/sys/arch/ews4800mips/ews4800mips/machdep.c Thu Jun 11 19:20:43 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.30 2019/12/31 13:07:10 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.31 2020/06/11 19:20:43 ad Exp $ */
/*-
* Copyright (c) 2001, 2004, 2005 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.30 2019/12/31 13:07:10 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.31 2020/06/11 19:20:43 ad Exp $");
#include "opt_ddb.h"
@@ -230,7 +230,7 @@ cpu_startup(void)
* are allocated via the pool allocator, and we use KSEG to
* map those pages.)
*/
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
}
Index: src/sys/arch/hp300/hp300/machdep.c
diff -u src/sys/arch/hp300/hp300/machdep.c:1.233 src/sys/arch/hp300/hp300/machdep.c:1.234
--- src/sys/arch/hp300/hp300/machdep.c:1.233 Tue Apr 21 09:02:33 2020
+++ src/sys/arch/hp300/hp300/machdep.c Thu Jun 11 19:20:43 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.233 2020/04/21 09:02:33 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.234 2020/06/11 19:20:43 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.233 2020/04/21 09:02:33 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.234 2020/06/11 19:20:43 ad Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -324,7 +324,7 @@ cpu_startup(void)
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/hppa/hppa/machdep.c
diff -u src/sys/arch/hppa/hppa/machdep.c:1.13 src/sys/arch/hppa/hppa/machdep.c:1.14
--- src/sys/arch/hppa/hppa/machdep.c:1.13 Wed Apr 15 15:50:15 2020
+++ src/sys/arch/hppa/hppa/machdep.c Thu Jun 11 19:20:43 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.13 2020/04/15 15:50:15 skrll Exp $ */
+/* $NetBSD: machdep.c,v 1.14 2020/06/11 19:20:43 ad Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.13 2020/04/15 15:50:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.14 2020/06/11 19:20:43 ad Exp $");
#include "opt_cputype.h"
#include "opt_ddb.h"
@@ -931,7 +931,7 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
- format_bytes(pbuf[0], sizeof(pbuf[0]), ptoa(uvm_availmem()));
+ format_bytes(pbuf[0], sizeof(pbuf[0]), ptoa(uvm_availmem(false)));
printf("avail mem = %s\n", pbuf[0]);
}
Index: src/sys/arch/luna68k/luna68k/machdep.c
diff -u src/sys/arch/luna68k/luna68k/machdep.c:1.105 src/sys/arch/luna68k/luna68k/machdep.c:1.106
--- src/sys/arch/luna68k/luna68k/machdep.c:1.105 Tue Dec 31 13:07:10 2019
+++ src/sys/arch/luna68k/luna68k/machdep.c Thu Jun 11 19:20:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.105 2019/12/31 13:07:10 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.106 2020/06/11 19:20:44 ad Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.105 2019/12/31 13:07:10 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.106 2020/06/11 19:20:44 ad Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -345,7 +345,7 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
}
Index: src/sys/arch/mac68k/mac68k/machdep.c
diff -u src/sys/arch/mac68k/mac68k/machdep.c:1.357 src/sys/arch/mac68k/mac68k/machdep.c:1.358
--- src/sys/arch/mac68k/mac68k/machdep.c:1.357 Tue Dec 31 13:07:11 2019
+++ src/sys/arch/mac68k/mac68k/machdep.c Thu Jun 11 19:20:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.357 2019/12/31 13:07:11 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.358 2020/06/11 19:20:44 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.357 2019/12/31 13:07:11 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.358 2020/06/11 19:20:44 ad Exp $");
#include "opt_adb.h"
#include "opt_copy_symtab.h"
@@ -414,7 +414,7 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/mips/mips/cpu_subr.c
diff -u src/sys/arch/mips/mips/cpu_subr.c:1.46 src/sys/arch/mips/mips/cpu_subr.c:1.47
--- src/sys/arch/mips/mips/cpu_subr.c:1.46 Sat Feb 15 07:20:41 2020
+++ src/sys/arch/mips/mips/cpu_subr.c Thu Jun 11 19:20:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_subr.c,v 1.46 2020/02/15 07:20:41 skrll Exp $ */
+/* $NetBSD: cpu_subr.c,v 1.47 2020/06/11 19:20:44 ad Exp $ */
/*-
* Copyright (c) 2010, 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.46 2020/02/15 07:20:41 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.47 2020/06/11 19:20:44 ad Exp $");
#include "opt_cputype.h"
#include "opt_ddb.h"
@@ -337,7 +337,7 @@ cpu_startup_common(void)
* map those pages.)
*/
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
#if defined(__mips_n32)
Index: src/sys/arch/mvme68k/mvme68k/machdep.c
diff -u src/sys/arch/mvme68k/mvme68k/machdep.c:1.157 src/sys/arch/mvme68k/mvme68k/machdep.c:1.158
--- src/sys/arch/mvme68k/mvme68k/machdep.c:1.157 Tue Dec 31 13:07:11 2019
+++ src/sys/arch/mvme68k/mvme68k/machdep.c Thu Jun 11 19:20:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.157 2019/12/31 13:07:11 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.158 2020/06/11 19:20:44 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.157 2019/12/31 13:07:11 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.158 2020/06/11 19:20:44 ad Exp $");
#include "opt_ddb.h"
#include "opt_m060sp.h"
@@ -474,7 +474,7 @@ cpu_startup(void)
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/news68k/news68k/machdep.c
diff -u src/sys/arch/news68k/news68k/machdep.c:1.107 src/sys/arch/news68k/news68k/machdep.c:1.108
--- src/sys/arch/news68k/news68k/machdep.c:1.107 Mon Feb 3 23:09:03 2020
+++ src/sys/arch/news68k/news68k/machdep.c Thu Jun 11 19:20:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.107 2020/02/03 23:09:03 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.108 2020/06/11 19:20:44 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.107 2020/02/03 23:09:03 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.108 2020/06/11 19:20:44 ad Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -237,7 +237,7 @@ cpu_startup(void)
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/next68k/next68k/machdep.c
diff -u src/sys/arch/next68k/next68k/machdep.c:1.114 src/sys/arch/next68k/next68k/machdep.c:1.115
--- src/sys/arch/next68k/next68k/machdep.c:1.114 Tue Dec 31 13:07:11 2019
+++ src/sys/arch/next68k/next68k/machdep.c Thu Jun 11 19:20:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.114 2019/12/31 13:07:11 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.115 2020/06/11 19:20:44 ad Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.114 2019/12/31 13:07:11 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.115 2020/06/11 19:20:44 ad Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -303,7 +303,7 @@ cpu_startup(void)
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/powerpc/booke/booke_machdep.c
diff -u src/sys/arch/powerpc/booke/booke_machdep.c:1.29 src/sys/arch/powerpc/booke/booke_machdep.c:1.30
--- src/sys/arch/powerpc/booke/booke_machdep.c:1.29 Tue Dec 31 13:07:11 2019
+++ src/sys/arch/powerpc/booke/booke_machdep.c Thu Jun 11 19:20:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: booke_machdep.c,v 1.29 2019/12/31 13:07:11 ad Exp $ */
+/* $NetBSD: booke_machdep.c,v 1.30 2020/06/11 19:20:44 ad Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -38,7 +38,7 @@
#define _POWERPC_BUS_DMA_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: booke_machdep.c,v 1.29 2019/12/31 13:07:11 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: booke_machdep.c,v 1.30 2020/06/11 19:20:44 ad Exp $");
#include "opt_modular.h"
@@ -191,7 +191,7 @@ booke_cpu_startup(const char *model)
* pool pages.
*/
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c
diff -u src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.28 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.29
--- src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.28 Tue Dec 31 13:07:11 2019
+++ src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c Thu Jun 11 19:20:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ibm4xx_machdep.c,v 1.28 2019/12/31 13:07:11 ad Exp $ */
+/* $NetBSD: ibm4xx_machdep.c,v 1.29 2020/06/11 19:20:44 ad Exp $ */
/* Original: ibm40x_machdep.c,v 1.3 2005/01/17 17:19:36 shige Exp $ */
/*
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibm4xx_machdep.c,v 1.28 2019/12/31 13:07:11 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibm4xx_machdep.c,v 1.29 2020/06/11 19:20:44 ad Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -307,7 +307,7 @@ ibm4xx_cpu_startup(const char *model)
* pool pages.
*/
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
}
Index: src/sys/arch/powerpc/oea/oea_machdep.c
diff -u src/sys/arch/powerpc/oea/oea_machdep.c:1.78 src/sys/arch/powerpc/oea/oea_machdep.c:1.79
--- src/sys/arch/powerpc/oea/oea_machdep.c:1.78 Tue Dec 31 13:07:11 2019
+++ src/sys/arch/powerpc/oea/oea_machdep.c Thu Jun 11 19:20:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: oea_machdep.c,v 1.78 2019/12/31 13:07:11 ad Exp $ */
+/* $NetBSD: oea_machdep.c,v 1.79 2020/06/11 19:20:44 ad Exp $ */
/*
* Copyright (C) 2002 Matt Thomas
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.78 2019/12/31 13:07:11 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.79 2020/06/11 19:20:44 ad Exp $");
#include "opt_ppcarch.h"
#include "opt_compat_netbsd.h"
@@ -1000,7 +1000,7 @@ oea_startup(const char *model)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
#ifdef MULTIPROCESSOR
Index: src/sys/arch/riscv/riscv/riscv_machdep.c
diff -u src/sys/arch/riscv/riscv/riscv_machdep.c:1.10 src/sys/arch/riscv/riscv/riscv_machdep.c:1.11
--- src/sys/arch/riscv/riscv/riscv_machdep.c:1.10 Sat Mar 14 16:12:16 2020
+++ src/sys/arch/riscv/riscv/riscv_machdep.c Thu Jun 11 19:20:45 2020
@@ -31,7 +31,7 @@
#include "opt_modular.h"
-__RCSID("$NetBSD: riscv_machdep.c,v 1.10 2020/03/14 16:12:16 skrll Exp $");
+__RCSID("$NetBSD: riscv_machdep.c,v 1.11 2020/06/11 19:20:45 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -326,7 +326,7 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, FALSE, NULL);
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
}
Index: src/sys/arch/sgimips/sgimips/machdep.c
diff -u src/sys/arch/sgimips/sgimips/machdep.c:1.149 src/sys/arch/sgimips/sgimips/machdep.c:1.150
--- src/sys/arch/sgimips/sgimips/machdep.c:1.149 Tue Dec 31 13:07:12 2019
+++ src/sys/arch/sgimips/sgimips/machdep.c Thu Jun 11 19:20:45 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.149 2019/12/31 13:07:12 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.150 2020/06/11 19:20:45 ad Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.149 2019/12/31 13:07:12 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.150 2020/06/11 19:20:45 ad Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -730,7 +730,7 @@ cpu_startup(void)
* are allocated via the pool allocator, and we use KSEG to
* map those pages.)
*/
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
}
Index: src/sys/arch/sh3/sh3/sh3_machdep.c
diff -u src/sys/arch/sh3/sh3/sh3_machdep.c:1.109 src/sys/arch/sh3/sh3/sh3_machdep.c:1.110
--- src/sys/arch/sh3/sh3/sh3_machdep.c:1.109 Tue Dec 31 13:07:12 2019
+++ src/sys/arch/sh3/sh3/sh3_machdep.c Thu Jun 11 19:20:45 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sh3_machdep.c,v 1.109 2019/12/31 13:07:12 ad Exp $ */
+/* $NetBSD: sh3_machdep.c,v 1.110 2020/06/11 19:20:45 ad Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.109 2019/12/31 13:07:12 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.110 2020/06/11 19:20:45 ad Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -304,7 +304,7 @@ sh_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
}
Index: src/sys/arch/sparc/sparc/machdep.c
diff -u src/sys/arch/sparc/sparc/machdep.c:1.333 src/sys/arch/sparc/sparc/machdep.c:1.334
--- src/sys/arch/sparc/sparc/machdep.c:1.333 Tue Dec 31 13:07:12 2019
+++ src/sys/arch/sparc/sparc/machdep.c Thu Jun 11 19:20:45 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.333 2019/12/31 13:07:12 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.334 2020/06/11 19:20:45 ad Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.333 2019/12/31 13:07:12 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.334 2020/06/11 19:20:45 ad Exp $");
#include "opt_compat_netbsd.h"
#include "opt_compat_sunos.h"
@@ -322,7 +322,7 @@ cpu_startup(void)
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
pmap_redzone();
Index: src/sys/arch/sparc64/sparc64/machdep.c
diff -u src/sys/arch/sparc64/sparc64/machdep.c:1.297 src/sys/arch/sparc64/sparc64/machdep.c:1.298
--- src/sys/arch/sparc64/sparc64/machdep.c:1.297 Tue Dec 31 13:07:12 2019
+++ src/sys/arch/sparc64/sparc64/machdep.c Thu Jun 11 19:20:45 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.297 2019/12/31 13:07:12 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.298 2020/06/11 19:20:45 ad Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2019 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.297 2019/12/31 13:07:12 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.298 2020/06/11 19:20:45 ad Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -195,7 +195,7 @@ cpu_startup(void)
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
#if 0
Index: src/sys/arch/sun2/sun2/machdep.c
diff -u src/sys/arch/sun2/sun2/machdep.c:1.82 src/sys/arch/sun2/sun2/machdep.c:1.83
--- src/sys/arch/sun2/sun2/machdep.c:1.82 Sun Mar 8 06:06:46 2020
+++ src/sys/arch/sun2/sun2/machdep.c Thu Jun 11 19:20:45 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.82 2020/03/08 06:06:46 rin Exp $ */
+/* $NetBSD: machdep.c,v 1.83 2020/06/11 19:20:45 ad Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -149,7 +149,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.82 2020/03/08 06:06:46 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.83 2020/06/11 19:20:45 ad Exp $");
#include "opt_ddb.h"
#include "opt_fpu_emulate.h"
@@ -337,7 +337,7 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/sun3/sun3/machdep.c
diff -u src/sys/arch/sun3/sun3/machdep.c:1.211 src/sys/arch/sun3/sun3/machdep.c:1.212
--- src/sys/arch/sun3/sun3/machdep.c:1.211 Tue Dec 31 13:07:12 2019
+++ src/sys/arch/sun3/sun3/machdep.c Thu Jun 11 19:20:45 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.211 2019/12/31 13:07:12 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.212 2020/06/11 19:20:45 ad Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.211 2019/12/31 13:07:12 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.212 2020/06/11 19:20:45 ad Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -258,7 +258,7 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/sun3/sun3x/machdep.c
diff -u src/sys/arch/sun3/sun3x/machdep.c:1.138 src/sys/arch/sun3/sun3x/machdep.c:1.139
--- src/sys/arch/sun3/sun3x/machdep.c:1.138 Tue Dec 31 13:07:12 2019
+++ src/sys/arch/sun3/sun3x/machdep.c Thu Jun 11 19:20:45 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.138 2019/12/31 13:07:12 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.139 2020/06/11 19:20:45 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.138 2019/12/31 13:07:12 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.139 2020/06/11 19:20:45 ad Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -221,7 +221,7 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/vax/vax/machdep.c
diff -u src/sys/arch/vax/vax/machdep.c:1.195 src/sys/arch/vax/vax/machdep.c:1.196
--- src/sys/arch/vax/vax/machdep.c:1.195 Tue Dec 31 13:07:12 2019
+++ src/sys/arch/vax/vax/machdep.c Thu Jun 11 19:20:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.195 2019/12/31 13:07:12 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.196 2020/06/11 19:20:46 ad Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.195 2019/12/31 13:07:12 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.196 2020/06/11 19:20:46 ad Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -205,7 +205,7 @@ cpu_startup(void)
VM_PHYS_SIZE, 0, false, NULL);
#endif
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
#ifdef DDB
Index: src/sys/arch/x68k/x68k/machdep.c
diff -u src/sys/arch/x68k/x68k/machdep.c:1.202 src/sys/arch/x68k/x68k/machdep.c:1.203
--- src/sys/arch/x68k/x68k/machdep.c:1.202 Tue Dec 31 13:07:13 2019
+++ src/sys/arch/x68k/x68k/machdep.c Thu Jun 11 19:20:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.202 2019/12/31 13:07:13 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.203 2020/06/11 19:20:46 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.202 2019/12/31 13:07:13 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.203 2020/06/11 19:20:46 ad Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -299,7 +299,7 @@ cpu_startup(void)
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem(false)));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/compat/linux/common/linux_misc.c
diff -u src/sys/compat/linux/common/linux_misc.c:1.249 src/sys/compat/linux/common/linux_misc.c:1.250
--- src/sys/compat/linux/common/linux_misc.c:1.249 Sun May 3 01:06:56 2020
+++ src/sys/compat/linux/common/linux_misc.c Thu Jun 11 19:20:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_misc.c,v 1.249 2020/05/03 01:06:56 thorpej Exp $ */
+/* $NetBSD: linux_misc.c,v 1.250 2020/06/11 19:20:46 ad Exp $ */
/*-
* Copyright (c) 1995, 1998, 1999, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.249 2020/05/03 01:06:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.250 2020/06/11 19:20:46 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1355,7 +1355,7 @@ linux_sys_sysinfo(struct lwp *l, const s
si.loads[1] = la->ldavg[1] * LINUX_SYSINFO_LOADS_SCALE / la->fscale;
si.loads[2] = la->ldavg[2] * LINUX_SYSINFO_LOADS_SCALE / la->fscale;
si.totalram = ctob((u_long)physmem);
- si.freeram = (u_long)uvm_availmem() * uvmexp.pagesize;
+ si.freeram = (u_long)uvm_availmem(true) * uvmexp.pagesize;
si.sharedram = 0; /* XXX */
si.bufferram = (u_long)uvmexp.filepages * uvmexp.pagesize;
si.totalswap = (u_long)uvmexp.swpages * uvmexp.pagesize;
Index: src/sys/compat/linux32/common/linux32_sysinfo.c
diff -u src/sys/compat/linux32/common/linux32_sysinfo.c:1.11 src/sys/compat/linux32/common/linux32_sysinfo.c:1.12
--- src/sys/compat/linux32/common/linux32_sysinfo.c:1.11 Sun Apr 19 20:31:59 2020
+++ src/sys/compat/linux32/common/linux32_sysinfo.c Thu Jun 11 19:20:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_sysinfo.c,v 1.11 2020/04/19 20:31:59 thorpej Exp $ */
+/* $NetBSD: linux32_sysinfo.c,v 1.12 2020/06/11 19:20:46 ad Exp $ */
/*-
* Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_sysinfo.c,v 1.11 2020/04/19 20:31:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_sysinfo.c,v 1.12 2020/06/11 19:20:46 ad Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -77,7 +77,7 @@ linux32_sys_sysinfo(struct lwp *l, const
si.loads[1] = la->ldavg[1] * LINUX_SYSINFO_LOADS_SCALE / la->fscale;
si.loads[2] = la->ldavg[2] * LINUX_SYSINFO_LOADS_SCALE / la->fscale;
si.totalram = ctob((u_long)physmem);
- si.freeram = (u_long)uvm_availmem() * uvmexp.pagesize;
+ si.freeram = (u_long)uvm_availmem(true) * uvmexp.pagesize;
si.sharedram = 0; /* XXX */
si.bufferram = (u_long)uvmexp.filepages * uvmexp.pagesize;
si.totalswap = (u_long)uvmexp.swpages * uvmexp.pagesize;
Index: src/sys/dev/ccd.c
diff -u src/sys/dev/ccd.c:1.183 src/sys/dev/ccd.c:1.184
--- src/sys/dev/ccd.c:1.183 Tue Dec 31 13:07:13 2019
+++ src/sys/dev/ccd.c Thu Jun 11 19:20:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.183 2019/12/31 13:07:13 ad Exp $ */
+/* $NetBSD: ccd.c,v 1.184 2020/06/11 19:20:46 ad Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.183 2019/12/31 13:07:13 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.184 2020/06/11 19:20:46 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -702,7 +702,7 @@ ccdbackoff(struct ccd_softc *cs)
{
/* XXX Arbitrary, should be a uvm call. */
- return uvm_availmem() < (uvmexp.freemin >> 1) &&
+ return uvm_availmem(true) < (uvmexp.freemin >> 1) &&
disk_isbusy(&cs->sc_dkdev);
}
Index: src/sys/fs/tmpfs/tmpfs_mem.c
diff -u src/sys/fs/tmpfs/tmpfs_mem.c:1.12 src/sys/fs/tmpfs/tmpfs_mem.c:1.13
--- src/sys/fs/tmpfs/tmpfs_mem.c:1.12 Tue Dec 31 13:07:13 2019
+++ src/sys/fs/tmpfs/tmpfs_mem.c Thu Jun 11 19:20:46 2020
@@ -1,7 +1,7 @@
-/* $NetBSD: tmpfs_mem.c,v 1.12 2019/12/31 13:07:13 ad Exp $ */
+/* $NetBSD: tmpfs_mem.c,v 1.13 2020/06/11 19:20:46 ad Exp $ */
/*
- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
+ * Copyright (c) 2010, 2011, 2020 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_mem.c,v 1.12 2019/12/31 13:07:13 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_mem.c,v 1.13 2020/06/11 19:20:46 ad Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -97,12 +97,11 @@ tmpfs_mem_info(bool total)
{
size_t size = 0;
- /* XXX: unlocked */
size += uvmexp.swpgavail;
if (!total) {
size -= uvmexp.swpgonly;
}
- size += uvm_availmem();
+ size += uvm_availmem(true);
size += uvmexp.filepages;
if (size > uvmexp.wired) {
size -= uvmexp.wired;
Index: src/sys/kern/init_main.c
diff -u src/sys/kern/init_main.c:1.526 src/sys/kern/init_main.c:1.527
--- src/sys/kern/init_main.c:1.526 Sat May 23 23:42:43 2020
+++ src/sys/kern/init_main.c Thu Jun 11 19:20:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.526 2020/05/23 23:42:43 ad Exp $ */
+/* $NetBSD: init_main.c,v 1.527 2020/06/11 19:20:46 ad Exp $ */
/*-
* Copyright (c) 2008, 2009, 2019 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.526 2020/05/23 23:42:43 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.527 2020/06/11 19:20:46 ad Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -1160,6 +1160,6 @@ banner(void)
(*pr)("%s%s", copyright, version);
format_bytes(pbuf, MEM_PBUFSIZE, ctob((uint64_t)physmem));
(*pr)("total memory = %s\n", pbuf);
- format_bytes(pbuf, MEM_PBUFSIZE, ctob((uint64_t)uvm_availmem()));
+ format_bytes(pbuf, MEM_PBUFSIZE, ctob((uint64_t)uvm_availmem(false)));
(*pr)("avail memory = %s\n", pbuf);
}
Index: src/sys/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.150 src/sys/kern/kern_module.c:1.151
--- src/sys/kern/kern_module.c:1.150 Mon Jun 8 20:19:50 2020
+++ src/sys/kern/kern_module.c Thu Jun 11 19:20:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_module.c,v 1.150 2020/06/08 20:19:50 thorpej Exp $ */
+/* $NetBSD: kern_module.c,v 1.151 2020/06/11 19:20:46 ad Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.150 2020/06/08 20:19:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.151 2020/06/11 19:20:46 ad Exp $");
#define _MODULE_INTERNAL
@@ -1655,7 +1655,7 @@ module_thread(void *cookie)
if (!ISSET(mod->mod_flags, MODFLG_AUTO_LOADED))
continue;
- if (uvm_availmem() < uvmexp.freemin) {
+ if (uvm_availmem(false) < uvmexp.freemin) {
module_thread_ticks = hz;
} else if (module_autotime == 0 ||
mod->mod_autotime == 0) {
Index: src/sys/kern/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.254 src/sys/kern/kern_proc.c:1.255
--- src/sys/kern/kern_proc.c:1.254 Tue May 26 00:50:53 2020
+++ src/sys/kern/kern_proc.c Thu Jun 11 19:20:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_proc.c,v 1.254 2020/05/26 00:50:53 kamil Exp $ */
+/* $NetBSD: kern_proc.c,v 1.255 2020/06/11 19:20:46 ad Exp $ */
/*-
* Copyright (c) 1999, 2006, 2007, 2008, 2020 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.254 2020/05/26 00:50:53 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.255 2020/06/11 19:20:46 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -524,7 +524,7 @@ proc0_init(void)
rlim[RLIMIT_NPROC].rlim_max = maxproc;
rlim[RLIMIT_NPROC].rlim_cur = maxproc < maxuprc ? maxproc : maxuprc;
- lim = MIN(VM_MAXUSER_ADDRESS, ctob((rlim_t)uvm_availmem()));
+ lim = MIN(VM_MAXUSER_ADDRESS, ctob((rlim_t)uvm_availmem(false)));
rlim[RLIMIT_RSS].rlim_max = lim;
rlim[RLIMIT_MEMLOCK].rlim_max = lim;
rlim[RLIMIT_MEMLOCK].rlim_cur = lim / 3;
Index: src/sys/kern/vfs_bio.c
diff -u src/sys/kern/vfs_bio.c:1.295 src/sys/kern/vfs_bio.c:1.296
--- src/sys/kern/vfs_bio.c:1.295 Mon Apr 27 07:51:02 2020
+++ src/sys/kern/vfs_bio.c Thu Jun 11 19:20:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_bio.c,v 1.295 2020/04/27 07:51:02 jdolecek Exp $ */
+/* $NetBSD: vfs_bio.c,v 1.296 2020/06/11 19:20:46 ad Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2019, 2020 The NetBSD Foundation, Inc.
@@ -123,7 +123,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.295 2020/04/27 07:51:02 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.296 2020/06/11 19:20:46 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_bufcache.h"
@@ -602,7 +602,7 @@ buf_canrelease(void)
ninvalid += bufqueues[BQ_AGE].bq_bytes;
- pagedemand = uvmexp.freetarg - uvm_availmem();
+ pagedemand = uvmexp.freetarg - uvm_availmem(false);
if (pagedemand < 0)
return ninvalid;
return MAX(ninvalid, MIN(2 * MAXBSIZE,
Index: src/sys/miscfs/procfs/procfs_linux.c
diff -u src/sys/miscfs/procfs/procfs_linux.c:1.84 src/sys/miscfs/procfs/procfs_linux.c:1.85
--- src/sys/miscfs/procfs/procfs_linux.c:1.84 Sun May 31 08:38:54 2020
+++ src/sys/miscfs/procfs/procfs_linux.c Thu Jun 11 19:20:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_linux.c,v 1.84 2020/05/31 08:38:54 rin Exp $ */
+/* $NetBSD: procfs_linux.c,v 1.85 2020/06/11 19:20:46 ad Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_linux.c,v 1.84 2020/05/31 08:38:54 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_linux.c,v 1.85 2020/06/11 19:20:46 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -143,7 +143,7 @@ procfs_domeminfo(struct lwp *curl, struc
bf = malloc(LBFSZ, M_TEMP, M_WAITOK);
cpu_count_sync_all();
- freepg = (long)uvm_availmem();
+ freepg = (long)uvm_availmem(true);
filepg = (long)cpu_count_get(CPU_COUNT_FILEPAGES);
anonpg = (long)cpu_count_get(CPU_COUNT_ANONPAGES);
execpg = (long)cpu_count_get(CPU_COUNT_EXECPAGES);
Index: src/sys/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.189 src/sys/rump/librump/rumpkern/vm.c:1.190
--- src/sys/rump/librump/rumpkern/vm.c:1.189 Sat Jun 6 22:31:40 2020
+++ src/sys/rump/librump/rumpkern/vm.c Thu Jun 11 19:20:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vm.c,v 1.189 2020/06/06 22:31:40 ad Exp $ */
+/* $NetBSD: vm.c,v 1.190 2020/06/11 19:20:46 ad Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.189 2020/06/06 22:31:40 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.190 2020/06/11 19:20:46 ad Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -430,7 +430,7 @@ uvm_pageunwire(struct vm_page *pg)
}
int
-uvm_availmem(void)
+uvm_availmem(bool cached)
{
return uvmexp.free;
Index: src/sys/ufs/chfs/chfs_subr.c
diff -u src/sys/ufs/chfs/chfs_subr.c:1.13 src/sys/ufs/chfs/chfs_subr.c:1.14
--- src/sys/ufs/chfs/chfs_subr.c:1.13 Sat May 16 18:31:53 2020
+++ src/sys/ufs/chfs/chfs_subr.c Thu Jun 11 19:20:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_subr.c,v 1.13 2020/05/16 18:31:53 christos Exp $ */
+/* $NetBSD: chfs_subr.c,v 1.14 2020/06/11 19:20:47 ad Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -79,7 +79,7 @@ chfs_mem_info(bool total)
if (!total) {
size -= uvmexp.swpgonly;
}
- size += uvm_availmem();
+ size += uvm_availmem(true);
size += uvmexp.filepages;
if (size > uvmexp.wired) {
size -= uvmexp.wired;
Index: src/sys/ufs/lfs/lfs_bio.c
diff -u src/sys/ufs/lfs/lfs_bio.c:1.147 src/sys/ufs/lfs/lfs_bio.c:1.148
--- src/sys/ufs/lfs/lfs_bio.c:1.147 Sat Mar 14 15:35:35 2020
+++ src/sys/ufs/lfs/lfs_bio.c Thu Jun 11 19:20:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_bio.c,v 1.147 2020/03/14 15:35:35 ad Exp $ */
+/* $NetBSD: lfs_bio.c,v 1.148 2020/06/11 19:20:47 ad Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2008 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.147 2020/03/14 15:35:35 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.148 2020/06/11 19:20:47 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -772,7 +772,7 @@ lfs_wait_pages(void)
int active, inactive;
uvm_estimatepageable(&active, &inactive);
- return LFS_WAIT_RESOURCE(active + inactive + uvm_availmem(), 1);
+ return LFS_WAIT_RESOURCE(active + inactive + uvm_availmem(false), 1);
}
int
@@ -781,5 +781,5 @@ lfs_max_pages(void)
int active, inactive;
uvm_estimatepageable(&active, &inactive);
- return LFS_MAX_RESOURCE(active + inactive + uvm_availmem(), 1);
+ return LFS_MAX_RESOURCE(active + inactive + uvm_availmem(false), 1);
}
Index: src/sys/uvm/uvm_extern.h
diff -u src/sys/uvm/uvm_extern.h:1.227 src/sys/uvm/uvm_extern.h:1.228
--- src/sys/uvm/uvm_extern.h:1.227 Tue May 26 00:50:53 2020
+++ src/sys/uvm/uvm_extern.h Thu Jun 11 19:20:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_extern.h,v 1.227 2020/05/26 00:50:53 kamil Exp $ */
+/* $NetBSD: uvm_extern.h,v 1.228 2020/06/11 19:20:47 ad Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -780,7 +780,7 @@ int uvm_obj_wirepages(struct uvm_objec
void uvm_obj_unwirepages(struct uvm_object *, off_t, off_t);
/* uvm_page.c */
-int uvm_availmem(void);
+int uvm_availmem(bool);
void uvm_page_numa_load(paddr_t, paddr_t, u_int);
struct vm_page *uvm_pagealloc_strat(struct uvm_object *,
voff_t, struct vm_anon *, int, int, int);
Index: src/sys/uvm/uvm_glue.c
diff -u src/sys/uvm/uvm_glue.c:1.179 src/sys/uvm/uvm_glue.c:1.180
--- src/sys/uvm/uvm_glue.c:1.179 Fri May 22 19:46:29 2020
+++ src/sys/uvm/uvm_glue.c Thu Jun 11 19:20:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_glue.c,v 1.179 2020/05/22 19:46:29 ad Exp $ */
+/* $NetBSD: uvm_glue.c,v 1.180 2020/06/11 19:20:47 ad Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_glue.c,v 1.179 2020/05/22 19:46:29 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_glue.c,v 1.180 2020/06/11 19:20:47 ad Exp $");
#include "opt_kgdb.h"
#include "opt_kstack.h"
@@ -482,7 +482,7 @@ uvm_init_limits(struct proc *p)
p->p_rlimit[RLIMIT_AS].rlim_cur = RLIM_INFINITY;
p->p_rlimit[RLIMIT_AS].rlim_max = RLIM_INFINITY;
p->p_rlimit[RLIMIT_RSS].rlim_cur = MIN(VM_MAXUSER_ADDRESS,
- ctob((rlim_t)uvm_availmem()));
+ ctob((rlim_t)uvm_availmem(false)));
}
/*
Index: src/sys/uvm/uvm_meter.c
diff -u src/sys/uvm/uvm_meter.c:1.77 src/sys/uvm/uvm_meter.c:1.78
--- src/sys/uvm/uvm_meter.c:1.77 Sat May 23 23:42:44 2020
+++ src/sys/uvm/uvm_meter.c Thu Jun 11 19:20:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_meter.c,v 1.77 2020/05/23 23:42:44 ad Exp $ */
+/* $NetBSD: uvm_meter.c,v 1.78 2020/06/11 19:20:47 ad Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_meter.c,v 1.77 2020/05/23 23:42:44 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_meter.c,v 1.78 2020/06/11 19:20:47 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -107,7 +107,7 @@ sysctl_vm_uvmexp2(SYSCTLFN_ARGS)
u.pagemask = uvmexp.pagemask;
u.pageshift = uvmexp.pageshift;
u.npages = uvmexp.npages;
- u.free = uvm_availmem();
+ u.free = uvm_availmem(true);
u.active = active;
u.inactive = inactive;
u.paging = uvmexp.paging;
@@ -390,7 +390,7 @@ uvm_total(struct vmtotal *totalp)
/*
* Calculate object memory usage statistics.
*/
- freepg = uvm_availmem();
+ freepg = uvm_availmem(true);
uvm_estimatepageable(&active, NULL);
totalp->t_free = freepg;
totalp->t_vm = uvmexp.npages - freepg + uvmexp.swpginuse;
@@ -457,7 +457,7 @@ uvm_update_uvmexp(void)
cpu_count_sync_all();
- uvmexp.free = (int)uvm_availmem();
+ uvmexp.free = (int)uvm_availmem(true);
uvmexp.zeropages = (int)cpu_count_get(CPU_COUNT_ZEROPAGES);
uvmexp.cpuhit = (int)cpu_count_get(CPU_COUNT_CPUHIT);
uvmexp.cpumiss = (int)cpu_count_get(CPU_COUNT_CPUMISS);
Index: src/sys/uvm/uvm_page.c
diff -u src/sys/uvm/uvm_page.c:1.238 src/sys/uvm/uvm_page.c:1.239
--- src/sys/uvm/uvm_page.c:1.238 Sun May 24 19:46:59 2020
+++ src/sys/uvm/uvm_page.c Thu Jun 11 19:20:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_page.c,v 1.238 2020/05/24 19:46:59 ad Exp $ */
+/* $NetBSD: uvm_page.c,v 1.239 2020/06/11 19:20:47 ad Exp $ */
/*-
* Copyright (c) 2019, 2020 The NetBSD Foundation, Inc.
@@ -95,7 +95,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.238 2020/05/24 19:46:59 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.239 2020/06/11 19:20:47 ad Exp $");
#include "opt_ddb.h"
#include "opt_uvm.h"
@@ -1018,7 +1018,7 @@ uvm_cpu_attach(struct cpu_info *ci)
*/
int
-uvm_availmem(void)
+uvm_availmem(bool cached)
{
struct pgfreelist *pgfl;
int fl, b, fpages;
Index: src/sys/uvm/uvm_pdaemon.c
diff -u src/sys/uvm/uvm_pdaemon.c:1.127 src/sys/uvm/uvm_pdaemon.c:1.128
--- src/sys/uvm/uvm_pdaemon.c:1.127 Mon May 25 19:46:20 2020
+++ src/sys/uvm/uvm_pdaemon.c Thu Jun 11 19:20:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pdaemon.c,v 1.127 2020/05/25 19:46:20 ad Exp $ */
+/* $NetBSD: uvm_pdaemon.c,v 1.128 2020/06/11 19:20:47 ad Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pdaemon.c,v 1.127 2020/05/25 19:46:20 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pdaemon.c,v 1.128 2020/06/11 19:20:47 ad Exp $");
#include "opt_uvmhist.h"
#include "opt_readahead.h"
@@ -184,7 +184,7 @@ uvm_wait(const char *wmsg)
void
uvm_kick_pdaemon(void)
{
- int fpages = uvm_availmem();
+ int fpages = uvm_availmem(false);
if (fpages + uvmexp.paging < uvmexp.freemin ||
(fpages + uvmexp.paging < uvmexp.freetarg &&
@@ -302,7 +302,7 @@ uvm_pageout(void *arg)
* Estimate a hint. Note that bufmem are returned to
* system only when entire pool page is empty.
*/
- fpages = uvm_availmem();
+ fpages = uvm_availmem(false);
UVMHIST_LOG(pdhist," free/ftarg=%jd/%jd",
fpages, uvmexp.freetarg, 0,0);
@@ -320,7 +320,7 @@ uvm_pageout(void *arg)
* if there's any free memory to be had,
* wake up any waiters.
*/
- if (uvm_availmem() > uvmexp.reserve_kernel ||
+ if (uvm_availmem(false) > uvmexp.reserve_kernel ||
uvmexp.paging == 0) {
mutex_spin_enter(&uvmpd_lock);
wakeup(&uvmexp.free);
@@ -368,7 +368,7 @@ uvm_pageout_done(int npages)
*/
mutex_spin_enter(&uvmpd_lock);
- if (uvm_availmem() <= uvmexp.reserve_kernel) {
+ if (uvm_availmem(false) <= uvmexp.reserve_kernel) {
wakeup(&uvm.pagedaemon);
} else if (uvm_pagedaemon_waiters != 0) {
wakeup(&uvmexp.free);
@@ -655,7 +655,7 @@ uvmpd_scan_queue(void)
* see if we've met the free target.
*/
- if (uvm_availmem() + uvmexp.paging
+ if (uvm_availmem(false) + uvmexp.paging
#if defined(VMSWAP)
+ swapcluster_nused(&swc)
#endif /* defined(VMSWAP) */
@@ -788,7 +788,8 @@ uvmpd_scan_queue(void)
* free target when all the current pageouts complete.
*/
- if (uvm_availmem() + uvmexp.paging > uvmexp.freetarg << 2) {
+ if (uvm_availmem(false) + uvmexp.paging >
+ uvmexp.freetarg << 2) {
rw_exit(slock);
continue;
}
@@ -905,7 +906,7 @@ uvmpd_scan(void)
*/
swap_shortage = 0;
- fpages = uvm_availmem();
+ fpages = uvm_availmem(false);
if (fpages < uvmexp.freetarg &&
uvmexp.swpginuse >= uvmexp.swpgavail &&
!uvm_swapisfull() &&
@@ -920,7 +921,7 @@ uvmpd_scan(void)
* modules.
*/
- if (uvm_availmem() < uvmexp.freemin) {
+ if (uvm_availmem(false) < uvmexp.freemin) {
module_thread_kick();
}
}
@@ -1031,7 +1032,7 @@ uvmpd_pool_drain_thread(void *arg)
/*
* kill unused metadata buffers.
*/
- bufcnt = uvmexp.freetarg - uvm_availmem();
+ bufcnt = uvmexp.freetarg - uvm_availmem(false);
if (bufcnt < 0)
bufcnt = 0;
Index: src/sys/uvm/uvm_pdpolicy_clock.c
diff -u src/sys/uvm/uvm_pdpolicy_clock.c:1.37 src/sys/uvm/uvm_pdpolicy_clock.c:1.38
--- src/sys/uvm/uvm_pdpolicy_clock.c:1.37 Sun May 17 19:38:17 2020
+++ src/sys/uvm/uvm_pdpolicy_clock.c Thu Jun 11 19:20:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pdpolicy_clock.c,v 1.37 2020/05/17 19:38:17 ad Exp $ */
+/* $NetBSD: uvm_pdpolicy_clock.c,v 1.38 2020/06/11 19:20:47 ad Exp $ */
/* NetBSD: uvm_pdaemon.c,v 1.72 2006/01/05 10:47:33 yamt Exp $ */
/*-
@@ -98,7 +98,7 @@
#else /* defined(PDSIM) */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pdpolicy_clock.c,v 1.37 2020/05/17 19:38:17 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pdpolicy_clock.c,v 1.38 2020/06/11 19:20:47 ad Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -196,7 +196,7 @@ uvmpdpol_scaninit(void)
*/
cpu_count_sync_all();
- freepg = uvm_availmem();
+ freepg = uvm_availmem(false);
anonpg = cpu_count_get(CPU_COUNT_ANONPAGES);
filepg = cpu_count_get(CPU_COUNT_FILEPAGES);
execpg = cpu_count_get(CPU_COUNT_EXECPAGES);
Index: src/sys/uvm/uvm_pglist.c
diff -u src/sys/uvm/uvm_pglist.c:1.82 src/sys/uvm/uvm_pglist.c:1.83
--- src/sys/uvm/uvm_pglist.c:1.82 Sat May 23 20:22:42 2020
+++ src/sys/uvm/uvm_pglist.c Thu Jun 11 19:20:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pglist.c,v 1.82 2020/05/23 20:22:42 ad Exp $ */
+/* $NetBSD: uvm_pglist.c,v 1.83 2020/06/11 19:20:47 ad Exp $ */
/*-
* Copyright (c) 1997, 2019 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pglist.c,v 1.82 2020/05/23 20:22:42 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pglist.c,v 1.83 2020/06/11 19:20:47 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -310,7 +310,7 @@ uvm_pglistalloc_contig(int num, paddr_t
uvm_pgfl_lock();
/* Are there even any free pages? */
- if (uvm_availmem() <=
+ if (uvm_availmem(false) <=
(uvmexp.reserve_pagedaemon + uvmexp.reserve_kernel))
goto out;
@@ -456,7 +456,7 @@ again:
count++;
/* Are there even any free pages? */
- if (uvm_availmem() <=
+ if (uvm_availmem(false) <=
(uvmexp.reserve_pagedaemon + uvmexp.reserve_kernel))
goto out;
Index: src/sys/uvm/uvm_stat.c
diff -u src/sys/uvm/uvm_stat.c:1.43 src/sys/uvm/uvm_stat.c:1.44
--- src/sys/uvm/uvm_stat.c:1.43 Tue Dec 31 13:07:14 2019
+++ src/sys/uvm/uvm_stat.c Thu Jun 11 19:20:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_stat.c,v 1.43 2019/12/31 13:07:14 ad Exp $ */
+/* $NetBSD: uvm_stat.c,v 1.44 2020/06/11 19:20:47 ad Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_stat.c,v 1.43 2019/12/31 13:07:14 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_stat.c,v 1.44 2020/06/11 19:20:47 ad Exp $");
#include "opt_readahead.h"
#include "opt_ddb.h"
@@ -67,7 +67,7 @@ uvmexp_print(void (*pr)(const char *, ..
uvmexp.pagesize, uvmexp.pagesize, uvmexp.pagemask,
uvmexp.pageshift, uvmexp.ncolors);
(*pr)(" %d VM pages: %d active, %d inactive, %d wired, %d free\n",
- uvmexp.npages, active, inactive, uvmexp.wired, uvm_availmem());
+ uvmexp.npages, active, inactive, uvmexp.wired, uvm_availmem(false));
(*pr)(" pages %" PRId64 " anon, %" PRId64 " file, %" PRId64 " exec\n",
cpu_count_get(CPU_COUNT_ANONPAGES),
cpu_count_get(CPU_COUNT_FILEPAGES),
