xnu-792.17.14.tar.gz

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

diff --git a/bsd/kern/uipc_domain.c b/bsd/kern/uipc_domain.c
index 94912be8fd367997bd07c5dd7a6b5fc6c3622f79..e01929374f3e85db53d38f4f6a869f7d22e607ef 100644 (file)
--- a/bsd/kern/uipc_domain.c
+++ b/bsd/kern/uipc_domain.c
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 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
  * 
  * 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.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * 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
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /* Copyright (c) 1998, 1999 Apple Computer, Inc. All Rights Reserved */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
  */
 /* Copyright (c) 1998, 1999 Apple Computer, Inc. All Rights Reserved */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */


@@ -67,13 +70,13 @@
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>

-#include <sys/proc.h>
+#include <sys/proc_internal.h>

 #include <sys/sysctl.h>
 #include <sys/syslog.h>
 #include <sys/queue.h>
 
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
 #include <sys/queue.h>
 

-void   pffasttimo __P((void *));
-void   pfslowtimo __P((void *));
+void   pffasttimo(void *);
+void   pfslowtimo(void *);

 
 /*
  * Add/delete 'domain': Link structure into system list,
 
 /*
  * Add/delete 'domain': Link structure into system list,


@@ -81,11 +84,21 @@ void        pfslowtimo __P((void *));
  * To delete, just remove from the list (dom_refs must be zero)
  */
 
  * To delete, just remove from the list (dom_refs must be zero)
  */
 

