linux-kernel - [RFC PATCH 08/21] scsi: use lib tagset init helper

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20221005032257.80681-9-kch@nvidia.com>
Date:   Tue, 4 Oct 2022 20:22:44 -0700
From:   Chaitanya Kulkarni <kch@...dia.com>
To:     <linux-block@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
        <linux-omap@...r.kernel.org>, <linux-remoteproc@...r.kernel.org>,
        <linux-mmc@...r.kernel.org>, <linux-mtd@...ts.infradead.org>,
        <linux-arm-kernel@...ts.infradead.org>,
        <linux-nvme@...ts.infradead.org>, <linux-s390@...r.kernel.org>,
        <linux-scsi@...r.kernel.org>
CC:     <axboe@...nel.dk>, <efremov@...ux.com>, <josef@...icpanda.com>,
        <idryomov@...il.com>, <dongsheng.yang@...ystack.cn>,
        <haris.iqbal@...os.com>, <jinpu.wang@...os.com>, <mst@...hat.com>,
        <jasowang@...hat.com>, <pbonzini@...hat.com>,
        <stefanha@...hat.com>, <ohad@...ery.com>, <andersson@...nel.org>,
        <baolin.wang@...ux.alibaba.com>, <ulf.hansson@...aro.org>,
        <richard@....at>, <miquel.raynal@...tlin.com>, <vigneshr@...com>,
        <marcan@...can.st>, <sven@...npeter.dev>, <alyssa@...enzweig.io>,
        <kbusch@...nel.org>, <hch@....de>, <sagi@...mberg.me>,
        <sth@...ux.ibm.com>, <hoeppner@...ux.ibm.com>, <hca@...ux.ibm.com>,
        <gor@...ux.ibm.com>, <agordeev@...ux.ibm.com>,
        <borntraeger@...ux.ibm.com>, <svens@...ux.ibm.com>,
        <jejb@...ux.ibm.com>, <martin.petersen@...cle.com>, <hare@...e.de>,
        <kch@...dia.com>, <bhelgaas@...gle.com>, <john.garry@...wei.com>,
        <mcgrof@...nel.org>, <christophe.jaillet@...adoo.fr>,
        <vaibhavgupta40@...il.com>, <wsa+renesas@...g-engineering.com>,
        <damien.lemoal@...nsource.wdc.com>, <johannes.thumshirn@....com>,
        <bvanassche@....org>, <ming.lei@...hat.com>,
        <shinichiro.kawasaki@....com>, <vincent.fu@...sung.com>,
        <christoph.boehmwalder@...bit.com>, <joel@....id.au>,
        <vincent.whitchurch@...s.com>, <nbd@...er.debian.org>,
        <ceph-devel@...r.kernel.org>,
        <virtualization@...ts.linux-foundation.org>,
        <asahi@...ts.linux.dev>
Subject: [RFC PATCH 08/21] scsi: use lib tagset init helper

Use the block layer helper to initialize the common fields of tag_set
such as blk_mq_ops, number of h/w queues, queue depth, command size,
numa_node, timeout, BLK_MQ_F_XXX flags, driver data. This initialization
is spread all over the block drivers. This avoids the code repetation of
the inialization code of the tag set in current block drivers and any
future ones.

Signed-off-by: Chaitanya Kulkarni <kch@...dia.com>
---
 drivers/scsi/scsi_lib.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index d7ec4ab2b111..121f292ba0d8 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1955,6 +1955,8 @@ int scsi_mq_setup_tags(struct Scsi_Host *shost)
 {
 	unsigned int cmd_size, sgl_size;
 	struct blk_mq_tag_set *tag_set = &shost->tag_set;
+	unsigned int flags = BLK_MQ_F_SHOULD_MERGE |
+		BLK_ALLOC_POLICY_TO_MQ_FLAG(shost->hostt->tag_alloc_policy);
 
 	sgl_size = max_t(unsigned int, sizeof(struct scatterlist),
 				scsi_mq_inline_sgl_size(shost));
@@ -1964,19 +1966,14 @@ int scsi_mq_setup_tags(struct Scsi_Host *shost)
 			sizeof(struct scatterlist) * SCSI_INLINE_PROT_SG_CNT;
 
 	memset(tag_set, 0, sizeof(*tag_set));
+	blk_mq_init_tag_set(tag_set, NULL, shost->nr_hw_queues ? : 1,
+			shost->can_queue, cmd_size, dev_to_node(shost->dma_dev),
+			0, flags, shost);
 	if (shost->hostt->commit_rqs)
 		tag_set->ops = &scsi_mq_ops;
 	else
 		tag_set->ops = &scsi_mq_ops_no_commit;
-	tag_set->nr_hw_queues = shost->nr_hw_queues ? : 1;
 	tag_set->nr_maps = shost->nr_maps ? : 1;
-	tag_set->queue_depth = shost->can_queue;
-	tag_set->cmd_size = cmd_size;
-	tag_set->numa_node = dev_to_node(shost->dma_dev);
-	tag_set->flags = BLK_MQ_F_SHOULD_MERGE;
-	tag_set->flags |=
-		BLK_ALLOC_POLICY_TO_MQ_FLAG(shost->hostt->tag_alloc_policy);
-	tag_set->driver_data = shost;
 	if (shost->host_tagset)
 		tag_set->flags |= BLK_MQ_F_TAG_HCTX_SHARED;
 
-- 
2.29.0