From: Jens Axboe <axboe@kernel.dk>
To: Bart Van Assche <bvanassche@acm.org>,
linux-block@vger.kernel.org, linux-scsi@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 07/14] blk-mq: support multiple hctx maps
Date: Mon, 29 Oct 2018 13:24:23 -0600 [thread overview]
Message-ID: <214cdac8-9c13-213b-023f-2fb1bf67c8db@kernel.dk> (raw)
In-Reply-To: <1540836903.196084.70.camel@acm.org>
On 10/29/18 12:15 PM, Bart Van Assche wrote:
> On Mon, 2018-10-29 at 10:37 -0600, Jens Axboe wrote:
>> -static inline struct blk_mq_hw_ctx *blk_mq_map_queue(struct request_queue *q,
>> - unsigned int flags,
>> - int cpu)
>> +static inline struct blk_mq_hw_ctx *blk_mq_map_queue_type(struct request_queue *q,
>> + int type, int cpu)
>> {
>> struct blk_mq_tag_set *set = q->tag_set;
>>
>> - return q->queue_hw_ctx[set->map[0].mq_map[cpu]];
>> + return q->queue_hw_ctx[set->map[type].mq_map[cpu]];
>> }
>>
>> -static inline struct blk_mq_hw_ctx *blk_mq_map_queue_type(struct request_queue *q,
>> - int type, int cpu)
>> +static inline struct blk_mq_hw_ctx *blk_mq_map_queue(struct request_queue *q,
>> + unsigned int flags,
>> + int cpu)
>> {
>> - return blk_mq_map_queue(q, type, cpu);
>> + int type = 0;
>> +
>> + if (q->mq_ops->flags_to_type)
>> + type = q->mq_ops->flags_to_type(q, flags);
>> +
>> + return blk_mq_map_queue_type(q, type, cpu);
>> }
>
> How about adding a comment above both these functions that explains their
> purpose? Since blk_mq_map_queue() maps rq->cmd_flags and the cpu index to
> a hardware context, how about renaming blk_mq_map_queue() into
> blk_mq_map_cmd_flags()?
I don't want to rename it, but I've added a kerneldoc function header to
both of them.
>> diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
>> index f9e19962a22f..837087cf07cc 100644
>> --- a/include/linux/blk-mq.h
>> +++ b/include/linux/blk-mq.h
>> @@ -86,6 +86,7 @@ enum {
>>
>> struct blk_mq_tag_set {
>> struct blk_mq_queue_map map[HCTX_MAX_TYPES];
>> + unsigned int nr_maps;
>> const struct blk_mq_ops *ops;
>> unsigned int nr_hw_queues;
>> unsigned int queue_depth; /* max hw supported */
>> @@ -109,6 +110,7 @@ struct blk_mq_queue_data {
>>
>> typedef blk_status_t (queue_rq_fn)(struct blk_mq_hw_ctx *,
>> const struct blk_mq_queue_data *);
>> +typedef int (flags_to_type_fn)(struct request_queue *, unsigned int);
>
> How about adding a comment that the format of the second argument of
> flags_to_type_fn is the same as that of rq->cmd_flags?
Done
--
Jens Axboe
next prev parent reply other threads:[~2018-10-29 19:24 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-29 16:37 [PATCHSET v2 0/14] blk-mq: Add support for multiple queue maps Jens Axboe
2018-10-29 16:37 ` [PATCH 01/14] blk-mq: kill q->mq_map Jens Axboe
2018-10-29 16:46 ` Bart Van Assche
2018-10-29 16:51 ` Jens Axboe
2018-10-29 16:37 ` [PATCH 02/14] blk-mq: abstract out queue map Jens Axboe
2018-10-29 18:33 ` Bart Van Assche
2018-10-29 16:37 ` [PATCH 03/14] blk-mq: provide dummy blk_mq_map_queue_type() helper Jens Axboe
2018-10-29 17:22 ` Bart Van Assche
2018-10-29 17:27 ` Jens Axboe
2018-10-29 16:37 ` [PATCH 04/14] blk-mq: pass in request/bio flags to queue mapping Jens Axboe
2018-10-29 17:30 ` Bart Van Assche
2018-10-29 17:33 ` Jens Axboe
2018-10-29 16:37 ` [PATCH 05/14] blk-mq: allow software queue to map to multiple hardware queues Jens Axboe
2018-10-29 17:34 ` Bart Van Assche
2018-10-29 17:35 ` Jens Axboe
2018-10-29 16:37 ` [PATCH 06/14] blk-mq: add 'type' attribute to the sysfs hctx directory Jens Axboe
2018-10-29 17:40 ` Bart Van Assche
2018-10-29 16:37 ` [PATCH 07/14] blk-mq: support multiple hctx maps Jens Axboe
2018-10-29 18:15 ` Bart Van Assche
2018-10-29 19:24 ` Jens Axboe [this message]
2018-10-29 16:37 ` [PATCH 08/14] blk-mq: separate number of hardware queues from nr_cpu_ids Jens Axboe
2018-10-29 18:31 ` Bart Van Assche
2018-10-29 16:37 ` [PATCH 09/14] blk-mq: ensure that plug lists don't straddle hardware queues Jens Axboe
2018-10-29 19:27 ` Bart Van Assche
2018-10-29 19:30 ` Jens Axboe
2018-10-29 19:49 ` Jens Axboe
2018-10-30 8:08 ` Ming Lei
2018-10-30 17:22 ` Jens Axboe
2018-10-29 16:37 ` [PATCH 10/14] blk-mq: initial support for multiple queue maps Jens Axboe
2018-10-29 19:40 ` Bart Van Assche
2018-10-29 19:53 ` Jens Axboe
2018-10-29 20:00 ` Bart Van Assche
2018-10-29 20:09 ` Jens Axboe
2018-10-29 20:25 ` Bart Van Assche
2018-10-29 20:29 ` Jens Axboe
2018-10-29 16:37 ` [PATCH 11/14] irq: add support for allocating (and affinitizing) sets of IRQs Jens Axboe
2018-10-29 17:08 ` Thomas Gleixner
2018-10-29 17:09 ` Jens Axboe
2018-10-30 9:25 ` Ming Lei
2018-10-30 14:26 ` Keith Busch
2018-10-30 14:36 ` Jens Axboe
2018-10-30 14:45 ` Keith Busch
2018-10-30 14:53 ` Jens Axboe
2018-10-30 15:08 ` Keith Busch
2018-10-30 15:18 ` Jens Axboe
2018-10-30 16:02 ` Keith Busch
2018-10-30 16:42 ` Jens Axboe
2018-10-30 17:09 ` Jens Axboe
2018-10-30 17:22 ` Keith Busch
2018-10-30 17:33 ` Jens Axboe
2018-10-30 17:35 ` Keith Busch
2018-10-30 17:25 ` Thomas Gleixner
2018-10-30 17:34 ` Jens Axboe
2018-10-30 17:43 ` Jens Axboe
2018-10-30 17:46 ` Thomas Gleixner
2018-10-30 17:47 ` Jens Axboe
2018-10-29 16:37 ` [PATCH 12/14] nvme: utilize two queue maps, one for reads and one for writes Jens Axboe
2018-10-29 16:37 ` [PATCH 13/14] block: add REQ_HIPRI and inherit it from IOCB_HIPRI Jens Axboe
2018-10-29 16:37 ` [PATCH 14/14] nvme: add separate poll queue map Jens Axboe
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=214cdac8-9c13-213b-023f-2fb1bf67c8db@kernel.dk \
--to=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.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).