From: John Garry <john.garry@huawei.com>
To: <axboe@kernel.dk>, <damien.lemoal@opensource.wdc.com>,
<bvanassche@acm.org>, <jejb@linux.ibm.com>,
<martin.petersen@oracle.com>, <hch@lst.de>, <ming.lei@redhat.com>,
<hare@suse.de>
Cc: <chenxiang66@hisilicon.com>, <linux-block@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linux-ide@vger.kernel.org>,
<linux-scsi@vger.kernel.org>, <dm-devel@redhat.com>,
<beanhuo@micron.com>, John Garry <john.garry@huawei.com>
Subject: [PATCH 01/11] blk-mq: Add blk_mq_init_queue_ops()
Date: Tue, 22 Mar 2022 18:39:35 +0800 [thread overview]
Message-ID: <1647945585-197349-2-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1647945585-197349-1-git-send-email-john.garry@huawei.com>
Add an API to allocate a request queue which accepts a custom set of
blk_mq_ops for that request queue.
The reason which we may want custom ops is for queuing requests which we
don't want to go through the normal queuing path.
Signed-off-by: John Garry <john.garry@huawei.com>
---
block/blk-mq.c | 23 +++++++++++++++++------
drivers/md/dm-rq.c | 2 +-
include/linux/blk-mq.h | 5 ++++-
3 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index f3bf3358a3bb..8ea3447339ca 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -3858,7 +3858,7 @@ void blk_mq_release(struct request_queue *q)
}
static struct request_queue *blk_mq_init_queue_data(struct blk_mq_tag_set *set,
- void *queuedata)
+ void *queuedata, const struct blk_mq_ops *ops)
{
struct request_queue *q;
int ret;
@@ -3867,27 +3867,35 @@ static struct request_queue *blk_mq_init_queue_data(struct blk_mq_tag_set *set,
if (!q)
return ERR_PTR(-ENOMEM);
q->queuedata = queuedata;
- ret = blk_mq_init_allocated_queue(set, q);
+ ret = blk_mq_init_allocated_queue(set, q, ops);
if (ret) {
blk_cleanup_queue(q);
return ERR_PTR(ret);
}
+
return q;
}
struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *set)
{
- return blk_mq_init_queue_data(set, NULL);
+ return blk_mq_init_queue_data(set, NULL, NULL);
}
EXPORT_SYMBOL(blk_mq_init_queue);
+struct request_queue *blk_mq_init_queue_ops(struct blk_mq_tag_set *set,
+ const struct blk_mq_ops *custom_ops)
+{
+ return blk_mq_init_queue_data(set, NULL, custom_ops);
+}
+EXPORT_SYMBOL(blk_mq_init_queue_ops);
+
struct gendisk *__blk_mq_alloc_disk(struct blk_mq_tag_set *set, void *queuedata,
struct lock_class_key *lkclass)
{
struct request_queue *q;
struct gendisk *disk;
- q = blk_mq_init_queue_data(set, queuedata);
+ q = blk_mq_init_queue_data(set, queuedata, NULL);
if (IS_ERR(q))
return ERR_CAST(q);
@@ -4010,13 +4018,16 @@ static void blk_mq_realloc_hw_ctxs(struct blk_mq_tag_set *set,
}
int blk_mq_init_allocated_queue(struct blk_mq_tag_set *set,
- struct request_queue *q)
+ struct request_queue *q, const struct blk_mq_ops *custom_ops)
{
WARN_ON_ONCE(blk_queue_has_srcu(q) !=
!!(set->flags & BLK_MQ_F_BLOCKING));
/* mark the queue as mq asap */
- q->mq_ops = set->ops;
+ if (custom_ops)
+ q->mq_ops = custom_ops;
+ else
+ q->mq_ops = set->ops;
q->poll_cb = blk_stat_alloc_callback(blk_mq_poll_stats_fn,
blk_mq_poll_stats_bkt,
diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c
index 3907950a0ddc..9d93f72a3eec 100644
--- a/drivers/md/dm-rq.c
+++ b/drivers/md/dm-rq.c
@@ -560,7 +560,7 @@ int dm_mq_init_request_queue(struct mapped_device *md, struct dm_table *t)
if (err)
goto out_kfree_tag_set;
- err = blk_mq_init_allocated_queue(md->tag_set, md->queue);
+ err = blk_mq_init_allocated_queue(md->tag_set, md->queue, NULL);
if (err)
goto out_tag_set;
return 0;
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index d319ffa59354..e12d17c86c52 100644
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -688,8 +688,11 @@ struct gendisk *__blk_mq_alloc_disk(struct blk_mq_tag_set *set, void *queuedata,
__blk_mq_alloc_disk(set, queuedata, &__key); \
})
struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *);
+struct request_queue *blk_mq_init_queue_ops(struct blk_mq_tag_set *,
+ const struct blk_mq_ops *custom_ops);
+
int blk_mq_init_allocated_queue(struct blk_mq_tag_set *set,
- struct request_queue *q);
+ struct request_queue *q, const struct blk_mq_ops *custom_ops);
void blk_mq_unregister_dev(struct device *, struct request_queue *);
int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set);
--
2.26.2
next prev parent reply other threads:[~2022-03-22 10:45 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-22 10:39 [PATCH RFC 00/11] blk-mq/libata/scsi: SCSI driver tagging improvements John Garry
2022-03-22 10:39 ` John Garry [this message]
2022-03-22 11:18 ` [PATCH 01/11] blk-mq: Add blk_mq_init_queue_ops() Christoph Hellwig
2022-03-22 11:33 ` John Garry
2022-03-22 12:16 ` Hannes Reinecke
2022-03-22 12:30 ` John Garry
2022-03-22 14:03 ` Hannes Reinecke
2022-03-22 15:17 ` John Garry
2022-03-22 15:31 ` Hannes Reinecke
2022-03-23 2:57 ` Bart Van Assche
2022-03-23 9:01 ` John Garry
2022-03-22 10:39 ` [PATCH 02/11] scsi: core: Add SUBMITTED_BY_SCSI_CUSTOM_OPS John Garry
2022-03-22 11:20 ` Christoph Hellwig
2022-03-22 10:39 ` [PATCH 03/11] libata: Send internal commands through the block layer John Garry
2022-03-22 11:20 ` Christoph Hellwig
2022-03-22 11:36 ` John Garry
2022-04-07 14:32 ` John Garry
2022-03-22 10:39 ` [PATCH 04/11] scsi: libsas: Send SMP " John Garry
2022-03-22 11:23 ` Christoph Hellwig
2022-03-22 14:37 ` John Garry
2022-03-22 10:39 ` [PATCH 05/11] scsi: libsas: Send TMF " John Garry
2022-03-22 10:39 ` [PATCH 06/11] scsi: core: Add scsi_alloc_request_hwq() John Garry
2022-03-22 10:39 ` [PATCH 07/11] scsi: libsas: Send internal abort commands through the block layer John Garry
2022-03-22 10:39 ` [PATCH 08/11] scsi: libsas: Change ATA support to deal with each qc having a SCSI command John Garry
2022-03-22 10:39 ` [PATCH 09/11] scsi: libsas: Add sas_task_to_unique_tag() John Garry
2022-03-22 10:39 ` [PATCH 10/11] scsi: libsas: Add sas_task_to_hwq() John Garry
2022-03-22 10:39 ` [PATCH 11/11] scsi: hisi_sas: Remove private tag management John Garry
2022-03-22 11:30 ` [PATCH RFC 00/11] blk-mq/libata/scsi: SCSI driver tagging improvements Hannes Reinecke
2022-03-22 12:17 ` John Garry
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=1647945585-197349-2-git-send-email-john.garry@huawei.com \
--to=john.garry@huawei.com \
--cc=axboe@kernel.dk \
--cc=beanhuo@micron.com \
--cc=bvanassche@acm.org \
--cc=chenxiang66@hisilicon.com \
--cc=damien.lemoal@opensource.wdc.com \
--cc=dm-devel@redhat.com \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=jejb@linux.ibm.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--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;
as well as URLs for NNTP newsgroup(s).