mtip32xx cleanups
Hi Jens,
this series cleans up the sysfs setup in the mtip32xx driver and then converts it to use the new blk_mq_alloc_disk and blk_cleanup_disk helpers added in the for-5.14/block tree.
PATCH 1/2 mtip32xx: simplify sysfs setup
Pass the driver specific attributes directly to device_add_disk instead of manually creating them after the disk registration.
Signed-off-by Christoph Hellwig <[email protected]>
--- drivers/block/mtip32xx/mtip32xx.c | 79 ++++++------------------------- 1 file changed, 15 insertions(+), 64 deletions(-)
drivers/block/mtip32xx/mtip32xx.c +15 -64
@@ -2160,6 +2160,20 @@ static ssize_t mtip_hw_show_status(struct device *dev, static DEVICE_ATTR(status, 0444, mtip_hw_show_status, NULL); +static struct attribute *mtip_disk_attrs[] = { + &dev_attr_status.attr, +NULL , +}; + +static const struct attribute_group mtip_disk_attr_group = { + .attrs = mtip_disk_attrs, +}; + +static const struct attribute_group *mtip_disk_attr_groups[] = { + &mtip_disk_attr_group, +NULL , +}; +/* debugsfs entries */ static ssize_t show_device_status (struct device_driver *drv,char *buf)
@@ -2384,47 +2398,6 @@ static const struct file_operations mtip_flags_fops = { .llseek = no_llseek, }; -/* -* Create the sysfs related attributes. -* -* @dd Pointer to the driver data structure. -* @kobj Pointer to the kobj for the block device. -* -* return value -* 0 Operation completed successfully. -* -EINVAL Invalid parameter. -*/ -static int mtip_hw_sysfs_init (struct driver_data *dd,struct kobject *kobj) -{ -if (!kobj || !dd) -return -EINVAL ; - -if (sysfs_create_file (kobj, &dev_attr_status.attr)) -dev_warn (&dd->pdev->dev, -"Error creating 'status' sysfs entry\n" ); -return 0 ; -} - -/* -* Remove the sysfs related attributes. -* -* @dd Pointer to the driver data structure. -* @kobj Pointer to the kobj for the block device. -* -* return value -* 0 Operation completed successfully. -* -EINVAL Invalid parameter. -*/ -static int mtip_hw_sysfs_exit (struct driver_data *dd,struct kobject *kobj) -{ -if (!kobj || !dd) -return -EINVAL ; - -sysfs_remove_file (kobj, &dev_attr_status.attr); - -return 0 ; -} -static int mtip_hw_debugfs_init (struct driver_data *dd) {if (!dfs_parent)
@@ -3579,7 +3552,6 @@ static int mtip_block_initialize(struct driver_data *dd)int rv =0 , wait_for_rebuild =0 ;sector_t capacity;unsigned int index =0 ; -struct kobject *kobj;if (dd->disk) goto skip_create_disk;/* hw init done, before rebuild */
@@ -3685,17 +3657,7 @@ static int mtip_block_initialize(struct driver_data *dd)set_capacity (dd->disk, capacity);/* Enable the block device and add it to /dev */ -device_add_disk (&dd->pdev->dev, dd->disk,NULL ); - -/* -* Now that the disk is active, initialize any sysfs attributes -* managed by the protocol layer. -*/ - kobj =kobject_get (&disk_to_dev (dd->disk)->kobj); -if (kobj) { -mtip_hw_sysfs_init (dd, kobj); -kobject_put (kobj); - } +device_add_disk (&dd->pdev->dev, dd->disk, mtip_disk_attr_groups);if (dd->mtip_svc_handler) {set_bit (MTIP_DDF_INIT_DONE_BIT , &dd->dd_flag);
@@ -3764,8 +3726,6 @@ static bool mtip_no_dev_cleanup(struct request *rq, void *data, bool reserv)*/ static int mtip_block_remove (struct driver_data *dd) { -struct kobject *kobj; -mtip_hw_debugfs_exit (dd);if (dd->mtip_svc_handler) {
@@ -3774,15 +3734,6 @@ static int mtip_block_remove(struct driver_data *dd)kthread_stop (dd->mtip_svc_handler); } -/* Clean up the sysfs attributes, if created */ -if (test_bit (MTIP_DDF_INIT_DONE_BIT , &dd->dd_flag)) { - kobj =kobject_get (&disk_to_dev (dd->disk)->kobj); -if (kobj) { -mtip_hw_sysfs_exit (dd, kobj); -kobject_put (kobj); - } - } -if (!dd->sr) {/* * Explicitly wait here for IOs to quiesce,
Signature · 1 line
2.30.2
PATCH 2/2 mtip32xx: use blk_mq_alloc_disk and blk_cleanup_disk
In reply to Christoph HellwigUse blk_mq_alloc_disk and blk_cleanup_disk to simplify the gendisk and request_queue allocation.
Signed-off-by Christoph Hellwig <[email protected]>
--- drivers/block/mtip32xx/mtip32xx.c | 71 ++++++++++++------------------- 1 file changed, 27 insertions(+), 44 deletions(-)
drivers/block/mtip32xx/mtip32xx.c +27 -44
@@ -3561,35 +3561,6 @@ static int mtip_block_initialize(struct driver_data *dd) goto protocol_init_error; } - dd->disk =alloc_disk_node (MTIP_MAX_MINORS , dd->numa_node); -if (dd->disk ==NULL ) { -dev_err (&dd->pdev->dev, -"Unable to allocate gendisk structure\n" ); - rv = -EINVAL ; - goto alloc_disk_error; - } - - rv =ida_alloc (&rssd_index_ida,GFP_KERNEL ); -if (rv <0 ) - goto ida_get_error; - index = rv; - - rv =rssd_disk_name_format ("rssd" , - index, - dd->disk->disk_name, -DISK_NAME_LEN ); -if (rv) - goto disk_index_error; - - dd->disk->major = dd->major; - dd->disk->first_minor = index *MTIP_MAX_MINORS ; - dd->disk->minors =MTIP_MAX_MINORS ; - dd->disk->fops = &mtip_block_ops; - dd->disk->private_data = dd; - dd->index = index; - -mtip_hw_debugfs_init (dd); -memset (&dd->tags,0 ,sizeof (dd->tags)); dd->tags.ops = &mtip_mq_ops; dd->tags.nr_hw_queues =1 ;
@@ -3608,17 +3579,35 @@ static int mtip_block_initialize(struct driver_data *dd) goto block_queue_alloc_tag_error; } -/* Allocate the request queue. */ - dd->queue =blk_mq_init_queue (&dd->tags); -if (IS_ERR (dd->queue)) { + dd->disk =blk_mq_alloc_disk (&dd->tags, dd); +if (IS_ERR (dd->disk)) {dev_err (&dd->pdev->dev,"Unable to allocate request queue\n" ); rv = -ENOMEM ; goto block_queue_alloc_init_error; } + dd->queue = dd->disk->queue; - dd->disk->queue = dd->queue; - dd->queue->queuedata = dd; + rv =ida_alloc (&rssd_index_ida,GFP_KERNEL ); +if (rv <0 ) + goto ida_get_error; + index = rv; + + rv =rssd_disk_name_format ("rssd" , + index, + dd->disk->disk_name, +DISK_NAME_LEN ); +if (rv) + goto disk_index_error; + + dd->disk->major = dd->major; + dd->disk->first_minor = index *MTIP_MAX_MINORS ; + dd->disk->minors =MTIP_MAX_MINORS ; + dd->disk->fops = &mtip_block_ops; + dd->disk->private_data = dd; + dd->index = index; + +mtip_hw_debugfs_init (dd); skip_create_disk:/* Initialize the protocol layer. */
@@ -3684,23 +3673,17 @@ static int mtip_block_initialize(struct driver_data *dd) kthread_run_error:/* Delete our gendisk. This also removes the device from /dev */ del_gendisk (dd->disk); - read_capacity_error: init_hw_cmds_error: -blk_cleanup_queue (dd->queue); -block_queue_alloc_init_error: -blk_mq_free_tag_set (&dd->tags); -block_queue_alloc_tag_error:mtip_hw_debugfs_exit (dd); disk_index_error:ida_free (&rssd_index_ida, index); - ida_get_error: -put_disk (dd->disk); - -alloc_disk_error: +blk_cleanup_disk (dd->disk); +block_queue_alloc_init_error: +blk_mq_free_tag_set (&dd->tags); +block_queue_alloc_tag_error:mtip_hw_exit (dd);/* De-initialize the protocol layer. */ - protocol_init_error:return rv; }
Signature · 1 line
2.30.2
Quoted 5 lines · Christoph Hellwig
Hi Jens,
this series cleans up the sysfs setup in the mtip32xx driver and then converts it to use the new
blk_mq_alloc_diskandblk_cleanup_diskhelpers added in the for-5.14/block tree.
Applied, thanks.
Signature · 1 line
Jens Axboe