Changes for 3.16 kernel. This likely breaks older kernels.

Author: dtrace4linux

.gdbinit

@@ -1,3 +1,4 @@
+set auto-load safe-path /
 set confirm no
 set history expansion 1
 dir libctf

TODO

@@ -1,6 +1,6 @@
 NAME=dtrace
 MAJ_VERSION=1
-MIN_VERSION=0153
+MIN_VERSION=0154
 EXCLUDE="*.ko *.o .git"
 EXCLUDE_DIRS="build-"
-#date Sun Mar 23 22:00:18 GMT 2014
+#date Sun Feb 22 11:01:19 GMT 2015

archive.sh

@@ -72,7 +72,7 @@ obj-m := dtracedrv.o
 
 H	= dtrace_linux.h dtrace_proto.h
 EXTRA_AFLAGS += \
-	-I$(M)/../../linux
+	-I$(M)/../../linux $(OLD_RSP)
 
 # Add -gdwarf-2 because gcc-4.8 will cause mkctf.sh to fail due to
 # something libdwarf doesnt like.
@@ -83,7 +83,7 @@ EXTRA_CFLAGS += -g -gdwarf-2 \
 	-I$(M)/../../linux \
 	-I$(M)/../../common/ctf \
 	-I$(M)/../../uts/common \
-	-D_KERNEL -DCTF_OLD_VERSIONS $(PTR32)
+	-D_KERNEL -DCTF_OLD_VERSIONS $(PTR32) $(OLD_RSP)
 
 ######################################################################
 #   Handle  include  files  which  exist  or  moved  around amongst  #

driver/Makefile

@@ -267,6 +267,15 @@ ctl_linux_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsign
 		if (child == NULL)
 			return -ESRCH;
 		get_task_struct(child);
+# if 1
+		/***********************************************/
+		/*   Fed  up  trying  to  make the code below  */
+		/*   work  across  all  kernels  -  lets just  */
+		/*   disable it for now.		       */
+		/***********************************************/
+		uid1 = 0;
+		uid2 = 1; // force failure
+# else
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
 		uid2 = KUIDT_VALUE(child->cred->uid);
 #else
@@ -280,6 +289,7 @@ ctl_linux_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsign
 #else
 		uid1 = current->uid;
 #endif
+# endif
 		if (uid1 != uid2 && uid1 != 0)
 			return -EPERM;
 

driver/ctl.c

@@ -1035,13 +1035,16 @@ dtrace_bcopy(const void *src, void *dst, size_t len)
 static void
 dtrace_strcpy(const void *src, void *dst, size_t len)
 {
+	volatile uint16_t *flags;
+
+	flags = (volatile uint16_t *)&cpu_core[cpu_get_id()].cpuc_dtrace_flags;
+
 	if (len != 0) {
 		uint8_t *s1 = dst, c;
 		const uint8_t *s2 = src;
-
 		do {
 			*s1++ = c = dtrace_load8((uintptr_t)s2++);
-		} while (--len != 0 && c != '\0');
+		} while (--len != 0 && c != '\0' && (*flags & CPU_DTRACE_FAULT) == 0);
 	}
 }
 
@@ -4559,14 +4562,14 @@ PRINT_CASE(DIF_SUBR_LLTOSTR);
 	struct file *fp = (struct file *) tupregs[0].dttk_value;
 		if (fp) {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
-			regs[rd] = (uint64_t *) (void *) d_path(&fp->f_path, buf, sizeof buf);
+			regs[rd] = (uint64_t) (void *) d_path(&fp->f_path, buf, sizeof buf);
 #else
 			regs[rd] = d_path(&fp->f_dentry, fp->f_vfsmnt, buf, sizeof buf);
 #endif
 /*			regs[rd] = d_path(&get_current()->files->fdt->fd[1]->f_path, buf, sizeof buf);*/
 		}
 		else
