[PATCH] aoe 11/12: add support for disk statistics

add support for disk statistics

Signed-off-by: Ed L. Cashin <ecashin@coraid.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/block/aoe/aoe.h b/drivers/block/aoe/aoe.h
index d3b0e2ca151a88e1678d4d5e7fdbd2b642d571ed..2e92cfb4997cdaa4ca335f43af409033c0d4e9dd 100644 (file)
--- a/drivers/block/aoe/aoe.h
+++ b/drivers/block/aoe/aoe.h
@@ -90,6 +90,7 @@ enum {
 
 struct buf {
        struct list_head bufs;
+       ulong start_time;       /* for disk stats */
        ulong flags;
        ulong nframesout;
        char *bufaddr;

diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index 63561b280bc5e7149b944b4daba1c6a8acbf303d..a2735d97584616972abad960697a3450e585864a 100644 (file)
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -125,6 +125,7 @@ aoeblk_make_request(request_queue_t *q, struct bio *bio)
        }
        memset(buf, 0, sizeof(*buf));
        INIT_LIST_HEAD(&buf->bufs);
+       buf->start_time = jiffies;
        buf->bio = bio;
        buf->resid = bio->bi_size;
        buf->sector = bio->bi_sector;

diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index f810bd6bf87fc9f00284ad88f0222e07dab59591..60beb8db4612a452fddeaf5d876e62ce0742c1c4 100644 (file)
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -456,6 +456,20 @@ aoecmd_ata_rsp(struct sk_buff *skb)
        if (buf) {
                buf->nframesout -= 1;
                if (buf->nframesout == 0 && buf->resid == 0) {
+                       unsigned long duration = jiffies - buf->start_time;
+                       unsigned long n_sect = buf->bio->bi_size >> 9;
+                       struct gendisk *disk = d->gd;
+
+                       if (bio_data_dir(buf->bio) == WRITE) {
+                               disk_stat_inc(disk, writes);
+                               disk_stat_add(disk, write_ticks, duration);
+                               disk_stat_add(disk, write_sectors, n_sect);
+                       } else {
+                               disk_stat_inc(disk, reads);
+                               disk_stat_add(disk, read_ticks, duration);
+                               disk_stat_add(disk, read_sectors, n_sect);
+                       }
+                       disk_stat_add(disk, io_ticks, duration);
                        n = (buf->flags & BUFFL_FAIL) ? -EIO : 0;
                        bio_endio(buf->bio, buf->bio->bi_size, n);
                        mempool_free(buf, d->bufpool);