From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Jeffle Xu <jefflexu@linux.alibaba.com>,
Ming Lei <ming.lei@redhat.com>,
Damien Le Moal <Damien.LeMoal@wdc.com>,
Keith Busch <kbusch@kernel.org>, Sagi Grimberg <sagi@grimberg.me>,
"Wunderlich, Mark" <mark.wunderlich@intel.com>,
"Vasudevan, Anil" <anil.vasudevan@intel.com>,
linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH 13/15] block: add a QUEUE_FLAG_POLL_CAPABLE flag
Date: Tue, 27 Apr 2021 18:16:17 +0200 [thread overview]
Message-ID: <20210427161619.1294399-14-hch@lst.de> (raw)
In-Reply-To: <20210427161619.1294399-1-hch@lst.de>
Add a new flag to prepare for bio based stacking drivers that support
polling.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/blk-mq.c | 4 +++-
block/blk-sysfs.c | 3 +--
include/linux/blkdev.h | 1 +
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index c26df1f68e5b..45e69eea2788 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -3236,8 +3236,10 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set,
q->queue_flags |= QUEUE_FLAG_MQ_DEFAULT;
if (set->nr_maps > HCTX_TYPE_POLL &&
- set->map[HCTX_TYPE_POLL].nr_queues)
+ set->map[HCTX_TYPE_POLL].nr_queues) {
+ blk_queue_flag_set(QUEUE_FLAG_POLL_CAPABLE, q);
blk_queue_flag_set(QUEUE_FLAG_POLL, q);
+ }
q->sg_reserved_size = INT_MAX;
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index e03bedf180ab..258468a3ab9c 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -431,8 +431,7 @@ static ssize_t queue_poll_store(struct request_queue *q, const char *page,
unsigned long poll_on;
ssize_t ret;
- if (!q->tag_set || q->tag_set->nr_maps <= HCTX_TYPE_POLL ||
- !q->tag_set->map[HCTX_TYPE_POLL].nr_queues)
+ if (!test_bit(QUEUE_FLAG_POLL_CAPABLE, &q->queue_flags))
return -EINVAL;
ret = queue_var_store(&poll_on, page, count);
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index bb5ed5cf57b4..366cf2a6d2e8 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -600,6 +600,7 @@ struct request_queue {
/* Keep blk_queue_flag_name[] in sync with the definitions below */
#define QUEUE_FLAG_STOPPED 0 /* queue is stopped */
#define QUEUE_FLAG_DYING 1 /* queue being torn down */
+#define QUEUE_FLAG_POLL_CAPABLE 2 /* IO polling supported */
#define QUEUE_FLAG_NOMERGES 3 /* disable merge attempts */
#define QUEUE_FLAG_SAME_COMP 4 /* complete on same CPU-group */
#define QUEUE_FLAG_FAIL_IO 5 /* fake timeout */
--
2.30.1
next prev parent reply other threads:[~2021-04-27 16:20 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-27 16:16 switch block layer polling to a bio based model v2 Christoph Hellwig
2021-04-27 16:16 ` [PATCH 01/15] direct-io: remove blk_poll support Christoph Hellwig
2021-04-27 16:16 ` [PATCH 02/15] block: don't try to poll multi-bio I/Os in __blkdev_direct_IO Christoph Hellwig
2021-04-27 16:16 ` [PATCH 03/15] iomap: don't try to poll multi-bio I/Os in __iomap_dio_rw Christoph Hellwig
2021-04-27 16:16 ` [PATCH 04/15] blk-mq: factor out a blk_qc_to_hctx helper Christoph Hellwig
2021-04-27 16:16 ` [PATCH 05/15] blk-mq: factor out a "classic" poll helper Christoph Hellwig
2021-04-27 16:16 ` [PATCH 06/15] blk-mq: remove blk_qc_t_to_tag and blk_qc_t_is_internal Christoph Hellwig
2021-04-27 16:16 ` [PATCH 07/15] blk-mq: remove blk_qc_t_valid Christoph Hellwig
2021-04-27 16:16 ` [PATCH 08/15] io_uring: don't sleep when polling for I/O Christoph Hellwig
2021-04-27 16:16 ` [PATCH 09/15] block: rename REQ_HIPRI to REQ_POLLED Christoph Hellwig
2021-04-27 16:16 ` [PATCH 10/15] block: use SLAB_TYPESAFE_BY_RCU for the bio slab Christoph Hellwig
2021-04-27 16:16 ` [PATCH 11/15] block: define 'struct bvec_iter' as packed Christoph Hellwig
2021-04-27 16:16 ` [PATCH 12/15] block: switch polling to be bio based Christoph Hellwig
2021-04-28 2:28 ` Ming Lei
2021-04-29 7:20 ` Christoph Hellwig
2021-04-29 7:36 ` Ming Lei
2021-04-29 9:50 ` Christoph Hellwig
2021-04-29 14:42 ` Ming Lei
2021-04-27 16:16 ` Christoph Hellwig [this message]
2021-04-27 16:16 ` [PATCH 14/15] nvme-multipath: set QUEUE_FLAG_NOWAIT Christoph Hellwig
2021-04-28 2:32 ` Ming Lei
2021-04-29 7:27 ` Christoph Hellwig
2021-04-29 7:37 ` Ming Lei
2021-04-29 9:46 ` Christoph Hellwig
2021-05-06 21:23 ` Sagi Grimberg
2021-04-27 16:16 ` [PATCH 15/15] nvme-multipath: enable polled I/O Christoph Hellwig
2021-04-28 2:36 ` Ming Lei
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=20210427161619.1294399-14-hch@lst.de \
--to=hch@lst.de \
--cc=Damien.LeMoal@wdc.com \
--cc=anil.vasudevan@intel.com \
--cc=axboe@kernel.dk \
--cc=jefflexu@linux.alibaba.com \
--cc=kbusch@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=mark.wunderlich@intel.com \
--cc=ming.lei@redhat.com \
--cc=sagi@grimberg.me \
/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).