-			regs[rd] = (uint64_t *) "<unknown>";
+			regs[rd] = (uint64_t) "<unknown>";
 		break;
 		}
 #endif
@@ -6290,6 +6293,7 @@ dtrace_probe(dtrace_id_t id, uintptr_t arg0, uintptr_t arg1,
 	/*   first probe. Silly me.		       */
 	/***********************************************/
 	cpup = cpu_get_this();
+
 	if (cpup && cpup->cpuc_regs && cpup->cpuc_regs->r_rfl & X86_EFLAGS_IF) {
 		if (dtrace_safe) {
 			cnt_probe_safe++;
@@ -6365,7 +6369,7 @@ dtrace_probe(dtrace_id_t id, uintptr_t arg0, uintptr_t arg1,
 			return;
 		}
 	}
-//asm("cli\n");
+
 	cpu_core[cpu].cpuc_probe_level++;
 	cpu_core[cpu].cpuc_this_probe = id;
 	__dtrace_probe(id, arg0, arg1, arg2, arg3, arg4);
@@ -6396,7 +6400,6 @@ dtrace_probe(dtrace_id_t id, uintptr_t arg0, uintptr_t arg1,
 	volatile uint16_t *flags;
 	hrtime_t now;
 
-//dtrace_printf("dtrace_probe(%d)\n", __LINE__);
 	cnt_probes++;
 # if linux
 	/***********************************************/
@@ -9696,6 +9699,7 @@ dtrace_difo_init(dtrace_difo_t *dp, dtrace_vstate_t *vstate)
 	dtrace_difo_hold(dp);
 }
 
+#if !defined(linux)
 static dtrace_difo_t *
 dtrace_difo_duplicate(dtrace_difo_t *dp, dtrace_vstate_t *vstate)
 {
@@ -9739,6 +9743,7 @@ dtrace_difo_duplicate(dtrace_difo_t *dp, dtrace_vstate_t *vstate)
 	dtrace_difo_init(new, vstate);
 	return (new);
 }
+#endif
 
 static void
 dtrace_difo_destroy(dtrace_difo_t *dp, dtrace_vstate_t *vstate)
@@ -15385,6 +15390,7 @@ dtrace_helpers_destroy(void)
 	dmutex_exit(&dtrace_lock);
 }
 
+#if !defined(linux)
 static void
 dtrace_helpers_duplicate(proc_t *from, proc_t *to)
 {
@@ -15466,6 +15472,7 @@ dtrace_helpers_duplicate(proc_t *from, proc_t *to)
 	if (hasprovs)
 		dtrace_helper_provider_register(to, newhelp, NULL);
 }
+#endif
 
 #if linux
 /**********************************************************************/
@@ -15698,6 +15705,7 @@ dtrace_resume(void)
 	dtrace_probe_foreach(offsetof(dtrace_pops_t, dtps_resume));
 }
 
