| Message ID | 20210318164827.1481133-2-ming.lei@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | block: support bio based io polling | expand |
On Thu, Mar 18 2021 at 12:48pm -0400, Ming Lei <ming.lei@redhat.com> wrote: > There has been 3 users, and will be more, so add one such helper. > > Signed-off-by: Ming Lei <ming.lei@redhat.com> Not sure if you're collecting Reviewed-by or Acked-by at this point? Seems you dropped Chaitanya's Reviewed-by to v1: https://listman.redhat.com/archives/dm-devel/2021-March/msg00166.html Do you plan to iterate a lot more before you put out a non-RFC? For this RFC v2, I'll withhold adding any of my Reviewed-by tags and just reply where I see things that might need folding into the next iteration. Mike
On Fri, Mar 19, 2021 at 12:52:42PM -0400, Mike Snitzer wrote: > On Thu, Mar 18 2021 at 12:48pm -0400, > Ming Lei <ming.lei@redhat.com> wrote: > > > There has been 3 users, and will be more, so add one such helper. > > > > Signed-off-by: Ming Lei <ming.lei@redhat.com> > > Not sure if you're collecting Reviewed-by or Acked-by at this point? > Seems you dropped Chaitanya's Reviewed-by to v1: > https://listman.redhat.com/archives/dm-devel/2021-March/msg00166.html Sorry, that should be an accident. > > Do you plan to iterate a lot more before you put out a non-RFC? For > this RFC v2, I'll withhold adding any of my Reviewed-by tags and just > reply where I see things that might need folding into the next > iteration. If no one objects the basic approach taken in V2, I will remove RFC in V3.
diff --git a/block/blk-core.c b/block/blk-core.c index fc60ff208497..a31371d55b9d 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -836,7 +836,7 @@ static noinline_for_stack bool submit_bio_checks(struct bio *bio) } } - if (!test_bit(QUEUE_FLAG_POLL, &q->queue_flags)) + if (!blk_queue_poll(q)) bio->bi_opf &= ~REQ_HIPRI; switch (bio_op(bio)) { diff --git a/block/blk-mq.c b/block/blk-mq.c index d4d7c1caa439..63c81df3b8b5 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -3869,8 +3869,7 @@ int blk_poll(struct request_queue *q, blk_qc_t cookie, bool spin) struct blk_mq_hw_ctx *hctx; long state; - if (!blk_qc_t_valid(cookie) || - !test_bit(QUEUE_FLAG_POLL, &q->queue_flags)) + if (!blk_qc_t_valid(cookie) || !blk_queue_poll(q)) return 0; if (current->plug) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index a5653892d773..1bf94f0d2e8d 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -956,7 +956,7 @@ static void nvme_execute_rq_polled(struct request_queue *q, { DECLARE_COMPLETION_ONSTACK(wait); - WARN_ON_ONCE(!test_bit(QUEUE_FLAG_POLL, &q->queue_flags)); + WARN_ON_ONCE(!blk_queue_poll(q)); rq->cmd_flags |= REQ_HIPRI; rq->end_io_data = &wait; diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index bc6bc8383b43..89a01850cf12 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -665,6 +665,7 @@ bool blk_queue_flag_test_and_set(unsigned int flag, struct request_queue *q); #define blk_queue_fua(q) test_bit(QUEUE_FLAG_FUA, &(q)->queue_flags) #define blk_queue_registered(q) test_bit(QUEUE_FLAG_REGISTERED, &(q)->queue_flags) #define blk_queue_nowait(q) test_bit(QUEUE_FLAG_NOWAIT, &(q)->queue_flags) +#define blk_queue_poll(q) test_bit(QUEUE_FLAG_POLL, &(q)->queue_flags) extern void blk_set_pm_only(struct request_queue *q); extern void blk_clear_pm_only(struct request_queue *q);
There has been 3 users, and will be more, so add one such helper. Signed-off-by: Ming Lei <ming.lei@redhat.com> --- block/blk-core.c | 2 +- block/blk-mq.c | 3 +-- drivers/nvme/host/core.c | 2 +- include/linux/blkdev.h | 1 + 4 files changed, 4 insertions(+), 4 deletions(-)