xnu-3248.50.21.tar.gz

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

diff --git a/bsd/kern/kern_malloc.c b/bsd/kern/kern_malloc.c
index 3f689cf358ad0cc3a4a68b7deb3cd3e6970b4725..d1adaabece24eb1e8deca7afd26a1a4c0f0d56b3 100644 (file)
--- a/bsd/kern/kern_malloc.c
+++ b/bsd/kern/kern_malloc.c
@@ -74,6 +74,7 @@
 #include <sys/socketvar.h>
 
 #include <net/route.h>
 #include <sys/socketvar.h>
 
 #include <net/route.h>

+#include <net/necp.h>

 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>


@@ -279,7 +280,7 @@ const char *memname[] = {
        "mactemp",      /* 104 M_MACTEMP */
        "sbuf",         /* 105 M_SBUF */
        "extattr",      /* 106 M_EXTATTR */
        "mactemp",      /* 104 M_MACTEMP */
        "sbuf",         /* 105 M_SBUF */
        "extattr",      /* 106 M_EXTATTR */

-       "lctx",         /* 107 M_LCTX */
+       "select",       /* 107 M_SELECT */

 #if TRAFFIC_MGT
        "traffic_mgt",   /* 108 M_TRAFFIC_MGT */
 #else
 #if TRAFFIC_MGT
        "traffic_mgt",   /* 108 M_TRAFFIC_MGT */
 #else


@@ -303,6 +304,21 @@ const char *memname[] = {
        "",                                     /* 116 M_FLOW_DIVERT_GROUP */
 #endif
        "ip6cga",       /* 117 M_IP6CGA */
        "",                                     /* 116 M_FLOW_DIVERT_GROUP */
 #endif
        "ip6cga",       /* 117 M_IP6CGA */

+#if NECP
+       "necp",                                 /* 118 M_NECP */
+       "necp_session_policy",  /* 119 M_NECP_SESSION_POLICY */
+       "necp_socket_policy",   /* 120 M_NECP_SOCKET_POLICY */
+       "necp_ip_policy",               /* 121 M_NECP_IP_POLICY */
+#else
+       "",                                             /* 118 M_NECP */
+       "",                                             /* 119 M_NECP_SESSION_POLICY */
+       "",                                             /* 120 M_NECP_SOCKET_POLICY */
+       "",                                             /* 121 M_NECP_IP_POLICY */
+#endif
+       "fdvnodedata"   /* 122 M_FD_VN_DATA */
+       "fddirbuf",     /* 123 M_FD_DIRBUF */
+       "netagent",     /* 124 M_NETAGENT */
+       ""

 };
 
 /* for use with kmzones.kz_zalloczone */
 };
 
 /* for use with kmzones.kz_zalloczone */


@@ -469,7 +485,7 @@ struct kmzones {
        { 0,            KMZ_MALLOC, FALSE },            /* 104 M_MACTEMP */
        { 0,            KMZ_MALLOC, FALSE },            /* 105 M_SBUF */
        { 0,            KMZ_MALLOC, FALSE },            /* 106 M_HFS_EXTATTR */
        { 0,            KMZ_MALLOC, FALSE },            /* 104 M_MACTEMP */
        { 0,            KMZ_MALLOC, FALSE },            /* 105 M_SBUF */
        { 0,            KMZ_MALLOC, FALSE },            /* 106 M_HFS_EXTATTR */

-       { 0,            KMZ_MALLOC, FALSE },            /* 107 M_LCTX */
+       { 0,            KMZ_MALLOC, FALSE },            /* 107 M_SELECT */

        { 0,            KMZ_MALLOC, FALSE },            /* 108 M_TRAFFIC_MGT */
 #if HFS_COMPRESSION
        { SOS(decmpfs_cnode),KMZ_CREATEZONE , FALSE},   /* 109 M_DECMPFS_CNODE */
        { 0,            KMZ_MALLOC, FALSE },            /* 108 M_TRAFFIC_MGT */
 #if HFS_COMPRESSION
        { SOS(decmpfs_cnode),KMZ_CREATEZONE , FALSE},   /* 109 M_DECMPFS_CNODE */


@@ -489,6 +505,19 @@ struct kmzones {
        { 0,            KMZ_MALLOC, FALSE },            /* 116 M_FLOW_DIVERT_GROUP */
 #endif /* FLOW_DIVERT */
        { 0,            KMZ_MALLOC, FALSE },            /* 117 M_IP6CGA */
        { 0,            KMZ_MALLOC, FALSE },            /* 116 M_FLOW_DIVERT_GROUP */
 #endif /* FLOW_DIVERT */
        { 0,            KMZ_MALLOC, FALSE },            /* 117 M_IP6CGA */

+       { 0,            KMZ_MALLOC, FALSE },            /* 118 M_NECP */
+#if NECP
+       { SOS(necp_session_policy),     KMZ_CREATEZONE, TRUE }, /* 119 M_NECP_SESSION_POLICY */
+       { SOS(necp_kernel_socket_policy),       KMZ_CREATEZONE, TRUE }, /* 120 M_NECP_SOCKET_POLICY */
+       { SOS(necp_kernel_ip_output_policy),    KMZ_CREATEZONE, TRUE }, /* 121 M_NECP_IP_POLICY */
+#else
+       { 0,            KMZ_MALLOC, FALSE },            /* 119 M_NECP_SESSION_POLICY */
+       { 0,            KMZ_MALLOC, FALSE },            /* 120 M_NECP_SOCKET_POLICY */
+       { 0,            KMZ_MALLOC, FALSE },            /* 121 M_NECP_IP_POLICY */
+#endif /* NECP */
+       { 0,            KMZ_MALLOC, FALSE },            /* 122 M_FD_VN_DATA */
+       { 0,            KMZ_MALLOC, FALSE },            /* 123 M_FD_DIRBUF */
+       { 0,            KMZ_MALLOC, FALSE },            /* 124 M_NETAGENT */

 #undef SOS
 #undef SOX
 };
 #undef SOS
 #undef SOX
 };


