From: John Garry <john.garry@huawei.com>
To: <axboe@kernel.dk>, <damien.lemoal@opensource.wdc.com>,
<bvanassche@acm.org>, <hch@lst.de>, <jejb@linux.ibm.com>,
<martin.petersen@oracle.com>, <hare@suse.de>,
<satishkh@cisco.com>, <sebaddel@cisco.com>, <kartilak@cisco.com>
Cc: <linux-doc@vger.kernel.org>, <linux-rdma@vger.kernel.org>,
<linux-mmc@vger.kernel.org>, <linux-nvme@lists.infradead.org>,
<linux-s390@vger.kernel.org>, <linux-scsi@vger.kernel.org>,
<mpi3mr-linuxdrv.pdl@broadcom.com>, <linux-block@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <nbd@other.debian.org>,
John Garry <john.garry@huawei.com>
Subject: [PATCH v2 2/6] blk-mq: Add a flag for reserved requests
Date: Tue, 21 Jun 2022 19:15:39 +0800 [thread overview]
Message-ID: <1655810143-67784-3-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1655810143-67784-1-git-send-email-john.garry@huawei.com>
Add a flag for reserved requests so that drivers may know this for any
special handling.
Signed-off-by: John Garry <john.garry@huawei.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Hannes Reinecke <hare@suse.de>
---
block/blk-mq.c | 6 ++++++
include/linux/blk-mq.h | 6 ++++++
2 files changed, 12 insertions(+)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 5aa95964191b..d38c97fe89f5 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -474,6 +474,9 @@ static struct request *__blk_mq_alloc_requests(struct blk_mq_alloc_data *data)
if (!(data->rq_flags & RQF_ELV))
blk_mq_tag_busy(data->hctx);
+ if (data->flags & BLK_MQ_REQ_RESERVED)
+ data->rq_flags |= RQF_RESV;
+
/*
* Try batched alloc if we want more than 1 tag.
*/
@@ -588,6 +591,9 @@ struct request *blk_mq_alloc_request_hctx(struct request_queue *q,
else
data.rq_flags |= RQF_ELV;
+ if (flags & BLK_MQ_REQ_RESERVED)
+ data.rq_flags |= RQF_RESV;
+
ret = -EWOULDBLOCK;
tag = blk_mq_get_tag(&data);
if (tag == BLK_MQ_NO_TAG)
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index e2d9daf7e8dd..6d81fe10e850 100644
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -57,6 +57,7 @@ typedef __u32 __bitwise req_flags_t;
#define RQF_TIMED_OUT ((__force req_flags_t)(1 << 21))
/* queue has elevator attached */
#define RQF_ELV ((__force req_flags_t)(1 << 22))
+#define RQF_RESV ((__force req_flags_t)(1 << 23))
/* flags that prevent us from merging requests: */
#define RQF_NOMERGE_FLAGS \
@@ -823,6 +824,11 @@ static inline bool blk_mq_need_time_stamp(struct request *rq)
return (rq->rq_flags & (RQF_IO_STAT | RQF_STATS | RQF_ELV));
}
+static inline bool blk_mq_is_reserved_rq(struct request *rq)
+{
+ return rq->rq_flags & RQF_RESV;
+}
+
/*
* Batched completions only work when there is no I/O error and no special
* ->end_io handler.
--
2.25.1
next prev parent reply other threads:[~2022-06-21 11:22 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-21 11:15 [PATCH v2 0/6] blk-mq: Add a flag for reserved requests series John Garry
2022-06-21 11:15 ` [PATCH v2 1/6] scsi: core: Remove reserved request time-out handling John Garry
2022-06-21 11:15 ` John Garry [this message]
2022-06-21 11:15 ` [PATCH v2 3/6] blk-mq: Drop blk_mq_ops.timeout 'reserved' arg John Garry
2022-06-23 12:35 ` Ulf Hansson
2022-06-21 11:15 ` [PATCH v2 4/6] scsi: fnic: Drop reserved request handling John Garry
2022-06-21 11:15 ` [PATCH v2 5/6] blk-mq: Drop 'reserved' arg of busy_tag_iter_fn John Garry
2022-06-23 13:12 ` Bart Van Assche
2022-06-26 13:58 ` Sagi Grimberg
2022-06-21 11:15 ` [PATCH v2 6/6] blk-mq: Drop local variable for reserved tag John Garry
2022-06-23 13:10 ` Bart Van Assche
2022-06-22 0:57 ` [PATCH v2 0/6] blk-mq: Add a flag for reserved requests series Martin K. Petersen
2022-06-28 8:27 ` 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=1655810143-67784-3-git-send-email-john.garry@huawei.com \
--to=john.garry@huawei.com \
--cc=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=damien.lemoal@opensource.wdc.com \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=jejb@linux.ibm.com \
--cc=kartilak@cisco.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-rdma@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=mpi3mr-linuxdrv.pdl@broadcom.com \
--cc=nbd@other.debian.org \
--cc=satishkh@cisco.com \
--cc=sebaddel@cisco.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