]> git.saurik.com Git - apple/xnu.git/blobdiff - bsd/dev/i386/fbt_x86.c
xnu-4903.241.1.tar.gz
[apple/xnu.git] / bsd / dev / i386 / fbt_x86.c
index 19d461ac269861c0d54f22992e890307ae0d1759..63d1a843015983165b4ac9b8235ec3a54345b356 100644 (file)
 #include <kern/thread.h>
 #include <mach/thread_status.h>
 #include <mach/vm_param.h>
-#include <mach-o/loader.h> 
+#include <mach-o/loader.h>
 #include <mach-o/nlist.h>
 #include <libkern/kernel_mach_header.h>
+#include <libkern/OSAtomic.h>
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -55,6 +56,8 @@
 
 #include <sys/dtrace_glue.h>
 
+#include <san/kasan.h>
+
 #define DTRACE_INVOP_NOP_SKIP 1
 #define DTRACE_INVOP_MOVL_ESP_EBP 10
 #define DTRACE_INVOP_MOVL_ESP_EBP_SKIP 2
@@ -101,743 +104,13 @@ extern dtrace_provider_id_t      fbt_id;
 extern fbt_probe_t             **fbt_probetab;
 extern int                     fbt_probetab_mask;
 
-kern_return_t fbt_perfCallback(int, x86_saved_state_t *, __unused int, __unused int);
-
-/*
- * Critical routines that must not be probed. PR_5221096, PR_5379018.
- * The blacklist must be kept in alphabetic order for purposes of bsearch().
- */
+kern_return_t fbt_perfCallback(int, x86_saved_state_t *, uintptr_t *, __unused int);
 
