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, linux-nvme@lists.infradead.org Subject: [PATCH 04/15] blk-mq: factor out a blk_qc_to_hctx helper Date: Wed, 12 May 2021 15:15:34 +0200 [thread overview] Message-ID: <20210512131545.495160-5-hch@lst.de> (raw) In-Reply-To: <20210512131545.495160-1-hch@lst.de> Add a helper to get the hctx from a request_queue and cookie, and fold the blk_qc_t_to_queue_num helper into it as no other callers are left. Signed-off-by: Christoph Hellwig <hch@lst.de> --- block/blk-mq.c | 8 +++++++- include/linux/blk_types.h | 5 ----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 466676bc2f0b..04e17d50fb02 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -63,6 +63,12 @@ static int blk_mq_poll_stats_bkt(const struct request *rq) return bucket; } +static inline struct blk_mq_hw_ctx *blk_qc_to_hctx(struct request_queue *q, + blk_qc_t qc) +{ + return q->queue_hw_ctx[(qc & ~BLK_QC_T_INTERNAL) >> BLK_QC_T_SHIFT]; +} + /* * Check if any of the ctx, dispatch list or elevator * have pending work in this hardware queue. @@ -3892,7 +3898,7 @@ int blk_poll(struct request_queue *q, blk_qc_t cookie, bool spin) if (current->plug) blk_flush_plug_list(current->plug, false); - hctx = q->queue_hw_ctx[blk_qc_t_to_queue_num(cookie)]; + hctx = blk_qc_to_hctx(q, cookie); /* * If we sleep, have the caller restart the poll loop to reset diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index db026b6ec15a..ed71a8d968f2 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -515,11 +515,6 @@ static inline bool blk_qc_t_valid(blk_qc_t cookie) return cookie != BLK_QC_T_NONE; } -static inline unsigned int blk_qc_t_to_queue_num(blk_qc_t cookie) -{ - return (cookie & ~BLK_QC_T_INTERNAL) >> BLK_QC_T_SHIFT; -} - static inline unsigned int blk_qc_t_to_tag(blk_qc_t cookie) { return cookie & ((1u << BLK_QC_T_SHIFT) - 1); -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
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, linux-nvme@lists.infradead.org Subject: [PATCH 04/15] blk-mq: factor out a blk_qc_to_hctx helper Date: Wed, 12 May 2021 15:15:34 +0200 [thread overview] Message-ID: <20210512131545.495160-5-hch@lst.de> (raw) In-Reply-To: <20210512131545.495160-1-hch@lst.de> Add a helper to get the hctx from a request_queue and cookie, and fold the blk_qc_t_to_queue_num helper into it as no other callers are left. Signed-off-by: Christoph Hellwig <hch@lst.de> --- block/blk-mq.c | 8 +++++++- include/linux/blk_types.h | 5 ----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 466676bc2f0b..04e17d50fb02 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -63,6 +63,12 @@ static int blk_mq_poll_stats_bkt(const struct request *rq) return bucket; } +static inline struct blk_mq_hw_ctx *blk_qc_to_hctx(struct request_queue *q, + blk_qc_t qc) +{ + return q->queue_hw_ctx[(qc & ~BLK_QC_T_INTERNAL) >> BLK_QC_T_SHIFT]; +} + /* * Check if any of the ctx, dispatch list or elevator * have pending work in this hardware queue. @@ -3892,7 +3898,7 @@ int blk_poll(struct request_queue *q, blk_qc_t cookie, bool spin) if (current->plug) blk_flush_plug_list(current->plug, false); - hctx = q->queue_hw_ctx[blk_qc_t_to_queue_num(cookie)]; + hctx = blk_qc_to_hctx(q, cookie); /* * If we sleep, have the caller restart the poll loop to reset diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index db026b6ec15a..ed71a8d968f2 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -515,11 +515,6 @@ static inline bool blk_qc_t_valid(blk_qc_t cookie) return cookie != BLK_QC_T_NONE; } -static inline unsigned int blk_qc_t_to_queue_num(blk_qc_t cookie) -{ - return (cookie & ~BLK_QC_T_INTERNAL) >> BLK_QC_T_SHIFT; -} - static inline unsigned int blk_qc_t_to_tag(blk_qc_t cookie) { return cookie & ((1u << BLK_QC_T_SHIFT) - 1); -- 2.30.2 _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2021-05-12 13:16 UTC|newest] Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-12 13:15 switch block layer polling to a bio based model v3 Christoph Hellwig 2021-05-12 13:15 ` Christoph Hellwig 2021-05-12 13:15 ` [PATCH 01/15] direct-io: remove blk_poll support Christoph Hellwig 2021-05-12 13:15 ` Christoph Hellwig 2021-05-12 13:15 ` [PATCH 02/15] block: don't try to poll multi-bio I/Os in __blkdev_direct_IO Christoph Hellwig 2021-05-12 13:15 ` Christoph Hellwig 2021-05-12 20:54 ` Sagi Grimberg 2021-05-12 20:54 ` Sagi Grimberg 2021-05-16 18:01 ` Kanchan Joshi 2021-05-16 18:01 ` Kanchan Joshi 2021-05-12 13:15 ` [PATCH 03/15] iomap: don't try to poll multi-bio I/Os in __iomap_dio_rw Christoph Hellwig 2021-05-12 13:15 ` Christoph Hellwig 2021-05-12 21:32 ` Darrick J. Wong 2021-05-12 21:32 ` Darrick J. Wong 2021-05-12 13:15 ` Christoph Hellwig [this message] 2021-05-12 13:15 ` [PATCH 04/15] blk-mq: factor out a blk_qc_to_hctx helper Christoph Hellwig 2021-05-12 20:58 ` Sagi Grimberg 2021-05-12 20:58 ` Sagi Grimberg 2021-05-12 13:15 ` [PATCH 05/15] blk-mq: factor out a "classic" poll helper Christoph Hellwig 2021-05-12 13:15 ` Christoph Hellwig 2021-05-12 20:59 ` Sagi Grimberg 2021-05-12 20:59 ` Sagi Grimberg 2021-05-12 13:15 ` [PATCH 06/15] blk-mq: remove blk_qc_t_to_tag and blk_qc_t_is_internal Christoph Hellwig 2021-05-12 13:15 ` Christoph Hellwig 2021-05-12 21:42 ` Sagi Grimberg 2021-05-12 21:42 ` Sagi Grimberg 2021-05-12 13:15 ` [PATCH 07/15] blk-mq: remove blk_qc_t_valid Christoph Hellwig 2021-05-12 13:15 ` Christoph Hellwig 2021-05-12 21:43 ` Sagi Grimberg 2021-05-12 21:43 ` Sagi Grimberg 2021-05-12 13:15 ` [PATCH 08/15] io_uring: don't sleep when polling for I/O Christoph Hellwig 2021-05-12 13:15 ` Christoph Hellwig 2021-05-12 21:55 ` Sagi Grimberg 2021-05-12 21:55 ` Sagi Grimberg 2021-05-19 13:02 ` Christoph Hellwig 2021-05-19 13:02 ` Christoph Hellwig 2021-05-12 13:15 ` [PATCH 09/15] block: rename REQ_HIPRI to REQ_POLLED Christoph Hellwig 2021-05-12 13:15 ` Christoph Hellwig 2021-05-12 21:56 ` Sagi Grimberg 2021-05-12 21:56 ` Sagi Grimberg 2021-05-12 22:43 ` Chaitanya Kulkarni 2021-05-12 22:43 ` Chaitanya Kulkarni 2021-05-12 13:15 ` [PATCH 10/15] block: use SLAB_TYPESAFE_BY_RCU for the bio slab Christoph Hellwig 2021-05-12 13:15 ` Christoph Hellwig 2021-05-12 13:15 ` [PATCH 11/15] block: define 'struct bvec_iter' as packed Christoph Hellwig 2021-05-12 13:15 ` Christoph Hellwig 2021-05-12 21:58 ` Sagi Grimberg 2021-05-12 21:58 ` Sagi Grimberg 2021-05-12 13:15 ` [PATCH 12/15] block: switch polling to be bio based Christoph Hellwig 2021-05-12 13:15 ` Christoph Hellwig 2021-05-12 22:03 ` Sagi Grimberg 2021-05-12 22:03 ` Sagi Grimberg 2021-05-12 22:12 ` Keith Busch 2021-05-12 22:12 ` Keith Busch 2021-05-14 2:50 ` Keith Busch 2021-05-14 2:50 ` Keith Busch 2021-05-14 16:26 ` Keith Busch 2021-05-14 16:26 ` Keith Busch 2021-05-14 16:28 ` Christoph Hellwig 2021-05-14 16:28 ` Christoph Hellwig 2021-05-13 1:26 ` Ming Lei 2021-05-13 1:26 ` Ming Lei 2021-05-13 1:23 ` Ming Lei 2021-05-13 1:23 ` Ming Lei 2021-05-12 13:15 ` [PATCH 13/15] block: don't allow writing to the poll queue attribute Christoph Hellwig 2021-05-12 13:15 ` Christoph Hellwig 2021-05-12 22:04 ` Sagi Grimberg 2021-05-12 22:04 ` Sagi Grimberg 2021-05-12 13:15 ` [PATCH 14/15] nvme-multipath: set QUEUE_FLAG_NOWAIT Christoph Hellwig 2021-05-12 13:15 ` Christoph Hellwig 2021-05-12 13:15 ` [PATCH 15/15] nvme-multipath: enable polled I/O Christoph Hellwig 2021-05-12 13:15 ` Christoph Hellwig 2021-05-12 22:10 ` Sagi Grimberg 2021-05-12 22:10 ` Sagi Grimberg 2021-05-12 22:16 ` Keith Busch 2021-05-12 22:16 ` Keith Busch 2021-05-13 23:33 ` switch block layer polling to a bio based model v3 Wunderlich, Mark 2021-05-13 23:33 ` Wunderlich, Mark -- strict thread matches above, loose matches on Subject: below -- 2021-04-27 16:16 switch block layer polling to a bio based model v2 Christoph Hellwig 2021-04-27 16:16 ` [PATCH 04/15] blk-mq: factor out a blk_qc_to_hctx helper 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=20210512131545.495160-5-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=linux-nvme@lists.infradead.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.