From: Goldwyn Rodrigues <rgoldwyn@suse.de>
To: linux-block@vger.kernel.org
Cc: hch@infradead.org, jack@suse.cz, linux-raid@vger.kernel.org,
dm-devel@redhat.com, Goldwyn Rodrigues <rgoldwyn@suse.com>
Subject: [PATCH 4/9] md: raid5 nowait support
Date: Wed, 26 Jul 2017 18:58:01 -0500 [thread overview]
Message-ID: <20170726235806.12148-5-rgoldwyn@suse.de> (raw)
In-Reply-To: <20170726235806.12148-1-rgoldwyn@suse.de>
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
Return EAGAIN in case RAID5 would block because of waiting due to:
+ Reshaping
+ Suspension
+ Stripe Expansion
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
---
drivers/md/raid5.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index aeeb8d6854e2..d1b3bcf26d29 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -5635,6 +5635,11 @@ static bool raid5_make_request(struct mddev *mddev, struct bio * bi)
? logical_sector < conf->reshape_safe
: logical_sector >= conf->reshape_safe) {
spin_unlock_irq(&conf->device_lock);
+ if (bi->bi_opf & REQ_NOWAIT) {
+ bio_wouldblock_error(bi);
+ finish_wait(&conf->wait_for_overlap, &w);
+ return true;
+ }
schedule();
do_prepare = true;
goto retry;
@@ -5672,6 +5677,11 @@ static bool raid5_make_request(struct mddev *mddev, struct bio * bi)
spin_unlock_irq(&conf->device_lock);
if (must_retry) {
raid5_release_stripe(sh);
+ if (bi->bi_opf & REQ_NOWAIT) {
+ bio_wouldblock_error(bi);
+ finish_wait(&conf->wait_for_overlap, &w);
+ return true;
+ }
schedule();
do_prepare = true;
goto retry;
@@ -5700,6 +5710,11 @@ static bool raid5_make_request(struct mddev *mddev, struct bio * bi)
sigset_t full, old;
sigfillset(&full);
sigprocmask(SIG_BLOCK, &full, &old);
+ if (bi->bi_opf & REQ_NOWAIT) {
+ bio_wouldblock_error(bi);
+ finish_wait(&conf->wait_for_overlap, &w);
+ return true;
+ }
schedule();
sigprocmask(SIG_SETMASK, &old, NULL);
do_prepare = true;
@@ -5715,6 +5730,11 @@ static bool raid5_make_request(struct mddev *mddev, struct bio * bi)
*/
md_wakeup_thread(mddev->thread);
raid5_release_stripe(sh);
+ if (bi->bi_opf & REQ_NOWAIT) {
+ bio_wouldblock_error(bi);
+ finish_wait(&conf->wait_for_overlap, &w);
+ return true;
+ }
schedule();
do_prepare = true;
goto retry;
--
2.12.3
next prev parent reply other threads:[~2017-07-26 23:58 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-26 23:57 [PATCH 0/9] Nowait feature for stacked block devices Goldwyn Rodrigues
2017-07-26 23:57 ` [PATCH 1/9] QUEUE_FLAG_NOWAIT to indicate device supports nowait Goldwyn Rodrigues
2017-08-08 20:32 ` Shaohua Li
2017-08-08 20:36 ` Jens Axboe
2017-08-10 2:18 ` Jens Axboe
2017-08-10 11:38 ` Goldwyn Rodrigues
2017-08-10 14:14 ` Jens Axboe
2017-08-10 17:15 ` Goldwyn Rodrigues
2017-08-10 17:17 ` Jens Axboe
2017-08-09 11:44 ` Goldwyn Rodrigues
2017-08-09 15:02 ` Shaohua Li
2017-08-09 15:35 ` Goldwyn Rodrigues
2017-08-09 20:21 ` Shaohua Li
2017-08-09 22:16 ` Goldwyn Rodrigues
2017-08-10 1:17 ` Shaohua Li
2017-08-10 2:07 ` Goldwyn Rodrigues
2017-08-10 2:17 ` Jens Axboe
2017-08-10 11:49 ` Goldwyn Rodrigues
2017-08-10 14:23 ` Jens Axboe
2017-08-10 14:25 ` Jan Kara
2017-08-10 14:28 ` Jens Axboe
2017-08-10 17:15 ` Goldwyn Rodrigues
2017-08-10 17:20 ` Jens Axboe
2017-07-26 23:57 ` [PATCH 2/9] md: Add nowait support to md Goldwyn Rodrigues
2017-08-08 20:34 ` Shaohua Li
2017-07-26 23:58 ` [PATCH 3/9] md: raid1 nowait support Goldwyn Rodrigues
2017-08-08 20:39 ` Shaohua Li
2017-08-09 11:45 ` Goldwyn Rodrigues
2017-07-26 23:58 ` Goldwyn Rodrigues [this message]
2017-08-08 20:43 ` [PATCH 4/9] md: raid5 " Shaohua Li
2017-08-09 11:45 ` Goldwyn Rodrigues
2017-07-26 23:58 ` [PATCH 5/9] md: raid10 " Goldwyn Rodrigues
2017-08-08 20:40 ` Shaohua Li
2017-07-26 23:58 ` [PATCH 6/9] dm: add " Goldwyn Rodrigues
2017-07-26 23:58 ` [PATCH 7/9] dm: Add nowait support to raid1 Goldwyn Rodrigues
2017-07-26 23:58 ` [PATCH 8/9] dm: Add nowait support to dm-delay Goldwyn Rodrigues
2017-07-26 23:58 ` [PATCH 9/9] dm-mpath: Add nowait support Goldwyn Rodrigues
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170726235806.12148-5-rgoldwyn@suse.de \
--to=rgoldwyn@suse.de \
--cc=dm-devel@redhat.com \
--cc=hch@infradead.org \
--cc=jack@suse.cz \
--cc=linux-block@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=rgoldwyn@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox