[src/trunk]: src/sys/rump/librump/rumpkern Fix the memory limiter to work for...

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

details:   https://anonhg.NetBSD.org/src/rev/3e71aa34db80
branches:  trunk
changeset: 327276:3e71aa34db80
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Mar 03 16:50:28 2014 +0000

description:
Fix the memory limiter to work for non-pagedaemon threads again

reported by njoly

diffstat:

 sys/rump/librump/rumpkern/vm.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r 980066ab6fed -r 3e71aa34db80 sys/rump/librump/rumpkern/vm.c
--- a/sys/rump/librump/rumpkern/vm.c    Mon Mar 03 16:22:57 2014 +0000
+++ b/sys/rump/librump/rumpkern/vm.c    Mon Mar 03 16:50:28 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vm.c,v 1.149 2014/02/18 06:18:13 pooka Exp $   */
+/*     $NetBSD: vm.c,v 1.150 2014/03/03 16:50:28 pooka 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.149 2014/02/18 06:18:13 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.150 2014/03/03 16:50:28 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -1158,6 +1158,8 @@
 void *
 rump_hypermalloc(size_t howmuch, int alignment, bool waitok, const char *wmsg)
 {
+       const unsigned long thelimit =
+           curlwp == uvm.pagedaemon_lwp ? pdlimit : rump_physmemlimit;
        unsigned long newmem;
        void *rv;
        int error;
@@ -1166,10 +1168,9 @@
 
        /* first we must be within the limit */
  limitagain:
-       if (rump_physmemlimit != RUMPMEM_UNLIMITED) {
+       if (thelimit != RUMPMEM_UNLIMITED) {
                newmem = atomic_add_long_nv(&curphysmem, howmuch);
-               if ((newmem > rump_physmemlimit) &&
-                   !(curlwp == uvm.pagedaemon_lwp || newmem > pdlimit)) {
+               if (newmem > thelimit) {
                        newmem = atomic_add_long_nv(&curphysmem, -howmuch);
                        if (!waitok) {
                                return NULL;