Module Name: src
Committed By: riz
Date: Mon Feb 1 05:05:44 UTC 2016
Modified Files:
src/sys/kern: subr_devsw.c vfs_bio.c
Log Message:
Implement the 'io' provider for DTrace. From riastradh@, with
fixes from me.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/kern/subr_devsw.c
cvs rdiff -u -r1.258 -r1.259 src/sys/kern/vfs_bio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_devsw.c
diff -u src/sys/kern/subr_devsw.c:1.33 src/sys/kern/subr_devsw.c:1.34
--- src/sys/kern/subr_devsw.c:1.33 Fri Sep 5 05:57:21 2014
+++ src/sys/kern/subr_devsw.c Mon Feb 1 05:05:43 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_devsw.c,v 1.33 2014/09/05 05:57:21 matt Exp $ */
+/* $NetBSD: subr_devsw.c,v 1.34 2016/02/01 05:05:43 riz Exp $ */
/*-
* Copyright (c) 2001, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -69,7 +69,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.33 2014/09/05 05:57:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.34 2016/02/01 05:05:43 riz Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_dtrace.h"
+#endif
#include <sys/param.h>
#include <sys/conf.h>
@@ -80,6 +84,7 @@ __KERNEL_RCSID(0, "$NetBSD: subr_devsw.c
#include <sys/cpu.h>
#include <sys/buf.h>
#include <sys/reboot.h>
+#include <sys/sdt.h>
#ifdef DEVSW_DEBUG
#define DPRINTF(x) printf x
@@ -730,12 +735,17 @@ bdev_close(dev_t dev, int flag, int devt
return rv;
}
+SDT_PROVIDER_DECLARE(io);
+SDT_PROBE_DEFINE1(io, kernel, , start, "struct buf *"/*bp*/);
+
void
bdev_strategy(struct buf *bp)
{
const struct bdevsw *d;
int mpflag;
+ SDT_PROBE1(io, kernel, , start, bp);
+
if ((d = bdevsw_lookup(bp->b_dev)) == NULL) {
bp->b_error = ENXIO;
bp->b_resid = bp->b_bcount;
Index: src/sys/kern/vfs_bio.c
diff -u src/sys/kern/vfs_bio.c:1.258 src/sys/kern/vfs_bio.c:1.259
--- src/sys/kern/vfs_bio.c:1.258 Mon Jan 11 01:22:36 2016
+++ src/sys/kern/vfs_bio.c Mon Feb 1 05:05:43 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_bio.c,v 1.258 2016/01/11 01:22:36 dholland Exp $ */
+/* $NetBSD: vfs_bio.c,v 1.259 2016/02/01 05:05:43 riz Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -123,10 +123,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.258 2016/01/11 01:22:36 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.259 2016/02/01 05:05:43 riz Exp $");
#ifdef _KERNEL_OPT
#include "opt_bufcache.h"
+#include "opt_dtrace.h"
#endif
#include <sys/param.h>
@@ -146,6 +147,7 @@ __KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v
#include <sys/wapbl.h>
#include <sys/bitops.h>
#include <sys/cprng.h>
+#include <sys/sdt.h>
#include <uvm/uvm.h> /* extern struct uvm uvm */
@@ -1474,6 +1476,11 @@ buf_drain(int n)
return size;
}
+SDT_PROVIDER_DEFINE(io);
+
+SDT_PROBE_DEFINE1(io, kernel, , wait__start, "struct buf *"/*bp*/);
+SDT_PROBE_DEFINE1(io, kernel, , wait__done, "struct buf *"/*bp*/);
+
/*
* Wait for operations on the buffer to complete.
* When they do, extract and return the I/O's error value.
@@ -1485,11 +1492,15 @@ biowait(buf_t *bp)
KASSERT(ISSET(bp->b_cflags, BC_BUSY));
KASSERT(bp->b_refcnt > 0);
+ SDT_PROBE1(io, kernel, , wait__start, bp);
+
mutex_enter(bp->b_objlock);
while (!ISSET(bp->b_oflags, BO_DONE | BO_DELWRI))
cv_wait(&bp->b_done, bp->b_objlock);
mutex_exit(bp->b_objlock);
+ SDT_PROBE1(io, kernel, , wait__done, bp);
+
return bp->b_error;
}
@@ -1528,11 +1539,15 @@ biodone(buf_t *bp)
}
}
+SDT_PROBE_DEFINE1(io, kernel, , done, "struct buf *"/*bp*/);
+
static void
biodone2(buf_t *bp)
{
void (*callout)(buf_t *);
+ SDT_PROBE1(io, kernel, ,done, bp);
+
mutex_enter(bp->b_objlock);
/* Note that the transfer is done. */
if (ISSET(bp->b_oflags, BO_DONE))
