5 files changed, 59 insertions, 32 deletions

diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index 6fe4405d0a6c2..15d0fd5f3e9c3 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -682,6 +682,7 @@ vm_init_limits(udata)
 	void *udata;
 {
 	struct proc *p = udata;
+	struct plimit *limp;
 	int rss_limit;
 
 	/*
@@ -691,14 +692,15 @@ vm_init_limits(udata)
 	 * of memory - half of main memory helps to favor smaller processes,
 	 * and reduces thrashing of the object cache.
 	 */
-	p->p_rlimit[RLIMIT_STACK].rlim_cur = dflssiz;
-	p->p_rlimit[RLIMIT_STACK].rlim_max = maxssiz;
-	p->p_rlimit[RLIMIT_DATA].rlim_cur = dfldsiz;
-	p->p_rlimit[RLIMIT_DATA].rlim_max = maxdsiz;
+	limp = p->p_limit;
+	limp->pl_rlimit[RLIMIT_STACK].rlim_cur = dflssiz;
+	limp->pl_rlimit[RLIMIT_STACK].rlim_max = maxssiz;
+	limp->pl_rlimit[RLIMIT_DATA].rlim_cur = dfldsiz;
+	limp->pl_rlimit[RLIMIT_DATA].rlim_max = maxdsiz;
 	/* limit the limit to no less than 2MB */
 	rss_limit = max(cnt.v_free_count, 512);
-	p->p_rlimit[RLIMIT_RSS].rlim_cur = ptoa(rss_limit);
-	p->p_rlimit[RLIMIT_RSS].rlim_max = RLIM_INFINITY;
+	limp->pl_rlimit[RLIMIT_RSS].rlim_cur = ptoa(rss_limit);
+	limp->pl_rlimit[RLIMIT_RSS].rlim_max = RLIM_INFINITY;
 }
 
 void
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index f06fd78d76084..5c93a84acc626 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -2467,6 +2467,7 @@ vm_map_stack(vm_map_t map, vm_offset_t addrbos, vm_size_t max_ssize,
 	vm_offset_t bot, top;
 	vm_size_t init_ssize;
 	int orient, rv;
+	rlim_t vmemlim;
 
 	/*
 	 * The stack orientation is piggybacked with the cow argument.
@@ -2483,6 +2484,10 @@ vm_map_stack(vm_map_t map, vm_offset_t addrbos, vm_size_t max_ssize,
 
 	init_ssize = (max_ssize < sgrowsiz) ? max_ssize : sgrowsiz;
 
+	PROC_LOCK(curthread->td_proc);
+	vmemlim = lim_cur(curthread->td_proc, RLIMIT_VMEM);
+	PROC_UNLOCK(curthread->td_proc);
+
 	vm_map_lock(map);
 
 	/* If addr is already mapped, no go */
@@ -2492,8 +2497,7 @@ vm_map_stack(vm_map_t map, vm_offset_t addrbos, vm_size_t max_ssize,
 	}
 
 	/* If we would blow our VMEM resource limit, no go */
-	if (map->size + init_ssize >
-	    curthread->td_proc->p_rlimit[RLIMIT_VMEM].rlim_cur) {
+	if (map->size + init_ssize > vmemlim) {
 		vm_map_unlock(map);
 		return (KERN_NO_SPACE);
 	}
@@ -2566,11 +2570,17 @@ vm_map_growstack(struct proc *p, vm_offset_t addr)
 	vm_map_t map = &vm->vm_map;
 	vm_offset_t end;
 	size_t grow_amount, max_grow;
+	rlim_t stacklim, vmemlim;
 	int is_procstack, rv;
 
 	GIANT_REQUIRED;
 
 Retry:
+	PROC_LOCK(p);
+	stacklim = lim_cur(p, RLIMIT_STACK);
+	vmemlim = lim_cur(curthread->td_proc, RLIMIT_VMEM);
+	PROC_UNLOCK(p);
+
 	vm_map_lock_read(map);
 
 	/* If addr is already in the entry range, no need to grow.*/
@@ -2658,8 +2668,7 @@ Retry:
 	 * If this is the main process stack, see if we're over the stack
 	 * limit.
 	 */
-	if (is_procstack && (ctob(vm->vm_ssize) + grow_amount >
-			     p->p_rlimit[RLIMIT_STACK].rlim_cur)) {
+	if (is_procstack && (ctob(vm->vm_ssize) + grow_amount > stacklim)) {
 		vm_map_unlock_read(map);
 		return (KERN_NO_SPACE);
 	}
@@ -2668,14 +2677,12 @@ Retry:
 	grow_amount = roundup (grow_amount, sgrowsiz);
 	if (grow_amount > stack_entry->avail_ssize)
 		grow_amount = stack_entry->avail_ssize;
-	if (is_procstack && (ctob(vm->vm_ssize) + grow_amount >
-			     p->p_rlimit[RLIMIT_STACK].rlim_cur)) {
-		grow_amount = p->p_rlimit[RLIMIT_STACK].rlim_cur -
-			      ctob(vm->vm_ssize);
+	if (is_procstack && (ctob(vm->vm_ssize) + grow_amount > stacklim)) {
+		grow_amount = stacklim - ctob(vm->vm_ssize);
 	}
 
 	/* If we would blow our VMEM resource limit, no go */
-	if (map->size + grow_amount > p->p_rlimit[RLIMIT_VMEM].rlim_cur) {
+	if (map->size + grow_amount > vmemlim) {
 		vm_map_unlock_read(map);
 		return (KERN_NO_SPACE);
 	}
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index ab876a5b6aa93..2cad29b42253a 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -266,7 +266,7 @@ mmap(td, uap)
 			return (EINVAL);
 		if (addr + size < addr)
 			return (EINVAL);
-	}
+	} else {
 	/*
 	 * XXX for non-fixed mappings where no hint is provided or
 	 * the hint would fall in the potential heap space,
@@ -275,13 +275,15 @@ mmap(td, uap)
 	 * There should really be a pmap call to determine a reasonable
 	 * location.
 	 */
-	else if (addr == 0 ||
-	    (addr >= round_page((vm_offset_t)vms->vm_taddr) &&
-	     addr < round_page((vm_offset_t)vms->vm_daddr +
-	      td->td_proc->p_rlimit[RLIMIT_DATA].rlim_max)))
-		addr = round_page((vm_offset_t)vms->vm_daddr +
-		    td->td_proc->p_rlimit[RLIMIT_DATA].rlim_max);
-
+		PROC_LOCK(td->td_proc);
+		if (addr == 0 ||
+		    (addr >= round_page((vm_offset_t)vms->vm_taddr) &&
+		    addr < round_page((vm_offset_t)vms->vm_daddr +
+		    lim_max(td->td_proc, RLIMIT_DATA))))
+			addr = round_page((vm_offset_t)vms->vm_daddr +
+			    lim_max(td->td_proc, RLIMIT_DATA));
+		PROC_UNLOCK(td->td_proc);
+	}
 	mtx_lock(&Giant);	/* syscall marked mp-safe but isn't */
 	do {
 		if (flags & MAP_ANON) {
@@ -1002,9 +1004,13 @@ mlock(td, uap)
 		return (EAGAIN);
 
 #if 0
+	PROC_LOCK(td->td_proc);
 	if (size + ptoa(pmap_wired_count(vm_map_pmap(&td->td_proc->p_vmspace->vm_map))) >
-	    td->td_proc->p_rlimit[RLIMIT_MEMLOCK].rlim_cur)
+	    lim_cur(td->td_proc, RLIMIT_MEMLOCK)) {
+		PROC_UNLOCK(td->td_proc);
 		return (ENOMEM);
+	}
+	PROC_UNLOCK(td->td_proc);
 #else
 	error = suser(td);
 	if (error)
@@ -1044,9 +1050,13 @@ mlockall(td, uap)
 	 * If wiring all pages in the process would cause it to exceed
 	 * a hard resource limit, return ENOMEM.
 	 */
+	PROC_LOCK(td->td_proc);
 	if (map->size - ptoa(pmap_wired_count(vm_map_pmap(map)) >
-		td->td_proc->p_rlimit[RLIMIT_MEMLOCK].rlim_cur))
+		lim_cur(td->td_proc, RLIMIT_MEMLOCK))) {
+		PROC_UNLOCK(td->td_proc);
 		return (ENOMEM);
+	}
+	PROC_UNLOCK(td->td_proc);
 #else
 	error = suser(td);
 	if (error)
@@ -1176,10 +1186,13 @@ vm_mmap(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot,
 
 	objsize = size = round_page(size);
 
+	PROC_LOCK(td->td_proc);
 	if (td->td_proc->p_vmspace->vm_map.size + size >
-	    td->td_proc->p_rlimit[RLIMIT_VMEM].rlim_cur) {
+	    lim_cur(td->td_proc, RLIMIT_VMEM)) {
+		PROC_UNLOCK(td->td_proc);
 		return(ENOMEM);
 	}
+	PROC_UNLOCK(td->td_proc);
 
 	/*
 	 * We currently can only deal with page aligned file offsets.
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index 471f9b39349b1..506f1ec84a39c 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -1486,6 +1486,7 @@ vm_daemon()
 	struct proc *p;
 	int breakout;
 	struct thread *td;
+	struct rlimit rsslim;
 
 	mtx_lock(&Giant);
 	while (TRUE) {
@@ -1511,6 +1512,7 @@ vm_daemon()
 				PROC_UNLOCK(p);
 				continue;
 			}
+			lim_rlimit(p, RLIMIT_RSS, &rsslim);
 			/*
 			 * if the process is in a non-running type state,
 			 * don't touch it.
@@ -1534,8 +1536,7 @@ vm_daemon()
 			 * get a limit
 			 */
 			limit = OFF_TO_IDX(
-			    qmin(p->p_rlimit[RLIMIT_RSS].rlim_cur,
-				p->p_rlimit[RLIMIT_RSS].rlim_max));
+			    qmin(rsslim.rlim_cur, rsslim.rlim_max));
 
 			/*
 			 * let processes that are swapped out really be
diff --git a/sys/vm/vm_unix.c b/sys/vm/vm_unix.c
index 877609f1eb775..6313cc1125a0f 100644
--- a/sys/vm/vm_unix.c
+++ b/sys/vm/vm_unix.c
@@ -77,10 +77,16 @@ obreak(td, uap)
 {
 	struct vmspace *vm = td->td_proc->p_vmspace;
 	vm_offset_t new, old, base;
+	rlim_t datalim, vmemlim;
 	int rv;
 	int error = 0;
 	boolean_t do_map_wirefuture;
 
+	PROC_LOCK(td->td_proc);
+	datalim = lim_cur(td->td_proc, RLIMIT_DATA);
+	vmemlim = lim_cur(td->td_proc, RLIMIT_VMEM);
+	PROC_UNLOCK(td->td_proc);
+
 	do_map_wirefuture = FALSE;
 	new = round_page((vm_offset_t)uap->nsize);
 	vm_map_lock(&vm->vm_map);
@@ -92,8 +98,7 @@ obreak(td, uap)
 		 * Check the resource limit, but allow a process to reduce
 		 * its usage, even if it remains over the limit.
 		 */
-		if (new - base > td->td_proc->p_rlimit[RLIMIT_DATA].rlim_cur &&
-		    new > old) {
+		if (new - base > datalim && new > old) {
 			error = ENOMEM;
 			goto done;
 		}
@@ -111,8 +116,7 @@ obreak(td, uap)
 		goto done;
 	}
 	if (new > old) {
-		if (vm->vm_map.size + (new - old) >
-		    td->td_proc->p_rlimit[RLIMIT_VMEM].rlim_cur) {
+		if (vm->vm_map.size + (new - old) > vmemlim) {
 			error = ENOMEM;
 			goto done;
 		}