svn commit: r218989 - in head: lib/libc/sys sys/vm

[Sergey Kandaurov]

Author: pluknet
Date: Thu Feb 24 09:22:56 2011
New Revision: 218989
URL: http://svn.freebsd.org/changeset/base/218989

Log:
  Remove sysctl vm.max_proc_mmap used to protect from KVA space exhaustion.
  As it was pointed out by Alan Cox, that no longer serves its purpose with
  the modern UMA allocator compared to the old one used in 4.x days.
  
  The removal of sysctl eliminates max_proc_mmap type overflow leading to
  the broken mmap(2) seen with large amount of physical memory on arches
  with factually unbound KVA space (such as amd64).  It was found that
  slightly less than 256GB of physmem was enough to trigger the overflow.
  
  Reviewed by:	alc, kib
  Approved by:	avg (mentor)
  MFC after:	2 months

Modified:
  head/lib/libc/sys/mmap.2
  head/sys/vm/vm_mmap.c

Modified: head/lib/libc/sys/mmap.2
==============================================================================
--- head/lib/libc/sys/mmap.2	Thu Feb 24 09:13:47 2011	(r218988)
+++ head/lib/libc/sys/mmap.2	Thu Feb 24 09:22:56 2011	(r218989)
@@ -346,9 +346,6 @@ was specified and the
 argument was not available.
 .Dv MAP_ANON
 was specified and insufficient memory was available.
-The system has reached the per-process mmap limit specified in the
-.Va vm.max_proc_mmap
-sysctl.
 .El
 .Sh SEE ALSO
 .Xr madvise 2 ,

Modified: head/sys/vm/vm_mmap.c
==============================================================================
--- head/sys/vm/vm_mmap.c	Thu Feb 24 09:13:47 2011	(r218988)
+++ head/sys/vm/vm_mmap.c	Thu Feb 24 09:22:56 2011	(r218989)
@@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sysproto.h>
@@ -66,7 +65,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 #include <sys/sysent.h>
 #include <sys/vmmeter.h>
-#include <sys/sysctl.h>
 
 #include <security/mac/mac_framework.h>
 
@@ -80,7 +78,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_pageout.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_page.h>
-#include <vm/vm_kern.h>
 
 #ifdef HWPMC_HOOKS
 #include <sys/pmckern.h>
@@ -92,30 +89,6 @@ struct sbrk_args {
 };
 #endif
 
-static int max_proc_mmap;
-SYSCTL_INT(_vm, OID_AUTO, max_proc_mmap, CTLFLAG_RW, &max_proc_mmap, 0,
-    "Maximum number of memory-mapped files per process");
-
-/*
- * Set the maximum number of vm_map_entry structures per process.  Roughly
- * speaking vm_map_entry structures are tiny, so allowing them to eat 1/100
- * of our KVM malloc space still results in generous limits.  We want a
- * default that is good enough to prevent the kernel running out of resources
- * if attacked from compromised user account but generous enough such that
- * multi-threaded processes are not unduly inconvenienced.
- */
-static void vmmapentry_rsrc_init(void *);
-SYSINIT(vmmersrc, SI_SUB_KVM_RSRC, SI_ORDER_FIRST, vmmapentry_rsrc_init,
-    NULL);
-
-static void
-vmmapentry_rsrc_init(dummy)
-        void *dummy;
-{
-    max_proc_mmap = vm_kmem_size / sizeof(struct vm_map_entry);
-    max_proc_mmap /= 100;
-}
-
 static int vm_mmap_vnode(struct thread *, vm_size_t, vm_prot_t, vm_prot_t *,
     int *, struct vnode *, vm_ooffset_t *, vm_object_t *);
 static int vm_mmap_cdev(struct thread *, vm_size_t, vm_prot_t, vm_prot_t *,
@@ -377,18 +350,6 @@ mmap(td, uap)
 		handle_type = OBJT_VNODE;
 	}
 map:
-
-	/*
-	 * Do not allow more then a certain number of vm_map_entry structures
-	 * per process.  Scale with the number of rforks sharing the map
-	 * to make the limit reasonable for threads.
-	 */
-	if (max_proc_mmap &&
-	    vms->vm_map.nentries >= max_proc_mmap * vms->vm_refcnt) {
-		error = ENOMEM;
-		goto done;
-	}
-
 	td->td_fpop = fp;
 	error = vm_mmap(&vms->vm_map, &addr, size, prot, maxprot,
 	    flags, handle_type, handle, pos);