linux-kernel - [RFC PATCH 07/21] virtio-blk: 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]

Date:   Tue, 4 Oct 2022 20:22:43 -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 07/21] virtio-blk: 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/block/virtio_blk.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 23c5a1239520..975b4a8213af 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -885,6 +885,8 @@ static int virtblk_probe(struct virtio_device *vdev)
 	struct virtio_blk *vblk;
 	struct request_queue *q;
 	int err, index;
+	unsigned int cmd_size = sizeof(struct virtblk_req) +
+		sizeof(struct scatterlist) * VIRTIO_BLK_INLINE_SG_CNT;
 
 	u32 v, blk_size, max_size, sg_elems, opt_io_size;
 	u16 min_io_size;
@@ -942,15 +944,9 @@ static int virtblk_probe(struct virtio_device *vdev)
 	}
 
 	memset(&vblk->tag_set, 0, sizeof(vblk->tag_set));
-	vblk->tag_set.ops = &virtio_mq_ops;
-	vblk->tag_set.queue_depth = queue_depth;
-	vblk->tag_set.numa_node = NUMA_NO_NODE;
-	vblk->tag_set.flags = BLK_MQ_F_SHOULD_MERGE;
-	vblk->tag_set.cmd_size =
-		sizeof(struct virtblk_req) +
-		sizeof(struct scatterlist) * VIRTIO_BLK_INLINE_SG_CNT;
-	vblk->tag_set.driver_data = vblk;
-	vblk->tag_set.nr_hw_queues = vblk->num_vqs;
+	blk_mq_init_tag_set(&vblk->tag_set, &virtio_mq_ops, vblk->num_vqs,
+			queue_depth, cmd_size, NUMA_NO_NODE, 0,
+			BLK_MQ_F_SHOULD_MERGE, vblk);
 	vblk->tag_set.nr_maps = 1;
 	if (vblk->io_queues[HCTX_TYPE_POLL])
 		vblk->tag_set.nr_maps = 3;
-- 
2.29.0