From: Jens Axboe <axboe@fb.com>
To: <linux-block@vger.kernel.org>
Cc: <ming.lei@redhat.com>, <hch@lst.de>, Jens Axboe <axboe@fb.com>
Subject: [PATCH 6/7] blk-mq-sched: remove hack that bypasses scheduler for reserved requests
Date: Fri, 28 Apr 2017 08:55:39 -0600 [thread overview]
Message-ID: <1493391340-24629-7-git-send-email-axboe@fb.com> (raw)
In-Reply-To: <1493391340-24629-1-git-send-email-axboe@fb.com>
We have update the troublesome driver (mtip32xx) to deal with this
appropriately. So kill the hack that bypassed scheduler allocation
and insertion for reserved requests.
Signed-off-by: Jens Axboe <axboe@fb.com>
---
block/blk-mq-sched.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
index 8b361e192e8a..e79e9f18d7c2 100644
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c
@@ -82,11 +82,7 @@ struct request *blk_mq_sched_get_request(struct request_queue *q,
if (likely(!data->hctx))
data->hctx = blk_mq_map_queue(q, data->ctx->cpu);
- /*
- * For a reserved tag, allocate a normal request since we might
- * have driver dependencies on the value of the internal tag.
- */
- if (e && !(data->flags & BLK_MQ_REQ_RESERVED)) {
+ if (e) {
data->flags |= BLK_MQ_REQ_INTERNAL;
/*
--
2.7.4
next prev parent reply other threads:[~2017-04-28 14:55 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-28 14:55 [PATCH v3 0/7] Fixup mtip32xx for scheduling Jens Axboe
2017-04-28 14:55 ` [PATCH 1/7] mtip32xx: get rid of 'atomic' argument to mtip_exec_internal_command() Jens Axboe
2017-04-28 14:55 ` [PATCH 2/7] mtip32xx: kill atomic argument to mtip_quiesce_io() Jens Axboe
2017-04-28 14:55 ` [PATCH 3/7] mtip32xx: abstract out "are any commands active" helper Jens Axboe
2017-04-28 14:55 ` [PATCH 4/7] blk-mq: add and export helper to tell if a request is reserved Jens Axboe
2017-04-28 15:04 ` Bart Van Assche
2017-04-28 15:22 ` Ming Lei
2017-05-02 6:12 ` Hannes Reinecke
2017-04-28 14:55 ` [PATCH 5/7] mtip32xx: convert internal command issue to block IO path Jens Axboe
2017-05-02 6:14 ` Hannes Reinecke
2017-04-28 14:55 ` Jens Axboe [this message]
2017-04-28 15:22 ` [PATCH 6/7] blk-mq-sched: remove hack that bypasses scheduler for reserved requests Ming Lei
2017-05-02 6:15 ` Hannes Reinecke
2017-04-28 14:55 ` [PATCH 7/7] Revert "mtip32xx: pass BLK_MQ_F_NO_SCHED" Jens Axboe
2017-05-02 6:15 ` Hannes Reinecke
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=1493391340-24629-7-git-send-email-axboe@fb.com \
--to=axboe@fb.com \
--cc=hch@lst.de \
--cc=linux-block@vger.kernel.org \
--cc=ming.lei@redhat.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