X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8f6c56a50524aa785f7e596d52dddfb331e18961..6d2010ae8f7a6078e10b361c6962983bab233e0f:/osfmk/kern/ipc_host.c diff --git a/osfmk/kern/ipc_host.c b/osfmk/kern/ipc_host.c index 0e8196cc0..65f1035fe 100644 --- a/osfmk/kern/ipc_host.c +++ b/osfmk/kern/ipc_host.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved. + * Copyright (c) 2000-2009 Apple Inc. All rights reserved. * * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ * @@ -81,14 +81,6 @@ * Forward declarations */ -void -ipc_processor_terminate( - processor_t processor); - -void -ipc_processor_disable( - processor_t processor); - boolean_t ref_pset_port_locked( ipc_port_t port, boolean_t matchn, processor_set_t *ppset); @@ -97,12 +89,15 @@ ref_pset_port_locked( * ipc_host_init: set up various things. */ +extern lck_grp_t host_notify_lock_grp; +extern lck_attr_t host_notify_lock_attr; + void ipc_host_init(void) { ipc_port_t port; int i; - mutex_init(&realhost.lock, 0); + lck_mtx_init(&realhost.lock, &host_notify_lock_grp, &host_notify_lock_attr); /* * Allocate and set up the two host ports. @@ -140,8 +135,8 @@ void ipc_host_init(void) /* * Set up ipc for default processor set. */ - ipc_pset_init(&default_pset); - ipc_pset_enable(&default_pset); + ipc_pset_init(&pset0); + ipc_pset_enable(&pset0); /* * And for master processor @@ -205,51 +200,6 @@ ipc_processor_enable( myport = processor->processor_self; ipc_kobject_set(myport, (ipc_kobject_t) processor, IKOT_PROCESSOR); } - -/* - * ipc_processor_disable: - * - * Disable ipc control of processor by clearing port object. - */ -void -ipc_processor_disable( - processor_t processor) -{ - ipc_port_t myport; - - myport = processor->processor_self; - if (myport == IP_NULL) - return; - ipc_kobject_set(myport, IKO_NULL, IKOT_NONE); -} - -/* - * ipc_processor_terminate: - * - * Processor is off-line. Destroy ipc control port. - */ -void -ipc_processor_terminate( - processor_t processor) -{ - ipc_port_t myport; - spl_t s; - - s = splsched(); - processor_lock(processor); - myport = processor->processor_self; - if (myport == IP_NULL) { - processor_unlock(processor); - splx(s); - return; - } - - processor->processor_self = IP_NULL; - processor_unlock(processor); - splx(s); - - ipc_port_dealloc_kernel(myport); -} /* * ipc_pset_init: @@ -283,51 +233,14 @@ void ipc_pset_enable( processor_set_t pset) { - pset_lock(pset); - if (pset->active) { - ipc_kobject_set(pset->pset_self, - (ipc_kobject_t) pset, IKOT_PSET); - ipc_kobject_set(pset->pset_name_self, - (ipc_kobject_t) pset, IKOT_PSET_NAME); - pset->ref_count += 2; - } - pset_unlock(pset); -} - -/* - * ipc_pset_disable: - * - * Disable ipc access to a processor set by clearing the port objects. - * Caller must hold pset lock and a reference to the pset. Ok to - * just decrement pset reference count as a result. - */ -void -ipc_pset_disable( - processor_set_t pset) -{ - ipc_kobject_set(pset->pset_self, IKO_NULL, IKOT_NONE); - ipc_kobject_set(pset->pset_name_self, IKO_NULL, IKOT_NONE); - pset->ref_count -= 2; -} - -/* - * ipc_pset_terminate: - * - * Processor set is dead. Deallocate the ipc control structures. - */ -void -ipc_pset_terminate( - processor_set_t pset) -{ - ipc_port_dealloc_kernel(pset->pset_self); - ipc_port_dealloc_kernel(pset->pset_name_self); + ipc_kobject_set(pset->pset_self, (ipc_kobject_t) pset, IKOT_PSET); + ipc_kobject_set(pset->pset_name_self, (ipc_kobject_t) pset, IKOT_PSET_NAME); } /* - * processor_set_default, processor_set_default_priv: + * processor_set_default: * - * Return ports for manipulating default_processor set. MiG code - * differentiates between these two routines. + * Return ports for manipulating default_processor set. */ kern_return_t processor_set_default( @@ -337,9 +250,9 @@ processor_set_default( if (host == HOST_NULL) return(KERN_INVALID_ARGUMENT); - *pset = &default_pset; - pset_reference(*pset); - return(KERN_SUCCESS); + *pset = &pset0; + + return (KERN_SUCCESS); } /* @@ -483,18 +396,13 @@ ref_pset_port_locked(ipc_port_t port, boolean_t matchn, processor_set_t *ppset) pset = PROCESSOR_SET_NULL; if (ip_active(port) && ((ip_kotype(port) == IKOT_PSET) || - (matchn && (ip_kotype(port) == IKOT_PSET_NAME)))) { + (matchn && (ip_kotype(port) == IKOT_PSET_NAME)))) { pset = (processor_set_t) port->ip_kobject; - if (!pset_lock_try(pset)) { - ip_unlock(port); - mutex_pause(); - return (FALSE); - } - pset->ref_count++; - pset_unlock(pset); } + *ppset = pset; ip_unlock(port); + return (TRUE); } @@ -522,6 +430,7 @@ convert_host_to_port( * Purpose: * Convert from a processor to a port. * Produces a naked send right which may be invalid. + * Processors are not reference counted, so nothing to release. * Conditions: * Nothing locked. */ @@ -530,20 +439,10 @@ ipc_port_t convert_processor_to_port( processor_t processor) { - ipc_port_t port; - spl_t s; - - s = splsched(); - processor_lock(processor); - - if (processor->processor_self != IP_NULL) - port = ipc_port_make_send(processor->processor_self); - else - port = IP_NULL; - - processor_unlock(processor); - splx(s); + ipc_port_t port = processor->processor_self; + if (port != IP_NULL) + port = ipc_port_make_send(port); return port; } @@ -551,8 +450,8 @@ convert_processor_to_port( * Routine: convert_pset_to_port * Purpose: * Convert from a pset to a port. - * Consumes a pset ref; produces a naked send right - * which may be invalid. + * Produces a naked send right which may be invalid. + * Processor sets are not reference counted, so nothing to release. * Conditions: * Nothing locked. */ @@ -561,16 +460,11 @@ ipc_port_t convert_pset_to_port( processor_set_t pset) { - ipc_port_t port; + ipc_port_t port = pset->pset_self; - pset_lock(pset); - if (pset->active) - port = ipc_port_make_send(pset->pset_self); - else - port = IP_NULL; - pset_unlock(pset); + if (port != IP_NULL) + port = ipc_port_make_send(port); - pset_deallocate(pset); return port; } @@ -578,8 +472,8 @@ convert_pset_to_port( * Routine: convert_pset_name_to_port * Purpose: * Convert from a pset to a port. - * Consumes a pset ref; produces a naked send right - * which may be invalid. + * Produces a naked send right which may be invalid. + * Processor sets are not reference counted, so nothing to release. * Conditions: * Nothing locked. */ @@ -588,16 +482,11 @@ ipc_port_t convert_pset_name_to_port( processor_set_name_t pset) { - ipc_port_t port; + ipc_port_t port = pset->pset_name_self; - pset_lock(pset); - if (pset->active) - port = ipc_port_make_send(pset->pset_name_self); - else - port = IP_NULL; - pset_unlock(pset); + if (port != IP_NULL) + port = ipc_port_make_send(port); - pset_deallocate(pset); return port; } @@ -660,12 +549,12 @@ host_set_exception_ports( assert(host_priv == &realhost); - if (exception_mask & ~EXC_MASK_ALL) { + if (exception_mask & ~EXC_MASK_VALID) { return KERN_INVALID_ARGUMENT; } if (IP_VALID(new_port)) { - switch (new_behavior) { + switch (new_behavior & ~MACH_EXCEPTION_CODES) { case EXCEPTION_DEFAULT: case EXCEPTION_STATE: case EXCEPTION_STATE_IDENTITY: @@ -737,7 +626,7 @@ host_get_exception_ports( if (host_priv == HOST_PRIV_NULL) return KERN_INVALID_ARGUMENT; - if (exception_mask & ~EXC_MASK_ALL) { + if (exception_mask & ~EXC_MASK_VALID) { return KERN_INVALID_ARGUMENT; } @@ -802,7 +691,7 @@ host_swap_exception_ports( if (host_priv == HOST_PRIV_NULL) return KERN_INVALID_ARGUMENT; - if (exception_mask & ~EXC_MASK_ALL) { + if (exception_mask & ~EXC_MASK_VALID) { return KERN_INVALID_ARGUMENT; }