-static const char * critical_blacklist[] =
-{
-       "bcopy_phys",
-       "console_cpu_alloc", 
-       "console_cpu_free", 
-       "cpu_IA32e_disable", 
-       "cpu_IA32e_enable", 
-       "cpu_NMI_interrupt", 
-       "cpu_control", 
-       "cpu_data_alloc", 
-       "cpu_desc_init",
-       "cpu_desc_init64",      
-       "cpu_desc_load",
-       "cpu_desc_load64",      
-       "cpu_exit_wait", 
-       "cpu_info", 
-       "cpu_info_count", 
-       "cpu_init", 
-       "cpu_interrupt", 
-       "cpu_machine_init", 
-       "cpu_mode_init", 
-       "cpu_processor_alloc", 
-       "cpu_processor_free", 
-       "cpu_signal_handler", 
-       "cpu_sleep", 
-       "cpu_start", 
-       "cpu_subtype", 
-       "cpu_thread_alloc", 
-       "cpu_thread_halt", 
-       "cpu_thread_init", 
-       "cpu_threadtype", 
-       "cpu_to_processor", 
-       "cpu_topology_sort",
-       "cpu_topology_start_cpu",       
-       "cpu_type", 
-       "cpuid_cpu_display",
-       "handle_pending_TLB_flushes",
-       "hw_compare_and_store",
-       "machine_idle_cstate",
-       "mca_cpu_alloc",
-       "mca_cpu_init",
-       "ml_nofault_copy",
-       "pmap_cpu_alloc", 
-       "pmap_cpu_free", 
-       "pmap_cpu_high_map_vaddr", 
-       "pmap_cpu_high_shared_remap", 
-       "pmap_cpu_init",
-       "register_cpu_setup_func",
-       "unregister_cpu_setup_func",
-       "vstart"
-};
-#define CRITICAL_BLACKLIST_COUNT (sizeof(critical_blacklist)/sizeof(critical_blacklist[0]))
-
-/*
- * The transitive closure of entry points that can be reached from probe context.
- * (Apart from routines whose names begin with dtrace_).
- */
-static const char * probe_ctx_closure[] =
-{
-       "Debugger",
-       "IS_64BIT_PROCESS",
-       "OSCompareAndSwap",
-       "absolutetime_to_microtime",
-       "ast_pending",
-       "astbsd_on",
-       "clock_get_calendar_nanotime_nowait",
-       "copyin",
-       "copyin_user",
-       "copyinstr",
-       "copyout",
-       "copyoutstr",
-       "cpu_number",
-       "current_proc",
-       "current_processor",
-       "current_task",
-       "current_thread",
-       "debug_enter",
-       "find_user_regs",
-       "flush_tlb64",
-       "get_bsdtask_info",
-       "get_bsdthread_info",
-       "hw_atomic_and",
-       "kauth_cred_get",
-       "kauth_getgid",
-       "kauth_getuid",
-       "kernel_preempt_check",
-       "mach_absolute_time",
-       "max_valid_stack_address",
-       "ml_at_interrupt_context",
-       "ml_phys_write_byte_64",
-       "ml_phys_write_half_64",
-       "ml_phys_write_word_64",
-       "ml_set_interrupts_enabled",
-       "panic",
-       "pmap64_pde",
-       "pmap64_pdpt",
-       "pmap_find_phys",
-       "pmap_get_mapwindow",
-       "pmap_pde",
-       "pmap_pte",
-       "pmap_put_mapwindow",
-       "pmap_valid_page",
-       "prf",
-       "proc_is64bit",
-       "proc_selfname",
-       "proc_selfpid",
-       "proc_selfppid",
-       "psignal_lock",
-       "rtc_nanotime_load",
-       "rtc_nanotime_read",
-       "sdt_getargdesc",
-       "strlcpy",
-       "sync_iss_to_iks_unconditionally",
-       "systrace_stub",
-       "timer_grab"
-};
-#define PROBE_CTX_CLOSURE_COUNT (sizeof(probe_ctx_closure)/sizeof(probe_ctx_closure[0]))
-
-
-static int _cmp(const void *a, const void *b)
-{
-       return strncmp((const char *)a, *(const char **)b, strlen((const char *)a) + 1);
-}
-
-static const void * bsearch(
-       register const void *key,
-       const void *base0,
-       size_t nmemb,
-       register size_t size,
-       register int (*compar)(const void *, const void *)) {
-
-       register const char *base = base0;
-       register size_t lim;
-       register int cmp;
-       register const void *p;
-
-       for (lim = nmemb; lim != 0; lim >>= 1) {
-               p = base + (lim >> 1) * size;
-               cmp = (*compar)(key, p);
-               if (cmp == 0)
-                       return p;
-               if (cmp > 0) {  /* key > p: move right */
-                       base = (const char *)p + size;
-                       lim--;
-               }               /* else move left */
-       }
-       return (NULL);
-}
-
-#if defined(__i386__)
-int
-fbt_invop(uintptr_t addr, uintptr_t *stack, uintptr_t rval)
-{
-       uintptr_t stack0 = 0, stack1 = 0, stack2 = 0, stack3 = 0, stack4 = 0;
-       fbt_probe_t *fbt = fbt_probetab[FBT_ADDR2NDX(addr)];
-
-       for (; fbt != NULL; fbt = fbt->fbtp_hashnext) {
-               if ((uintptr_t)fbt->fbtp_patchpoint == addr) {
-
-                       if (fbt->fbtp_roffset == 0) {
-                               uintptr_t *stacktop;
-                               if (CPU_ON_INTR(CPU))
-                                       stacktop = (uintptr_t *)dtrace_get_cpu_int_stack_top();
-                               else
-                                       stacktop = (uintptr_t *)(dtrace_get_kernel_stack(current_thread()) + kernel_stack_size);
-
-                               stack += 1; /* skip over the target's pushl'd %ebp */
-
-                               if (stack <= stacktop)
-                                       CPU->cpu_dtrace_caller = *stack++;
-                               if (stack <= stacktop)
-                                       stack0 = *stack++;
-                               if (stack <= stacktop)
-                                       stack1 = *stack++;
-                               if (stack <= stacktop)
-                                       stack2 = *stack++;
-                               if (stack <= stacktop)
-                                       stack3 = *stack++;
-                               if (stack <= stacktop)
-                                       stack4 = *stack++;
-
-                               /* 32-bit ABI, arguments passed on stack. */
-                               dtrace_probe(fbt->fbtp_id, stack0, stack1, stack2, stack3, stack4);
-                               CPU->cpu_dtrace_caller = 0;
-                       } else {
-                               dtrace_probe(fbt->fbtp_id, fbt->fbtp_roffset, rval, 0, 0, 0);
-                               CPU->cpu_dtrace_caller = 0;
-                       }
-
-                       return (fbt->fbtp_rval);
-               }
-       }
-
-       return (0);
-}
-
-#define IS_USER_TRAP(regs) (regs && (((regs)->cs & 3) != 0))
-#define T_INVALID_OPCODE 6
-#define FBT_EXCEPTION_CODE T_INVALID_OPCODE
-#define T_PREEMPT       255
-
-kern_return_t
-fbt_perfCallback(
-                int                    trapno,
-                x86_saved_state_t      *tagged_regs,
-                __unused int        unused1,
-                __unused int        unused2)
-{
-       kern_return_t retval = KERN_FAILURE;
-       x86_saved_state32_t *saved_state = saved_state32(tagged_regs);
-       struct x86_saved_state32_from_kernel *regs = (struct x86_saved_state32_from_kernel *)saved_state;
-
-       if (FBT_EXCEPTION_CODE == trapno && !IS_USER_TRAP(saved_state)) {
-               boolean_t oldlevel, cpu_64bit;
-               uint32_t esp_probe, *ebp, edi, fp, *pDst, delta = 0;
-               int emul;
-
-               cpu_64bit = ml_is64bit();
-               oldlevel = ml_set_interrupts_enabled(FALSE);
-
-               /* Calculate where the stack pointer was when the probe instruction "fired." */
-               if (cpu_64bit) {
-                       esp_probe = saved_state->uesp; /* Easy, x86_64 establishes this value in idt64.s */
-               } else {
-                       esp_probe = (uint32_t)&(regs[1]); /* Nasty, infer the location above the save area */
-               }
-
-               emul = dtrace_invop( saved_state->eip, (uintptr_t *)esp_probe, saved_state->eax );
-               __asm__ volatile(".globl _dtrace_invop_callsite");
-               __asm__ volatile("_dtrace_invop_callsite:");
-
-               switch (emul) {
-               case DTRACE_INVOP_NOP:
-                       saved_state->eip += DTRACE_INVOP_NOP_SKIP;      /* Skip over the patched NOP (planted by sdt.) */
-                       retval = KERN_SUCCESS;
-                       break;
-
-               case DTRACE_INVOP_MOVL_ESP_EBP:
-                       saved_state->ebp = esp_probe;                                           /* Emulate patched movl %esp,%ebp */
-                       saved_state->eip += DTRACE_INVOP_MOVL_ESP_EBP_SKIP;     /* Skip over the bytes of the patched movl %esp,%ebp */
-                       retval = KERN_SUCCESS;
-                       break;
-
-               case DTRACE_INVOP_POPL_EBP:
-               case DTRACE_INVOP_LEAVE:
-/*
- * Emulate first micro-op of patched leave: movl %ebp,%esp
- * fp points just below the return address slot for target's ret 
- * and at the slot holding the frame pointer saved by the target's prologue.
- */
-                       fp = saved_state->ebp;
-/* Emulate second micro-op of patched leave: patched popl %ebp
- * savearea ebp is set for the frame of the caller to target
- * The *live* %esp will be adjusted below for pop increment(s)
- */
-                       saved_state->ebp = *(uint32_t *)fp;
-/* Skip over the patched leave */
-                       saved_state->eip += DTRACE_INVOP_LEAVE_SKIP;
-/*
- * Lift the stack to account for the emulated leave
- * Account for words local in this frame
- * (in "case DTRACE_INVOP_POPL_EBP:" this is zero.)
- */
-                       delta = ((uint32_t *)fp) - ((uint32_t *)esp_probe);
-/* Account for popping off the ebp (just accomplished by the emulation
- * above...)
- */
-                       delta += 1;
-                       
-                       if (cpu_64bit)
-                               saved_state->uesp += (delta << 2);
-
-/* XXX Fragile in the extreme. Obtain the value of %edi that our caller pushed
- * (on behalf of its caller -- trap_from_kernel()). Ultimately,
- * trap_from_kernel's stack pointer is restored from this slot.
- * This is sensitive to the manner in which the compiler preserves %edi,
- * and trap_from_kernel()'s internals.
- */
-                       ebp = (uint32_t *)__builtin_frame_address(0);
-                       ebp = (uint32_t *)*ebp;
-                       edi = *(ebp - 1);
-/* Shift contents of stack */
-                       for (pDst = (uint32_t *)fp;
-                            pDst > (((uint32_t *)edi));
-                                pDst--)
-                               *pDst = pDst[-delta];
-
-/* Track the stack lift in "saved_state". */
-                       saved_state = (x86_saved_state32_t *) (((uintptr_t)saved_state) + (delta << 2));
-
-/* Now adjust the value of %edi in our caller (kernel_trap)'s frame */
-                       *(ebp - 1) = edi + (delta << 2);
-
-                       retval = KERN_SUCCESS;
-                       break;
-                       
-               default:
-                       retval = KERN_FAILURE;
-                       break;
-               }
-               saved_state->trapno = T_PREEMPT; /* Avoid call to i386_astintr()! */
-
-               ml_set_interrupts_enabled(oldlevel);
-       }
-
-       return retval;
-}
-
-/*ARGSUSED*/
-static void
-__fbt_provide_module(void *arg, struct modctl *ctl)
-{
-#pragma unused(arg)
-       kernel_mach_header_t            *mh;
-       struct load_command         *cmd;
-       kernel_segment_command_t        *orig_ts = NULL, *orig_le = NULL;
-       struct symtab_command       *orig_st = NULL;
-       struct nlist                *sym = NULL;
-       char                                            *strings;
-       uintptr_t                                       instrLow, instrHigh;
-       char                                            *modname;
-       unsigned int                            i, j;
-
-       int gIgnoreFBTBlacklist = 0;
-       PE_parse_boot_argn("IgnoreFBTBlacklist", &gIgnoreFBTBlacklist, sizeof (gIgnoreFBTBlacklist));
-
-       mh = (kernel_mach_header_t *)(ctl->address);
-       modname = ctl->mod_modname;
-
-       if (0 == ctl->address || 0 == ctl->size) /* Has the linker been jettisoned? */
-               return;
-
-       /*
-        * Employees of dtrace and their families are ineligible.  Void
-        * where prohibited.
-        */
-
-       if (LIT_STRNEQL(modname, "com.apple.driver.dtrace"))
-               return;
-
-       if (strstr(modname, "CHUD") != NULL)
-               return;
-
-       if (mh->magic != MH_MAGIC)
-               return;
-
-       cmd = (struct load_command *) &mh[1];
-       for (i = 0; i < mh->ncmds; i++) {
-               if (cmd->cmd == LC_SEGMENT_KERNEL) {
-                       kernel_segment_command_t *orig_sg = (kernel_segment_command_t *) cmd;
-
-                       if (LIT_STRNEQL(orig_sg->segname, SEG_TEXT))
-                               orig_ts = orig_sg;
-                       else if (LIT_STRNEQL(orig_sg->segname, SEG_LINKEDIT))
-                               orig_le = orig_sg;
-                       else if (LIT_STRNEQL(orig_sg->segname, ""))
-                               orig_ts = orig_sg; /* kexts have a single unnamed segment */
-               }
-               else if (cmd->cmd == LC_SYMTAB)
-                       orig_st = (struct symtab_command *) cmd;
-
-               cmd = (struct load_command *) ((caddr_t) cmd + cmd->cmdsize);
-       }
-
-       if ((orig_ts == NULL) || (orig_st == NULL) || (orig_le == NULL))
-               return;
-
-       sym = (struct nlist *)(orig_le->vmaddr + orig_st->symoff - orig_le->fileoff);
-       strings = (char *)(orig_le->vmaddr + orig_st->stroff - orig_le->fileoff);
-
-       /* Find extent of the TEXT section */
-       instrLow = (uintptr_t)orig_ts->vmaddr;
-       instrHigh = (uintptr_t)(orig_ts->vmaddr + orig_ts->vmsize);
-
-       for (i = 0; i < orig_st->nsyms; i++) {
-               fbt_probe_t *fbt, *retfbt;
-               machine_inst_t *instr, *limit, theInstr, i1, i2;
-               uint8_t n_type = sym[i].n_type & (N_TYPE | N_EXT);
-               char *name = strings + sym[i].n_un.n_strx;
-               int size;
-
-               /* Check that the symbol is a global and that it has a name. */
-               if (((N_SECT | N_EXT) != n_type && (N_ABS | N_EXT) != n_type))
-                       continue;
-
-               if (0 == sym[i].n_un.n_strx) /* iff a null, "", name. */
-                       continue;
-               
-               /* Lop off omnipresent leading underscore. */                   
-               if (*name == '_')
-                       name += 1;
-
-               if (LIT_STRNSTART(name, "dtrace_") && !LIT_STRNSTART(name, "dtrace_safe_")) {
-                       /*
-                        * Anything beginning with "dtrace_" may be called
-                        * from probe context unless it explitly indicates
-                        * that it won't be called from probe context by
-                        * using the prefix "dtrace_safe_".
-                        */
-                       continue;
-               }
-
-               if (LIT_STRNSTART(name, "dsmos_")) 
-                       continue; /* Don't Steal Mac OS X! */
-
-        if (LIT_STRNSTART(name, "_dtrace"))
-                       continue; /* Shims in dtrace.c */
-
-               if (LIT_STRNSTART(name, "chud"))
-                       continue; /* Professional courtesy. */
-               
-               if (LIT_STRNSTART(name, "hibernate_"))
-                       continue; /* Let sleeping dogs lie. */
-               
-               if (LIT_STRNEQL(name, "_ZN9IOService14newTemperatureElPS_") || /* IOService::newTemperature */
-                       LIT_STRNEQL(name, "_ZN9IOService26temperatureCriticalForZoneEPS_")) /* IOService::temperatureCriticalForZone */
-                       continue; /* Per the fire code */
-
-               /*
-                * Place no probes (illegal instructions) in the exception handling path!
-                */
-               if (LIT_STRNEQL(name, "t_invop") ||
-                       LIT_STRNEQL(name, "enter_lohandler") ||
-                       LIT_STRNEQL(name, "lo_alltraps") ||
-                       LIT_STRNEQL(name, "kernel_trap") ||
-                       LIT_STRNEQL(name, "interrupt") ||                 
-                       LIT_STRNEQL(name, "i386_astintr"))
-                       continue;
-
-               if (LIT_STRNEQL(name, "current_thread") ||
-                       LIT_STRNEQL(name, "ast_pending") ||
-                       LIT_STRNEQL(name, "fbt_perfCallback") ||
-                       LIT_STRNEQL(name, "machine_thread_get_kern_state") ||
-                       LIT_STRNEQL(name, "get_threadtask") ||
-                       LIT_STRNEQL(name, "ml_set_interrupts_enabled") ||
-                       LIT_STRNEQL(name, "dtrace_invop") ||
-                       LIT_STRNEQL(name, "fbt_invop") ||
-                       LIT_STRNEQL(name, "sdt_invop") ||
-                       LIT_STRNEQL(name, "max_valid_stack_address"))
-                       continue;
-
-               /*
-                * Voodoo.
-                */
-               if (LIT_STRNSTART(name, "machine_stack_") ||
-                       LIT_STRNSTART(name, "mapping_") ||
-                       LIT_STRNEQL(name, "tmrCvt") ||
-
-                       LIT_STRNSTART(name, "tsc_") ||
-
-                       LIT_STRNSTART(name, "pmCPU") ||
-                       LIT_STRNEQL(name, "pmKextRegister") ||
-                       LIT_STRNEQL(name, "pmMarkAllCPUsOff") ||
-                       LIT_STRNEQL(name, "pmSafeMode") ||
-                       LIT_STRNEQL(name, "pmTimerSave") ||
-                       LIT_STRNEQL(name, "pmTimerRestore") ||
-                       LIT_STRNEQL(name, "pmUnRegister") ||
-                       LIT_STRNSTART(name, "pms") ||
-                       LIT_STRNEQL(name, "power_management_init") ||
-                       LIT_STRNSTART(name, "usimple_") ||
-                       LIT_STRNEQL(name, "lck_spin_lock") ||
-                       LIT_STRNEQL(name, "lck_spin_unlock") ||           
-
-                       LIT_STRNSTART(name, "rtc_") ||
-                       LIT_STRNSTART(name, "_rtc_") ||
-                       LIT_STRNSTART(name, "rtclock_") ||
-                       LIT_STRNSTART(name, "clock_") ||
-                       LIT_STRNSTART(name, "absolutetime_to_") ||
-                       LIT_STRNEQL(name, "setPop") ||
-                       LIT_STRNEQL(name, "nanoseconds_to_absolutetime") ||
-                       LIT_STRNEQL(name, "nanotime_to_absolutetime") ||
-
-                       LIT_STRNSTART(name, "etimer_") ||
-
-                       LIT_STRNSTART(name, "commpage_") ||
-                       LIT_STRNSTART(name, "pmap_") ||
-                       LIT_STRNSTART(name, "ml_") ||
-                       LIT_STRNSTART(name, "PE_") ||
-                       LIT_STRNEQL(name, "kprintf") ||
-                       LIT_STRNSTART(name, "lapic_") ||
-                       LIT_STRNSTART(name, "acpi_"))
-                       continue;
-
-        /*
-         * Avoid machine_ routines. PR_5346750.
-         */
-        if (LIT_STRNSTART(name, "machine_"))
-            continue;
-
-               if (LIT_STRNEQL(name, "handle_pending_TLB_flushes"))
-                       continue;
-
-        /*
-         * Place no probes on critical routines. PR_5221096
-         */
-        if (!gIgnoreFBTBlacklist &&
-            bsearch( name, critical_blacklist, CRITICAL_BLACKLIST_COUNT, sizeof(name), _cmp ) != NULL)
-                continue;
-
-        /*
-                * Place no probes that could be hit in probe context.
-                */
-               if (!gIgnoreFBTBlacklist && 
-                       bsearch( name, probe_ctx_closure, PROBE_CTX_CLOSURE_COUNT, sizeof(name), _cmp ) != NULL)
-                       continue;
-
-               /*
-                * Place no probes that could be hit on the way to the debugger.
-                */
-               if (LIT_STRNSTART(name, "kdp_") ||
-                       LIT_STRNSTART(name, "kdb_") ||
-                       LIT_STRNSTART(name, "kdbg_") ||
-                       LIT_STRNSTART(name, "kdebug_") ||
-                       LIT_STRNEQL(name, "kernel_debug") ||
-                       LIT_STRNEQL(name, "Debugger") ||
-                       LIT_STRNEQL(name, "Call_DebuggerC") ||
-                       LIT_STRNEQL(name, "lock_debugger") ||
-                       LIT_STRNEQL(name, "unlock_debugger") ||
-                       LIT_STRNEQL(name, "SysChoked")) 
-                       continue;
-
-               /*
-                * Place no probes that could be hit on the way to a panic.
-                */
-               if (NULL != strstr(name, "panic_") ||
-                       LIT_STRNEQL(name, "panic") ||
-                       LIT_STRNEQL(name, "handleMck") ||
-                       LIT_STRNEQL(name, "unresolved_kernel_trap"))
-                       continue;
-               
-               if (dtrace_probe_lookup(fbt_id, modname, name, NULL) != 0)
-                       continue;
-
-               for (j = 0, instr = (machine_inst_t *)sym[i].n_value, theInstr = 0;
-                        (j < 4) && ((uintptr_t)instr >= instrLow) && (instrHigh > (uintptr_t)(instr + 2)); 
-                        j++) {
-                       theInstr = instr[0];
-                       if (theInstr == FBT_PUSHL_EBP || theInstr == FBT_RET || theInstr == FBT_RET_IMM16)
-                               break;
-
-                       if ((size = dtrace_instr_size(instr)) <= 0)
-                               break;
-                       instr += size;
-               }
-
-               if (theInstr != FBT_PUSHL_EBP)
-                       continue;
-
-               i1 = instr[1];
-               i2 = instr[2];
-
-               limit = (machine_inst_t *)instrHigh;
-
-               if ((i1 == FBT_MOVL_ESP_EBP0_V0 && i2 == FBT_MOVL_ESP_EBP1_V0) ||
-                       (i1 == FBT_MOVL_ESP_EBP0_V1 && i2 == FBT_MOVL_ESP_EBP1_V1)) {
-                               instr += 1; /* Advance to the movl %esp,%ebp */
-                               theInstr = i1;
-               } else {
-                       /*
-                        * Sometimes, the compiler will schedule an intervening instruction
-                        * in the function prologue. Example:
-                        *
-                        * _mach_vm_read:
-                        * 000006d8        pushl   %ebp
-                        * 000006d9        movl    $0x00000004,%edx
-                        * 000006de        movl    %esp,%ebp
-                        * 
-                        * Try the next instruction, to see if it is a movl %esp,%ebp
-                        */
-
-                       instr += 1; /* Advance past the pushl %ebp */
-                       if ((size = dtrace_instr_size(instr)) <= 0)
-                               continue;
-                       instr += size;
-
-                       if ((instr + 1) >= limit)
-                               continue;
-
-                       i1 = instr[0];
-                       i2 = instr[1];
-
-                       if (!(i1 == FBT_MOVL_ESP_EBP0_V0 && i2 == FBT_MOVL_ESP_EBP1_V0) &&
-                               !(i1 == FBT_MOVL_ESP_EBP0_V1 && i2 == FBT_MOVL_ESP_EBP1_V1))
-                               continue;
-
-                       /* instr already points at the movl %esp,%ebp */
-                       theInstr = i1;
-               }
-
-               fbt = kmem_zalloc(sizeof (fbt_probe_t), KM_SLEEP);
-               strlcpy( (char *)&(fbt->fbtp_name), name, MAX_FBTP_NAME_CHARS );
-               fbt->fbtp_id = dtrace_probe_create(fbt_id, modname, name, FBT_ENTRY, FBT_AFRAMES_ENTRY, fbt);
-               fbt->fbtp_patchpoint = instr;
-               fbt->fbtp_ctl = ctl;
-               fbt->fbtp_loadcnt = ctl->mod_loadcnt;
-               fbt->fbtp_rval = DTRACE_INVOP_MOVL_ESP_EBP;
-               fbt->fbtp_savedval = theInstr;
-               fbt->fbtp_patchval = FBT_PATCHVAL;
-
-               fbt->fbtp_hashnext = fbt_probetab[FBT_ADDR2NDX(instr)];
-               fbt->fbtp_symndx = i;
-               fbt_probetab[FBT_ADDR2NDX(instr)] = fbt;
-
-               retfbt = NULL;
-again:
-               if (instr >= limit)
-                       continue;
-
-               /*
-                * If this disassembly fails, then we've likely walked off into
-                * a jump table or some other unsuitable area.  Bail out of the
-                * disassembly now.
-                */
-               if ((size = dtrace_instr_size(instr)) <= 0)
-                       continue;
-
-               /*
-                * We (desperately) want to avoid erroneously instrumenting a
-                * jump table, especially given that our markers are pretty
-                * short:  two bytes on x86, and just one byte on amd64.  To
-                * determine if we're looking at a true instruction sequence
-                * or an inline jump table that happens to contain the same
-                * byte sequences, we resort to some heuristic sleeze:  we
-                * treat this instruction as being contained within a pointer,
-                * and see if that pointer points to within the body of the
-                * function.  If it does, we refuse to instrument it.
-                */
-               for (j = 0; j < sizeof (uintptr_t); j++) {
-                       uintptr_t check = (uintptr_t)instr - j;
-                       uint8_t *ptr;
-
-                       if (check < sym[i].n_value)
-                               break;
-
-                       if (check + sizeof (uintptr_t) > (uintptr_t)limit)
-                               continue;
-
-                       ptr = *(uint8_t **)check;
-
-                       if (ptr >= (uint8_t *)sym[i].n_value && ptr < limit) {
-                               instr += size;
-                               goto again;
-                       }
-               }
-
-               /*
-                * OK, it's an instruction.
-                */
-               theInstr = instr[0];
-
-               /* Walked onto the start of the next routine? If so, bail out of this function. */
-               if (theInstr == FBT_PUSHL_EBP)
-                       continue;
-
-               if (!(size == 1 && (theInstr == FBT_POPL_EBP || theInstr == FBT_LEAVE))) {
-                       instr += size;
-                       goto again;
-               }
-
-               /*
-                * Found the popl %ebp; or leave.
-                */
-               machine_inst_t *patch_instr = instr;
-
-               /*
-                * Scan forward for a "ret", or "jmp".
-                */
-               instr += size;
-               if (instr >= limit)
-                       continue;
-
-               size = dtrace_instr_size(instr);
-               if (size <= 0) /* Failed instruction decode? */
-                       continue;
-
-               theInstr = instr[0];
-
-               if (!(size == FBT_RET_LEN && (theInstr == FBT_RET)) &&
-                       !(size == FBT_RET_IMM16_LEN && (theInstr == FBT_RET_IMM16)) &&
-                       !(size == FBT_JMP_SHORT_REL_LEN && (theInstr == FBT_JMP_SHORT_REL)) &&
-                       !(size == FBT_JMP_NEAR_REL_LEN && (theInstr == FBT_JMP_NEAR_REL)) &&
-                       !(size == FBT_JMP_FAR_ABS_LEN && (theInstr == FBT_JMP_FAR_ABS)))
-                       continue;
-
-               /*
-                * popl %ebp; ret; or leave; ret; or leave; jmp tailCalledFun; -- We have a winner!
-                */
-               fbt = kmem_zalloc(sizeof (fbt_probe_t), KM_SLEEP);
-               strlcpy( (char *)&(fbt->fbtp_name), name, MAX_FBTP_NAME_CHARS );
-
-               if (retfbt == NULL) {
-                       fbt->fbtp_id = dtrace_probe_create(fbt_id, modname,
-                           name, FBT_RETURN, FBT_AFRAMES_RETURN, fbt);
-               } else {
-                       retfbt->fbtp_next = fbt;
-                       fbt->fbtp_id = retfbt->fbtp_id;
-               }
-
-               retfbt = fbt;
-               fbt->fbtp_patchpoint = patch_instr;
-               fbt->fbtp_ctl = ctl;
-               fbt->fbtp_loadcnt = ctl->mod_loadcnt;
-
-               if (*patch_instr == FBT_POPL_EBP) {
-                       fbt->fbtp_rval = DTRACE_INVOP_POPL_EBP;
-               } else {
-                       ASSERT(*patch_instr == FBT_LEAVE);
-                       fbt->fbtp_rval = DTRACE_INVOP_LEAVE;
-               }
-               fbt->fbtp_roffset =
-                   (uintptr_t)(patch_instr - (uint8_t *)sym[i].n_value);
-
-               fbt->fbtp_savedval = *patch_instr;
-               fbt->fbtp_patchval = FBT_PATCHVAL;
-               fbt->fbtp_hashnext = fbt_probetab[FBT_ADDR2NDX(patch_instr)];
-               fbt->fbtp_symndx = i;
-               fbt_probetab[FBT_ADDR2NDX(patch_instr)] = fbt;
-
-               instr += size;
-               goto again;
-       }
-}
-#elif defined(__x86_64__)
 int
 fbt_invop(uintptr_t addr, uintptr_t *state, uintptr_t rval)
 {
        fbt_probe_t *fbt = fbt_probetab[FBT_ADDR2NDX(addr)];
-       
+
        for (; fbt != NULL; fbt = fbt->fbtp_hashnext) {
                if ((uintptr_t)fbt->fbtp_patchpoint == addr) {
 
@@ -870,7 +143,7 @@ kern_return_t
 fbt_perfCallback(
                 int                    trapno,
                 x86_saved_state_t      *tagged_regs,
-                __unused int        unused1,
+               uintptr_t               *lo_spp,
                 __unused int        unused2)
 {
        kern_return_t retval = KERN_FAILURE;
@@ -878,18 +151,36 @@ fbt_perfCallback(
 
        if (FBT_EXCEPTION_CODE == trapno && !IS_USER_TRAP(saved_state)) {
                boolean_t oldlevel;
-               uint64_t rsp_probe, *rbp, r12, fp, delta = 0;
+               uint64_t rsp_probe, fp, delta = 0;
+               uintptr_t old_sp;
                uint32_t *pDst;
                int emul;
 
+
                oldlevel = ml_set_interrupts_enabled(FALSE);
 
                /* Calculate where the stack pointer was when the probe instruction "fired." */
                rsp_probe = saved_state->isf.rsp; /* Easy, x86_64 establishes this value in idt64.s */
 
+               __asm__ volatile(
+                       "Ldtrace_invop_callsite_pre_label:\n"
+                       ".data\n"
+                       ".private_extern _dtrace_invop_callsite_pre\n"
+                       "_dtrace_invop_callsite_pre:\n"
+                       "  .quad Ldtrace_invop_callsite_pre_label\n"
+                       ".text\n"
+                                );
+
                emul = dtrace_invop( saved_state->isf.rip, (uintptr_t *)saved_state, saved_state->rax );
-               __asm__ volatile(".globl _dtrace_invop_callsite");
-               __asm__ volatile("_dtrace_invop_callsite:");
+
+               __asm__ volatile(
+                       "Ldtrace_invop_callsite_post_label:\n"
+                       ".data\n"
+                       ".private_extern _dtrace_invop_callsite_post\n"
+                       "_dtrace_invop_callsite_post:\n"
+                       "  .quad Ldtrace_invop_callsite_post_label\n"
+                       ".text\n"
+                                );
 
                switch (emul) {
                case DTRACE_INVOP_NOP:
@@ -907,7 +198,7 @@ fbt_perfCallback(
                case DTRACE_INVOP_LEAVE:
 /*
  * Emulate first micro-op of patched leave: mov %rbp,%rsp
- * fp points just below the return address slot for target's ret 
+ * fp points just below the return address slot for target's ret
  * and at the slot holding the frame pointer saved by the target's prologue.
  */
                        fp = saved_state->rbp;
@@ -929,34 +220,41 @@ fbt_perfCallback(
  */
                        delta += 2;
                        saved_state->isf.rsp += (delta << 2);
-
-/* XXX Fragile in the extreme. 
- * This is sensitive to trap_from_kernel()'s internals.
- */
-                       rbp = (uint64_t *)__builtin_frame_address(0);
-                       rbp = (uint64_t *)*rbp;
-                       r12 = *(rbp - 4);
-
+/* Obtain the stack pointer recorded by the trampolines */
+                       old_sp = *lo_spp;
 /* Shift contents of stack */
                        for (pDst = (uint32_t *)fp;
-                            pDst > (((uint32_t *)r12));
+                            pDst > (((uint32_t *)old_sp));
                                 pDst--)
                                *pDst = pDst[-delta];
 
+#if KASAN
+                       /*
+                        * The above has moved stack objects so they are no longer in sync
+                        * with the shadow.
+                        */
+                       uintptr_t base = (uintptr_t)((uint32_t *)old_sp - delta);
+                       uintptr_t size = (uintptr_t)fp - base;
+                       if (base >= VM_MIN_KERNEL_AND_KEXT_ADDRESS) {
+                               kasan_unpoison_stack(base, size);
+                       }
+#endif
+
 /* Track the stack lift in "saved_state". */
                        saved_state = (x86_saved_state64_t *) (((uintptr_t)saved_state) + (delta << 2));
-
-/* Now adjust the value of %r12 in our caller (kernel_trap)'s frame */
-                       *(rbp - 4) = r12 + (delta << 2);
+/* Adjust the stack pointer utilized by the trampolines */
+                       *lo_spp = old_sp + (delta << 2);
 
                        retval = KERN_SUCCESS;
                        break;
-                       
+
                default:
                        retval = KERN_FAILURE;
                        break;
                }
-               saved_state->isf.trapno = T_PREEMPT; /* Avoid call to i386_astintr()! */
+
+               /* Trick trap_from_kernel into not attempting to handle pending AST_URGENT */
+               saved_state->isf.trapno = T_PREEMPT;
 
                ml_set_interrupts_enabled(oldlevel);
        }
@@ -964,454 +262,281 @@ fbt_perfCallback(
        return retval;
 }
 
-/*ARGSUSED*/
-static void
-__fbt_provide_module(void *arg, struct modctl *ctl)
+void
+fbt_provide_probe(struct modctl *ctl, const char *modname, const char* symbolName, machine_inst_t* symbolStart, machine_inst_t* instrHigh)
 {
-#pragma unused(arg)
-       kernel_mach_header_t            *mh;
-       struct load_command         *cmd;
-       kernel_segment_command_t        *orig_ts = NULL, *orig_le = NULL;
-       struct symtab_command       *orig_st = NULL;
-       struct nlist_64             *sym = NULL;
-       char                                            *strings;
-       uintptr_t                                       instrLow, instrHigh;
-       char                                            *modname;
-       unsigned int                            i, j;
-
-       int gIgnoreFBTBlacklist = 0;
-       PE_parse_boot_argn("IgnoreFBTBlacklist", &gIgnoreFBTBlacklist, sizeof (gIgnoreFBTBlacklist));
-
-       mh = (kernel_mach_header_t *)(ctl->address);
-       modname = ctl->mod_modname;
-
-       if (0 == ctl->address || 0 == ctl->size) /* Has the linker been jettisoned? */
-               return;
+       unsigned int                    j;
+       unsigned int                    doenable = 0;
+       dtrace_id_t                     thisid;
+
+       fbt_probe_t *newfbt, *retfbt, *entryfbt;
+       machine_inst_t *instr, *limit, theInstr, i1, i2, i3;
+       int size;
 
        /*
-        * Employees of dtrace and their families are ineligible.  Void
-        * where prohibited.
+        * Guard against null symbols
         */
-
-       if (LIT_STRNEQL(modname, "com.apple.driver.dtrace"))
-               return;
-
-       if (strstr(modname, "CHUD") != NULL)
+       if (!symbolStart || !instrHigh || instrHigh < symbolStart) {
+               kprintf("dtrace: %s has an invalid address\n", symbolName);
                return;
+       }
 
-       if (mh->magic != MH_MAGIC_64)
-               return;
+       for (j = 0, instr = symbolStart, theInstr = 0;
+            (j < 4) && (instrHigh > (instr + 2)); j++) {
+               theInstr = instr[0];
+               if (theInstr == FBT_PUSH_RBP || theInstr == FBT_RET || theInstr == FBT_RET_IMM16)
+                       break;
 
-       cmd = (struct load_command *) &mh[1];
-       for (i = 0; i < mh->ncmds; i++) {
-               if (cmd->cmd == LC_SEGMENT_KERNEL) {
-                       kernel_segment_command_t *orig_sg = (kernel_segment_command_t *) cmd;
-
-                       if (LIT_STRNEQL(orig_sg->segname, SEG_TEXT))
-                               orig_ts = orig_sg;
-                       else if (LIT_STRNEQL(orig_sg->segname, SEG_LINKEDIT))
-                               orig_le = orig_sg;
-                       else if (LIT_STRNEQL(orig_sg->segname, ""))
-                               orig_ts = orig_sg; /* kexts have a single unnamed segment */
-               }
-               else if (cmd->cmd == LC_SYMTAB)
-                       orig_st = (struct symtab_command *) cmd;
+               if ((size = dtrace_instr_size(instr)) <= 0)
+                       break;
 
-               cmd = (struct load_command *) ((caddr_t) cmd + cmd->cmdsize);
+               instr += size;
        }
 
-       if ((orig_ts == NULL) || (orig_st == NULL) || (orig_le == NULL))
+       if (theInstr != FBT_PUSH_RBP)
                return;
 
-       sym = (struct nlist_64 *)(orig_le->vmaddr + orig_st->symoff - orig_le->fileoff);
-       strings = (char *)(orig_le->vmaddr + orig_st->stroff - orig_le->fileoff);
-
-       /* Find extent of the TEXT section */
-       instrLow = (uintptr_t)orig_ts->vmaddr;
-       instrHigh = (uintptr_t)(orig_ts->vmaddr + orig_ts->vmsize);
-
-       for (i = 0; i < orig_st->nsyms; i++) {
-               fbt_probe_t *fbt, *retfbt;
-               machine_inst_t *instr, *limit, theInstr, i1, i2, i3;
-               uint8_t n_type = sym[i].n_type & (N_TYPE | N_EXT);
-               char *name = strings + sym[i].n_un.n_strx;
-               int size;
-
-               /* Check that the symbol is a global and that it has a name. */
-               if (((N_SECT | N_EXT) != n_type && (N_ABS | N_EXT) != n_type))
-                       continue;
-
-               if (0 == sym[i].n_un.n_strx) /* iff a null, "", name. */
-                       continue;
-               
-               /* Lop off omnipresent leading underscore. */                   
-               if (*name == '_')
-                       name += 1;
-
-               if (LIT_STRNSTART(name, "dtrace_") && !LIT_STRNSTART(name, "dtrace_safe_")) {
-                       /*
-                        * Anything beginning with "dtrace_" may be called
-                        * from probe context unless it explitly indicates
-                        * that it won't be called from probe context by
-                        * using the prefix "dtrace_safe_".
-                        */
-                       continue;
-               }
+       i1 = instr[1];
+       i2 = instr[2];
+       i3 = instr[3];
 
-               if (LIT_STRNSTART(name, "fasttrap_") ||
-                   LIT_STRNSTART(name, "fuword") ||
-                   LIT_STRNSTART(name, "suword") ||
-                       LIT_STRNEQL(name, "sprlock") ||
-                       LIT_STRNEQL(name, "sprunlock") ||
-                       LIT_STRNEQL(name, "uread") ||
-                       LIT_STRNEQL(name, "uwrite"))
-                       continue; /* Fasttrap inner-workings. */
-
-               if (LIT_STRNSTART(name, "dsmos_")) 
-                       continue; /* Don't Steal Mac OS X! */
-
-        if (LIT_STRNSTART(name, "_dtrace"))
-                       continue; /* Shims in dtrace.c */
-
-               if (LIT_STRNSTART(name, "chud"))
-                       continue; /* Professional courtesy. */
-               
-               if (LIT_STRNSTART(name, "hibernate_"))
-                       continue; /* Let sleeping dogs lie. */
-               
-               if (LIT_STRNEQL(name, "ZN9IOService14newTemperatureElPS_") || /* IOService::newTemperature */
-                       LIT_STRNEQL(name, "ZN9IOService26temperatureCriticalForZoneEPS_")) /* IOService::temperatureCriticalForZone */
-                       continue; /* Per the fire code */
+       limit = (machine_inst_t *)instrHigh;
 
+       if (i1 == FBT_REX_RSP_RBP && i2 == FBT_MOV_RSP_RBP0 && i3 == FBT_MOV_RSP_RBP1) {
+               instr += 1; /* Advance to the mov %rsp,%rbp */
+               theInstr = i1;
+       } else {
+               return;
+       }
+#if 0
+       else {
                /*
-                * Place no probes (illegal instructions) in the exception handling path!
+                * Sometimes, the compiler will schedule an intervening instruction
+                * in the function prologue. Example:
+                *
+                * _mach_vm_read:
+                * 000006d8        pushl   %ebp
+                * 000006d9        movl    $0x00000004,%edx
+                * 000006de        movl    %esp,%ebp
+                *
+                * Try the next instruction, to see if it is a movl %esp,%ebp
                 */
-               if (LIT_STRNEQL(name, "t_invop") ||
-                       LIT_STRNEQL(name, "enter_lohandler") ||
-                       LIT_STRNEQL(name, "lo_alltraps") ||
-                       LIT_STRNEQL(name, "kernel_trap") ||
-                       LIT_STRNEQL(name, "interrupt") ||                 
-                       LIT_STRNEQL(name, "i386_astintr"))
-                       continue;
 
-               if (LIT_STRNEQL(name, "current_thread") ||
-                       LIT_STRNEQL(name, "ast_pending") ||
-                       LIT_STRNEQL(name, "fbt_perfCallback") ||
-                       LIT_STRNEQL(name, "machine_thread_get_kern_state") ||
-                       LIT_STRNEQL(name, "get_threadtask") ||
-                       LIT_STRNEQL(name, "ml_set_interrupts_enabled") ||
-                       LIT_STRNEQL(name, "dtrace_invop") ||
-                       LIT_STRNEQL(name, "fbt_invop") ||
-                       LIT_STRNEQL(name, "sdt_invop") ||
-                       LIT_STRNEQL(name, "max_valid_stack_address"))
-                       continue;
-
-               /*
-                * Voodoo.
-                */
-               if (LIT_STRNSTART(name, "machine_stack_") ||
-                       LIT_STRNSTART(name, "mapping_") ||
-                       LIT_STRNEQL(name, "tmrCvt") ||
-
-                       LIT_STRNSTART(name, "tsc_") ||
-
-                       LIT_STRNSTART(name, "pmCPU") ||
-                       LIT_STRNEQL(name, "pmKextRegister") ||
-                       LIT_STRNEQL(name, "pmMarkAllCPUsOff") || 
-                       LIT_STRNEQL(name, "pmSafeMode") ||
-                       LIT_STRNEQL(name, "pmTimerSave") ||
-                       LIT_STRNEQL(name, "pmTimerRestore") ||            
-                       LIT_STRNEQL(name, "pmUnRegister") ||
-                       LIT_STRNSTART(name, "pms") ||
-                       LIT_STRNEQL(name, "power_management_init") ||
-                       LIT_STRNSTART(name, "usimple_") ||
-                       LIT_STRNSTART(name, "lck_spin_lock") ||
-                       LIT_STRNSTART(name, "lck_spin_unlock") ||
-
-                       LIT_STRNSTART(name, "rtc_") ||
-                       LIT_STRNSTART(name, "_rtc_") ||
-                       LIT_STRNSTART(name, "rtclock_") ||
-                       LIT_STRNSTART(name, "clock_") ||
-                       LIT_STRNSTART(name, "absolutetime_to_") ||
-                       LIT_STRNEQL(name, "setPop") ||
-                       LIT_STRNEQL(name, "nanoseconds_to_absolutetime") ||
-                       LIT_STRNEQL(name, "nanotime_to_absolutetime") ||
-
-                       LIT_STRNSTART(name, "etimer_") ||
-
-                       LIT_STRNSTART(name, "commpage_") ||
-                       LIT_STRNSTART(name, "pmap_") ||
-                       LIT_STRNSTART(name, "ml_") ||
-                       LIT_STRNSTART(name, "PE_") ||
-                       LIT_STRNEQL(name, "kprintf") ||
-                       LIT_STRNSTART(name, "lapic_") ||
-                       LIT_STRNSTART(name, "acpi_"))
-                       continue;
+               instr += 1; /* Advance past the pushl %ebp */
+               if ((size = dtrace_instr_size(instr)) <= 0)
+                       return;
 
-        /*
-         * Avoid machine_ routines. PR_5346750.
-         */
-        if (LIT_STRNSTART(name, "machine_"))
-            continue;
+               instr += size;
 
-               if (LIT_STRNEQL(name, "handle_pending_TLB_flushes"))
-                       continue;
+               if ((instr + 1) >= limit)
+                       return;
 
-        /*
-         * Place no probes on critical routines. PR_5221096
-         */
-        if (!gIgnoreFBTBlacklist &&
-            bsearch( name, critical_blacklist, CRITICAL_BLACKLIST_COUNT, sizeof(name), _cmp ) != NULL)
-                continue;
+               i1 = instr[0];
+               i2 = instr[1];
 
-        /*
-                * Place no probes that could be hit in probe context.
-                */
-               if (!gIgnoreFBTBlacklist && 
-                       bsearch( name, probe_ctx_closure, PROBE_CTX_CLOSURE_COUNT, sizeof(name), _cmp ) != NULL)
-                       continue;
+               if (!(i1 == FBT_MOVL_ESP_EBP0_V0 && i2 == FBT_MOVL_ESP_EBP1_V0) &&
+                   !(i1 == FBT_MOVL_ESP_EBP0_V1 && i2 == FBT_MOVL_ESP_EBP1_V1))
+                       return;
 
-               /*
-                * Place no probes that could be hit on the way to the debugger.
-                */
-               if (LIT_STRNSTART(name, "kdp_") ||
-                       LIT_STRNSTART(name, "kdb_") ||
-                       LIT_STRNSTART(name, "kdbg_") ||
-                       LIT_STRNSTART(name, "kdebug_") ||
-                       LIT_STRNEQL(name, "kernel_debug") ||
-                       LIT_STRNEQL(name, "Debugger") ||
-                       LIT_STRNEQL(name, "Call_DebuggerC") ||
-                       LIT_STRNEQL(name, "lock_debugger") ||
-                       LIT_STRNEQL(name, "unlock_debugger") ||
-                       LIT_STRNEQL(name, "SysChoked")) 
-                       continue;
+               /* instr already points at the movl %esp,%ebp */
+               theInstr = i1;
+       }
+#endif
+       thisid = dtrace_probe_lookup(fbt_id, modname, symbolName, FBT_ENTRY);
+       newfbt = kmem_zalloc(sizeof (fbt_probe_t), KM_SLEEP);
+       strlcpy( (char *)&(newfbt->fbtp_name), symbolName, MAX_FBTP_NAME_CHARS );
 
+       if (thisid != 0) {
                /*
-                * Place no probes that could be hit on the way to a panic.
+                * The dtrace_probe previously existed, so we have to hook
+                * the newfbt entry onto the end of the existing fbt's chain.
+                * If we find an fbt entry that was previously patched to
+                * fire, (as indicated by the current patched value), then
+                * we want to enable this newfbt on the spot.
                 */
-               if (NULL != strstr(name, "panic_") ||
-                       LIT_STRNEQL(name, "panic") ||
-                       LIT_STRNEQL(name, "handleMck") ||
-                       LIT_STRNEQL(name, "unresolved_kernel_trap"))
-                       continue;
-               
-               if (dtrace_probe_lookup(fbt_id, modname, name, NULL) != 0)
-                       continue;
-
-               for (j = 0, instr = (machine_inst_t *)sym[i].n_value, theInstr = 0;
-                        (j < 4) && ((uintptr_t)instr >= instrLow) && (instrHigh > (uintptr_t)(instr + 2)); 
-                        j++) {
-                       theInstr = instr[0];
-                       if (theInstr == FBT_PUSH_RBP || theInstr == FBT_RET || theInstr == FBT_RET_IMM16)
+               entryfbt = dtrace_probe_arg (fbt_id, thisid);
+               ASSERT (entryfbt != NULL);
+               for(; entryfbt != NULL; entryfbt = entryfbt->fbtp_next) {
+                       if (entryfbt->fbtp_currentval == entryfbt->fbtp_patchval)
+                               doenable++;
+
+                       if (entryfbt->fbtp_next == NULL) {
+                               entryfbt->fbtp_next = newfbt;
+                               newfbt->fbtp_id = entryfbt->fbtp_id;
                                break;
-
-                       if ((size = dtrace_instr_size(instr)) <= 0)
-                               break;
-                       instr += size;
-               }
-
-               if (theInstr != FBT_PUSH_RBP)
-                       continue;
-
-               i1 = instr[1];
-               i2 = instr[2];
-               i3 = instr[3];
-
-               limit = (machine_inst_t *)instrHigh;
-
-               if (i1 == FBT_REX_RSP_RBP && i2 == FBT_MOV_RSP_RBP0 && i3 == FBT_MOV_RSP_RBP1) {
-                               instr += 1; /* Advance to the mov %rsp,%rbp */
-                               theInstr = i1;
-               } else {
-                       continue;
-               }
-#if 0
-               else {
-                       /*
-                        * Sometimes, the compiler will schedule an intervening instruction
-                        * in the function prologue. Example:
-                        *
-                        * _mach_vm_read:
-                        * 000006d8        pushl   %ebp
-                        * 000006d9        movl    $0x00000004,%edx
-                        * 000006de        movl    %esp,%ebp
-                        * 
-                        * Try the next instruction, to see if it is a movl %esp,%ebp
-                        */
-
-                       instr += 1; /* Advance past the pushl %ebp */
-                       if ((size = dtrace_instr_size(instr)) <= 0)
-                               continue;
-                       instr += size;
-
-                       if ((instr + 1) >= limit)
-                               continue;
-
-                       i1 = instr[0];
-                       i2 = instr[1];
-
-                       if (!(i1 == FBT_MOVL_ESP_EBP0_V0 && i2 == FBT_MOVL_ESP_EBP1_V0) &&
-                               !(i1 == FBT_MOVL_ESP_EBP0_V1 && i2 == FBT_MOVL_ESP_EBP1_V1))
-                               continue;
-
-                       /* instr already points at the movl %esp,%ebp */
-                       theInstr = i1;
+                       }
                }
-#endif
+       }
+       else {
+               /*
+                * The dtrace_probe did not previously exist, so we
+                * create it and hook in the newfbt.  Since the probe is
+                * new, we obviously do not need to enable it on the spot.
+                */
+               newfbt->fbtp_id = dtrace_probe_create(fbt_id, modname, symbolName, FBT_ENTRY, FBT_AFRAMES_ENTRY, newfbt);
+               doenable = 0;
+       }
 
-               fbt = kmem_zalloc(sizeof (fbt_probe_t), KM_SLEEP);
-               strlcpy( (char *)&(fbt->fbtp_name), name, MAX_FBTP_NAME_CHARS );
-               fbt->fbtp_id = dtrace_probe_create(fbt_id, modname, name, FBT_ENTRY, FBT_AFRAMES_ENTRY, fbt);
-               fbt->fbtp_patchpoint = instr;
-               fbt->fbtp_ctl = ctl;
-               fbt->fbtp_loadcnt = ctl->mod_loadcnt;
-               fbt->fbtp_rval = DTRACE_INVOP_MOV_RSP_RBP;
-               fbt->fbtp_savedval = theInstr;
-               fbt->fbtp_patchval = FBT_PATCHVAL;
+       newfbt->fbtp_patchpoint = instr;
+       newfbt->fbtp_ctl = ctl;
+       newfbt->fbtp_loadcnt = ctl->mod_loadcnt;
+       newfbt->fbtp_rval = DTRACE_INVOP_MOV_RSP_RBP;
+       newfbt->fbtp_savedval = theInstr;
+       newfbt->fbtp_patchval = FBT_PATCHVAL;
+       newfbt->fbtp_currentval = 0;
+       newfbt->fbtp_hashnext = fbt_probetab[FBT_ADDR2NDX(instr)];
+       fbt_probetab[FBT_ADDR2NDX(instr)] = newfbt;
 
-               fbt->fbtp_hashnext = fbt_probetab[FBT_ADDR2NDX(instr)];
-               fbt->fbtp_symndx = i;
-               fbt_probetab[FBT_ADDR2NDX(instr)] = fbt;
+       if (doenable)
+               fbt_enable(NULL, newfbt->fbtp_id, newfbt);
 
-               retfbt = NULL;
-again:
-               if (instr >= limit)
-                       continue;
+       /*
+        * The fbt entry chain is in place, one entry point per symbol.
+        * The fbt return chain can have multiple return points per symbol.
+        * Here we find the end of the fbt return chain.
+        */
 
-               /*
-                * If this disassembly fails, then we've likely walked off into
-                * a jump table or some other unsuitable area.  Bail out of the
-                * disassembly now.
-                */
-               if ((size = dtrace_instr_size(instr)) <= 0)
-                       continue;
+       doenable=0;
 
-               /*
-                * We (desperately) want to avoid erroneously instrumenting a
-                * jump table, especially given that our markers are pretty
-                * short:  two bytes on x86, and just one byte on amd64.  To
-                * determine if we're looking at a true instruction sequence
-                * or an inline jump table that happens to contain the same
-                * byte sequences, we resort to some heuristic sleeze:  we
-                * treat this instruction as being contained within a pointer,
-                * and see if that pointer points to within the body of the
-                * function.  If it does, we refuse to instrument it.
+       thisid = dtrace_probe_lookup(fbt_id, modname, symbolName, FBT_RETURN);
+       if (thisid != 0) {
+               /* The dtrace_probe previously existed, so we have to
+                * find the end of the existing fbt chain.  If we find
+                * an fbt return that was previously patched to fire,
+                * (as indicated by the currrent patched value), then
+                * we want to enable any new fbts on the spot.
                 */
-               for (j = 0; j < sizeof (uintptr_t); j++) {
-                       uintptr_t check = (uintptr_t)instr - j;
-                       uint8_t *ptr;
-
-                       if (check < sym[i].n_value)
+               retfbt = dtrace_probe_arg (fbt_id, thisid);
+               ASSERT(retfbt != NULL);
+               for (;  retfbt != NULL; retfbt =  retfbt->fbtp_next) {
+                       if (retfbt->fbtp_currentval == retfbt->fbtp_patchval)
+                               doenable++;
+                       if(retfbt->fbtp_next == NULL)
                                break;
+               }
+       }
+       else {
+               doenable = 0;
+               retfbt = NULL;
+       }
 
-                       if (check + sizeof (uintptr_t) > (uintptr_t)limit)
-                               continue;
+again:
+       if (instr >= limit)
+               return;
 
-                       ptr = *(uint8_t **)check;
+       /*
+        * If this disassembly fails, then we've likely walked off into
+        * a jump table or some other unsuitable area.  Bail out of the
+        * disassembly now.
+        */
+       if ((size = dtrace_instr_size(instr)) <= 0)
+               return;
 
-                       if (ptr >= (uint8_t *)sym[i].n_value && ptr < limit) {
-                               instr += size;
-                               goto again;
-                       }
-               }
+       /*
+        * We (desperately) want to avoid erroneously instrumenting a
+        * jump table, especially given that our markers are pretty
+        * short:  two bytes on x86, and just one byte on amd64.  To
+        * determine if we're looking at a true instruction sequence
+        * or an inline jump table that happens to contain the same
+        * byte sequences, we resort to some heuristic sleeze:  we
+        * treat this instruction as being contained within a pointer,
+        * and see if that pointer points to within the body of the
+        * function.  If it does, we refuse to instrument it.
+        */
+       for (j = 0; j < sizeof (uintptr_t); j++) {
+               uintptr_t check = (uintptr_t)instr - j;
+               uint8_t *ptr;
 
-               /*
-                * OK, it's an instruction.
-                */
-               theInstr = instr[0];
+               if (check < (uintptr_t)symbolStart)
+                       break;
 
-               /* Walked onto the start of the next routine? If so, bail out of this function. */
-               if (theInstr == FBT_PUSH_RBP)
+               if (check + sizeof (uintptr_t) > (uintptr_t)limit)
                        continue;
 
-               if (!(size == 1 && (theInstr == FBT_POP_RBP || theInstr == FBT_LEAVE))) {
+               ptr = *(uint8_t **)check;
+
+               if (ptr >= (uint8_t *)symbolStart && ptr < limit) {
                        instr += size;
                        goto again;
                }
+       }
 
-               /*
-                * Found the pop %rbp; or leave.
-                */
-               machine_inst_t *patch_instr = instr;
+       /*
+        * OK, it's an instruction.
+        */
+       theInstr = instr[0];
 
-               /*
-                * Scan forward for a "ret", or "jmp".
-                */
+       /* Walked onto the start of the next routine? If so, bail out of this function. */
+       if (theInstr == FBT_PUSH_RBP)
+               return;
+
+       if (!(size == 1 && (theInstr == FBT_POP_RBP || theInstr == FBT_LEAVE))) {
                instr += size;
-               if (instr >= limit)
-                       continue;
+               goto again;
+       }
 
-               size = dtrace_instr_size(instr);
-               if (size <= 0) /* Failed instruction decode? */
-                       continue;
+       /*
+        * Found the pop %rbp; or leave.
+        */
+       machine_inst_t *patch_instr = instr;
 
-               theInstr = instr[0];
+       /*
+        * Scan forward for a "ret", or "jmp".
+        */
+       instr += size;
+       if (instr >= limit)
+               return;
 
-               if (!(size == FBT_RET_LEN && (theInstr == FBT_RET)) &&
-                       !(size == FBT_RET_IMM16_LEN && (theInstr == FBT_RET_IMM16)) &&
-                       !(size == FBT_JMP_SHORT_REL_LEN && (theInstr == FBT_JMP_SHORT_REL)) &&
-                       !(size == FBT_JMP_NEAR_REL_LEN && (theInstr == FBT_JMP_NEAR_REL)) &&
-                       !(size == FBT_JMP_FAR_ABS_LEN && (theInstr == FBT_JMP_FAR_ABS)))
-                       continue;
+       size = dtrace_instr_size(instr);
+       if (size <= 0) /* Failed instruction decode? */
+               return;
 
-               /*
-                * pop %rbp; ret; or leave; ret; or leave; jmp tailCalledFun; -- We have a winner!
-                */
-               fbt = kmem_zalloc(sizeof (fbt_probe_t), KM_SLEEP);
-               strlcpy( (char *)&(fbt->fbtp_name), name, MAX_FBTP_NAME_CHARS );
-
-               if (retfbt == NULL) {
-                       fbt->fbtp_id = dtrace_probe_create(fbt_id, modname,
-                           name, FBT_RETURN, FBT_AFRAMES_RETURN, fbt);
-               } else {
-                       retfbt->fbtp_next = fbt;
-                       fbt->fbtp_id = retfbt->fbtp_id;
-               }
+       theInstr = instr[0];
 
-               retfbt = fbt;
-               fbt->fbtp_patchpoint = patch_instr;
-               fbt->fbtp_ctl = ctl;
-               fbt->fbtp_loadcnt = ctl->mod_loadcnt;
+       if (!(size == FBT_RET_LEN && (theInstr == FBT_RET)) &&
+           !(size == FBT_RET_IMM16_LEN && (theInstr == FBT_RET_IMM16)) &&
+           !(size == FBT_JMP_SHORT_REL_LEN && (theInstr == FBT_JMP_SHORT_REL)) &&
+           !(size == FBT_JMP_NEAR_REL_LEN && (theInstr == FBT_JMP_NEAR_REL)) &&
+           !(size == FBT_JMP_FAR_ABS_LEN && (theInstr == FBT_JMP_FAR_ABS)))
+               return;
 
-               if (*patch_instr == FBT_POP_RBP) {
-                       fbt->fbtp_rval = DTRACE_INVOP_POP_RBP;
-               } else {
-                       ASSERT(*patch_instr == FBT_LEAVE);
-                       fbt->fbtp_rval = DTRACE_INVOP_LEAVE;
-               }
-               fbt->fbtp_roffset =
-                   (uintptr_t)(patch_instr - (uint8_t *)sym[i].n_value);
+       /*
+        * pop %rbp; ret; or leave; ret; or leave; jmp tailCalledFun; -- We have a winner!
+        */
+       newfbt = kmem_zalloc(sizeof (fbt_probe_t), KM_SLEEP);
+       strlcpy( (char *)&(newfbt->fbtp_name), symbolName, MAX_FBTP_NAME_CHARS );
+
+       if (retfbt == NULL) {
+               newfbt->fbtp_id = dtrace_probe_create(fbt_id, modname,
+                                                     symbolName, FBT_RETURN, FBT_AFRAMES_RETURN, newfbt);
+       } else {
+               retfbt->fbtp_next = newfbt;
+               newfbt->fbtp_id = retfbt->fbtp_id;
+       }
 
-               fbt->fbtp_savedval = *patch_instr;
-               fbt->fbtp_patchval = FBT_PATCHVAL;
-               fbt->fbtp_hashnext = fbt_probetab[FBT_ADDR2NDX(patch_instr)];
-               fbt->fbtp_symndx = i;
-               fbt_probetab[FBT_ADDR2NDX(patch_instr)] = fbt;
+       retfbt = newfbt;
+       newfbt->fbtp_patchpoint = patch_instr;
+       newfbt->fbtp_ctl = ctl;
+       newfbt->fbtp_loadcnt = ctl->mod_loadcnt;
 
-               instr += size;
-               goto again;
+       if (*patch_instr == FBT_POP_RBP) {
+               newfbt->fbtp_rval = DTRACE_INVOP_POP_RBP;
+       } else {
+               ASSERT(*patch_instr == FBT_LEAVE);
+               newfbt->fbtp_rval = DTRACE_INVOP_LEAVE;
        }
-}
-#else
-#error Unknown arch
-#endif
+       newfbt->fbtp_roffset =
+       (uintptr_t)(patch_instr - (uint8_t *)symbolStart);
 
-extern struct modctl g_fbt_kernctl;
-#undef kmem_alloc /* from its binding to dt_kmem_alloc glue */
-#undef kmem_free /* from its binding to dt_kmem_free glue */
-#include <vm/vm_kern.h>
+       newfbt->fbtp_savedval = *patch_instr;
+       newfbt->fbtp_patchval = FBT_PATCHVAL;
+       newfbt->fbtp_hashnext = fbt_probetab[FBT_ADDR2NDX(patch_instr)];
+       fbt_probetab[FBT_ADDR2NDX(patch_instr)] = newfbt;
 
-/*ARGSUSED*/
-void
-fbt_provide_module(void *arg, struct modctl *ctl)
-{
-#pragma unused(ctl)
-       __fbt_provide_module(arg, &g_fbt_kernctl);
+       if (doenable)
+               fbt_enable(NULL, newfbt->fbtp_id, newfbt);
 
-       if ( (vm_offset_t)g_fbt_kernctl.address != (vm_offset_t )NULL )
-           kmem_free(kernel_map, (vm_offset_t)g_fbt_kernctl.address, round_page(g_fbt_kernctl.size));
-       g_fbt_kernctl.address = 0;
-       g_fbt_kernctl.size = 0;
+       instr += size;
+       goto again;
 }
+