xnu-517.3.7.tar.gz

[apple/xnu.git] / bsd / kern / kern_resource.c

diff --git a/bsd/kern/kern_resource.c b/bsd/kern/kern_resource.c
index 5a41676e229fd11d46f3487d92a321b423d5da10..c59a2cf9c7589b7351bb3d822144ce94b1790a46 100644 (file)
--- a/bsd/kern/kern_resource.c
+++ b/bsd/kern/kern_resource.c
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -62,6 +65,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
 
 #include <sys/param.h>
 #include <sys/systm.h>

+#include <sys/sysctl.h>

 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/resourcevar.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/resourcevar.h>


@@ -85,6 +89,22 @@ int  dosetrlimit __P((struct proc *p, u_int which, struct rlimit *limp));
 rlim_t maxdmap = MAXDSIZ;      /* XXX */ 
 rlim_t maxsmap = MAXSSIZ;      /* XXX */ 
 
 rlim_t maxdmap = MAXDSIZ;      /* XXX */ 
 rlim_t maxsmap = MAXSSIZ;      /* XXX */ 
 

+/*
+ * Limits on the number of open files per process, and the number
+ * of child processes per process.
+ *
+ * Note: would be in kern/subr_param.c in FreeBSD.
+ */
+int maxprocperuid = CHILD_MAX;         /* max # of procs per user */
+int maxfilesperproc = OPEN_MAX;                /* per-proc open files limit */
+
+SYSCTL_INT( _kern, KERN_MAXPROCPERUID, maxprocperuid, CTLFLAG_RW,
+               &maxprocperuid, 0, "Maximum processes allowed per userid" );
+
+SYSCTL_INT( _kern, KERN_MAXFILESPERPROC, maxfilesperproc, CTLFLAG_RW,       
+               &maxfilesperproc, 0, "Maximum files allowed open per process" );
+
+

 /*
  * Resource controls and accounting.
  */
 /*
  * Resource controls and accounting.
  */


