X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/4a3eedf9ecc9bbe3f3a5c6ce5e53ad199d639d32..8a3053a07cee346dca737a5670e546fd26a7c9d6:/bsd/dev/dtrace/dtrace_glue.c diff --git a/bsd/dev/dtrace/dtrace_glue.c b/bsd/dev/dtrace/dtrace_glue.c index 1ef883569..3e34344a7 100644 --- a/bsd/dev/dtrace/dtrace_glue.c +++ b/bsd/dev/dtrace/dtrace_glue.c @@ -51,6 +51,8 @@ #include #include #include +#include +#include #include #include #include @@ -64,10 +66,12 @@ #include #include /* All the bits we care about are guarded by MACH_KERNEL_PRIVATE :-( */ + /* * pid/proc */ -#define proc_t struct proc +/* Solaris proc_t is the struct. Darwin's proc_t is a pointer to it. */ +#define proc_t struct proc /* Steer clear of the Darwin typedef for proc_t */ /* Not called from probe context */ proc_t * @@ -226,7 +230,7 @@ done: lck_mtx_t cpu_lock; lck_mtx_t mod_lock; -cpu_t *cpu_list; +dtrace_cpu_t *cpu_list; cpu_core_t *cpu_core; /* XXX TLB lockdown? */ /* @@ -266,62 +270,22 @@ PRIV_POLICY_ONLY(void *cr, int priv, int boolean) return kauth_cred_issuser(cr); /* XXX TODO: HAS_PRIVILEGE(cr, priv); */ } +/* XXX Get around const poisoning using structure assigns */ gid_t -crgetgid(const cred_t *cr) { return cr->cr_groups[0]; } +crgetgid(const cred_t *cr) { cred_t copy_cr = *cr; return kauth_cred_getgid(©_cr); } uid_t -crgetuid(const cred_t *cr) { return cr->cr_uid; } +crgetuid(const cred_t *cr) { cred_t copy_cr = *cr; return kauth_cred_getuid(©_cr); } /* * "cyclic" */ -/* osfmk/kern/timer_call.h */ -typedef void *call_entry_param_t; -typedef void (*call_entry_func_t)( - call_entry_param_t param0, - call_entry_param_t param1); - -typedef struct call_entry { - queue_chain_t q_link; - call_entry_func_t func; - call_entry_param_t param0; - call_entry_param_t param1; - uint64_t deadline; - enum { - IDLE, - PENDING, - DELAYED } state; -} call_entry_data_t; - - -typedef struct call_entry *timer_call_t; -typedef void *timer_call_param_t; -typedef void (*timer_call_func_t)( - timer_call_param_t param0, - timer_call_param_t param1); - -extern void -timer_call_setup( - timer_call_t call, - timer_call_func_t func, - timer_call_param_t param0); - -extern boolean_t -timer_call_enter1( - timer_call_t call, - timer_call_param_t param1, - uint64_t deadline); - -extern boolean_t -timer_call_cancel( - timer_call_t call); - typedef struct wrap_timer_call { cyc_handler_t hdlr; cyc_time_t when; uint64_t deadline; - struct call_entry call; + struct timer_call call; } wrap_timer_call_t; #define WAKEUP_REAPER 0x7FFFFFFFFFFFFFFFLL @@ -336,7 +300,7 @@ _timer_call_apply_cyclic( void *ignore, void *vTChdl ) (*(wrapTC->hdlr.cyh_func))( wrapTC->hdlr.cyh_arg ); clock_deadline_for_periodic_event( wrapTC->when.cyt_interval, mach_absolute_time(), &(wrapTC->deadline) ); - timer_call_enter1( &(wrapTC->call), (void *)wrapTC, wrapTC->deadline ); + timer_call_enter1( &(wrapTC->call), (void *)wrapTC, wrapTC->deadline, TIMER_CALL_SYS_CRITICAL | TIMER_CALL_LOCAL ); /* Did timer_call_remove_cyclic request a wakeup call when this timer call was re-armed? */ if (wrapTC->when.cyt_interval == WAKEUP_REAPER) @@ -358,7 +322,7 @@ timer_call_add_cyclic(wrap_timer_call_t *wrapTC, cyc_handler_t *handler, cyc_tim wrapTC->deadline = now; clock_deadline_for_periodic_event( wrapTC->when.cyt_interval, now, &(wrapTC->deadline) ); - timer_call_enter1( &(wrapTC->call), (void *)wrapTC, wrapTC->deadline ); + timer_call_enter1( &(wrapTC->call), (void *)wrapTC, wrapTC->deadline, TIMER_CALL_SYS_CRITICAL | TIMER_CALL_LOCAL ); return (cyclic_id_t)wrapTC; } @@ -419,11 +383,11 @@ _cyclic_add_omni(cyclic_id_list_t cyc_list) t = (char *)cyc_list; t += sizeof(cyc_omni_handler_t); - cyc_list = (cyclic_id_list_t)t; + cyc_list = (cyclic_id_list_t)(uintptr_t)t; t += sizeof(cyclic_id_t)*NCPU; t += (sizeof(wrap_timer_call_t))*cpu_number(); - wrapTC = (wrap_timer_call_t *)t; + wrapTC = (wrap_timer_call_t *)(uintptr_t)t; cyc_list[cpu_number()] = timer_call_add_cyclic(wrapTC, &cH, &cT); } @@ -454,7 +418,7 @@ _cyclic_remove_omni(cyclic_id_list_t cyc_list) t = (char *)cyc_list; t += sizeof(cyc_omni_handler_t); - cyc_list = (cyclic_id_list_t)t; + cyc_list = (cyclic_id_list_t)(uintptr_t)t; cid = cyc_list[cpu_number()]; oarg = timer_call_get_cyclic_arg(cid); @@ -575,7 +539,7 @@ dtrace_timeout(void (*func)(void *, void *), void* arg, uint64_t nanos) * and clock drift on later invocations is not a worry. */ uint64_t deadline = mach_absolute_time() + nanos; - + /* DRK: consider using a lower priority callout here */ thread_call_enter_delayed(call, deadline); return call; @@ -674,7 +638,7 @@ _dtrace_register_anon_DOF(char *name, uchar_t *data, uint_t nelements) int ddi_prop_lookup_int_array(dev_t match_dev, dev_info_t *dip, uint_t flags, - char *name, int **data, uint_t *nelements) + const char *name, int **data, uint_t *nelements) { #pragma unused(match_dev,dip,flags) unsigned int i; @@ -698,14 +662,14 @@ ddi_prop_free(void *buf) } int -ddi_driver_major(dev_info_t *devi) { return (int)major(devi); } +ddi_driver_major(dev_info_t *devi) { return (int)major(CAST_DOWN_EXPLICIT(int,devi)); } int ddi_create_minor_node(dev_info_t *dip, const char *name, int spec_type, minor_t minor_num, const char *node_type, int flag) { #pragma unused(spec_type,node_type,flag) - dev_t dev = makedev( (uint32_t)dip, minor_num ); + dev_t dev = makedev( ddi_driver_major(dip), minor_num ); if (NULL == devfs_make_node( dev, DEVFS_CHAR, UID_ROOT, GID_WHEEL, 0666, name, 0 )) return DDI_FAILURE; @@ -885,7 +849,7 @@ void dt_kmem_free_aligned(void* buf, size_t size) */ kmem_cache_t * kmem_cache_create( - char *name, /* descriptive name for this cache */ + const char *name, /* descriptive name for this cache */ size_t bufsize, /* size of the objects it manages */ size_t align, /* required object alignment */ int (*constructor)(void *, void *, int), /* object constructor */ @@ -988,7 +952,7 @@ vmem_create(const char *name, void *base, size_t size, size_t quantum, void *ign p->blist = bl = blist_create( size ); blist_free(bl, 0, size); - if (base) blist_alloc( bl, (daddr_t)base ); /* Chomp off initial ID(s) */ + if (base) blist_alloc( bl, (daddr_t)(uintptr_t)base ); /* Chomp off initial ID(s) */ return (vmem_t *)p; } @@ -1011,7 +975,7 @@ vmem_alloc(vmem_t *vmp, size_t size, int vmflag) panic("vmem_alloc: failure after blist_resize!"); } - return (void *)p; + return (void *)(uintptr_t)p; } void @@ -1019,7 +983,7 @@ vmem_free(vmem_t *vmp, void *vaddr, size_t size) { struct blist_hdl *p = (struct blist_hdl *)vmp; - blist_free( p->blist, (daddr_t)vaddr, (daddr_t)size ); + blist_free( p->blist, (daddr_t)(uintptr_t)vaddr, (daddr_t)size ); } void @@ -1043,7 +1007,8 @@ vmem_destroy(vmem_t *vmp) hrtime_t dtrace_gethrestime(void) { - uint32_t secs, nanosecs; + clock_sec_t secs; + clock_nsec_t nanosecs; uint64_t secs64, ns64; clock_get_calendar_nanotime_nowait(&secs, &nanosecs); @@ -1122,7 +1087,7 @@ dtrace_gethrtime(void) uint32_t dtrace_cas32(uint32_t *target, uint32_t cmp, uint32_t new) { - if (OSCompareAndSwap( cmp, new, (unsigned long *)target )) + if (OSCompareAndSwap( (UInt32)cmp, (UInt32)new, (volatile UInt32 *)target )) return cmp; else return ~cmp; /* Must return something *other* than cmp */ @@ -1131,14 +1096,10 @@ dtrace_cas32(uint32_t *target, uint32_t cmp, uint32_t new) void * dtrace_casptr(void *target, void *cmp, void *new) { -#if defined(__LP64__) -#error dtrace_casptr implementation missing for LP64 -#else - if (OSCompareAndSwap( (uint32_t)cmp, (uint32_t)new, (unsigned long *)target )) + if (OSCompareAndSwapPtr( cmp, new, (void**)target )) return cmp; else return (void *)(~(uintptr_t)cmp); /* Must return something *other* than cmp */ -#endif } /* @@ -1188,9 +1149,7 @@ dtrace_copycheck(user_addr_t uaddr, uintptr_t kaddr, size_t size) ASSERT(kaddr + size >= kaddr); - if (ml_at_interrupt_context() || /* Avoid possible copyio page fault on int stack, which panics! */ - 0 != recover || /* Avoid reentrancy into copyio facility. */ - uaddr + size < uaddr || /* Avoid address wrap. */ + if ( uaddr + size < uaddr || /* Avoid address wrap. */ KERN_FAILURE == dtrace_copyio_preflight(uaddr)) /* Machine specific setup/constraints. */ { DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR); @@ -1201,8 +1160,10 @@ dtrace_copycheck(user_addr_t uaddr, uintptr_t kaddr, size_t size) } void -dtrace_copyin(user_addr_t src, uintptr_t dst, size_t len) +dtrace_copyin(user_addr_t src, uintptr_t dst, size_t len, volatile uint16_t *flags) { +#pragma unused(flags) + if (dtrace_copycheck( src, dst, len )) { if (copyin((const user_addr_t)src, (char *)dst, (vm_size_t)len)) { DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR); @@ -1213,8 +1174,10 @@ dtrace_copyin(user_addr_t src, uintptr_t dst, size_t len) } void -dtrace_copyinstr(user_addr_t src, uintptr_t dst, size_t len) +dtrace_copyinstr(user_addr_t src, uintptr_t dst, size_t len, volatile uint16_t *flags) { +#pragma unused(flags) + size_t actual; if (dtrace_copycheck( src, dst, len )) { @@ -1236,8 +1199,10 @@ dtrace_copyinstr(user_addr_t src, uintptr_t dst, size_t len) } void -dtrace_copyout(uintptr_t src, user_addr_t dst, size_t len) +dtrace_copyout(uintptr_t src, user_addr_t dst, size_t len, volatile uint16_t *flags) { +#pragma unused(flags) + if (dtrace_copycheck( dst, src, len )) { if (copyout((const void *)src, dst, (vm_size_t)len)) { DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR); @@ -1248,8 +1213,10 @@ dtrace_copyout(uintptr_t src, user_addr_t dst, size_t len) } void -dtrace_copyoutstr(uintptr_t src, user_addr_t dst, size_t len) +dtrace_copyoutstr(uintptr_t src, user_addr_t dst, size_t len, volatile uint16_t *flags) { +#pragma unused(flags) + size_t actual; if (dtrace_copycheck( dst, src, len )) { @@ -1471,13 +1438,6 @@ dtrace_tally_fault(user_addr_t uaddr) return( DTRACE_CPUFLAG_ISSET(CPU_DTRACE_NOFAULT) ? TRUE : FALSE ); } -void -dtrace_vpanic(const char *format, va_list alist) -{ - vuprintf( format, alist ); - panic("dtrace_vpanic"); -} - #define TOTTY 0x02 extern int prf(const char *, va_list, int, struct tty *); /* bsd/kern/subr_prf.h */ @@ -1504,7 +1464,7 @@ void cmn_err( int level, const char *format, ... ) * 2002-01-24 gvdl Initial implementation of strstr */ -__private_extern__ char * +__private_extern__ const char * strstr(const char *in, const char *str) { char c; @@ -1512,7 +1472,7 @@ strstr(const char *in, const char *str) c = *str++; if (!c) - return (char *) in; // Trivial empty string case + return (const char *) in; // Trivial empty string case len = strlen(str); do { @@ -1525,7 +1485,7 @@ strstr(const char *in, const char *str) } while (sc != c); } while (strncmp(in, str, len) != 0); - return (char *) (in - 1); + return (const char *) (in - 1); } /* @@ -1541,7 +1501,7 @@ dtrace_caller(int ignore) int dtrace_getstackdepth(int aframes) { - struct frame *fp = (struct frame *)dtrace_getfp(); + struct frame *fp = (struct frame *)__builtin_frame_address(0); struct frame *nextfp, *minfp, *stacktop; int depth = 0; int on_intr; @@ -1549,7 +1509,7 @@ dtrace_getstackdepth(int aframes) if ((on_intr = CPU_ON_INTR(CPU)) != 0) stacktop = (struct frame *)dtrace_get_cpu_int_stack_top(); else - stacktop = (struct frame *)(dtrace_get_kernel_stack(current_thread()) + KERNEL_STACK_SIZE); + stacktop = (struct frame *)(dtrace_get_kernel_stack(current_thread()) + kernel_stack_size); minfp = fp; @@ -1568,7 +1528,7 @@ dtrace_getstackdepth(int aframes) vm_offset_t kstack_base = dtrace_get_kernel_stack(current_thread()); minfp = (struct frame *)kstack_base; - stacktop = (struct frame *)(kstack_base + KERNEL_STACK_SIZE); + stacktop = (struct frame *)(kstack_base + kernel_stack_size); on_intr = 0; continue;