+lck_grp_t              *domain_proto_mtx_grp;
+lck_attr_t     *domain_proto_mtx_attr;
+static lck_grp_attr_t  *domain_proto_mtx_grp_attr;
+lck_mtx_t              *domain_proto_mtx;
+extern int             do_reclaim;

 
 void init_domain(register struct domain *dp)
 {
        struct protosw  *pr;
        
 
 void init_domain(register struct domain *dp)
 {
        struct protosw  *pr;
        

+       if ((dp->dom_mtx = lck_mtx_alloc_init(domain_proto_mtx_grp, domain_proto_mtx_attr)) == NULL) {
+               printf("init_domain: can't init domain mtx for domain=%s\n", dp->dom_name);
+               return; /* we have a problem... */
+       }
+

        if (dp->dom_init)
                (*dp->dom_init)();
 
        if (dp->dom_init)
                (*dp->dom_init)();
 


@@ -112,6 +125,7 @@ void init_domain(register struct domain *dp)
 
 void   concat_domain(struct domain *dp) 
 {
 
 void   concat_domain(struct domain *dp) 
 {

+       lck_mtx_assert(domain_proto_mtx, LCK_MTX_ASSERT_OWNED);

        dp->dom_next = domains; 
        domains = dp; 
 }
        dp->dom_next = domains; 
        domains = dp; 
 }


@@ -119,33 +133,30 @@ void      concat_domain(struct domain *dp)
 void
 net_add_domain(register struct domain *dp)
 {      register struct protosw *pr;
 void
 net_add_domain(register struct domain *dp)
 {      register struct protosw *pr;

-       register int s;
-       extern int splhigh(void);
-       extern int splx(int);

 
        kprintf("Adding domain %s (family %d)\n", dp->dom_name,
                dp->dom_family);
        /* First, link in the domain */
 
        kprintf("Adding domain %s (family %d)\n", dp->dom_name,
                dp->dom_family);
        /* First, link in the domain */

-       s = splhigh();

 
 

+       lck_mtx_lock(domain_proto_mtx);

        concat_domain(dp);
 
        init_domain(dp);
        concat_domain(dp);
 
        init_domain(dp);

+       lck_mtx_unlock(domain_proto_mtx);

 
 

-       splx(s);

 }
 
 int
 net_del_domain(register struct domain *dp)
 {      register struct domain *dp1, *dp2;
 }
 
 int
 net_del_domain(register struct domain *dp)
 {      register struct domain *dp1, *dp2;

-       register int s, retval = 0;
-       extern int splhigh(void);
-       extern int splx(int);
+       register int retval = 0;
+
+       lck_mtx_lock(domain_proto_mtx);

  
  

-       if (dp->dom_refs)
+       if (dp->dom_refs) {
+               lck_mtx_unlock(domain_proto_mtx);

                return(EBUSY);
                return(EBUSY);

-
-       s = splhigh();
+     }

 
        for (dp2 = NULL, dp1 = domains; dp1; dp2 = dp1, dp1 = dp1->dom_next)
        {       if (dp == dp1)
 
        for (dp2 = NULL, dp1 = domains; dp1; dp2 = dp1, dp1 = dp1->dom_next)
        {       if (dp == dp1)


@@ -158,27 +169,24 @@ net_del_domain(register struct domain *dp)
                        domains = dp1->dom_next;
        } else
                retval = EPFNOSUPPORT;
                        domains = dp1->dom_next;
        } else
                retval = EPFNOSUPPORT;

-       splx(s);
+       lck_mtx_unlock(domain_proto_mtx);

 
        return(retval);
 }
 
 /*
  * net_add_proto - link a protosw into a domain's protosw chain
 
        return(retval);
 }
 
 /*
  * net_add_proto - link a protosw into a domain's protosw chain

+ * 
+ * note: protocols must use their own domain lock before calling net_add_proto

  */
 int
 net_add_proto(register struct protosw *pp,
              register struct domain *dp)
 {      register struct protosw *pp1, *pp2;
  */
 int
 net_add_proto(register struct protosw *pp,
              register struct domain *dp)
 {      register struct protosw *pp1, *pp2;

-       register int s;
-       extern int splhigh(void);
-       extern int splx(int);

 
 

-       s = splhigh();

        for (pp2 = NULL, pp1 = dp->dom_protosw; pp1; pp1 = pp1->pr_next)
        {       if (pp1->pr_type == pp->pr_type &&
                    pp1->pr_protocol == pp->pr_protocol) {
        for (pp2 = NULL, pp1 = dp->dom_protosw; pp1; pp1 = pp1->pr_next)
        {       if (pp1->pr_type == pp->pr_type &&
                    pp1->pr_protocol == pp->pr_protocol) {

-                       splx(s);

                        return(EEXIST);
                }
                pp2 = pp1;
                        return(EEXIST);
                }
                pp2 = pp1;


@@ -188,13 +196,12 @@ net_add_proto(register struct protosw *pp,
        else
                pp2->pr_next = pp;
        pp->pr_next = NULL;
        else
                pp2->pr_next = pp;
        pp->pr_next = NULL;

-       TAILQ_INIT(&pp->pr_sfilter);
+       TAILQ_INIT(&pp->pr_filter_head);

        if (pp->pr_init)
                (*pp->pr_init)();
 
        /* Make sure pr_init isn't called again!! */
        pp->pr_init = 0;
        if (pp->pr_init)
                (*pp->pr_init)();
 
        /* Make sure pr_init isn't called again!! */
        pp->pr_init = 0;

-       splx(s);

        return(0);
 }
 
        return(0);
 }
 


@@ -202,17 +209,15 @@ net_add_proto(register struct protosw *pp,
  * net_del_proto - remove a protosw from a domain's protosw chain.
  * Search the protosw chain for the element with matching data.
  * Then unlink and return.
  * net_del_proto - remove a protosw from a domain's protosw chain.
  * Search the protosw chain for the element with matching data.
  * Then unlink and return.

+ *
+ * note: protocols must use their own domain lock before calling net_del_proto

  */
 int
 net_del_proto(register int type,
              register int protocol,
              register struct domain *dp)
 {      register struct protosw *pp1, *pp2;
  */
 int
 net_del_proto(register int type,
              register int protocol,
              register struct domain *dp)
 {      register struct protosw *pp1, *pp2;

-       int s;
-       extern int splhigh(void);
-       extern int splx(int);

 
 

-       s = splhigh();

        for (pp2 = NULL, pp1 = dp->dom_protosw; pp1; pp1 = pp1->pr_next)
        {       if (pp1->pr_type == type &&
                    pp1->pr_protocol == protocol)
        for (pp2 = NULL, pp1 = dp->dom_protosw; pp1; pp1 = pp1->pr_next)
        {       if (pp1->pr_type == type &&
                    pp1->pr_protocol == protocol)


@@ -220,14 +225,12 @@ net_del_proto(register int type,
                pp2 = pp1;
        }
         if (pp1 == NULL) {
                pp2 = pp1;
        }
         if (pp1 == NULL) {

-                       splx(s);

                        return(ENXIO);
                }
        if (pp2)
                pp2->pr_next = pp1->pr_next;
        else
                dp->dom_protosw = pp1->pr_next;
                        return(ENXIO);
                }
        if (pp2)
                pp2->pr_next = pp1->pr_next;
        else
                dp->dom_protosw = pp1->pr_next;

-       splx(s);

        return(0);
 }
 
        return(0);
 }
 


@@ -258,11 +261,30 @@ domaininit()
        extern struct domain keydomain;
 #endif
 
        extern struct domain keydomain;
 #endif
 

+       /*
+        * allocate lock group attribute and group for domain mutexes
+        */
+       domain_proto_mtx_grp_attr = lck_grp_attr_alloc_init();
+       lck_grp_attr_setdefault(domain_proto_mtx_grp_attr);
+
+       domain_proto_mtx_grp = lck_grp_alloc_init("domain", domain_proto_mtx_grp_attr);
+               
+       /*
+        * allocate the lock attribute for per domain mutexes
+        */
+       domain_proto_mtx_attr = lck_attr_alloc_init();
+       lck_attr_setdefault(domain_proto_mtx_attr);
+
+       if ((domain_proto_mtx = lck_mtx_alloc_init(domain_proto_mtx_grp, domain_proto_mtx_attr)) == NULL) {
+               printf("domaininit: can't init domain mtx for domain list\n");
+               return; /* we have a problem... */
+       }

        /*
         * Add all the static domains to the domains list
         */
 
        /*
         * Add all the static domains to the domains list
         */
 

-       thread_funnel_switch(KERNEL_FUNNEL, NETWORK_FUNNEL);
+       lck_mtx_lock(domain_proto_mtx);
+

        concat_domain(&localdomain);
        concat_domain(&routedomain);
        concat_domain(&inetdomain);
        concat_domain(&localdomain);
        concat_domain(&routedomain);
        concat_domain(&inetdomain);


@@ -296,9 +318,9 @@ domaininit()
        for (dp = domains; dp; dp = dp->dom_next)
                init_domain(dp);
 
        for (dp = domains; dp; dp = dp->dom_next)
                init_domain(dp);
 

+       lck_mtx_unlock(domain_proto_mtx);

        timeout(pffasttimo, NULL, 1);
        timeout(pfslowtimo, NULL, 1);
        timeout(pffasttimo, NULL, 1);
        timeout(pfslowtimo, NULL, 1);

-       thread_funnel_switch(NETWORK_FUNNEL, KERNEL_FUNNEL);

 }
 
 struct protosw *
 }
 
 struct protosw *


@@ -308,14 +330,20 @@ pffindtype(family, type)
        register struct domain *dp;
        register struct protosw *pr;
 
        register struct domain *dp;
        register struct protosw *pr;
 

+       lck_mtx_assert(domain_proto_mtx, LCK_MTX_ASSERT_NOTOWNED);
+       lck_mtx_lock(domain_proto_mtx);

        for (dp = domains; dp; dp = dp->dom_next)
                if (dp->dom_family == family)
                        goto found;
        for (dp = domains; dp; dp = dp->dom_next)
                if (dp->dom_family == family)
                        goto found;

+       lck_mtx_unlock(domain_proto_mtx);

        return (0);
 found:
        for (pr = dp->dom_protosw; pr; pr = pr->pr_next)
        return (0);
 found:
        for (pr = dp->dom_protosw; pr; pr = pr->pr_next)

-               if (pr->pr_type && pr->pr_type == type)
+               if (pr->pr_type && pr->pr_type == type) {
+                       lck_mtx_unlock(domain_proto_mtx);

                        return (pr);
                        return (pr);

+               }
+       lck_mtx_unlock(domain_proto_mtx);

        return (0);
 }
 
        return (0);
 }
 


@@ -323,18 +351,35 @@ struct domain *
 pffinddomain(int pf)
 {      struct domain *dp;
 
 pffinddomain(int pf)
 {      struct domain *dp;
 

+       lck_mtx_assert(domain_proto_mtx, LCK_MTX_ASSERT_NOTOWNED);
+       lck_mtx_lock(domain_proto_mtx);

        dp = domains;
        while (dp)
        dp = domains;
        while (dp)

-       {       if (dp->dom_family == pf)
+       {       if (dp->dom_family == pf) {
+                       lck_mtx_unlock(domain_proto_mtx);

                        return(dp);
                        return(dp);

+               }

                dp = dp->dom_next;
        }
                dp = dp->dom_next;
        }

+       lck_mtx_unlock(domain_proto_mtx);

        return(NULL);
 }
 
 struct protosw *
 pffindproto(family, protocol, type)
        int family, protocol, type;
        return(NULL);
 }
 
 struct protosw *
 pffindproto(family, protocol, type)
        int family, protocol, type;

+{
+       register struct protosw *pr;
+       lck_mtx_assert(domain_proto_mtx, LCK_MTX_ASSERT_NOTOWNED);
+       lck_mtx_lock(domain_proto_mtx);
+       pr = pffindproto_locked(family, protocol, type);
+       lck_mtx_unlock(domain_proto_mtx);
+       return (pr);
+}
+
+struct protosw *
+pffindproto_locked(family, protocol, type)
+       int family, protocol, type;

 {
        register struct domain *dp;
        register struct protosw *pr;
 {
        register struct domain *dp;
        register struct protosw *pr;


@@ -359,18 +404,12 @@ found:
 }
 
 int
 }
 
 int

-net_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
-       int *name;
-       u_int namelen;
-       void *oldp;
-       size_t *oldlenp;
-       void *newp;
-       size_t newlen;
-       struct proc *p;
+net_sysctl(int *name, u_int namelen, user_addr_t oldp, size_t *oldlenp, 
+           user_addr_t newp, size_t newlen, struct proc *p)

 {
        register struct domain *dp;
        register struct protosw *pr;
 {
        register struct domain *dp;
        register struct protosw *pr;

-       int family, protocol;
+       int family, protocol, error;

 
        /*
         * All sysctl names at this level are nonterminal;
 
        /*
         * All sysctl names at this level are nonterminal;


@@ -384,15 +423,21 @@ net_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
 
        if (family == 0)
                return (0);
 
        if (family == 0)
                return (0);

+       lck_mtx_lock(domain_proto_mtx);

        for (dp = domains; dp; dp = dp->dom_next)
                if (dp->dom_family == family)
                        goto found;
        for (dp = domains; dp; dp = dp->dom_next)
                if (dp->dom_family == family)
                        goto found;

+       lck_mtx_unlock(domain_proto_mtx);

        return (ENOPROTOOPT);
 found:
        for (pr = dp->dom_protosw; pr; pr = pr->pr_next)
        return (ENOPROTOOPT);
 found:
        for (pr = dp->dom_protosw; pr; pr = pr->pr_next)

-               if (pr->pr_protocol == protocol && pr->pr_sysctl)
-                       return ((*pr->pr_sysctl)(name + 2, namelen - 2,
-                           oldp, oldlenp, newp, newlen));
+               if (pr->pr_protocol == protocol && pr->pr_sysctl) {
+                       error = (*pr->pr_sysctl)(name + 2, namelen - 2,
+                           oldp, oldlenp, newp, newlen);
+                       lck_mtx_unlock(domain_proto_mtx);
+                       return (error);
+               }
+       lck_mtx_unlock(domain_proto_mtx);

        return (ENOPROTOOPT);
 }
 
        return (ENOPROTOOPT);
 }
 


@@ -415,10 +460,13 @@ pfctlinput2(cmd, sa, ctlparam)
 
        if (!sa)
                return;
 
        if (!sa)
                return;

+
+       lck_mtx_lock(domain_proto_mtx);

        for (dp = domains; dp; dp = dp->dom_next)
                for (pr = dp->dom_protosw; pr; pr = pr->pr_next)
                        if (pr->pr_ctlinput)
                                (*pr->pr_ctlinput)(cmd, sa, ctlparam);
        for (dp = domains; dp; dp = dp->dom_next)
                for (pr = dp->dom_protosw; pr; pr = pr->pr_next)
                        if (pr->pr_ctlinput)
                                (*pr->pr_ctlinput)(cmd, sa, ctlparam);

+       lck_mtx_unlock(domain_proto_mtx);

 }
 
 void
 }
 
 void


@@ -427,17 +475,19 @@ pfslowtimo(arg)
 {
        register struct domain *dp;
        register struct protosw *pr;
 {
        register struct domain *dp;
        register struct protosw *pr;

-       boolean_t       funnel_state;

 
 

-       funnel_state = thread_funnel_set(network_flock, TRUE);
-
-       for (dp = domains; dp; dp = dp->dom_next)
-               for (pr = dp->dom_protosw; pr; pr = pr->pr_next)
+       lck_mtx_lock(domain_proto_mtx);
+       for (dp = domains; dp; dp = dp->dom_next) 
+               for (pr = dp->dom_protosw; pr; pr = pr->pr_next) {

                        if (pr->pr_slowtimo)
                                (*pr->pr_slowtimo)();
                        if (pr->pr_slowtimo)
                                (*pr->pr_slowtimo)();

+                       if (do_reclaim && pr->pr_drain)
+                               (*pr->pr_drain)();
+               }
+       do_reclaim = 0;
+       lck_mtx_unlock(domain_proto_mtx);

        timeout(pfslowtimo, NULL, hz/2);
         
        timeout(pfslowtimo, NULL, hz/2);
         

-       (void) thread_funnel_set(network_flock, FALSE);

 }
 
 void
 }
 
 void


@@ -446,15 +496,12 @@ pffasttimo(arg)
 {
        register struct domain *dp;
        register struct protosw *pr;
 {
        register struct domain *dp;
        register struct protosw *pr;

-       boolean_t       funnel_state;
-
-       funnel_state = thread_funnel_set(network_flock, TRUE);

 
 

+       lck_mtx_lock(domain_proto_mtx);

        for (dp = domains; dp; dp = dp->dom_next)
                for (pr = dp->dom_protosw; pr; pr = pr->pr_next)
                        if (pr->pr_fasttimo)
                                (*pr->pr_fasttimo)();
        for (dp = domains; dp; dp = dp->dom_next)
                for (pr = dp->dom_protosw; pr; pr = pr->pr_next)
                        if (pr->pr_fasttimo)
                                (*pr->pr_fasttimo)();

+       lck_mtx_unlock(domain_proto_mtx);

        timeout(pffasttimo, NULL, hz/5);
        timeout(pffasttimo, NULL, hz/5);

-
-       (void) thread_funnel_set(network_flock, FALSE);

 }
 }