[v3,02/13] block: Rename BLKDEV_MAX_RQ -> BLKDEV_DEFAULT_RQ

Message ID	1630065724-69146-3-git-send-email-john.garry@huawei.com
State	Superseded
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; From: John Garry <john.garry@huawei.com> To: <axboe@kernel.dk> CC: <linux-block@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <ming.lei@redhat.com>, <linux-scsi@vger.kernel.org>, John Garry <john.garry@huawei.com> Subject: [PATCH v3 02/13] block: Rename BLKDEV_MAX_RQ -> BLKDEV_DEFAULT_RQ Date: Fri, 27 Aug 2021 20:01:53 +0800 Message-ID: <1630065724-69146-3-git-send-email-john.garry@huawei.com> In-Reply-To: <1630065724-69146-1-git-send-email-john.garry@huawei.com> References: <1630065724-69146-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk
Series	blk-mq: Reduce static requests memory footprint for shared sbitmap \| expand [v3,00/13] blk-mq: Reduce static requests memory footprint for shared sbitmap [v3,01/13] blk-mq: Change rqs check in blk_mq_free_rqs() [v3,02/13] block: Rename BLKDEV_MAX_RQ -> BLKDEV_DEFAULT_RQ [v3,03/13] blk-mq: Relocate shared sbitmap resize in blk_mq_update_nr_requests() [v3,04/13] blk-mq: Invert check in blk_mq_update_nr_requests() [v3,05/13] blk-mq-sched: Rename blk_mq_sched_alloc_{tags -> map_and_rqs}() [v3,06/13] blk-mq-sched: Rename blk_mq_sched_free_{requests -> rqs}() [v3,07/13] blk-mq: Pass driver tags to blk_mq_clear_rq_mapping() [v3,08/13] blk-mq: Don't clear driver tags own mapping [v3,09/13] blk-mq: Add blk_mq_tag_update_sched_shared_sbitmap() [v3,10/13] blk-mq: Add blk_mq_alloc_map_and_rqs() [v3,11/13] blk-mq: Refactor and rename blk_mq_free_map_and_{requests->rqs}() [v3,12/13] blk-mq: Use shared tags for shared sbitmap support [v3,13/13] blk-mq: Stop using pointers for blk_mq_tags bitmap tags

Message ID

1630065724-69146-3-git-send-email-john.garry@huawei.com

State

Superseded

Headers

Received-SPF: pass (google.com: domain of linux-scsi-owner@vger.kernel.org
	designates 23.128.96.18 as permitted sender)
	client-ip=23.128.96.18; 
From: John Garry <john.garry@huawei.com>
To: <axboe@kernel.dk>
CC: <linux-block@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<ming.lei@redhat.com>, <linux-scsi@vger.kernel.org>,
	John Garry <john.garry@huawei.com>
Subject: [PATCH v3 02/13] block: Rename BLKDEV_MAX_RQ -> BLKDEV_DEFAULT_RQ
Date: Fri, 27 Aug 2021 20:01:53 +0800
Message-ID: <1630065724-69146-3-git-send-email-john.garry@huawei.com>
In-Reply-To: <1630065724-69146-1-git-send-email-john.garry@huawei.com>
References: <1630065724-69146-1-git-send-email-john.garry@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain
Precedence: bulk

Series

blk-mq: Reduce static requests memory footprint for shared sbitmap | expand

Commit Message

John Garry Aug. 27, 2021, 12:01 p.m. UTC

It is a bit confusing that there is BLKDEV_MAX_RQ and MAX_SCHED_RQ, as
the name BLKDEV_MAX_RQ would imply the max requests always, which it is
not.

Rename to BLKDEV_MAX_RQ to BLKDEV_DEFAULT_RQ, matching its usage - that being
the default number of requests assigned when allocating a request queue.

Signed-off-by: John Garry <john.garry@huawei.com>

Reviewed-by: Ming Lei <ming.lei@redhat.com>

---
 block/blk-core.c       | 2 +-
 block/blk-mq-sched.c   | 2 +-
 block/blk-mq-sched.h   | 2 +-
 drivers/block/rbd.c    | 2 +-
 include/linux/blkdev.h | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

-- 
2.26.2

diff --git a/block/blk-core.c b/block/blk-core.c
index 0874bc2fcdb4..93b585593ebd 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -569,7 +569,7 @@  struct request_queue *blk_alloc_queue(int node_id)
 
 	blk_queue_dma_alignment(q, 511);
 	blk_set_default_limits(&q->limits);
-	q->nr_requests = BLKDEV_MAX_RQ;
+	q->nr_requests = BLKDEV_DEFAULT_RQ;
 
 	return q;
 
diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
index 0f006cabfd91..2231fb0d4c35 100644
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c
@@ -606,7 +606,7 @@  int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e)
 	 * Additionally, this is a per-hw queue depth.
 	 */
 	q->nr_requests = 2 * min_t(unsigned int, q->tag_set->queue_depth,
-				   BLKDEV_MAX_RQ);
+				   BLKDEV_DEFAULT_RQ);
 
 	queue_for_each_hw_ctx(q, hctx, i) {
 		ret = blk_mq_sched_alloc_tags(q, hctx, i);
diff --git a/block/blk-mq-sched.h b/block/blk-mq-sched.h
index 5246ae040704..1e46be6c5178 100644
--- a/block/blk-mq-sched.h
+++ b/block/blk-mq-sched.h
@@ -5,7 +5,7 @@ 
 #include "blk-mq.h"
 #include "blk-mq-tag.h"
 
-#define MAX_SCHED_RQ (16 * BLKDEV_MAX_RQ)
+#define MAX_SCHED_RQ (16 * BLKDEV_DEFAULT_RQ)
 
 void blk_mq_sched_assign_ioc(struct request *rq);
 
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index e65c9d706f6f..bf60aebd0cfb 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -836,7 +836,7 @@  struct rbd_options {
 	u32 alloc_hint_flags;  /* CEPH_OSD_OP_ALLOC_HINT_FLAG_* */
 };
 
-#define RBD_QUEUE_DEPTH_DEFAULT	BLKDEV_MAX_RQ
+#define RBD_QUEUE_DEPTH_DEFAULT	BLKDEV_DEFAULT_RQ
 #define RBD_ALLOC_SIZE_DEFAULT	(64 * 1024)
 #define RBD_LOCK_TIMEOUT_DEFAULT 0  /* no timeout */
 #define RBD_READ_ONLY_DEFAULT	false
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index c9cb12483e12..fc3987eda2c1 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -44,7 +44,7 @@  struct blk_stat_callback;
 struct blk_keyslot_manager;
 
 #define BLKDEV_MIN_RQ	4
-#define BLKDEV_MAX_RQ	128	/* Default maximum */
+#define BLKDEV_DEFAULT_RQ	128
 
 /* Must be consistent with blk_mq_poll_stats_bkt() */
 #define BLK_MQ_POLL_STATS_BKTS 16

[v3,02/13] block: Rename BLKDEV_MAX_RQ -> BLKDEV_DEFAULT_RQ

Commit Message

Patch