@@ -555,11 +584,28 @@ struct _mhead {
        char    dat[0];
 };
 
        char    dat[0];
 };
 

+
+void *
+_MALLOC_external(
+       size_t          size,
+       int             type,
+       int             flags);

 void *
 void *

-_MALLOC(
+_MALLOC_external(

        size_t          size,
        int             type,
        int             flags)
        size_t          size,
        int             type,
        int             flags)

+{
+    static vm_allocation_site_t site = { VM_KERN_MEMORY_KALLOC, VM_TAG_BT };
+    return (__MALLOC(size, type, flags, &site));
+}
+
+void *
+__MALLOC(
+       size_t          size,
+       int             type,
+       int             flags,
+       vm_allocation_site_t *site)

 {
        struct _mhead   *hdr = NULL;
        size_t          memsize = sizeof (*hdr) + size;
 {
        struct _mhead   *hdr = NULL;
        size_t          memsize = sizeof (*hdr) + size;


@@ -574,7 +620,7 @@ _MALLOC(
                if (size > memsize)   /* overflow detected */
                        return (NULL);
                else
                if (size > memsize)   /* overflow detected */
                        return (NULL);
                else

-                       hdr = (void *)kalloc_noblock(memsize); 
+                       hdr = (void *)kalloc_canblock(memsize, FALSE, site); 

        } else {
                if (size > memsize) {
                        /*
        } else {
                if (size > memsize) {
                        /*


@@ -585,7 +631,7 @@ _MALLOC(
                        panic("_MALLOC: overflow detected, size %llu ", (uint64_t) size);
                }
                else
                        panic("_MALLOC: overflow detected, size %llu ", (uint64_t) size);
                }
                else

-                       hdr = (void *)kalloc(memsize);
+                       hdr = (void *)kalloc_canblock(memsize, TRUE, site);

 
               if (hdr == NULL) {
 
 
               if (hdr == NULL) {
 


@@ -631,11 +677,12 @@ _FREE(
 }
 
 void *
 }
 
 void *

-_REALLOC(
+__REALLOC(

        void            *addr,
        size_t          size,
        int             type,
        void            *addr,
        size_t          size,
        int             type,

-       int             flags)
+       int             flags,
+       vm_allocation_site_t *site)

 {
        struct _mhead   *hdr;
        void            *newaddr;
 {
        struct _mhead   *hdr;
        void            *newaddr;


@@ -643,10 +690,10 @@ _REALLOC(
 
        /* realloc(NULL, ...) is equivalent to malloc(...) */
        if (addr == NULL)
 
        /* realloc(NULL, ...) is equivalent to malloc(...) */
        if (addr == NULL)

-               return (_MALLOC(size, type, flags));
+               return (__MALLOC(size, type, flags, site));

 
        /* Allocate a new, bigger (or smaller) block */
 
        /* Allocate a new, bigger (or smaller) block */

-       if ((newaddr = _MALLOC(size, type, flags)) == NULL)
+       if ((newaddr = __MALLOC(size, type, flags, site)) == NULL)

                return (NULL);
 
        hdr = addr;
                return (NULL);
 
        hdr = addr;


@@ -661,10 +708,25 @@ _REALLOC(
 }
 
 void *
 }
 
 void *

-_MALLOC_ZONE(
+_MALLOC_ZONE_external(
+       size_t          size,
+       int             type,
+       int             flags);
+void *
+_MALLOC_ZONE_external(

        size_t          size,
        int             type,
        int             flags)
        size_t          size,
        int             type,
        int             flags)

+{
+    return (__MALLOC_ZONE(size, type, flags, NULL));
+}
+
+void *
+__MALLOC_ZONE(
+       size_t          size,
+       int             type,
+       int             flags,
+       vm_allocation_site_t *site)

 {
        struct kmzones  *kmz;
        void            *elem;
 {
        struct kmzones  *kmz;
        void            *elem;


@@ -688,9 +750,9 @@ _MALLOC_ZONE(
                }
        else
                if (flags & M_NOWAIT) {
                }
        else
                if (flags & M_NOWAIT) {

-                       elem = (void *)kalloc_noblock(size);
+                       elem = (void *)kalloc_canblock(size, FALSE, site);

                } else {
                } else {

-                       elem = (void *)kalloc(size);
+                       elem = (void *)kalloc_canblock(size, TRUE, site);

                }
 
        return (elem);
                }
 
        return (elem);