Module Name: src
Committed By: simonb
Date: Sat Jul 16 10:20:21 UTC 2022
Modified Files:
src/sys/kern: subr_pool.c
Log Message:
Use 64-bit math to calculate pool sizes. Fixes overflow errors for
pools larger than 4GB and gives the correct output for kernel pool pages
in "vmstat -s" output.
To generate a diff of this commit:
cvs rdiff -u -r1.284 -r1.285 src/sys/kern/subr_pool.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/kern/subr_pool.c
diff -u src/sys/kern/subr_pool.c:1.284 src/sys/kern/subr_pool.c:1.285
--- src/sys/kern/subr_pool.c:1.284 Sun May 29 10:47:40 2022
+++ src/sys/kern/subr_pool.c Sat Jul 16 10:20:21 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_pool.c,v 1.284 2022/05/29 10:47:40 andvar Exp $ */
+/* $NetBSD: subr_pool.c,v 1.285 2022/07/16 10:20:21 simonb Exp $ */
/*
* Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010, 2014, 2015, 2018,
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.284 2022/05/29 10:47:40 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.285 2022/07/16 10:20:21 simonb Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -1795,10 +1795,11 @@ pool_totalpages_locked(void)
uint64_t total = 0;
TAILQ_FOREACH(pp, &pool_head, pr_poollist) {
- uint64_t bytes = pp->pr_npages * pp->pr_alloc->pa_pagesz;
+ uint64_t bytes =
+ (uint64_t)pp->pr_npages * pp->pr_alloc->pa_pagesz;
if ((pp->pr_roflags & PR_RECURSIVE) != 0)
- bytes -= (pp->pr_nout * pp->pr_size);
+ bytes -= ((uint64_t)pp->pr_nout * pp->pr_size);
total += bytes;
}
