Centralize the devstat handling for all GEOM disk device drivers

in geom_disk.c.

As a side effect this makes a lot of #include <sys/devicestat.h>
lines not needed and some biofinish() calls can be reduced to
biodone() again.

2 files changed, 30 insertions, 18 deletions

diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c
index 3abc28f..b973246 100644
--- a/sys/geom/geom_ccd.c
+++ b/sys/geom/geom_ccd.c
@@ -66,7 +66,6 @@
 #include <sys/stdint.h>
 #include <sys/sysctl.h>
 #include <sys/disk.h>
-#include <sys/devicestat.h>
 #include <sys/fcntl.h>
 #include <sys/vnode.h>
 
@@ -389,14 +388,6 @@ ccdinit(struct ccd_s *cs, char **cpaths, struct thread *td)
 	ccg->ccg_nsectors = 1024 * 1024 / ccg->ccg_secsize;
 	ccg->ccg_ncylinders = cs->sc_size / ccg->ccg_nsectors;
 
-	/*
-	 * Add a devstat entry for this device.
-	 */
-	devstat_add_entry(&cs->device_stats, "ccd", cs->sc_unit,
-			  ccg->ccg_secsize, DEVSTAT_ALL_SUPPORTED,
-			  DEVSTAT_TYPE_STORARRAY |DEVSTAT_TYPE_IF_OTHER,
-			  DEVSTAT_PRIORITY_ARRAY);
-
 	cs->sc_flags |= CCDF_INITED;
 	cs->sc_cflags = cs->sc_flags;	/* So we can find out later... */
 	return (0);
@@ -574,10 +565,6 @@ ccdstart(struct ccd_s *cs, struct bio *bp)
 	daddr_t bn;
 	int err;
 
-
-	/* Record the transaction start  */
-	devstat_start_transaction(&cs->device_stats);
-
 	/*
 	 * Translate the partition-relative block number to an absolute.
 	 */
@@ -909,7 +896,7 @@ ccdiodone(struct bio *ibp)
 	if (bp->bio_resid == 0) {
 		if (bp->bio_flags & BIO_ERROR)
 			bp->bio_resid = bp->bio_bcount;
-		biofinish(bp, &cs->device_stats, 0);
+		biodone(bp);
 	}
 }
 
@@ -1180,9 +1167,6 @@ ccdioctltoo(int unit, u_long cmd, caddr_t data, int flag, struct thread *td)
 		free(cs->sc_itable, M_CCD);
 		free(cs->sc_vpp, M_CCD);
 
-		/* And remove the devstat entry. */
-		devstat_remove_entry(&cs->device_stats);
-
 		/* This must be atomic. */
 		ccdunlock(cs);
 		ccddestroy(cs);
diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c
index dc04afb..ae7a762 100644
--- a/sys/geom/geom_disk.c
+++ b/sys/geom/geom_disk.c
@@ -48,6 +48,7 @@
 #include <sys/malloc.h>
 #include <sys/sysctl.h>
 #include <sys/stdint.h>
+#include <sys/devicestat.h>
 #include <machine/md_var.h>
 
 #include <sys/lock.h>
@@ -161,12 +162,33 @@ g_disk_kerneldump(struct bio *bp, struct disk *dp)
 static void
 g_disk_done(struct bio *bp)
 {
+	struct bio *bp2;
+	struct disk *dp;
+	devstat_trans_flags flg;
 
 	/* See "notes" for why we need a mutex here */
 	/* XXX: will witness accept a mix of Giant/unGiant drivers here ? */
 	mtx_lock(&g_disk_done_mtx);
 	bp->bio_completed = bp->bio_length - bp->bio_resid;
-	g_std_done(bp);
+
+	bp2 = bp->bio_parent;
+	dp = bp2->bio_to->geom->softc;
+	if (bp2->bio_error == 0)
+		bp2->bio_error = bp->bio_error;
+	bp2->bio_completed += bp->bio_completed;
+	g_destroy_bio(bp);
+	bp2->bio_inbed++;
+	if (bp2->bio_children == bp2->bio_inbed) {
+		if (bp2->bio_cmd == BIO_DELETE)
+			flg = DEVSTAT_FREE;
+		else if (bp2->bio_cmd == BIO_READ)
+			flg = DEVSTAT_READ;
+		else
+			flg = DEVSTAT_WRITE;
+		devstat_end_transaction(dp->d_devstat, bp2->bio_completed,
+		    DEVSTAT_TAG_SIMPLE, flg);
+		g_io_deliver(bp2, bp2->bio_error);
+	}
 	mtx_unlock(&g_disk_done_mtx);
 }
 
@@ -197,6 +219,7 @@ g_disk_start(struct bio *bp)
 			error = ENOMEM;
 			break;
 		}
+		devstat_start_transaction(dp->d_devstat);
 		do {
 			bp2->bio_offset += off;
 			bp2->bio_length -= off;
@@ -317,6 +340,10 @@ disk_create(int unit, struct disk *dp, int flags, void *unused __unused, void *
 	KASSERT(dp->d_name != NULL, ("disk_create need d_name"));
 	KASSERT(*dp->d_name != 0, ("disk_create need d_name"));
 	KASSERT(strlen(dp->d_name) < SPECNAMELEN - 4, ("disk name too long"));
+	dp->d_devstat = g_malloc(sizeof *dp->d_devstat, M_WAITOK | M_ZERO);
+	devstat_add_entry(dp->d_devstat, dp->d_name, dp->d_unit,
+	    dp->d_sectorsize, DEVSTAT_ALL_SUPPORTED,
+	    DEVSTAT_TYPE_DIRECT, DEVSTAT_PRIORITY_MAX);
 	g_call_me(g_disk_create, dp);
 }
 
@@ -329,6 +356,7 @@ disk_destroy(struct disk *dp)
 	gp->flags |= G_GEOM_WITHER;
 	gp->softc = NULL;
 	g_orphan_provider(LIST_FIRST(&gp->provider), ENXIO);
+	devstat_remove_entry(dp->d_devstat);
 }
 
 static void