diff options
| -rw-r--r-- | include/sys/vdev_impl.h | 4 | ||||
| -rw-r--r-- | include/sys/zio.h | 4 | ||||
| -rw-r--r-- | module/zfs/vdev.c | 8 | ||||
| -rw-r--r-- | module/zfs/vdev_queue.c | 13 |
4 files changed, 16 insertions, 13 deletions
diff --git a/include/sys/vdev_impl.h b/include/sys/vdev_impl.h index 711408e6a..e0669cc0b 100644 --- a/include/sys/vdev_impl.h +++ b/include/sys/vdev_impl.h @@ -105,8 +105,8 @@ struct vdev_queue { avl_tree_t vq_read_tree; avl_tree_t vq_write_tree; avl_tree_t vq_pending_tree; - uint64_t vq_io_complete_ts; - uint64_t vq_io_delta_ts; + hrtime_t vq_io_complete_ts; + hrtime_t vq_io_delta_ts; list_t vq_io_list; kmutex_t vq_lock; }; diff --git a/include/sys/zio.h b/include/sys/zio.h index 03530330c..189966bef 100644 --- a/include/sys/zio.h +++ b/include/sys/zio.h @@ -410,8 +410,8 @@ struct zio { uint64_t io_offset; uint64_t io_deadline; /* expires at timestamp + deadline */ - uint64_t io_timestamp; /* submitted at (ticks) */ - uint64_t io_delta; /* vdev queue service delta (ticks) */ + hrtime_t io_timestamp; /* submitted at */ + hrtime_t io_delta; /* vdev queue service delta */ uint64_t io_delay; /* vdev disk service delta (ticks) */ avl_node_t io_offset_node; avl_node_t io_deadline_node; diff --git a/module/zfs/vdev.c b/module/zfs/vdev.c index d6b55ee48..662a877f8 100644 --- a/module/zfs/vdev.c +++ b/module/zfs/vdev.c @@ -3219,10 +3219,10 @@ vdev_deadman(vdev_t *vd) * the spa_deadman_synctime we log a zevent. */ fio = avl_first(&vq->vq_pending_tree); - delta = ddi_get_lbolt64() - fio->io_timestamp; - if (delta > NSEC_TO_TICK(spa_deadman_synctime(spa))) { - zfs_dbgmsg("SLOW IO: zio timestamp %llu, " - "delta %llu, last io %llu", + delta = gethrtime() - fio->io_timestamp; + if (delta > spa_deadman_synctime(spa)) { + zfs_dbgmsg("SLOW IO: zio timestamp %lluns, " + "delta %lluns, last io %lluns", fio->io_timestamp, delta, vq->vq_io_complete_ts); zfs_ereport_post(FM_EREPORT_ZFS_DELAY, diff --git a/module/zfs/vdev_queue.c b/module/zfs/vdev_queue.c index 3f2793ba4..b2cc6b87f 100644 --- a/module/zfs/vdev_queue.c +++ b/module/zfs/vdev_queue.c @@ -44,8 +44,11 @@ int zfs_vdev_max_pending = 10; int zfs_vdev_min_pending = 4; -/* deadline = pri + ddi_get_lbolt64() >> time_shift) */ -int zfs_vdev_time_shift = 6; +/* + * The deadlines are grouped into buckets based on zfs_vdev_time_shift: + * deadline = pri + gethrtime() >> time_shift) + */ +int zfs_vdev_time_shift = 29; /* each bucket is 0.537 seconds */ /* exponential I/O issue ramp-up rate */ int zfs_vdev_ramp_rate = 2; @@ -396,7 +399,7 @@ vdev_queue_io(zio_t *zio) mutex_enter(&vq->vq_lock); - zio->io_timestamp = ddi_get_lbolt64(); + zio->io_timestamp = gethrtime(); zio->io_deadline = (zio->io_timestamp >> zfs_vdev_time_shift) + zio->io_priority; @@ -430,8 +433,8 @@ vdev_queue_io_done(zio_t *zio) avl_remove(&vq->vq_pending_tree, zio); - zio->io_delta = ddi_get_lbolt64() - zio->io_timestamp; - vq->vq_io_complete_ts = ddi_get_lbolt64(); + zio->io_delta = gethrtime() - zio->io_timestamp; + vq->vq_io_complete_ts = gethrtime(); vq->vq_io_delta_ts = vq->vq_io_complete_ts - zio->io_timestamp; for (i = 0; i < zfs_vdev_ramp_rate; i++) { |