diff options
| author | Jens Axboe <axboe@fb.com> | 2014-02-12 09:34:01 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-22 13:32:28 -0800 |
| commit | 50f9027cd5e959f1f14777c4c3dccf91fc0b8fc0 (patch) | |
| tree | e7309af50f370f0a5af9da478cecf819ea8fb6db /block | |
| parent | e028fddcb873c16722b44e6bcab14aa56500e9d9 (diff) | |
| download | kernel-common-50f9027cd5e959f1f14777c4c3dccf91fc0b8fc0.tar.gz kernel-common-50f9027cd5e959f1f14777c4c3dccf91fc0b8fc0.tar.bz2 kernel-common-50f9027cd5e959f1f14777c4c3dccf91fc0b8fc0.zip | |
block: add cond_resched() to potentially long running ioctl discard loop
commit c8123f8c9cb517403b51aa41c3c46ff5e10b2c17 upstream.
When mkfs issues a full device discard and the device only
supports discards of a smallish size, we can loop in
blkdev_issue_discard() for a long time. If preempt isn't enabled,
this can turn into a softlock situation and the kernel will
start complaining.
Add an explicit cond_resched() at the end of the loop to avoid
that.
Signed-off-by: Jens Axboe <axboe@fb.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-lib.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/block/blk-lib.c b/block/blk-lib.c index d6f50d572565..9a32f5868fb9 100644 --- a/block/blk-lib.c +++ b/block/blk-lib.c @@ -121,6 +121,14 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector, atomic_inc(&bb.done); submit_bio(type, bio); + + /* + * We can loop for a long time in here, if someone does + * full device discards (like mkfs). Be nice and allow + * us to schedule out to avoid softlocking if preempt + * is disabled. + */ + cond_resched(); } blk_finish_plug(&plug); |