Module Name: src
Committed By: ad
Date: Sat Dec 21 11:41:19 UTC 2019
Modified Files:
src/sys/uvm: uvm_pdaemon.c
Log Message:
uvm_reclaimable(): need to sum the per-CPU values for filepages/execpages.
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/sys/uvm/uvm_pdaemon.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/uvm_pdaemon.c
diff -u src/sys/uvm/uvm_pdaemon.c:1.115 src/sys/uvm/uvm_pdaemon.c:1.116
--- src/sys/uvm/uvm_pdaemon.c:1.115 Sat Dec 14 21:36:00 2019
+++ src/sys/uvm/uvm_pdaemon.c Sat Dec 21 11:41:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pdaemon.c,v 1.115 2019/12/14 21:36:00 ad Exp $ */
+/* $NetBSD: uvm_pdaemon.c,v 1.116 2019/12/21 11:41:18 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.115 2019/12/14 21:36:00 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pdaemon.c,v 1.116 2019/12/21 11:41:18 ad Exp $");
#include "opt_uvmhist.h"
#include "opt_readahead.h"
@@ -1002,7 +1002,9 @@ uvm_reclaimable(void)
* XXX ie. pools, traditional buffer cache.
*/
- filepages = uvmexp.filepages + uvmexp.execpages - uvmexp.wired;
+ cpu_count_sync_all();
+ filepages = (int)cpu_count_get(CPU_COUNT_FILEPAGES) +
+ (int)cpu_count_get(CPU_COUNT_EXECPAGES) - uvmexp.wired;
uvm_estimatepageable(&active, &inactive);
if (filepages >= MIN((active + inactive) >> 4,
5 * 1024 * 1024 >> PAGE_SHIFT)) {