@@ -350,14 +370,14 @@ dosetrlimit(p, which, limp)
                        
                        if (limp->rlim_cur > alimp->rlim_cur) {
                                /* grow stack */
                        
                        if (limp->rlim_cur > alimp->rlim_cur) {
                                /* grow stack */

-                               size = round_page(limp->rlim_cur);
-                               size -= round_page(alimp->rlim_cur);
+                               size = round_page_64(limp->rlim_cur);
+                               size -= round_page_64(alimp->rlim_cur);

 
 #if STACK_GROWTH_UP
                                /* go to top of current stack */
 
 #if STACK_GROWTH_UP
                                /* go to top of current stack */

-                               addr = trunc_page(p->user_stack + alimp->rlim_cur);
+                               addr = trunc_page((unsigned int)(p->user_stack + alimp->rlim_cur));

 #else STACK_GROWTH_UP
 #else STACK_GROWTH_UP

-                               addr = trunc_page(p->user_stack - alimp->rlim_cur);
+                               addr = trunc_page_32((unsigned int)(p->user_stack - alimp->rlim_cur));

                                addr -= size;
 #endif /* STACK_GROWTH_UP */
                                if (vm_allocate(current_map(),
                                addr -= size;
 #endif /* STACK_GROWTH_UP */
                                if (vm_allocate(current_map(),


@@ -370,39 +390,44 @@ dosetrlimit(p, which, limp)
                break;
 
        case RLIMIT_NOFILE:
                break;
 
        case RLIMIT_NOFILE:

-       /* 
-        * Only root can get the maxfiles limits, as it is systemwide resource
-        */
-               if (is_suser()) {
+               /* 
+               * Only root can set the maxfiles limits, as it is systemwide resource
+               */
+               if ( is_suser() ) {

                        if (limp->rlim_cur > maxfiles)
                                limp->rlim_cur = maxfiles;
                        if (limp->rlim_max > maxfiles)
                                limp->rlim_max = maxfiles;
                        if (limp->rlim_cur > maxfiles)
                                limp->rlim_cur = maxfiles;
                        if (limp->rlim_max > maxfiles)
                                limp->rlim_max = maxfiles;

-               } else {
-                       if (limp->rlim_cur > OPEN_MAX)
-                               limp->rlim_cur = OPEN_MAX;
-                       if (limp->rlim_max > OPEN_MAX)
-                               limp->rlim_max = OPEN_MAX;
+               }
+               else {
+                       if (limp->rlim_cur > maxfilesperproc)
+                               limp->rlim_cur = maxfilesperproc;
+                       if (limp->rlim_max > maxfilesperproc)
+                               limp->rlim_max = maxfilesperproc;

                }
                break;
 
        case RLIMIT_NPROC:
                }
                break;
 
        case RLIMIT_NPROC:

-       /* 
-        * Only root can get the maxproc limits, as it is systemwide resource
-        */
-               if (is_suser()) {
+               /* 
+                * Only root can set to the maxproc limits, as it is
+                * systemwide resource; all others are limited to
+                * maxprocperuid (presumably less than maxproc).
+                */
+               if ( is_suser() ) {

                        if (limp->rlim_cur > maxproc)
                                limp->rlim_cur = maxproc;
                        if (limp->rlim_max > maxproc)
                                limp->rlim_max = maxproc;
                        if (limp->rlim_cur > maxproc)
                                limp->rlim_cur = maxproc;
                        if (limp->rlim_max > maxproc)
                                limp->rlim_max = maxproc;

-               } else {
-                       if (limp->rlim_cur > CHILD_MAX)
-                               limp->rlim_cur = CHILD_MAX;
-                       if (limp->rlim_max > CHILD_MAX)
-                               limp->rlim_max = CHILD_MAX;
+               } 
+               else {
+                       if (limp->rlim_cur > maxprocperuid)
+                               limp->rlim_cur = maxprocperuid;
+                       if (limp->rlim_max > maxprocperuid)
+                               limp->rlim_max = maxprocperuid;

                }
                break;
                }
                break;

-       }
+               
+       } /* switch... */

        *alimp = *limp;
        return (0);
 }
        *alimp = *limp;
        return (0);
 }


@@ -457,8 +482,8 @@ calcru(p, up, sp, ip)
                ut.tv_usec = tinfo.user_time.microseconds;
                st.tv_sec = tinfo.system_time.seconds;
                st.tv_usec = tinfo.system_time.microseconds;
                ut.tv_usec = tinfo.user_time.microseconds;
                st.tv_sec = tinfo.system_time.seconds;
                st.tv_usec = tinfo.system_time.microseconds;

-               timeradd(&ut,up,up);
-               timeradd(&st,up,up);
+               timeradd(&ut, up, up);
+               timeradd(&st, sp, sp);

 
                task_ttimes_stuff = TASK_THREAD_TIMES_INFO_COUNT;
                task_info(task, TASK_THREAD_TIMES_INFO,
 
                task_ttimes_stuff = TASK_THREAD_TIMES_INFO_COUNT;
                task_info(task, TASK_THREAD_TIMES_INFO,


@@ -468,8 +493,8 @@ calcru(p, up, sp, ip)
                ut.tv_usec = ttimesinfo.user_time.microseconds;
                st.tv_sec = ttimesinfo.system_time.seconds;
                st.tv_usec = ttimesinfo.system_time.microseconds;
                ut.tv_usec = ttimesinfo.user_time.microseconds;
                st.tv_sec = ttimesinfo.system_time.seconds;
                st.tv_usec = ttimesinfo.system_time.microseconds;

-               timeradd(&ut,up,up);
-               timeradd(&st,up,up);
+               timeradd(&ut, up, up);
+               timeradd(&st, sp, sp);

        }
 }
 
        }
 }