cmd/zvol_wait/Makefile
contrib/Makefile
contrib/bash_completion.d/Makefile
+ contrib/bpftrace/Makefile
contrib/dracut/02zfsexpandknowledge/Makefile
contrib/dracut/90zfs/Makefile
contrib/dracut/Makefile
-SUBDIRS = bash_completion.d dracut initramfs pyzfs zcp
-DIST_SUBDIRS = bash_completion.d dracut initramfs pyzfs zcp
+SUBDIRS = bash_completion.d bpftrace dracut initramfs pyzfs zcp
+DIST_SUBDIRS = bash_completion.d bpftrace dracut initramfs pyzfs zcp
--- /dev/null
+EXTRA_DIST = \
+ $(top_srcdir)/contrib/bpftrace/taskqlatency.bt \
+ $(top_srcdir)/contrib/bpftrace/zfs-trace.sh
--- /dev/null
+#include <sys/taskq.h>
+
+kprobe:trace_zfs_taskq_ent__birth
+{
+ $tqent = (struct taskq_ent *)arg0;
+
+ $tqent_id = $tqent->tqent_id;
+ $tq_name = str($tqent->tqent_taskq->tq_name);
+
+ @birth[$tq_name, $tqent_id] = nsecs;
+}
+
+kprobe:trace_zfs_taskq_ent__start
+{
+ $tqent = (struct taskq_ent *)arg0;
+
+ @tqent_id[tid] = $tqent->tqent_id;
+ @tq_name[tid] = str($tqent->tqent_taskq->tq_name);
+
+ @start[@tq_name[tid], @tqent_id[tid]] = nsecs;
+}
+
+kprobe:trace_zfs_taskq_ent__start
+/ @birth[@tq_name[tid], @tqent_id[tid]] /
+{
+ @queue_lat_us[@tq_name[tid]] =
+ hist((nsecs - @birth[@tq_name[tid], @tqent_id[tid]])/1000);
+ delete(@birth[@tq_name[tid], @tqent_id[tid]]);
+}
+
+kprobe:trace_zfs_taskq_ent__finish
+/ @start[@tq_name[tid], @tqent_id[tid]] /
+{
+ $tqent = (struct taskq_ent *)arg0;
+
+ @exec_lat_us[@tq_name[tid], ksym($tqent->tqent_func)] =
+ hist((nsecs - @start[@tq_name[tid], @tqent_id[tid]])/1000);
+ delete(@start[@tq_name[tid], @tqent_id[tid]]);
+}
+
+kprobe:trace_zfs_taskq_ent__finish
+{
+ delete(@tq_name[tid]);
+ delete(@tqent_id[tid]);
+}
+
+END
+{
+ clear(@birth);
+ clear(@start);
+
+ clear(@tq_name);
+ clear(@tqent_id);
+}
--- /dev/null
+#!/bin/sh
+
+ZVER=$(cat /sys/module/zfs/version | cut -f 1 -d '-')
+KVER=$(uname -r)
+
+bpftrace \
+ --include "/usr/src/zfs-$ZVER/$KVER/zfs_config.h" \
+ -I "/usr/src/zfs-$ZVER/include" \
+ -I "/usr/src/zfs-$ZVER/include/spl" \
+ "$@"
$(top_srcdir)/include/os/linux/spl/sys/timer.h \
$(top_srcdir)/include/os/linux/spl/sys/trace.h \
$(top_srcdir)/include/os/linux/spl/sys/trace_spl.h \
+ $(top_srcdir)/include/os/linux/spl/sys/trace_taskq.h \
$(top_srcdir)/include/os/linux/spl/sys/tsd.h \
$(top_srcdir)/include/os/linux/spl/sys/types32.h \
$(top_srcdir)/include/os/linux/spl/sys/types.h \
#ifndef _OS_LINUX_SPL_TRACE_H
#define _OS_LINUX_SPL_TRACE_H
+#include <sys/taskq.h>
+
#include <sys/trace.h>
+#include <sys/trace_taskq.h>
#endif
--- /dev/null
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+#if defined(_KERNEL)
+#if defined(HAVE_DECLARE_EVENT_CLASS)
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM zfs
+
+#undef TRACE_SYSTEM_VAR
+#define TRACE_SYSTEM_VAR zfs_taskq
+
+#if !defined(_TRACE_TASKQ_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_TASKQ_H
+
+#include <linux/tracepoint.h>
+#include <sys/types.h>
+
+/*
+ * Generic support for single argument tracepoints of the form:
+ *
+ * DTRACE_PROBE1(...,
+ * taskq_ent_t *, ...);
+ */
+/* BEGIN CSTYLED */
+DECLARE_EVENT_CLASS(zfs_taskq_ent_class,
+ TP_PROTO(taskq_ent_t *taskq_ent),
+ TP_ARGS(taskq_ent),
+ TP_STRUCT__entry(
+ __field(taskq_ent_t *, taskq_ent)
+ ),
+ TP_fast_assign(
+ __entry->taskq_ent = taskq_ent;
+ ),
+ TP_printk("taskq_ent %p", __entry->taskq_ent)
+);
+/* END CSTYLED */
+
+/* BEGIN CSTYLED */
+#define DEFINE_TASKQ_EVENT(name) \
+DEFINE_EVENT(zfs_taskq_ent_class, name, \
+ TP_PROTO(taskq_ent_t *taskq_ent), \
+ TP_ARGS(taskq_ent))
+/* END CSTYLED */
+DEFINE_TASKQ_EVENT(zfs_taskq_ent__birth);
+DEFINE_TASKQ_EVENT(zfs_taskq_ent__start);
+DEFINE_TASKQ_EVENT(zfs_taskq_ent__finish);
+
+#endif /* _TRACE_TASKQ_H */
+
+#undef TRACE_INCLUDE_PATH
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_PATH sys
+#define TRACE_INCLUDE_FILE trace_taskq
+#include <trace/define_trace.h>
+
+#else
+
+/*
+ * When tracepoints are not available, a DEFINE_DTRACE_PROBE* macro is
+ * needed for each DTRACE_PROBE. These will be used to generate stub
+ * tracing functions and prototypes for those functions. See
+ * include/os/linux/spl/sys/trace.h.
+ */
+
+DEFINE_DTRACE_PROBE1(taskq_ent__birth);
+DEFINE_DTRACE_PROBE1(taskq_ent__start);
+DEFINE_DTRACE_PROBE1(taskq_ent__finish);
+
+#endif /* HAVE_DECLARE_EVENT_CLASS */
+#endif /* _KERNEL */
#include <sys/taskq.h>
#include <sys/kmem.h>
#include <sys/tsd.h>
+#include <sys/trace_spl.h>
int spl_taskq_thread_bind = 0;
module_param(spl_taskq_thread_bind, int, 0644);
}
t->tqent_birth = jiffies;
+ DTRACE_PROBE1(taskq_ent__birth, taskq_ent_t *, t);
+
/*
* The priority list must be maintained in strict task id order
* from lowest to highest for lowest_id to be easily calculable.
t->tqent_taskq = tq;
t->tqent_timer.function = NULL;
t->tqent_timer.expires = 0;
+
t->tqent_birth = jiffies;
+ DTRACE_PROBE1(taskq_ent__birth, taskq_ent_t *, t);
ASSERT(!(t->tqent_flags & TQENT_FLAG_PREALLOC));
t->tqent_func = func;
t->tqent_arg = arg;
t->tqent_taskq = tq;
+
t->tqent_birth = jiffies;
+ DTRACE_PROBE1(taskq_ent__birth, taskq_ent_t *, t);
spin_unlock(&t->tqent_lock);
* tqent_flags here.
*
* Also use an on stack taskq_ent_t for tqt_task
- * assignment in this case. We only populate the two
- * fields used by the only user in taskq proc file.
+ * assignment in this case; we want to make sure
+ * to duplicate all fields, so the values are
+ * correct when it's accessed via DTRACE_PROBE*.
*/
tqt->tqt_id = t->tqent_id;
tqt->tqt_flags = t->tqent_flags;
if (t->tqent_flags & TQENT_FLAG_PREALLOC) {
- dup_task.tqent_func = t->tqent_func;
- dup_task.tqent_arg = t->tqent_arg;
+ dup_task = *t;
t = &dup_task;
}
tqt->tqt_task = t;
tq->tq_nactive++;
spin_unlock_irqrestore(&tq->tq_lock, flags);
+ DTRACE_PROBE1(taskq_ent__start, taskq_ent_t *, t);
+
/* Perform the requested task */
t->tqent_func(t->tqent_arg);
+ DTRACE_PROBE1(taskq_ent__finish, taskq_ent_t *, t);
+
spin_lock_irqsave_nested(&tq->tq_lock, flags,
tq->tq_lock_class);
tq->tq_nactive--;
* source file, so this dummy file exists for that purpose.
*/
+#include <sys/taskq.h>
+
#ifdef _KERNEL
#define CREATE_TRACE_POINTS
#include <sys/trace.h>
+#include <sys/trace_taskq.h>
#endif
projects / mirror_zfs.git / commitdiff