xnu-517.12.7.tar.gz

[apple/xnu.git] / osfmk / ipc / ipc_kmsg.c

diff --git a/osfmk/ipc/ipc_kmsg.c b/osfmk/ipc/ipc_kmsg.c
index 04932517e3379972e95ad18d585c8a5ef0f7735e..46267f0184f0c29aa9842629425f06b7348f2c4f 100644 (file)
--- a/osfmk/ipc/ipc_kmsg.c
+++ b/osfmk/ipc/ipc_kmsg.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 


@@ -88,6 +88,12 @@
 
 #include <string.h>
 
 
 #include <string.h>
 

+#ifdef ppc
+#include <ppc/Firmware.h>
+#include <ppc/low_trace.h>
+#endif
+
+

 extern vm_map_t                ipc_kernel_copy_map;
 extern vm_size_t       ipc_kmsg_max_vm_space;
 extern vm_size_t       msg_ool_size_small;
 extern vm_map_t                ipc_kernel_copy_map;
 extern vm_size_t       ipc_kmsg_max_vm_space;
 extern vm_size_t       msg_ool_size_small;


@@ -236,7 +242,7 @@ ipc_kmsg_free(
                        ip_unlock(port);
                        return;
                }
                        ip_unlock(port);
                        return;
                }

-               ip_unlock(port);
+               ip_check_unlock(port);  /* May be last reference */

                goto free_it;
        }
 
                goto free_it;
        }
 


