Module Name:    src
Committed By:   ad
Date:           Fri Dec 27 00:46:38 UTC 2019

Modified Files:
        src/sys/uvm: uvm_pager.c

Log Message:
PR kern/48044: panic: kernel diagnostic assertion "uvmexp.swpgonly + npages <= 
uvmexp.swpginuse" failed

swpgonly is updated asynchronously with regard to swap use.  We can't assert
this condition with confidence in the post-5.0 world, at least not without
broader changes.  swpgonly's ultimate use is of a heuristic nature so this
is no problem at all.


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sys/uvm/uvm_pager.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_pager.c
diff -u src/sys/uvm/uvm_pager.c:1.117 src/sys/uvm/uvm_pager.c:1.118
--- src/sys/uvm/uvm_pager.c:1.117	Sat Dec 21 14:41:44 2019
+++ src/sys/uvm/uvm_pager.c	Fri Dec 27 00:46:38 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_pager.c,v 1.117 2019/12/21 14:41:44 ad Exp $	*/
+/*	$NetBSD: uvm_pager.c,v 1.118 2019/12/27 00:46:38 ad Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pager.c,v 1.117 2019/12/21 14:41:44 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pager.c,v 1.118 2019/12/27 00:46:38 ad Exp $");
 
 #include "opt_uvmhist.h"
 #include "opt_readahead.h"
@@ -464,7 +464,6 @@ uvm_aio_aiodone_pages(struct vm_page **p
 
 		/* these pages are now only in swap. */
 		if (error != ENOMEM) {
-			KASSERT(uvmexp.swpgonly + npages <= uvmexp.swpginuse);
 			atomic_add_int(&uvmexp.swpgonly, npages);
 		}
 		if (error) {

Reply via email to