diff options
| author | Alexander Motin <mav@FreeBSD.org> | 2021-03-06 03:39:52 +0000 |
|---|---|---|
| committer | Alexander Motin <mav@FreeBSD.org> | 2021-03-09 03:15:38 +0000 |
| commit | 84e5f9455a181a792dfea7bbf3d43a3e2777c436 (patch) | |
| tree | 934b5102d943c707e1b9dcd5156d05d31e2750ac | |
| parent | c7ea14ed61888b99ad9c23e1f6d9eb4e5935fc78 (diff) | |
| download | src-84e5f9455a181a792dfea7bbf3d43a3e2777c436.tar.gz src-84e5f9455a181a792dfea7bbf3d43a3e2777c436.zip | |
Do not exit ctl_be_block_worker() prematurely.
Return while there are any I/Os in a queue may result in them stuck
indefinitely, since there is only one taskqueue task for all of them.
I think I've reproduced this by switching ha_role to secondary under
heavy load.
Approved by: re (delphij)
(cherry picked from commit 6ed39db2573bb808ac2c206cd6c831f0be86219c)
(cherry picked from commit a3d416f3daafc59bc2f4ee278593c8a3f7a30d2b)
| -rw-r--r-- | sys/cam/ctl/ctl_backend_block.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/cam/ctl/ctl_backend_block.c b/sys/cam/ctl/ctl_backend_block.c index cd4fab766844..92fee127c233 100644 --- a/sys/cam/ctl/ctl_backend_block.c +++ b/sys/cam/ctl/ctl_backend_block.c @@ -1705,7 +1705,7 @@ ctl_be_block_worker(void *context, int pending) if (cbe_lun->flags & CTL_LUN_FLAG_NO_MEDIA) { ctl_set_busy(&io->scsiio); ctl_complete_beio(beio); - return; + continue; } be_lun->dispatch(be_lun, beio); continue; @@ -1719,7 +1719,7 @@ ctl_be_block_worker(void *context, int pending) if (cbe_lun->flags & CTL_LUN_FLAG_NO_MEDIA) { ctl_set_busy(&io->scsiio); ctl_config_write_done(io); - return; + continue; } ctl_be_block_cw_dispatch(be_lun, io); continue; @@ -1733,7 +1733,7 @@ ctl_be_block_worker(void *context, int pending) if (cbe_lun->flags & CTL_LUN_FLAG_NO_MEDIA) { ctl_set_busy(&io->scsiio); ctl_config_read_done(io); - return; + continue; } ctl_be_block_cr_dispatch(be_lun, io); continue; @@ -1747,7 +1747,7 @@ ctl_be_block_worker(void *context, int pending) if (cbe_lun->flags & CTL_LUN_FLAG_NO_MEDIA) { ctl_set_busy(&io->scsiio); ctl_data_submit_done(io); - return; + continue; } ctl_be_block_dispatch(be_lun, io); continue; |