/home/fox/release/dtrace/2010/dtrace-20100711.tar.bz2

Author: dtrace4linux

.release

@@ -1,3 +1,3 @@
-date=Sat Jul 10 23:52:24 BST 2010
-release=dtrace-20100710
-build=151
+date=Sun Jul 11 21:51:34 BST 2010
+release=dtrace-20100711
+build=154

Bugs

@@ -80,3 +80,6 @@ x 20090204 23. Linux 2.6.9 (AS4) issues
 
   20090222 26. syscall:sigreturn wants to do things to the stack and
                wants a real stack frame. Need to handle that.
+
+  20100711 27. syscall::c*: seg fault in kernel
+  20100711 28. dtrace_xcall: not irq_disable correct.

Changes

@@ -1,3 +1,8 @@
+Sun Jul 11 21:40:15 2010  fox
+
+     344* dtrace_linux.c: dtrace_xcall: Dont call on_each_cpu as its not
+          interrupt safe.
+
 Sat Jul 10 21:40:00 2010  fox
 
      343* Archive: 1.0101

driver/dtrace.c

@@ -4624,11 +4624,6 @@ HERE();
 	mstate->dtms_difo = difo;
 
 	regs[DIF_REG_R0] = 0; 		/* %r0 is fixed at zero */
-HERE();
-{uint_t p = 0;
-for (p = 0; p < textlen; p++) {
-printk("DIS %p %x: %x\n", &text[p], p, text[p]);
-}}
 
 	while (pc < textlen && !(*flags & CPU_DTRACE_FAULT)) {
 		opc = pc;
@@ -4639,8 +4634,6 @@ printk("DIS %p %x: %x\n", &text[p], p, text[p]);
 		r2 = DIF_INSTR_R2(instr);
 		rd = DIF_INSTR_RD(instr);
 
-HERE();
-printk("opcode=%x instr=%x\n", DIF_INSTR_OP(instr), instr);
 		switch (DIF_INSTR_OP(instr)) {
 		case DIF_OP_OR:
 PRINT_CASE(DIF_OP_OR);
@@ -4964,7 +4957,6 @@ PRINT_CASE(DIF_OP_LDGA);
 PRINT_CASE(DIF_OP_LDGS);
 			id = DIF_INSTR_VAR(instr);
 
-printk("id=%d\n", id);
 			if (id >= DIF_VAR_OTHER_UBASE) {
 				uintptr_t a;
 HERE();
@@ -4987,17 +4979,14 @@ HERE();
 					 * reference to a NULL variable.
 					 */
 					regs[rd] = NULL;
-printk("regs[%d]=%llx\n", rd, regs[rd]);
 				} else {
 					regs[rd] = a + sizeof (uint64_t);
-printk("regs[%d]2=%llx\n", rd, regs[rd]);
 				}
 
 				break;
 			}
 
 			regs[rd] = dtrace_dif_variable(mstate, state, id, 0);
-printk("regs[%d]3=%llx\n", rd, regs[rd]);
 			break;
 
 		case DIF_OP_STGS:
@@ -12150,7 +12139,6 @@ dtrace_dof_slurp(dof_hdr_t *dof, dtrace_vstate_t *vstate, cred_t *cr,
 	dtrace_enabling_t *enab;
 	uint_t i;
 
-printk("cr=%p\n", cr);
 	ASSERT(MUTEX_HELD(&dtrace_lock));
 	ASSERT(dof->dofh_loadsz >= sizeof (dof_hdr_t));
 	/*

driver/dtrace_linux.c

@@ -1035,14 +1035,14 @@ dtrace_xcall(processorid_t cpu, dtrace_xcall_t func, void *arg)
 {
 	if (cpu == DTRACE_CPUALL) {
 		/***********************************************/
-		/*   Dont   call  smp_call_function  as  this  */
-		/*   doesnt work.			       */
+		/*   Avoid  calling  local_irq_disable, since  */
+		/*   we   will  likely  be  called  from  the  */
+		/*   hrtimer callback.			       */
 		/***********************************************/
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26)
-		on_each_cpu(func, arg, 0, TRUE);
-#else
-		on_each_cpu(func, arg, TRUE);
-#endif
+		preempt_disable();
+		smp_call_function(func, arg, TRUE);
+		func(arg);
+		preempt_enable();
 	} else {
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26)
 		/***********************************************/

driver/systrace.c

@@ -197,6 +197,7 @@ static int64_t (*sys_vfork_ptr)(uintptr_t, uintptr_t, uintptr_t, uintptr_t, uint
 
 static char *int_ret_from_sys_call_ptr;
 static char *ptregscall_common_ptr;
+static char *save_rest_ptr;
 
 /**********************************************************************/
 /*   Following  definitions are non-static to allow the assembler to  */
@@ -332,6 +333,13 @@ systrace_assembler_dummy(void)
 		/*   cannot be C code yet.		       */
 		/***********************************************/
 		FUNCTION(systrace_part1_sys_clone)
+/*
+"subq 6*8, %rsp\n"
+"call *save_rest_ptr\n"
+"leaq 8(%rsp), %r8\n"
+"mov $dtrace_systrace_syscall_clone,%rax\n"
+"jmp *ptregscall_common_ptr\n"
+*/
 		"lea    -0x28(%rsp),%r8\n"
 		"mov $dtrace_systrace_syscall_clone,%rax\n"
 		"jmp *ptregscall_common_ptr\n"
@@ -1002,6 +1010,8 @@ systrace_provide(void *arg, const dtrace_probedesc_t *desc)
 		int_ret_from_sys_call_ptr = (char *) get_proc_addr("int_ret_from_sys_call");
 	if (ptregscall_common_ptr == NULL)
 		ptregscall_common_ptr = (char *) get_proc_addr("ptregscall_common");
+	if (save_rest_ptr == NULL)
+		save_rest_ptr = (char *) get_proc_addr("save_rest");
 #endif
 
 	systrace_do_init(sysent, &systrace_sysent);