+#if !defined(linux)
 static int
 dtrace_cpu_setup(cpu_setup_t what, processorid_t cpu)
 {
@@ -15764,6 +15772,7 @@ dtrace_cpu_setup_initial(processorid_t cpu)
 {
 	(void) dtrace_cpu_setup(CPU_CONFIG, cpu);
 }
+#endif
 
 static void
 dtrace_toxrange_add(uintptr_t base, uintptr_t limit)

driver/dtrace.c

@@ -89,6 +89,7 @@ enum {
 	OFFSET_task_exit_notifier,
 	OFFSET_xtime,
 	OFFSET_ia32_sys_call_table,
+	OFFSET_old_rsp,
 	OFFSET_END_SYMS,
 	};
 static struct map {
@@ -106,6 +107,7 @@ static struct map {
 {"task_exit_notifier",     NULL},
 {"xtime",     		   NULL}, /* Needed for dtrace_gethrtime, if 2.6.9 */
 {"ia32_sys_call_table",    NULL}, /* On 64b kernel, the 32b syscall table. */
+{"old_rsp",    		   NULL}, /* This has moved to System.map in 3.7 or above */
 {"END_SYMS",               NULL}, /* This is a sentinel so we know we are done. */
 	{0}
 	};
@@ -244,6 +246,7 @@ extern unsigned long cnt_xcall5;
 extern unsigned long long cnt_xcall6;
 extern unsigned long long cnt_xcall7;
 extern unsigned long cnt_xcall8;
+extern unsigned long cnt_xcall_slave;
 extern unsigned long cnt_nmi1;
 extern unsigned long cnt_nmi2;
 extern unsigned long long cnt_timer1;
@@ -2850,6 +2853,7 @@ static int proc_dtrace_stats_show(struct seq_file *seq, void *v)
 		{TYPE_LONG_LONG, (unsigned long *) &cnt_xcall6, "xcall6(ack_waits)"},
 		{TYPE_LONG_LONG, (unsigned long *) &cnt_xcall7, "xcall7(fast)"},
 		{TYPE_LONG, (unsigned long *) &cnt_xcall8, "xcall8"},
+		{TYPE_LONG, (unsigned long *) &cnt_xcall_slave, "xcall_slave"},
 		{TYPE_INT, (unsigned long *) &dtrace_shutdown, "shutdown"},
 		{0}
 		};

driver/dtrace_linux.c

@@ -96,17 +96,12 @@ typedef uint32_t ipaddr_t;
 # define 	hz	HZ
 
 /**********************************************************************/
-/*   Code for 3.8.0 kernels which do strict kuid_t type checking.     */
-/*   Actually  -  its  another  Linux  mess. Centos 6.4 has a 2.6.32  */
-/*   kernel but with later semantics.				      */
+/*   This  is  nearly  impossible  to  get right for each kernel. We  */
+/*   cheat,   because   the   struct   wrapper  always  has  just  a  */
+/*   uid_t/gid_t.						      */
 /**********************************************************************/
-#if defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
-#	define	KUIDT_VALUE(v) v.val
-#	define	KGIDT_VALUE(v) v.val
-#else
-#	define	KUIDT_VALUE(v) v
-#	define	KGIDT_VALUE(v) v
-#endif
+# define	KUIDT_VALUE(v) *(uid_t *) &(v)
+# define	KGIDT_VALUE(v) *(gid_t *) &(v)
 
 /**********************************************************************/
 /*   File  based  on  code  from  FreeBSD  to  support  the  missing  */

driver/dtrace_linux.h

@@ -767,6 +767,14 @@ fbt_provide_function(struct modctl *mp, par_module_t *pmp,
 	pf_info_t	inf;
 int io_prov_sdt(pf_info_t *infp, uint8_t *instr, int size, int modrm);
 
+	/***********************************************/
+	/*   Ignore  these - they tend to result in a  */
+	/*   lot  of dups, and also tend to be in the  */
+	/*   same reusable and unmapped page.	       */
+	/***********************************************/
+	if (strncmp(name, "cleanup_module", 14) == 0)
+		return;
+
 	memset(&inf, 0, sizeof inf);
 	inf.mp = mp;
 	inf.pmp = pmp;

driver/fbt_linux.c

@@ -522,6 +522,14 @@ instr_provide_function(struct modctl *mp, par_module_t *pmp,
 	char	name_buf[128];
 	char	pred_buf[128];
 
+	/***********************************************/
+	/*   Ignore  these - they tend to result in a  */
+	/*   lot  of dups, and also tend to be in the  */
+	/*   same reusable and unmapped page.	       */
+	/***********************************************/
+	if (strncmp(name, "cleanup_module", 14) == 0)
+		return;
+
 # define UNHANDLED_FBT() if (do_print || dtrace_unhandled) { \
 		printk("instr:unhandled instr %s:%p %02x %02x %02x %02x\n", \
 			name, instr, instr[0], instr[1], instr[2], instr[3]); \