[src/netbsd-9]: src/sys/uvm Pull up following revision(s) (requested by ad in...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c40bdd5200cc
branches:  netbsd-9
changeset: 466582:c40bdd5200cc
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Dec 27 06:58:56 2019 +0000

description:
Pull up following revision(s) (requested by ad in ticket #584):

        sys/uvm/uvm_pager.c: revision 1.118

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.

diffstat:

 sys/uvm/uvm_pager.c |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r df348a56f462 -r c40bdd5200cc sys/uvm/uvm_pager.c
--- a/sys/uvm/uvm_pager.c       Thu Dec 26 20:20:27 2019 +0000
+++ b/sys/uvm/uvm_pager.c       Fri Dec 27 06:58:56 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_pager.c,v 1.111 2017/10/28 00:37:13 pgoyette Exp $ */
+/*     $NetBSD: uvm_pager.c,v 1.111.8.1 2019/12/27 06:58:56 martin 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.111 2017/10/28 00:37:13 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pager.c,v 1.111.8.1 2019/12/27 06:58:56 martin Exp $");
 
 #include "opt_uvmhist.h"
 #include "opt_readahead.h"
@@ -469,7 +469,6 @@
                /* these pages are now only in swap. */
                mutex_enter(&uvm_swap_data_lock);
                if (error != ENOMEM) {
-                       KASSERT(uvmexp.swpgonly + npages <= uvmexp.swpginuse);
                        uvmexp.swpgonly += npages;
                }
                mutex_exit(&uvm_swap_data_lock);