@@ -647,7 +653,7 @@ ipc_kmsg_get(
 {
        mach_msg_size_t                 msg_and_trailer_size;
        ipc_kmsg_t                      kmsg;
 {
        mach_msg_size_t                 msg_and_trailer_size;
        ipc_kmsg_t                      kmsg;

-       mach_msg_format_0_trailer_t     *trailer;
+       mach_msg_max_trailer_t          *trailer;

        mach_port_name_t                dest_name;
        ipc_entry_t                     dest_entry;
        ipc_port_t                      dest_port;
        mach_port_name_t                dest_name;
        ipc_entry_t                     dest_entry;
        ipc_port_t                      dest_port;


@@ -675,11 +681,17 @@ ipc_kmsg_get(
         * is initialized to the minimum (sizeof(mach_msg_trailer_t)), to optimize
         * the cases where no implicit data is requested.
         */
         * is initialized to the minimum (sizeof(mach_msg_trailer_t)), to optimize
         * the cases where no implicit data is requested.
         */

-       trailer = (mach_msg_format_0_trailer_t *) ((vm_offset_t)&kmsg->ikm_header + size);
-       trailer->msgh_sender = current_thread()->top_act->task->sec_token;
+       trailer = (mach_msg_max_trailer_t *) ((vm_offset_t)&kmsg->ikm_header + size);
+       trailer->msgh_sender = current_act()->task->sec_token;
+       trailer->msgh_audit = current_act()->task->audit_token;

        trailer->msgh_trailer_type = MACH_MSG_TRAILER_FORMAT_0;
        trailer->msgh_trailer_size = MACH_MSG_TRAILER_MINIMUM_SIZE;
        trailer->msgh_trailer_type = MACH_MSG_TRAILER_FORMAT_0;
        trailer->msgh_trailer_size = MACH_MSG_TRAILER_MINIMUM_SIZE;

-
+       
+#ifdef ppc
+       if(trcWork.traceMask) dbgTrace((unsigned int)kmsg->ikm_header.msgh_id, 
+               (unsigned int)kmsg->ikm_header.msgh_remote_port, 
+               (unsigned int)kmsg->ikm_header.msgh_local_port, 0); 
+#endif

        *kmsgp = kmsg;
        return MACH_MSG_SUCCESS;
 }
        *kmsgp = kmsg;
        return MACH_MSG_SUCCESS;
 }


@@ -706,7 +718,7 @@ ipc_kmsg_get_from_kernel(
 {
        ipc_kmsg_t      kmsg;
        mach_msg_size_t msg_and_trailer_size;
 {
        ipc_kmsg_t      kmsg;
        mach_msg_size_t msg_and_trailer_size;

-       mach_msg_format_0_trailer_t *trailer;
+       mach_msg_max_trailer_t *trailer;

        ipc_port_t      dest_port;
 
        assert(size >= sizeof(mach_msg_header_t));
        ipc_port_t      dest_port;
 
        assert(size >= sizeof(mach_msg_header_t));


@@ -756,9 +768,10 @@ ipc_kmsg_get_from_kernel(
         * is initialized to the minimum (sizeof(mach_msg_trailer_t)), to
         * optimize the cases where no implicit data is requested.
         */
         * is initialized to the minimum (sizeof(mach_msg_trailer_t)), to
         * optimize the cases where no implicit data is requested.
         */

-       trailer = (mach_msg_format_0_trailer_t *) 
+       trailer = (mach_msg_max_trailer_t *) 

                  ((vm_offset_t)&kmsg->ikm_header + size);
        trailer->msgh_sender = KERNEL_SECURITY_TOKEN;
                  ((vm_offset_t)&kmsg->ikm_header + size);
        trailer->msgh_sender = KERNEL_SECURITY_TOKEN;

+       trailer->msgh_audit = KERNEL_AUDIT_TOKEN;

        trailer->msgh_trailer_type = MACH_MSG_TRAILER_FORMAT_0;
        trailer->msgh_trailer_size = MACH_MSG_TRAILER_MINIMUM_SIZE;
 
        trailer->msgh_trailer_type = MACH_MSG_TRAILER_FORMAT_0;
        trailer->msgh_trailer_size = MACH_MSG_TRAILER_MINIMUM_SIZE;
 


@@ -1337,7 +1350,6 @@ ipc_kmsg_copyin_body(
     mach_msg_descriptor_t      *saddr, *eaddr;
     boolean_t                  complex;
     mach_msg_return_t          mr;
     mach_msg_descriptor_t      *saddr, *eaddr;
     boolean_t                  complex;
     mach_msg_return_t          mr;

-    boolean_t                  use_page_lists, steal_pages;

     int                                i;
     kern_return_t              kr;
     vm_size_t                  space_needed = 0;
     int                                i;
     kern_return_t              kr;
     vm_size_t                  space_needed = 0;


@@ -1350,8 +1362,6 @@ ipc_kmsg_copyin_body(
      */
     dest = (ipc_object_t) kmsg->ikm_header.msgh_remote_port;
     complex = FALSE;
      */
     dest = (ipc_object_t) kmsg->ikm_header.msgh_remote_port;
     complex = FALSE;

-    use_page_lists = ipc_kobject_vm_page_list(ip_kotype((ipc_port_t)dest));
-    steal_pages = ipc_kobject_vm_page_steal(ip_kotype((ipc_port_t)dest));

 
     body = (mach_msg_body_t *) (&kmsg->ikm_header + 1);
     saddr = (mach_msg_descriptor_t *) (body + 1);
 
     body = (mach_msg_body_t *) (&kmsg->ikm_header + 1);
     saddr = (mach_msg_descriptor_t *) (body + 1);


@@ -1377,9 +1387,6 @@ ipc_kmsg_copyin_body(
        if (sstart->type.type == MACH_MSG_OOL_DESCRIPTOR ||
            sstart->type.type == MACH_MSG_OOL_VOLATILE_DESCRIPTOR) {
 
        if (sstart->type.type == MACH_MSG_OOL_DESCRIPTOR ||
            sstart->type.type == MACH_MSG_OOL_VOLATILE_DESCRIPTOR) {
 

-               assert(!(sstart->out_of_line.copy == MACH_MSG_PHYSICAL_COPY &&
-                      (use_page_lists || steal_pages)));
-

                if (sstart->out_of_line.copy != MACH_MSG_PHYSICAL_COPY &&
                    sstart->out_of_line.copy != MACH_MSG_VIRTUAL_COPY) {
                    /*
                if (sstart->out_of_line.copy != MACH_MSG_PHYSICAL_COPY &&
                    sstart->out_of_line.copy != MACH_MSG_VIRTUAL_COPY) {
                    /*


@@ -1397,7 +1404,7 @@ ipc_kmsg_copyin_body(
                         * Out-of-line memory descriptor, accumulate kernel
                         * memory requirements
                         */
                         * Out-of-line memory descriptor, accumulate kernel
                         * memory requirements
                         */

-                       space_needed += round_page(sstart->out_of_line.size);
+                       space_needed += round_page_32(sstart->out_of_line.size);

                        if (space_needed > ipc_kmsg_max_vm_space) {
 
                                /*
                        if (space_needed > ipc_kmsg_max_vm_space) {
 
                                /*


@@ -1477,51 +1484,6 @@ ipc_kmsg_copyin_body(
                
                if (length == 0) {
                    dsc->address = 0;
                
                if (length == 0) {
                    dsc->address = 0;

-               } else if (use_page_lists) {
-                   int options;
-
-                   /*
-                    * Use page list copy mechanism if specified.
-                    */
-                   if (steal_pages == FALSE) {
-                       /*
-                        * XXX Temporary Hackaround.
-                        * XXX Because the same page
-                        * XXX might be in more than one
-                        * XXX out of line region, steal
-                        * XXX (busy) pages from previous
-                        * XXX region so that this copyin
-                        * XXX won't block (permanently).
-                        */
-                       if (copy != VM_MAP_COPY_NULL)
-                           vm_map_copy_steal_pages(copy);
-                   }
-
-                   /*
-                    *  Set up options for copying in page list.
-                    *  If deallocating, steal pages to prevent
-                    *  vm code from lazy evaluating deallocation.
-                    */
-                   options = VM_PROT_READ;
-                   if (dealloc) {
-                       options |= VM_MAP_COPYIN_OPT_SRC_DESTROY |
-                                       VM_MAP_COPYIN_OPT_STEAL_PAGES;
-                   }
-                   else if (steal_pages) {
-                       options |= VM_MAP_COPYIN_OPT_STEAL_PAGES;
-                   }
-
-                   if (vm_map_copyin_page_list(map, addr, length, options,
-                                               &copy, FALSE)
-                       != KERN_SUCCESS) {
-
-                       ipc_kmsg_clean_partial(kmsg, i, paddr, space_needed);
-                       return MACH_SEND_INVALID_MEMORY;
-                   }
-
-                   dsc->address = (void *) copy;
-                   dsc->copy = MACH_MSG_PAGE_LIST_COPY_T;
-

                } else if ((length >= MSG_OOL_SIZE_SMALL) &&
                           (dsc->copy == MACH_MSG_PHYSICAL_COPY) && !dealloc) {
 
                } else if ((length >= MSG_OOL_SIZE_SMALL) &&
                           (dsc->copy == MACH_MSG_PHYSICAL_COPY) && !dealloc) {
 


@@ -1549,7 +1511,7 @@ ipc_kmsg_copyin_body(
                         */
                        if (!page_aligned(length)) {
                                (void) memset((void *) (paddr + length), 0,
                         */
                        if (!page_aligned(length)) {
                                (void) memset((void *) (paddr + length), 0,

-                                       round_page(length) - length);
+                                       round_page_32(length) - length);

                        }
                        if (vm_map_copyin(ipc_kernel_copy_map, paddr, length,
                                           TRUE, &copy) != KERN_SUCCESS) {
                        }
                        if (vm_map_copyin(ipc_kernel_copy_map, paddr, length,
                                           TRUE, &copy) != KERN_SUCCESS) {


@@ -1558,8 +1520,8 @@ ipc_kmsg_copyin_body(
                            return MACH_MSG_VM_KERNEL;
                        }
                        dsc->address = (void *) copy;
                            return MACH_MSG_VM_KERNEL;
                        }
                        dsc->address = (void *) copy;

-                       paddr += round_page(length);
-                       space_needed -= round_page(length);
+                       paddr += round_page_32(length);
+                       space_needed -= round_page_32(length);

                } else {
 
                        /*
                } else {
 
                        /*


@@ -1642,9 +1604,8 @@ ipc_kmsg_copyin_body(
 
                        for(k = 0; k < j; k++) {
                            object = objects[k];
 
                        for(k = 0; k < j; k++) {
                            object = objects[k];

-                           if (!MACH_PORT_VALID(port))
-                               continue;
-                           ipc_object_destroy(object, dsc->disposition);
+                           if (IPC_OBJECT_VALID(object))
+                               ipc_object_destroy(object, dsc->disposition);

                        }
                        kfree(data, length);
                        ipc_kmsg_clean_partial(kmsg, i, paddr, space_needed);
                        }
                        kfree(data, length);
                        ipc_kmsg_clean_partial(kmsg, i, paddr, space_needed);


@@ -2333,7 +2294,6 @@ ipc_kmsg_copyout_body(
                dsc = &saddr->out_of_line;
 
                assert(dsc->copy != MACH_MSG_KALLOC_COPY_T);
                dsc = &saddr->out_of_line;
 
                assert(dsc->copy != MACH_MSG_KALLOC_COPY_T);

-               assert(dsc->copy != MACH_MSG_PAGE_LIST_COPY_T);

 
                copy_option = dsc->copy;
 
 
                copy_option = dsc->copy;
 


@@ -3017,9 +2977,6 @@ mm_copy_options_string(
            case MACH_MSG_KALLOC_COPY_T:
                name = "KALLOC_COPY_T";
                break;
            case MACH_MSG_KALLOC_COPY_T:
                name = "KALLOC_COPY_T";
                break;

-           case MACH_MSG_PAGE_LIST_COPY_T:
-               name = "PAGE_LIST_COPY_T";
-               break;

            default:
                name = "unknown";
                break;
            default:
                name = "unknown";
                break;