c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-01-13 03:30:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'io_schedule'

Browse Source 
Currently ZFS doesn't show any I/O time in eg "top" wait% or in
/proc/$pid/stat's blkio_ticks.  Using io_schedule() instead of
schedule() in zio_wait()'s cv_wait() is the correct way to fix
this.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #1158
Closes #1175
This commit is contained in:
Brian Behlendorf 2013-01-07 10:54:56 -08:00
commit e44056fcb6
2 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sys/zfs_context.h
View File

@ -322,6 +322,7 @@ extern void cv_signal(kcondvar_t *cv);
extern void cv_broadcast(kcondvar_t *cv); extern void cv_broadcast(kcondvar_t *cv);
#define cv_timedwait_interruptible(cv, mp, at) cv_timedwait(cv, mp, at) #define cv_timedwait_interruptible(cv, mp, at) cv_timedwait(cv, mp, at)
#define cv_wait_interruptible(cv, mp) cv_wait(cv, mp) #define cv_wait_interruptible(cv, mp) cv_wait(cv, mp)
#define cv_wait_io(cv, mp) cv_wait(cv, mp)
/* /*
* kstat creation, installation and deletion * kstat creation, installation and deletion

32
module/zfs/zio.c
View File

@ -1305,34 +1305,18 @@ __zio_execute(zio_t *zio)
int int
zio_wait(zio_t *zio) zio_wait(zio_t *zio)
{ {
uint64_t timeout;
int error; int error;
ASSERT(zio->io_stage == ZIO_STAGE_OPEN); ASSERT(zio->io_stage == ZIO_STAGE_OPEN);
ASSERT(zio->io_executor == NULL); ASSERT(zio->io_executor == NULL);
zio->io_waiter = curthread; zio->io_waiter = curthread;
timeout = ddi_get_lbolt() + (zio_delay_max / MILLISEC * hz);
__zio_execute(zio); __zio_execute(zio);
mutex_enter(&zio->io_lock); mutex_enter(&zio->io_lock);
while (zio->io_executor != NULL) { while (zio->io_executor != NULL)
/* cv_wait_io(&zio->io_cv, &zio->io_lock);
* Wake up periodically to prevent the kernel from complaining
* about a blocked task. However, check zio_delay_max to see
* if the I/O has exceeded the timeout and post an ereport.
*/
cv_timedwait_interruptible(&zio->io_cv, &zio->io_lock,
ddi_get_lbolt() + hz);
if (timeout && (ddi_get_lbolt() > timeout)) {
zio->io_delay = zio_delay_max;
zfs_ereport_post(FM_EREPORT_ZFS_DELAY,
zio->io_spa, zio->io_vd, zio, 0, 0);
timeout = 0;
}
}
mutex_exit(&zio->io_lock); mutex_exit(&zio->io_lock);
error = zio->io_error; error = zio->io_error;
@ -2905,11 +2889,15 @@ zio_done(zio_t *zio)
vdev_stat_update(zio, zio->io_size); vdev_stat_update(zio, zio->io_size);
/* /*
* When an I/O completes but was slow post an ereport. * If this I/O is attached to a particular vdev is slow, exeeding
* 30 seconds to complete, post an error described the I/O delay.
* We ignore these errors if the device is currently unavailable.
*/ */
if (zio->io_delay >= zio_delay_max) if (zio->io_delay >= zio_delay_max) {
zfs_ereport_post(FM_EREPORT_ZFS_DELAY, zio->io_spa, if (zio->io_vd != NULL && !vdev_is_dead(zio->io_vd))
zio->io_vd, zio, 0, 0); zfs_ereport_post(FM_EREPORT_ZFS_DELAY, zio->io_spa,
zio->io_vd, zio, 0, 0);
}
if (zio->io_error) { if (zio->io_error) {
/* /*