Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Replace usage of schedule_timeout with schedule_timeout_interruptible (#16150) 

This commit replaces current usages of schedule_timeout() with
schedule_timeout_interruptible() in code paths that expect the running
task to sleep for a short period of time. When schedule_timeout() is
called without previously calling set_current_state(), the running
task never sleeps because the task state remains in TASK_RUNNING.

By calling schedule_timeout_interruptible() to set the task state to
TASK_INTERRUPTIBLE before calling schedule_timeout() we achieve the
intended/desired behavior of putting the task to sleep for the
specified timeout.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Daniel Perry <dtperry@amazon.com>
Closes #16150
This commit is contained in:
Daniel Perry 2024-05-09 10:30:28 -04:00 committed by GitHub
parent 04bae5ec95
commit 2dff7527d4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/os/linux/spl/spl-taskq.c
View File

@ -158,7 +158,7 @@ retry:
* throttling the task dispatch rate. * throttling the task dispatch rate.
*/ */
spin_unlock_irqrestore(&tq->tq_lock, *irqflags); spin_unlock_irqrestore(&tq->tq_lock, *irqflags);
schedule_timeout(HZ / 100); schedule_timeout_interruptible(HZ / 100);
spin_lock_irqsave_nested(&tq->tq_lock, *irqflags, spin_lock_irqsave_nested(&tq->tq_lock, *irqflags,
tq->tq_lock_class); tq->tq_lock_class);
if (count < 100) { if (count < 100) {

2
module/os/linux/zfs/vdev_disk.c
View File

@ -397,7 +397,7 @@ vdev_disk_open(vdev_t *v, uint64_t *psize, uint64_t *max_psize,
if (v->vdev_removed) if (v->vdev_removed)
break; break;
schedule_timeout(MSEC_TO_TICK(10)); schedule_timeout_interruptible(MSEC_TO_TICK(10));
} else if (unlikely(BDH_PTR_ERR(bdh) == -ERESTARTSYS)) { } else if (unlikely(BDH_PTR_ERR(bdh) == -ERESTARTSYS)) {
timeout = MSEC2NSEC(zfs_vdev_open_timeout_ms * 10); timeout = MSEC2NSEC(zfs_vdev_open_timeout_ms * 10);
continue; continue;

3
module/os/linux/zfs/zvol_os.c
View File

@ -798,7 +798,8 @@ retry:
if ((gethrtime() - start) > timeout) if ((gethrtime() - start) > timeout)
return (SET_ERROR(-ERESTARTSYS)); return (SET_ERROR(-ERESTARTSYS));
schedule_timeout(MSEC_TO_TICK(10)); schedule_timeout_interruptible(
MSEC_TO_TICK(10));
goto retry; goto retry;
#endif #endif
} else { } else {