From: Andrzej Jakowski <andrzej.jakowski@linux.intel.com>
To: axboe@kernel.dk, song@kernel.org
Cc: linux-block@vger.kernel.org, linux-raid@vger.kernel.org,
Andrzej Jakowski <andrzej.jakowski@linux.intel.com>,
Artur Paszkiewicz <artur.paszkiewicz@intel.com>
Subject: [PATCH 2/2] md: enable io polling
Date: Sat, 25 Jan 2020 21:41:38 -0700 [thread overview]
Message-ID: <20200126044138.5066-3-andrzej.jakowski@linux.intel.com> (raw)
In-Reply-To: <20200126044138.5066-1-andrzej.jakowski@linux.intel.com>
Provide a callback for polling the mddev which in turn polls the active
member devices. Activate it only if all members support polling.
Signed-off-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
Signed-off-by: Andrzej Jakowski <andrzej.jakowski@linux.intel.com>
---
drivers/md/md.c | 39 +++++++++++++++++++++++++++++++++++----
1 file changed, 35 insertions(+), 4 deletions(-)
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 4e7c9f398bc6..95173cd4f8fd 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -5421,6 +5421,27 @@ int mddev_init_writes_pending(struct mddev *mddev)
}
EXPORT_SYMBOL_GPL(mddev_init_writes_pending);
+static int md_poll(struct request_queue *q, blk_qc_t cookie)
+{
+ struct mddev *mddev = q->queuedata;
+ struct md_rdev *rdev;
+ int ret = 0;
+ int rv;
+
+ rdev_for_each(rdev, mddev) {
+ if (rdev->raid_disk >= 0 && !test_bit(Faulty, &rdev->flags)) {
+ rv = blk_poll(bdev_get_queue(rdev->bdev), cookie, false);
+ if (rv < 0) {
+ ret = rv;
+ break;
+ }
+ ret += rv;
+ }
+ }
+
+ return ret;
+}
+
static int md_alloc(dev_t dev, char *name)
{
/*
@@ -5485,6 +5506,7 @@ static int md_alloc(dev_t dev, char *name)
blk_queue_make_request(mddev->queue, md_make_request);
blk_set_stacking_limits(&mddev->queue->limits);
+ mddev->queue->bio_poll_fn = md_poll;
disk = alloc_disk(1 << shift);
if (!disk) {
@@ -5789,12 +5811,17 @@ int md_run(struct mddev *mddev)
if (mddev->queue) {
bool nonrot = true;
+ bool poll = true;
rdev_for_each(rdev, mddev) {
- if (rdev->raid_disk >= 0 &&
- !blk_queue_nonrot(bdev_get_queue(rdev->bdev))) {
- nonrot = false;
- break;
+ if (rdev->raid_disk >= 0) {
+ struct request_queue *q;
+
+ q = bdev_get_queue(rdev->bdev);
+ if (!blk_queue_nonrot(q))
+ nonrot = false;
+ if (!test_bit(QUEUE_FLAG_POLL, &q->queue_flags))
+ poll = false;
}
}
if (mddev->degraded)
@@ -5803,6 +5830,10 @@ int md_run(struct mddev *mddev)
blk_queue_flag_set(QUEUE_FLAG_NONROT, mddev->queue);
else
blk_queue_flag_clear(QUEUE_FLAG_NONROT, mddev->queue);
+ if (poll)
+ blk_queue_flag_set(QUEUE_FLAG_POLL, mddev->queue);
+ else
+ blk_queue_flag_clear(QUEUE_FLAG_POLL, mddev->queue);
mddev->queue->backing_dev_info->congested_data = mddev;
mddev->queue->backing_dev_info->congested_fn = md_congested;
}
--
2.20.1
next prev parent reply other threads:[~2020-01-26 4:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-26 4:41 [PATCH 0/2] Enable polling on stackable devices Andrzej Jakowski
2020-01-26 4:41 ` [PATCH 1/2] block: introduce polling on bio level Andrzej Jakowski
2020-01-30 4:01 ` Jens Axboe
2020-01-31 6:35 ` Christoph Hellwig
2020-02-01 4:41 ` Jens Axboe
2020-01-31 6:34 ` Christoph Hellwig
2020-01-31 18:51 ` Andrzej Jakowski
2020-02-01 8:20 ` Christoph Hellwig
2020-01-26 4:41 ` Andrzej Jakowski [this message]
2020-01-31 6:36 ` [PATCH 2/2] md: enable io polling Christoph Hellwig
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=20200126044138.5066-3-andrzej.jakowski@linux.intel.com \
--to=andrzej.jakowski@linux.intel.com \
--cc=artur.paszkiewicz@intel.com \
--cc=axboe@kernel.dk \
--cc=linux-block@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=song@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).