simplify gendisk and request_queue allocation for blk-mq based drivers
Subsystems (19)
Hi all,
this series is the scond part of cleaning up lifetimes and allocation of the gendisk and request_queue structure. It adds a new interface to allocate the disk and queue together for blk based drivers, and uses that in all drivers that do not have any caveats in their gendisk and request_queue lifetime rules.
Diffstat:
block/blk-mq.c | 91 +++++++++++++++------------------- block/blk.h | 1 block/elevator.c | 2 drivers/block/amiflop.c | 16 +----- drivers/block/aoe/aoeblk.c | 33 ++++-------- drivers/block/aoe/aoedev.c | 3 - drivers/block/ataflop.c | 16 +----- drivers/block/floppy.c | 20 +------ drivers/block/loop.c | 19 ++----- drivers/block/nbd.c | 53 +++++++------------ drivers/block/null_blk/main.c | 11 +--- drivers/block/paride/pcd.c | 19 +++---- drivers/block/paride/pd.c | 30 ++++------- drivers/block/paride/pf.c | 18 ++---- drivers/block/ps3disk.c | 36 +++++-------- drivers/block/rbd.c | 52 ++++++------------- drivers/block/rnbd/rnbd-clt.c | 35 +++---------- drivers/block/sunvdc.c | 47 ++++------------- drivers/block/swim.c | 34 +++++------- drivers/block/swim3.c | 33 +++++------- drivers/block/sx8.c | 23 ++------ drivers/block/virtio_blk.c | 26 ++------- drivers/block/xen-blkfront.c | 96 ++++++++++++++---------------------- drivers/block/z2ram.c | 15 +---- drivers/cdrom/gdrom.c | 45 +++++++--------- drivers/md/dm-rq.c | 9 +-- drivers/memstick/core/ms_block.c | 25 +++------ drivers/memstick/core/mspro_block.c | 26 ++++----- drivers/mtd/mtd_blkdevs.c | 48 ++++++++---------- drivers/mtd/ubi/block.c | 68 ++++++++++--------------- drivers/s390/block/scm_blk.c | 21 ++----- include/linux/blk-mq.h | 24 ++++++--- include/linux/elevator.h | 1 33 files changed, 386 insertions(+), 610 deletions(-)
PATCH 1/30 blk-mq: factor out a blk_mq_alloc_sq_tag_set helper
Factour out a helper to initialize a simple single hw queue tag_set from blk_mq_init_sq_queue. This will allow to phase out blk_mq_init_sq_queue in favor of a more symmetric and general API.
--- block/blk-mq.c | 32 ++++++++++++++++++-------------- include/linux/blk-mq.h | 3 +++ 2 files changed, 21 insertions(+), 14 deletions(-)
block/blk-mq.c +18 -14
@@ -3152,24 +3152,12 @@ struct request_queue *blk_mq_init_sq_queue(struct blk_mq_tag_set *set,struct request_queue *q;int ret; -memset (set,0 ,sizeof (*set)); - set->ops = ops; - set->nr_hw_queues =1 ; - set->nr_maps =1 ; - set->queue_depth = queue_depth; - set->numa_node =NUMA_NO_NODE ; - set->flags = set_flags; - - ret =blk_mq_alloc_tag_set (set); + ret =blk_mq_alloc_sq_tag_set (set, ops, queue_depth, set_flags);if (ret)return ERR_PTR (ret); - q =blk_mq_init_queue (set); -if (IS_ERR (q)) { +if (IS_ERR (q))blk_mq_free_tag_set (set); -return q; - } -return q; }EXPORT_SYMBOL (blk_mq_init_sq_queue);
@@ -3589,6 +3577,22 @@ int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set) }EXPORT_SYMBOL (blk_mq_alloc_tag_set); +/* allocate and initialize a tagset for a simple single-queue device */ +int blk_mq_alloc_sq_tag_set (struct blk_mq_tag_set *set, +const struct blk_mq_ops *ops,unsigned int queue_depth, +unsigned int set_flags) +{ +memset (set,0 ,sizeof (*set)); + set->ops = ops; + set->nr_hw_queues =1 ; + set->nr_maps =1 ; + set->queue_depth = queue_depth; + set->numa_node =NUMA_NO_NODE ; + set->flags = set_flags; +return blk_mq_alloc_tag_set (set); +} +EXPORT_SYMBOL_GPL (blk_mq_alloc_sq_tag_set); +void blk_mq_free_tag_set (struct blk_mq_tag_set *set) {int i, j;
include/linux/blk-mq.h +3 -0
@@ -439,6 +439,9 @@ struct request_queue *blk_mq_init_sq_queue(struct blk_mq_tag_set *set,void blk_mq_unregister_dev (struct device *,struct request_queue *);int blk_mq_alloc_tag_set (struct blk_mq_tag_set *set); +int blk_mq_alloc_sq_tag_set (struct blk_mq_tag_set *set, +const struct blk_mq_ops *ops,unsigned int queue_depth, +unsigned int set_flags);void blk_mq_free_tag_set (struct blk_mq_tag_set *set);void blk_mq_flush_plug_list (struct blk_plug *plug,bool from_schedule);
Signature · 1 line
2.30.2
PATCH 2/30 blk-mq: improve the blk_mq_init_allocated_queue interface
In reply to Christoph HellwigDon't return the passed in request_queue but a normal error code, and drop the elevator_init argument in favor of just calling elevator_init_mq directly from dm-rq.
--- block/blk-mq.c | 36 ++++++++++++++---------------------- block/blk.h | 1 - block/elevator.c | 2 +- drivers/md/dm-rq.c | 9 +++------ include/linux/blk-mq.h | 5 ++--- include/linux/elevator.h | 1 + 6 files changed, 21 insertions(+), 33 deletions(-)
block/blk-mq.c +14 -22
@@ -3115,21 +3115,18 @@ void blk_mq_release(struct request_queue *q)struct request_queue *blk_mq_init_queue_data (struct blk_mq_tag_set *set,void *queuedata) { -struct request_queue *uninit_q, *q; +struct request_queue *q; +int ret; - uninit_q =blk_alloc_queue (set->numa_node); -if (!uninit_q) + q =blk_alloc_queue (set->numa_node); +if (!q)return ERR_PTR (-ENOMEM ); - uninit_q->queuedata = queuedata; - -/* -* Initialize the queue without an elevator. device_add_disk() will do -* the initialization. -*/ - q =blk_mq_init_allocated_queue (set, uninit_q, false); -if (IS_ERR (q)) -blk_cleanup_queue (uninit_q); - + q->queuedata = queuedata; + ret =blk_mq_init_allocated_queue (set, q); +if (ret) { +blk_cleanup_queue (q); +return ERR_PTR (ret); + }return q; }EXPORT_SYMBOL_GPL (blk_mq_init_queue_data);
@@ -3273,9 +3270,8 @@ static void blk_mq_realloc_hw_ctxs(struct blk_mq_tag_set *set,mutex_unlock (&q->sysfs_lock); } -struct request_queue *blk_mq_init_allocated_queue (struct blk_mq_tag_set *set, -struct request_queue *q, -bool elevator_init) +int blk_mq_init_allocated_queue (struct blk_mq_tag_set *set, +struct request_queue *q) {/* mark the queue as mq asap */ q->mq_ops = set->ops;
@@ -3325,11 +3321,7 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set,blk_mq_init_cpu_queues (q, set->nr_hw_queues);blk_mq_add_queue_tag_set (set, q);blk_mq_map_swqueue (q); - -if (elevator_init) -elevator_init_mq (q); - -return q; +return 0 ; err_hctxs:kfree (q->queue_hw_ctx);
@@ -3340,7 +3332,7 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set, q->poll_cb =NULL ; err_exit: q->mq_ops =NULL ; -return ERR_PTR (-ENOMEM ); +return -ENOMEM ; }EXPORT_SYMBOL (blk_mq_init_allocated_queue);
block/blk.h +0 -1
@@ -192,7 +192,6 @@ void blk_account_io_done(struct request *req, u64 now);void blk_insert_flush (struct request *rq); -void elevator_init_mq (struct request_queue *q);int elevator_switch_mq (struct request_queue *q,struct elevator_type *new_e);void __elevator_exit (struct request_queue *,struct elevator_queue *);
block/elevator.c +1 -1
@@ -693,7 +693,7 @@ void elevator_init_mq(struct request_queue *q)elevator_put (e); } } - +EXPORT_SYMBOL_GPL (elevator_init_mq);/* only for dm-rq */ /* * switch to new_e io scheduler. be careful not to introduce deadlocks -
drivers/md/dm-rq.c +3 -6
@@ -530,7 +530,6 @@ static const struct blk_mq_ops dm_mq_ops = {int dm_mq_init_request_queue (struct mapped_device *md,struct dm_table *t) { -struct request_queue *q;struct dm_target *immutable_tgt;int err;
@@ -557,12 +556,10 @@ int dm_mq_init_request_queue(struct mapped_device *md, struct dm_table *t)if (err) goto out_kfree_tag_set; - q =blk_mq_init_allocated_queue (md->tag_set, md->queue, true); -if (IS_ERR (q)) { - err =PTR_ERR (q); + err =blk_mq_init_allocated_queue (md->tag_set, md->queue); +if (err) goto out_tag_set; - } - +elevator_init_mq (md->queue);return 0 ; out_tag_set:
include/linux/blk-mq.h +2 -3
@@ -429,9 +429,8 @@ enum {struct request_queue *blk_mq_init_queue (struct blk_mq_tag_set *);struct request_queue *blk_mq_init_queue_data (struct blk_mq_tag_set *set,void *queuedata); -struct request_queue *blk_mq_init_allocated_queue (struct blk_mq_tag_set *set, -struct request_queue *q, -bool elevator_init); +int blk_mq_init_allocated_queue (struct blk_mq_tag_set *set, +struct request_queue *q); struct request_queue *blk_mq_init_sq_queue(struct blk_mq_tag_set *set, const struct blk_mq_ops *ops, unsigned int queue_depth,
include/linux/elevator.h +1 -0
@@ -120,6 +120,7 @@ extern void elv_merged_request(struct request_queue *, struct request *,extern bool elv_attempt_insert_merge (struct request_queue *,struct request *);extern struct request *elv_former_request (struct request_queue *,struct request *);extern struct request *elv_latter_request (struct request_queue *,struct request *); +void elevator_init_mq (struct request_queue *q);/* * io scheduler registration
Signature · 1 line
2.30.2
PATCH 3/30 blk-mq: add the blk_mq_alloc_disk APIs
In reply to Christoph HellwigAdd a new API to allocate a gendisk including the request_queue for use with blk-mq based drivers. This is to avoid boilerplate code in drivers.
--- block/blk-mq.c | 19 +++++++++++++++++++ include/linux/blk-mq.h | 12 ++++++++++++ 2 files changed, 31 insertions(+)
block/blk-mq.c +19 -0
@@ -3137,6 +3137,25 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *set) }EXPORT_SYMBOL (blk_mq_init_queue); +struct gendisk *__blk_mq_alloc_disk (struct blk_mq_tag_set *set,void *queuedata) +{ +struct request_queue *q; +struct gendisk *disk; + + q =blk_mq_init_queue_data (set, queuedata); +if (IS_ERR (q)) +return ERR_CAST (q); + + disk =__alloc_disk_node (0 , set->numa_node); +if (!disk) { +blk_cleanup_queue (q); +return ERR_PTR (-ENOMEM ); + } + disk->queue = q; +return disk; +} +EXPORT_SYMBOL (__blk_mq_alloc_disk); +/* * Helper for setting up a queue with mq ops, given queue depth, and * the passed in mq ops flags.
include/linux/blk-mq.h +12 -0
@@ -426,6 +426,18 @@ enum { ((policy & ((1 <<BLK_MQ_F_ALLOC_POLICY_BITS ) -1 )) \ << BLK_MQ_F_ALLOC_POLICY_START_BIT) +#define blk_mq_alloc_disk (set, queuedata) \ +({ \ + static struct lock_class_key __key; \ + struct gendisk *__disk = __blk_mq_alloc_disk(set, queuedata); \ + \ + if (__disk) \ + lockdep_init_map(&__disk->lockdep_map, \ + "(bio completion)", &__key, 0); \ + __disk; \ +}) +struct gendisk *__blk_mq_alloc_disk (struct blk_mq_tag_set *set, +void *queuedata);struct request_queue *blk_mq_init_queue (struct blk_mq_tag_set *);struct request_queue *blk_mq_init_queue_data (struct blk_mq_tag_set *set,void *queuedata);
Signature · 1 line
2.30.2
Re: [PATCH 03/30] blk-mq: add the blk_mq_alloc_disk APIs
Quoted 4 lines · Christoph Hellwig
Add a new API to allocate a gendisk including the
request_queuefor use with blk-mq based drivers. This is to avoid boilerplate code in drivers.Signed-off-by Christoph Hellwig <[email protected]>
This would be a nice API to get rid of the couple initialization calls and respective error handling in each blk-mq based drivers.
Looks good.
PATCH 4/30 virtio-blk: use blk_mq_alloc_disk
In reply to Christoph HellwigUse the blk_mq_alloc_disk API to simplify the gendisk and request_queue allocation.
--- drivers/block/virtio_blk.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-)
drivers/block/virtio_blk.c +7 -19
@@ -749,13 +749,6 @@ static int virtblk_probe(struct virtio_device *vdev)if (err) goto out_free_vblk; -/* FIXME: How many partitions? How long is a piece of string? */ - vblk->disk =alloc_disk (1 <<PART_BITS ); -if (!vblk->disk) { - err = -ENOMEM ; - goto out_free_vq; - } -/* Default queue sizing is to fill the ring. */ if (likely (!virtblk_queue_depth)) { queue_depth = vblk->vqs[0 ].vq->num_free;
@@ -779,21 +772,20 @@ static int virtblk_probe(struct virtio_device *vdev) err =blk_mq_alloc_tag_set (&vblk->tag_set);if (err) - goto out_put_disk; + goto out_free_vq; - q =blk_mq_init_queue (&vblk->tag_set); -if (IS_ERR (q)) { - err = -ENOMEM ; + vblk->disk =blk_mq_alloc_disk (&vblk->tag_set, vblk); +if (IS_ERR (vblk->disk)) { + err =PTR_ERR (vblk->disk); goto out_free_tags; } - vblk->disk->queue = q; - - q->queuedata = vblk; + q = vblk->disk->queue;virtblk_name_format ("vd" , index, vblk->disk->disk_name,DISK_NAME_LEN ); vblk->disk->major = major; vblk->disk->first_minor =index_to_minor (index); + vblk->disk->minors =1 <<PART_BITS ; vblk->disk->private_data = vblk; vblk->disk->fops = &virtblk_fops; vblk->disk->flags |=GENHD_FL_EXT_DEVT ;
@@ -892,8 +884,6 @@ static int virtblk_probe(struct virtio_device *vdev) out_free_tags:blk_mq_free_tag_set (&vblk->tag_set); -out_put_disk: -put_disk (vblk->disk); out_free_vq: vdev->config->del_vqs (vdev);kfree (vblk->vqs);
@@ -913,8 +903,7 @@ static void virtblk_remove(struct virtio_device *vdev)flush_work (&vblk->config_work);del_gendisk (vblk->disk); -blk_cleanup_queue (vblk->disk->queue); - +blk_cleanup_disk (vblk->disk);blk_mq_free_tag_set (&vblk->tag_set);mutex_lock (&vblk->vdev_mutex);
@@ -925,7 +914,6 @@ static void virtblk_remove(struct virtio_device *vdev)/* Virtqueues are stopped, nothing can use vblk->vdev anymore. */ vblk->vdev =NULL ; -put_disk (vblk->disk); vdev->config->del_vqs (vdev);kfree (vblk->vqs);
Signature · 1 line
2.30.2
PATCH 5/30 pcd: use blk_mq_alloc_disk
In reply to Christoph HellwigUse the blk_mq_alloc_disk API to simplify the gendisk and request_queue allocation.
--- drivers/block/paride/pcd.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
drivers/block/paride/pcd.c +8 -11
@@ -309,21 +309,19 @@ static void pcd_init_units(void) pcd_drive_count =0 ;for (unit =0 , cd = pcd; unit <PCD_UNITS ; unit++, cd++) { -struct gendisk *disk =alloc_disk (1 ); +struct gendisk *disk; -if (!disk) +if (blk_mq_alloc_sq_tag_set (&cd->tag_set, &pcd_mq_ops,1 , +BLK_MQ_F_SHOULD_MERGE ))continue ; - disk->queue =blk_mq_init_sq_queue (&cd->tag_set, &pcd_mq_ops, -1 ,BLK_MQ_F_SHOULD_MERGE ); -if (IS_ERR (disk->queue)) { - disk->queue =NULL ; -put_disk (disk); + disk =blk_mq_alloc_disk (&cd->tag_set, cd); +if (IS_ERR (disk)) { +blk_mq_free_tag_set (&cd->tag_set);continue ; }INIT_LIST_HEAD (&cd->rq_list); - disk->queue->queuedata = cd;blk_queue_bounce_limit (disk->queue,BLK_BOUNCE_HIGH ); cd->disk = disk; cd->pi = &cd->pia;
@@ -343,6 +341,7 @@ static void pcd_init_units(void) cd->info.mask =0 ; disk->major = major; disk->first_minor = unit; + disk->minors =1 ;strcpy (disk->disk_name, cd->name);/* umm... */ disk->fops = &pcd_bdops; disk->flags =GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE ;
@@ -759,10 +758,8 @@ static int pcd_detect(void)for (unit =0 , cd = pcd; unit <PCD_UNITS ; unit++, cd++) {if (!cd->disk)continue ; -blk_cleanup_queue (cd->disk->queue); - cd->disk->queue =NULL ; +blk_cleanup_disk (cd->disk);blk_mq_free_tag_set (&cd->tag_set); -put_disk (cd->disk); }pi_unregister_driver (par_drv);return -1 ;
Signature · 1 line
2.30.2
PATCH 6/30 pf: use blk_mq_alloc_disk
In reply to Christoph HellwigUse the blk_mq_alloc_disk API to simplify the gendisk and request_queue allocation.
--- drivers/block/paride/pf.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
drivers/block/paride/pf.c +7 -11
@@ -294,20 +294,17 @@ static void __init pf_init_units(void)for (unit =0 , pf = units; unit <PF_UNITS ; unit++, pf++) {struct gendisk *disk; - disk =alloc_disk (1 ); -if (!disk) +if (blk_mq_alloc_sq_tag_set (&pf->tag_set, &pf_mq_ops,1 , +BLK_MQ_F_SHOULD_MERGE ))continue ; - disk->queue =blk_mq_init_sq_queue (&pf->tag_set, &pf_mq_ops, -1 ,BLK_MQ_F_SHOULD_MERGE ); -if (IS_ERR (disk->queue)) { - disk->queue =NULL ; -put_disk (disk); + disk =blk_mq_alloc_disk (&pf->tag_set, pf); +if (IS_ERR (disk)) { +blk_mq_free_tag_set (&pf->tag_set);continue ; }INIT_LIST_HEAD (&pf->rq_list); - disk->queue->queuedata = pf;blk_queue_max_segments (disk->queue, cluster);blk_queue_bounce_limit (disk->queue,BLK_BOUNCE_HIGH ); pf->disk = disk;
@@ -318,6 +315,7 @@ static void __init pf_init_units(void)snprintf (pf->name,PF_NAMELEN ,"%s%d" , name, unit); disk->major = major; disk->first_minor = unit; + disk->minors =1 ;strcpy (disk->disk_name, pf->name); disk->fops = &pf_fops; disk->events =DISK_EVENT_MEDIA_CHANGE ;
@@ -766,10 +764,8 @@ static int pf_detect(void)for (pf = units, unit =0 ; unit <PF_UNITS ; pf++, unit++) {if (!pf->disk)continue ; -blk_cleanup_queue (pf->disk->queue); - pf->disk->queue =NULL ; +blk_cleanup_disk (pf->disk);blk_mq_free_tag_set (&pf->tag_set); -put_disk (pf->disk); }pi_unregister_driver (par_drv);return -1 ;
Signature · 1 line
2.30.2
PATCH 7/30 ms_block: use blk_mq_alloc_disk
In reply to Christoph HellwigUse the blk_mq_alloc_disk API to simplify the gendisk and request_queue allocation.
--- drivers/memstick/core/ms_block.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-)
drivers/memstick/core/ms_block.c +10 -15
@@ -2110,21 +2110,17 @@ static int msb_init_disk(struct memstick_dev *card)if (msb->disk_id <0 )return msb->disk_id; - msb->disk =alloc_disk (0 ); -if (!msb->disk) { - rc = -ENOMEM ; + rc =blk_mq_alloc_sq_tag_set (&msb->tag_set, &msb_mq_ops,2 , +BLK_MQ_F_SHOULD_MERGE ); +if (rc) goto out_release_id; - } - msb->queue =blk_mq_init_sq_queue (&msb->tag_set, &msb_mq_ops,2 , -BLK_MQ_F_SHOULD_MERGE ); -if (IS_ERR (msb->queue)) { - rc =PTR_ERR (msb->queue); - msb->queue =NULL ; - goto out_put_disk; + msb->disk =blk_mq_alloc_disk (&msb->tag_set, card); +if (IS_ERR (msb->disk)) { + rc =PTR_ERR (msb->disk); + goto out_free_tag_set; } - - msb->queue->queuedata = card; + msb->queue = msb->disk->queue;blk_queue_max_hw_sectors (msb->queue,MS_BLOCK_MAX_PAGES );blk_queue_max_segments (msb->queue,MS_BLOCK_MAX_SEGS );
@@ -2135,7 +2131,6 @@ static int msb_init_disk(struct memstick_dev *card)sprintf (msb->disk->disk_name,"msblk%d" , msb->disk_id); msb->disk->fops = &msb_bdops; msb->disk->private_data = msb; - msb->disk->queue = msb->queue; capacity = msb->pages_in_block * msb->logical_block_count; capacity *= (msb->page_size /512 );
@@ -2155,8 +2150,8 @@ static int msb_init_disk(struct memstick_dev *card)dbg ("Disk added" );return 0 ; -out_put_disk: -put_disk (msb->disk); +out_free_tag_set: +blk_mq_free_tag_set (&msb->tag_set); out_release_id:mutex_lock (&msb_disk_lock);idr_remove (&msb_disk_idr, msb->disk_id);
Signature · 1 line
2.30.2
Re: [PATCH 07/30] ms_block: use blk_mq_alloc_disk
Quoted 5 lines · Christoph Hellwig
Use the
blk_mq_alloc_diskAPI to simplify the gendisk andrequest_queueallocation.Signed-off-by Christoph Hellwig <[email protected]>
Kind regards
Uffe
Quoted 60 lines
--- drivers/memstick/core/ms_block.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-)drivers/memstick/core/ms_block.c +10
-16@@ -2110,21 +2110,17 @@ static int msb_init_disk(struct memstick_dev *card)if (msb->disk_id <0 )return msb->disk_id; - msb->disk =alloc_disk (0 ); -if (!msb->disk) { - rc = -ENOMEM ; + rc =blk_mq_alloc_sq_tag_set (&msb->tag_set, &msb_mq_ops,2 , +BLK_MQ_F_SHOULD_MERGE ); +if (rc) goto out_release_id; - } - msb->queue =blk_mq_init_sq_queue (&msb->tag_set, &msb_mq_ops,2 , -BLK_MQ_F_SHOULD_MERGE ); -if (IS_ERR (msb->queue)) { - rc =PTR_ERR (msb->queue); - msb->queue =NULL ; - goto out_put_disk; + msb->disk =blk_mq_alloc_disk (&msb->tag_set, card); +if (IS_ERR (msb->disk)) { + rc =PTR_ERR (msb->disk); + goto out_free_tag_set; } - - msb->queue->queuedata = card; + msb->queue = msb->disk->queue;blk_queue_max_hw_sectors (msb->queue,MS_BLOCK_MAX_PAGES );blk_queue_max_segments (msb->queue,MS_BLOCK_MAX_SEGS );@@ -2135,7 +2131,6 @@ static int msb_init_disk(struct memstick_dev *card)sprintf (msb->disk->disk_name,"msblk%d" , msb->disk_id); msb->disk->fops = &msb_bdops; msb->disk->private_data = msb; - msb->disk->queue = msb->queue; capacity = msb->pages_in_block * msb->logical_block_count; capacity *= (msb->page_size /512 );@@ -2155,8 +2150,8 @@ static int msb_init_disk(struct memstick_dev *card)dbg ("Disk added" );return 0 ; -out_put_disk: -put_disk (msb->disk); +out_free_tag_set: +blk_mq_free_tag_set (&msb->tag_set); out_release_id:mutex_lock (&msb_disk_lock);idr_remove (&msb_disk_idr, msb->disk_id); --2.30.2
PATCH 8/30 mspro: use blk_mq_alloc_disk
In reply to Christoph HellwigUse the blk_mq_alloc_disk API to simplify the gendisk and request_queue allocation.
--- drivers/memstick/core/mspro_block.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-)
drivers/memstick/core/mspro_block.c +11 -15
@@ -1205,21 +1205,17 @@ static int mspro_block_init_disk(struct memstick_dev *card)if (disk_id <0 )return disk_id; - msb->disk =alloc_disk (1 <<MSPRO_BLOCK_PART_SHIFT ); -if (!msb->disk) { - rc = -ENOMEM ; + rc =blk_mq_alloc_sq_tag_set (&msb->tag_set, &mspro_mq_ops,2 , +BLK_MQ_F_SHOULD_MERGE ); +if (rc) goto out_release_id; - } - msb->queue =blk_mq_init_sq_queue (&msb->tag_set, &mspro_mq_ops,2 , -BLK_MQ_F_SHOULD_MERGE ); -if (IS_ERR (msb->queue)) { - rc =PTR_ERR (msb->queue); - msb->queue =NULL ; - goto out_put_disk; + msb->disk =blk_mq_alloc_disk (&msb->tag_set, card); +if (IS_ERR (msb->disk)) { + rc =PTR_ERR (msb->disk); + goto out_free_tag_set; } - - msb->queue->queuedata = card; + msb->queue = msb->disk->queue;blk_queue_max_hw_sectors (msb->queue,MSPRO_BLOCK_MAX_PAGES );blk_queue_max_segments (msb->queue,MSPRO_BLOCK_MAX_SEGS );
@@ -1228,10 +1224,10 @@ static int mspro_block_init_disk(struct memstick_dev *card) msb->disk->major = major; msb->disk->first_minor = disk_id <<MSPRO_BLOCK_PART_SHIFT ; + msb->disk->minors =1 <<MSPRO_BLOCK_PART_SHIFT ; msb->disk->fops = &ms_block_bdops; msb->usage_count =1 ; msb->disk->private_data = msb; - msb->disk->queue = msb->queue;sprintf (msb->disk->disk_name,"mspblk%d" , disk_id);
@@ -1247,8 +1243,8 @@ static int mspro_block_init_disk(struct memstick_dev *card) msb->active =1 ;return 0 ; -out_put_disk: -put_disk (msb->disk); +out_free_tag_set: +blk_mq_free_tag_set (&msb->tag_set); out_release_id:mutex_lock (&mspro_block_disk_lock);idr_remove (&mspro_block_disk_idr, disk_id);
Signature · 1 line
2.30.2
Re: [PATCH 08/30] mspro: use blk_mq_alloc_disk
Quoted 5 lines · Christoph Hellwig
Use the
blk_mq_alloc_diskAPI to simplify the gendisk andrequest_queueallocation.Signed-off-by Christoph Hellwig <[email protected]>
Kind regards
Uffe
Quoted 62 lines
--- drivers/memstick/core/mspro_block.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-)drivers/memstick/core/mspro_block.c +11
-16@@ -1205,21 +1205,17 @@ static int mspro_block_init_disk(struct memstick_dev *card)if (disk_id <0 )return disk_id; - msb->disk =alloc_disk (1 <<MSPRO_BLOCK_PART_SHIFT ); -if (!msb->disk) { - rc = -ENOMEM ; + rc =blk_mq_alloc_sq_tag_set (&msb->tag_set, &mspro_mq_ops,2 , +BLK_MQ_F_SHOULD_MERGE ); +if (rc) goto out_release_id; - } - msb->queue =blk_mq_init_sq_queue (&msb->tag_set, &mspro_mq_ops,2 , -BLK_MQ_F_SHOULD_MERGE ); -if (IS_ERR (msb->queue)) { - rc =PTR_ERR (msb->queue); - msb->queue =NULL ; - goto out_put_disk; + msb->disk =blk_mq_alloc_disk (&msb->tag_set, card); +if (IS_ERR (msb->disk)) { + rc =PTR_ERR (msb->disk); + goto out_free_tag_set; } - - msb->queue->queuedata = card; + msb->queue = msb->disk->queue;blk_queue_max_hw_sectors (msb->queue,MSPRO_BLOCK_MAX_PAGES );blk_queue_max_segments (msb->queue,MSPRO_BLOCK_MAX_SEGS );@@ -1228,10 +1224,10 @@ static int mspro_block_init_disk(struct memstick_dev *card) msb->disk->major = major; msb->disk->first_minor = disk_id <<MSPRO_BLOCK_PART_SHIFT ; + msb->disk->minors =1 <<MSPRO_BLOCK_PART_SHIFT ; msb->disk->fops = &ms_block_bdops; msb->usage_count =1 ; msb->disk->private_data = msb; - msb->disk->queue = msb->queue;sprintf (msb->disk->disk_name,"mspblk%d" , disk_id);@@ -1247,8 +1243,8 @@ static int mspro_block_init_disk(struct memstick_dev *card) msb->active =1 ;return 0 ; -out_put_disk: -put_disk (msb->disk); +out_free_tag_set: +blk_mq_free_tag_set (&msb->tag_set); out_release_id:mutex_lock (&mspro_block_disk_lock);idr_remove (&mspro_block_disk_idr, disk_id); --
Quoted 2 lines
2.30.2
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH 9/30 mtd_blkdevs: use blk_mq_alloc_disk
In reply to Christoph HellwigUse the blk_mq_alloc_disk API to simplify the gendisk and request_queue allocation.
--- drivers/mtd/mtd_blkdevs.c | 48 ++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 26 deletions(-)
drivers/mtd/mtd_blkdevs.c +22 -26
@@ -30,11 +30,9 @@ static void blktrans_dev_release(struct kref *kref)struct mtd_blktrans_dev *dev = container_of(kref, struct mtd_blktrans_dev, ref); - dev->disk->private_data =NULL ; -blk_cleanup_queue (dev->rq); +blk_cleanup_disk (dev->disk);blk_mq_free_tag_set (dev->tag_set);kfree (dev->tag_set); -put_disk (dev->disk);list_del (&dev->list);kfree (dev); }
@@ -354,7 +352,7 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)if (new->devnum > (MINORMASK >> tr->part_bits) || (tr->part_bits && new->devnum >=27 *26 )) {mutex_unlock (&blktrans_ref_mutex); - goto error1; +return ret; }list_add_tail (&new->list, &tr->devs);
@@ -366,17 +364,28 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)if (!tr->writesect) new->readonly =1 ; -/* Create gendisk */ ret = -ENOMEM ; - gd =alloc_disk (1 << tr->part_bits); + new->tag_set =kzalloc (sizeof (*new->tag_set),GFP_KERNEL ); +if (!new->tag_set) + goto out_list_del; -if (!gd) - goto error2; + ret =blk_mq_alloc_sq_tag_set (new->tag_set, &mtd_mq_ops,2 , +BLK_MQ_F_SHOULD_MERGE |BLK_MQ_F_BLOCKING ); +if (ret) + goto out_kfree_tag_set; + +/* Create gendisk */ + gd =blk_mq_alloc_disk (new->tag_set, new); +if (IS_ERR (gd)) { + ret =PTR_ERR (gd); + goto out_free_tag_set; + } new->disk = gd; gd->private_data = new; gd->major = tr->major; gd->first_minor = (new->devnum) << tr->part_bits; + gd->minors =1 << tr->part_bits; gd->fops = &mtd_block_ops;if (tr->part_bits)
@@ -398,22 +407,9 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)spin_lock_init (&new->queue_lock);INIT_LIST_HEAD (&new->rq_list); - new->tag_set =kzalloc (sizeof (*new->tag_set),GFP_KERNEL ); -if (!new->tag_set) - goto error3; - - new->rq =blk_mq_init_sq_queue (new->tag_set, &mtd_mq_ops,2 , -BLK_MQ_F_SHOULD_MERGE |BLK_MQ_F_BLOCKING ); -if (IS_ERR (new->rq)) { - ret =PTR_ERR (new->rq); - new->rq =NULL ; - goto error4; - } -if (tr->flush)blk_queue_write_cache (new->rq, true, false); - new->rq->queuedata = new;blk_queue_logical_block_size (new->rq, tr->blksize);blk_queue_flag_set (QUEUE_FLAG_NONROT , new->rq);
@@ -437,13 +433,13 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)WARN_ON (ret); }return 0 ; -error4: + +out_free_tag_set: +blk_mq_free_tag_set (new->tag_set); +out_kfree_tag_set:kfree (new->tag_set); -error3: -put_disk (new->disk); -error2: +out_list_del:list_del (&new->list); -error1:return ret; }
Signature · 1 line
2.30.2
Re: [PATCH 09/30] mtd_blkdevs: use blk_mq_alloc_disk
Hi,
Quoted 4 lines · Christoph Hellwig
Use the
blk_mq_alloc_diskAPI to simplify the gendisk andrequest_queueallocation.Signed-off-by Christoph Hellwig <[email protected]>
This patch landed in linux-next as commit 6966bb921def ("mtd_blkdevs:
use blk_mq_alloc_disk"). It causes the following regression on my QEMU arm64 setup:
Using buffer write method
Concatenating MTD devices:
(0): "0.flash"
(1): "0.flash"
into device "0.flash"
Unable to handle kernel NULL pointer dereference at virtual address
0000000000000068
Mem abort info:
ESR = 0x96000004
EC = 0x25: DABT (current EL), IL = 32 bits SET = 0, FnV = 0
EA = 0, S1PTW = 0
Data abort info:
ISV = 0, ISS = 0x00000004
CM = 0, WnR = 0
[0000000000000068] user address but active_mm is swapper
Internal error: Oops: 96000004 [#1] PREEMPT SMP Modules linked in: CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.13.0-rc3+ #10492 Hardware name: linux,dummy-virt (DT) pstate: 00000005 (nzcv daif -PAN -UAO -TCO BTYPE=--) pc : blk_finish_plug+0x5c/0x268 lr : blk_queue_write_cache+0x28/0x70 ... Call trace: blk_finish_plug+0x5c/0x268 add_mtd_blktrans_dev+0x270/0x420 mtdblock_add_mtd+0x68/0x98 blktrans_notify_add+0x44/0x70 add_mtd_device+0x41c/0x490 mtd_device_parse_register+0xf4/0x1c8 physmap_flash_probe+0x44c/0x780 platform_probe+0x90/0xd8 really_probe+0x108/0x3c0 driver_probe_device+0x60/0xc0 device_driver_attach+0x6c/0x78 __driver_attach+0xc0/0x100 bus_for_each_dev+0x68/0xc8 driver_attach+0x20/0x28 bus_add_driver+0x168/0x1f8 driver_register+0x60/0x110 __platform_driver_register+0x24/0x30 physmap_init+0x18/0x20 do_one_initcall+0x84/0x450 kernel_init_freeable+0x2dc/0x334 kernel_init+0x10/0x110 ret_from_fork+0x10/0x18 Code: 88027c01 35ffffa2 17fff079 f9800031 (c85f7c22) ---[ end trace b774518e0766cc92 ]--- Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b SMP: stopping secondary CPUs Kernel Offset: 0x594d1fa00000 from 0xffff800010000000 PHYS_OFFSET: 0xffffea7300000000 CPU features: 0x11000671,00000846 Memory Limit: none ---[ end Kernel panic - not syncing: Attempted to kill init!
exitcode=0x0000000b ]---
Quoted 95 lines
--- drivers/mtd/mtd_blkdevs.c | 48 ++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 26 deletions(-)drivers/mtd/mtd_blkdevs.c +21
-22@@ -30,11 +30,9 @@ static void blktrans_dev_release(struct kref *kref)struct mtd_blktrans_dev *dev = container_of(kref, struct mtd_blktrans_dev, ref); - dev->disk->private_data =NULL ; -blk_cleanup_queue (dev->rq); +blk_cleanup_disk (dev->disk);blk_mq_free_tag_set (dev->tag_set);kfree (dev->tag_set); -put_disk (dev->disk);list_del (&dev->list);kfree (dev); }@@ -354,7 +352,7 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)if (new->devnum > (MINORMASK >> tr->part_bits) || (tr->part_bits && new->devnum >=27 *26 )) {mutex_unlock (&blktrans_ref_mutex); - goto error1; +return ret; }list_add_tail (&new->list, &tr->devs);@@ -366,17 +364,28 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)if (!tr->writesect) new->readonly =1 ; -/* Create gendisk */ ret = -ENOMEM ; - gd =alloc_disk (1 << tr->part_bits); + new->tag_set =kzalloc (sizeof (*new->tag_set),GFP_KERNEL ); +if (!new->tag_set) + goto out_list_del; -if (!gd) - goto error2; + ret =blk_mq_alloc_sq_tag_set (new->tag_set, &mtd_mq_ops,2 , +BLK_MQ_F_SHOULD_MERGE |BLK_MQ_F_BLOCKING ); +if (ret) + goto out_kfree_tag_set; + +/* Create gendisk */ + gd =blk_mq_alloc_disk (new->tag_set, new); +if (IS_ERR (gd)) { + ret =PTR_ERR (gd); + goto out_free_tag_set; + } new->disk = gd; gd->private_data = new; gd->major = tr->major; gd->first_minor = (new->devnum) << tr->part_bits; + gd->minors =1 << tr->part_bits; gd->fops = &mtd_block_ops;if (tr->part_bits)@@ -398,22 +407,9 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)spin_lock_init (&new->queue_lock);INIT_LIST_HEAD (&new->rq_list); - new->tag_set =kzalloc (sizeof (*new->tag_set),GFP_KERNEL ); -if (!new->tag_set) - goto error3; - - new->rq =blk_mq_init_sq_queue (new->tag_set, &mtd_mq_ops,2 , -BLK_MQ_F_SHOULD_MERGE |BLK_MQ_F_BLOCKING ); -if (IS_ERR (new->rq)) { - ret =PTR_ERR (new->rq); - new->rq =NULL ; - goto error4; - } -if (tr->flush)blk_queue_write_cache (new->rq, true, false); - new->rq->queuedata = new;blk_queue_logical_block_size (new->rq, tr->blksize);blk_queue_flag_set (QUEUE_FLAG_NONROT , new->rq);@@ -437,13 +433,13 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)WARN_ON (ret); }return 0 ; -error4: + +out_free_tag_set: +blk_mq_free_tag_set (new->tag_set); +out_kfree_tag_set:
drivers/mtd/mtd_blkdevs.c int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new) · line 445
Quoted 10 lines
drivers/mtd/mtd_blkdevs.c +1
-4kfree (new->tag_set); -error3: -put_disk (new->disk); -error2: +out_list_del:list_del (&new->list); -error1:return ret; }
Best regards
Signature · 2 lines
Marek Szyprowski, PhD Samsung R&D Institute Poland
Re: [PATCH 09/30] mtd_blkdevs: use blk_mq_alloc_disk
Quoted 11 lines · Marek Szyprowski
Hi,
Quoted 4 lines · Christoph Hellwig
Use the
blk_mq_alloc_diskAPI to simplify the gendisk andrequest_queueallocation.Signed-off-by Christoph Hellwig <[email protected]>This patch landed in linux-next as commit
6966bb921def("mtd_blkdevs:
useblk_mq_alloc_disk"). It causes the following regression on my QEMU arm64 setup:
Please try the patch below:
drivers/mtd/mtd_blkdevs.c +1 -0
@@ -382,6 +382,7 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new) } new->disk = gd; + new->rq = new->disk->queue; gd->private_data = new; gd->major = tr->major; gd->first_minor = (new->devnum) << tr->part_bits;
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Marek Szyprowski
Tested-byRe: [PATCH 09/30] mtd_blkdevs: use blk_mq_alloc_disk
Hi Christoph,
Quoted 16 lines · Christoph Hellwig
Quoted 8 lines · Marek Szyprowski
Quoted 4 lines · Christoph Hellwig
Use the
blk_mq_alloc_diskAPI to simplify the gendisk andrequest_queueallocation.Signed-off-by Christoph Hellwig <[email protected]>This patch landed in linux-next as commit
6966bb921def("mtd_blkdevs:
useblk_mq_alloc_disk"). It causes the following regression on my QEMU arm64 setup:Please try the patch below:
drivers/mtd/mtd_blkdevs.c +0
-0
drivers/mtd/mtd_blkdevs.c int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new) · line 388
Quoted 7 lines
drivers/mtd/mtd_blkdevs.c +1
-0@@ -382,6 +382,7 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new) } new->disk = gd; + new->rq = new->disk->queue; gd->private_data = new; gd->major = tr->major; gd->first_minor = (new->devnum) << tr->part_bits;
Right, this fixes the issue, thanks. Feel free to add:
Best regards
Signature · 2 lines
Marek Szyprowski, PhD Samsung R&D Institute Poland
PATCH 10/30 ps3disk: use blk_mq_alloc_disk
In reply to Christoph HellwigUse the blk_mq_alloc_disk API to simplify the gendisk and request_queue allocation.
--- drivers/block/ps3disk.c | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-)
drivers/block/ps3disk.c +14 -22
@@ -29,7 +29,6 @@struct ps3disk_private {spinlock_t lock;/* Request queue spinlock */ -struct request_queue *queue;struct blk_mq_tag_set tag_set;struct gendisk *gendisk;unsigned int blocking_factor;
@@ -267,7 +266,7 @@ static irqreturn_t ps3disk_interrupt(int irq, void *data)blk_mq_end_request (req, error);spin_unlock (&priv->lock); -blk_mq_run_hw_queues (priv->queue, true); +blk_mq_run_hw_queues (priv->gendisk->queue, true);return IRQ_HANDLED ; }
@@ -441,17 +440,20 @@ static int ps3disk_probe(struct ps3_system_bus_device *_dev)ps3disk_identify (dev); - queue =blk_mq_init_sq_queue (&priv->tag_set, &ps3disk_mq_ops,1 , + error =blk_mq_alloc_sq_tag_set (&priv->tag_set, &ps3disk_mq_ops,1 ,BLK_MQ_F_SHOULD_MERGE ); -if (IS_ERR (queue)) { -dev_err (&dev->sbd.core,"%s:%u: blk_mq_init_queue failed\n" , - __func__, __LINE__); - error =PTR_ERR (queue); +if (error) goto fail_teardown; + + gendisk =blk_mq_alloc_disk (&priv->tag_set, dev); +if (IS_ERR (gendisk)) { +dev_err (&dev->sbd.core,"%s:%u: blk_mq_alloc_disk failed\n" , + __func__, __LINE__); + error =PTR_ERR (gendisk); + goto fail_free_tag_set; } - priv->queue = queue; - queue->queuedata = dev; + queue = gendisk->queue;blk_queue_max_hw_sectors (queue, dev->bounce_size >>9 );blk_queue_dma_alignment (queue, dev->blk_size-1 );
@@ -462,19 +464,11 @@ static int ps3disk_probe(struct ps3_system_bus_device *_dev)blk_queue_max_segments (queue,-1 );blk_queue_max_segment_size (queue, dev->bounce_size); - gendisk =alloc_disk (PS3DISK_MINORS ); -if (!gendisk) { -dev_err (&dev->sbd.core,"%s:%u: alloc_disk failed\n" , __func__, - __LINE__); - error = -ENOMEM ; - goto fail_cleanup_queue; - } - priv->gendisk = gendisk; gendisk->major = ps3disk_major; gendisk->first_minor = devidx *PS3DISK_MINORS ; + gendisk->minors =PS3DISK_MINORS ; gendisk->fops = &ps3disk_fops; - gendisk->queue = queue; gendisk->private_data = dev;snprintf (gendisk->disk_name,sizeof (gendisk->disk_name),PS3DISK_NAME , devidx+'a' );
@@ -490,8 +484,7 @@ static int ps3disk_probe(struct ps3_system_bus_device *_dev)device_add_disk (&dev->sbd.core, gendisk,NULL );return 0 ; -fail_cleanup_queue: -blk_cleanup_queue (queue); +fail_free_tag_set:blk_mq_free_tag_set (&priv->tag_set); fail_teardown:ps3stor_teardown (dev);
@@ -517,9 +510,8 @@ static void ps3disk_remove(struct ps3_system_bus_device *_dev) &ps3disk_mask);mutex_unlock (&ps3disk_mask_mutex);del_gendisk (priv->gendisk); -blk_cleanup_queue (priv->queue); +blk_cleanup_disk (priv->gendisk);blk_mq_free_tag_set (&priv->tag_set); -put_disk (priv->gendisk);dev_notice (&dev->sbd.core,"Synchronizing disk cache\n" );ps3disk_sync_cache (dev);ps3stor_teardown (dev);
Signature · 1 line
2.30.2
Re: [PATCH 10/30] ps3disk: use blk_mq_alloc_disk
Hi Christoph,
Quoted 5 lines · Christoph Hellwig
Use the
blk_mq_alloc_diskAPI to simplify the gendisk andrequest_queueallocation.drivers/block/ps3disk.c | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-)
I tested your alloc_disk-part2 branch on PS3, and it seemed to be working OK.
PATCH 11/30 swim3: use blk_mq_alloc_disk
In reply to Christoph HellwigUse the blk_mq_alloc_disk API to simplify the gendisk and request_queue allocation.
--- drivers/block/swim3.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-)
drivers/block/swim3.c +14 -19
@@ -1202,30 +1202,27 @@ static int swim3_attach(struct macio_dev *mdev,return rc; } - disk =alloc_disk (1 ); -if (disk ==NULL ) { - rc = -ENOMEM ; - goto out_unregister; - } - fs = &floppy_states[floppy_count];memset (fs,0 ,sizeof (*fs)); - disk->queue =blk_mq_init_sq_queue (&fs->tag_set, &swim3_mq_ops,2 , -BLK_MQ_F_SHOULD_MERGE ); -if (IS_ERR (disk->queue)) { - rc =PTR_ERR (disk->queue); - disk->queue =NULL ; - goto out_put_disk; + rc =blk_mq_alloc_sq_tag_set (&fs->tag_set, &swim3_mq_ops,2 , +BLK_MQ_F_SHOULD_MERGE ); +if (rc) + goto out_unregister; + + disk =blk_mq_alloc_disk (&fs->tag_set, fs); +if (IS_ERR (disk)) { + rc =PTR_ERR (disk); + goto out_free_tag_set; } - disk->queue->queuedata = fs; rc =swim3_add_device (mdev, floppy_count);if (rc) - goto out_cleanup_queue; + goto out_cleanup_disk; disk->major =FLOPPY_MAJOR ; disk->first_minor = floppy_count; + disk->minors =1 ; disk->fops = &floppy_fops; disk->private_data = fs; disk->events =DISK_EVENT_MEDIA_CHANGE ;
@@ -1237,12 +1234,10 @@ static int swim3_attach(struct macio_dev *mdev, disks[floppy_count++] = disk;return 0 ; -out_cleanup_queue: -blk_cleanup_queue (disk->queue); - disk->queue =NULL ; +out_cleanup_disk: +blk_cleanup_disk (disk); +out_free_tag_set:blk_mq_free_tag_set (&fs->tag_set); -out_put_disk: -put_disk (disk); out_unregister:if (floppy_count ==0 )unregister_blkdev (FLOPPY_MAJOR ,"fd" );
Signature · 6 lines
2.30.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH 12/30 swim: use blk_mq_alloc_disk
In reply to Christoph HellwigUse the blk_mq_alloc_disk API to simplify the gendisk and request_queue allocation.
--- drivers/block/swim.c | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-)
drivers/block/swim.c +14 -20
@@ -800,23 +800,20 @@ static int swim_floppy_init(struct swim_priv *swd)spin_lock_init (&swd->lock);for (drive =0 ; drive < swd->floppy_count; drive++) { -struct request_queue *q; - - swd->unit[drive].disk =alloc_disk (1 ); -if (swd->unit[drive].disk ==NULL ) { - err = -ENOMEM ; + err =blk_mq_alloc_sq_tag_set (&swd->unit[drive].tag_set, + &swim_mq_ops,2 ,BLK_MQ_F_SHOULD_MERGE ); +if (err) goto exit_put_disks; - } - q =blk_mq_init_sq_queue (&swd->unit[drive].tag_set, &swim_mq_ops, -2 ,BLK_MQ_F_SHOULD_MERGE ); -if (IS_ERR (q)) { - err =PTR_ERR (q); + swd->unit[drive].disk = +blk_mq_alloc_disk (&swd->unit[drive].tag_set, + &swd->unit[drive]); +if (IS_ERR (swd->unit[drive].disk)) { +blk_mq_free_tag_set (&swd->unit[drive].tag_set); + err =PTR_ERR (swd->unit[drive].disk); goto exit_put_disks; } - swd->unit[drive].disk->queue = q; - swd->unit[drive].disk->queue->queuedata = &swd->unit[drive]; swd->unit[drive].swd = swd; }
@@ -824,6 +821,7 @@ static int swim_floppy_init(struct swim_priv *swd) swd->unit[drive].disk->flags =GENHD_FL_REMOVABLE ; swd->unit[drive].disk->major =FLOPPY_MAJOR ; swd->unit[drive].disk->first_minor = drive; + swd->unit[drive].disk->minors =1 ;sprintf (swd->unit[drive].disk->disk_name,"fd%d" , drive); swd->unit[drive].disk->fops = &floppy_fops; swd->unit[drive].disk->events =DISK_EVENT_MEDIA_CHANGE ;
@@ -839,14 +837,10 @@ static int swim_floppy_init(struct swim_priv *swd)do {struct gendisk *disk = swd->unit[drive].disk; -if (disk) { -if (disk->queue) { -blk_cleanup_queue (disk->queue); - disk->queue =NULL ; - } -blk_mq_free_tag_set (&swd->unit[drive].tag_set); -put_disk (disk); - } +if (!disk) +continue ; +blk_cleanup_disk (disk); +blk_mq_free_tag_set (&swd->unit[drive].tag_set); }while (drive--);return err; }
Signature · 6 lines
2.30.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH 13/30 sunvdc: use blk_mq_alloc_disk
In reply to Christoph HellwigUse the blk_mq_alloc_disk API to simplify the gendisk and request_queue allocation.
--- drivers/block/sunvdc.c | 47 ++++++++++++------------------------------ 1 file changed, 13 insertions(+), 34 deletions(-)
drivers/block/sunvdc.c +13 -34
@@ -780,27 +780,6 @@ static const struct blk_mq_ops vdc_mq_ops = { .queue_rq = vdc_queue_rq, }; -static void cleanup_queue (struct request_queue *q) -{ -struct vdc_port *port = q->queuedata; - -blk_cleanup_queue (q); -blk_mq_free_tag_set (&port->tag_set); -} - -static struct request_queue *init_queue (struct vdc_port *port) -{ -struct request_queue *q; - - q =blk_mq_init_sq_queue (&port->tag_set, &vdc_mq_ops,VDC_TX_RING_SIZE , -BLK_MQ_F_SHOULD_MERGE ); -if (IS_ERR (q)) -return q; - - q->queuedata = port; -return q; -} -static int probe_disk (struct vdc_port *port) {struct request_queue *q;
@@ -838,21 +817,21 @@ static int probe_disk(struct vdc_port *port) (u64)geom.num_sec); } - q =init_queue (port); -if (IS_ERR (q)) { - printk(KERN_ERR PFX "%s: Could not allocate queue.\n", - port->vio.name); -return PTR_ERR (q); - } - g =alloc_disk (1 <<PARTITION_SHIFT ); -if (!g) { + err =blk_mq_alloc_sq_tag_set (&port->tag_set, &vdc_mq_ops, +VDC_TX_RING_SIZE ,BLK_MQ_F_SHOULD_MERGE ); +if (err) +return err; + + g =blk_mq_alloc_disk (&port->tag_set, port); +if (IS_ERR (g)) { printk(KERN_ERR PFX "%s: Could not allocate gendisk.\n", port->vio.name); -cleanup_queue (q); -return -ENOMEM ; +blk_mq_free_tag_set (&port->tag_set); +return PTR_ERR (g); } port->disk = g; + q = g->queue;/* Each segment in a request is up to an aligned page in size. */ blk_queue_segment_boundary (q,PAGE_SIZE -1 );
@@ -862,6 +841,7 @@ static int probe_disk(struct vdc_port *port)blk_queue_max_hw_sectors (q, port->max_xfer_size); g->major = vdc_major; g->first_minor = port->vio.vdev->dev_no <<PARTITION_SHIFT ; + g->minors =1 <<PARTITION_SHIFT ;strcpy (g->disk_name, port->disk_name); g->fops = &vdc_fops;
@@ -1083,9 +1063,8 @@ static int vdc_port_remove(struct vio_dev *vdev)del_timer_sync (&port->vio.timer);del_gendisk (port->disk); -cleanup_queue (port->disk->queue); -put_disk (port->disk); - port->disk =NULL ; +blk_cleanup_disk (port->disk); +blk_mq_free_tag_set (&port->tag_set);vdc_free_tx_ring (port);vio_ldc_free (&port->vio);
Signature · 6 lines
2.30.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH 14/30 gdrom: use blk_mq_alloc_disk
In reply to Christoph HellwigUse the blk_mq_alloc_disk API to simplify the gendisk and request_queue allocation.
--- drivers/cdrom/gdrom.c | 45 ++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 24 deletions(-)
drivers/cdrom/gdrom.c +21 -24
@@ -772,53 +772,50 @@ static int probe_gdrom(struct platform_device *devptr) goto probe_fail_no_mem; }probe_gdrom_setupcd (); - gd.disk =alloc_disk (1 ); -if (!gd.disk) { - err = -ENODEV ; - goto probe_fail_no_disk; + + err =blk_mq_alloc_sq_tag_set (&gd.tag_set, &gdrom_mq_ops,1 , +BLK_MQ_F_SHOULD_MERGE |BLK_MQ_F_BLOCKING ); +if (err) + goto probe_fail_free_cd_info; + + gd.disk =blk_mq_alloc_disk (&gd.tag_set,NULL ); +if (IS_ERR (gd.disk)) { + err =PTR_ERR (gd.disk); + goto probe_fail_free_tag_set; } + gd.gdrom_rq = gd.disk->queue;probe_gdrom_setupdisk ();if (register_cdrom (gd.disk, gd.cd_info)) { err = -ENODEV ; - goto probe_fail_cdrom_register; + goto probe_fail_cleanup_disk; } gd.disk->fops = &gdrom_bdops; gd.disk->events =DISK_EVENT_MEDIA_CHANGE ;/* latch on to the interrupt */ err =gdrom_set_interrupt_handlers ();if (err) - goto probe_fail_cmdirq_register; - - gd.gdrom_rq =blk_mq_init_sq_queue (&gd.tag_set, &gdrom_mq_ops,1 , -BLK_MQ_F_SHOULD_MERGE |BLK_MQ_F_BLOCKING ); -if (IS_ERR (gd.gdrom_rq)) { - err =PTR_ERR (gd.gdrom_rq); - gd.gdrom_rq =NULL ; - goto probe_fail_requestq; - } + goto probe_fail_cleanup_disk; err =probe_gdrom_setupqueue ();if (err) - goto probe_fail_toc; + goto probe_fail_free_irqs; gd.toc =kzalloc (sizeof (struct gdromtoc ),GFP_KERNEL );if (!gd.toc) { err = -ENOMEM ; - goto probe_fail_toc; + goto probe_fail_free_irqs; }add_disk (gd.disk);return 0 ; -probe_fail_toc: -blk_cleanup_queue (gd.gdrom_rq); -blk_mq_free_tag_set (&gd.tag_set); -probe_fail_requestq: +probe_fail_free_irqs:free_irq (HW_EVENT_GDROM_DMA , &gd);free_irq (HW_EVENT_GDROM_CMD , &gd); -probe_fail_cmdirq_register: -probe_fail_cdrom_register: -del_gendisk (gd.disk); -probe_fail_no_disk: +probe_fail_cleanup_disk: +blk_cleanup_disk (gd.disk); +probe_fail_free_tag_set: +blk_mq_free_tag_set (&gd.tag_set); +probe_fail_free_cd_info:kfree (gd.cd_info); probe_fail_no_mem:unregister_blkdev (gdrom_major,GDROM_DEV_NAME );
Signature · 6 lines
2.30.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH 15/30 blk-mq: remove blk_mq_init_sq_queue
In reply to Christoph HellwigAll users are gone now.
--- block/blk-mq.c | 22 ---------------------- include/linux/blk-mq.h | 4 ---- 2 files changed, 26 deletions(-)
block/blk-mq.c +0 -22
@@ -3156,28 +3156,6 @@ struct gendisk *__blk_mq_alloc_disk(struct blk_mq_tag_set *set, void *queuedata) }EXPORT_SYMBOL (__blk_mq_alloc_disk); -/* -* Helper for setting up a queue with mq ops, given queue depth, and -* the passed in mq ops flags. -*/ -struct request_queue *blk_mq_init_sq_queue (struct blk_mq_tag_set *set, -const struct blk_mq_ops *ops, -unsigned int queue_depth, -unsigned int set_flags) -{ -struct request_queue *q; -int ret; - - ret =blk_mq_alloc_sq_tag_set (set, ops, queue_depth, set_flags); -if (ret) -return ERR_PTR (ret); - q =blk_mq_init_queue (set); -if (IS_ERR (q)) -blk_mq_free_tag_set (set); -return q; -} -EXPORT_SYMBOL (blk_mq_init_sq_queue); -static struct blk_mq_hw_ctx *blk_mq_alloc_and_init_hctx (struct blk_mq_tag_set *set,struct request_queue *q,int hctx_idx,int node)
include/linux/blk-mq.h +0 -4
@@ -443,10 +443,6 @@ struct request_queue *blk_mq_init_queue_data(struct blk_mq_tag_set *set, void *queuedata);int blk_mq_init_allocated_queue (struct blk_mq_tag_set *set,struct request_queue *q); -struct request_queue *blk_mq_init_sq_queue (struct blk_mq_tag_set *set, -const struct blk_mq_ops *ops, -unsigned int queue_depth, -unsigned int set_flags);void blk_mq_unregister_dev (struct device *,struct request_queue *);int blk_mq_alloc_tag_set (struct blk_mq_tag_set *set);
Signature · 6 lines
2.30.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH 15/30] blk-mq: remove blk_mq_init_sq_queue
Quoted 3 lines · Christoph Hellwig
All users are gone now.
Signed-off-by Christoph Hellwig <[email protected]>
Looks good.
PATCH 16/30 aoe: 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.
--- drivers/block/aoe/aoeblk.c | 33 ++++++++++++--------------------- drivers/block/aoe/aoedev.c | 3 +-- 2 files changed, 13 insertions(+), 23 deletions(-)
drivers/block/aoe/aoeblk.c +12 -21
@@ -338,14 +338,13 @@ static const struct blk_mq_ops aoeblk_mq_ops = { .queue_rq = aoeblk_queue_rq, }; -/* alloc_disk and add_disk can sleep */ +/* blk_mq_alloc_disk and add_disk can sleep */ void aoeblk_gdalloc (void *vp) {struct aoedev *d = vp;struct gendisk *gd;mempool_t *mp; -struct request_queue *q;struct blk_mq_tag_set *set;ulong flags;int late =0 ;
@@ -362,19 +361,12 @@ aoeblk_gdalloc(void *vp)if (late)return ; - gd =alloc_disk (AOE_PARTITIONS ); -if (gd ==NULL ) { -pr_err ("aoe: cannot allocate disk structure for %ld.%d\n" , - d->aoemajor, d->aoeminor); - goto err; - } - mp =mempool_create (MIN_BUFS , mempool_alloc_slab, mempool_free_slab, buf_pool_cache);if (mp ==NULL ) {printk (KERN_ERR "aoe: cannot allocate bufpool for %ld.%d\n" , d->aoemajor, d->aoeminor); - goto err_disk; + goto err; } set = &d->tag_set;
@@ -391,12 +383,11 @@ aoeblk_gdalloc(void *vp) goto err_mempool; } - q =blk_mq_init_queue (set); -if (IS_ERR (q)) { + gd =blk_mq_alloc_disk (set, d); +if (IS_ERR (gd)) {pr_err ("aoe: cannot allocate block queue for %ld.%d\n" , d->aoemajor, d->aoeminor); -blk_mq_free_tag_set (set); - goto err_mempool; + goto err_tagset; }spin_lock_irqsave (&d->lock, flags);
@@ -405,16 +396,16 @@ aoeblk_gdalloc(void *vp)WARN_ON (d->flags &DEVFL_TKILL );WARN_ON (d->gd);WARN_ON (d->flags &DEVFL_UP ); -blk_queue_max_hw_sectors (q,BLK_DEF_MAX_SECTORS ); -blk_queue_io_opt (q,SZ_2M ); +blk_queue_max_hw_sectors (gd->queue,BLK_DEF_MAX_SECTORS ); +blk_queue_io_opt (gd->queue,SZ_2M ); d->bufpool = mp; - d->blkq = gd->queue = q; - q->queuedata = d; + d->blkq = gd->queue; d->gd = gd;if (aoe_maxsectors) -blk_queue_max_hw_sectors (q, aoe_maxsectors); +blk_queue_max_hw_sectors (gd->queue, aoe_maxsectors); gd->major =AOE_MAJOR ; gd->first_minor = d->sysminor; + gd->minors =AOE_PARTITIONS ; gd->fops = &aoe_bdops; gd->private_data = d;set_capacity (gd, d->ssize);
@@ -435,10 +426,10 @@ aoeblk_gdalloc(void *vp)spin_unlock_irqrestore (&d->lock, flags);return ; +err_tagset: +blk_mq_free_tag_set (set); err_mempool:mempool_destroy (mp); -err_disk: -put_disk (gd); err:spin_lock_irqsave (&d->lock, flags); d->flags &= ~DEVFL_GD_NOW ;
drivers/block/aoe/aoedev.c +1 -2
@@ -277,9 +277,8 @@ freedev(struct aoedev *d)if (d->gd) {aoedisk_rm_debugfs (d);del_gendisk (d->gd); -put_disk (d->gd); +blk_cleanup_disk (d->gd);blk_mq_free_tag_set (&d->tag_set); -blk_cleanup_queue (d->blkq); } t = d->targets; e = t + d->ntargets;
Signature · 6 lines
2.30.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH 17/30 floppy: 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.
--- drivers/block/floppy.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-)
drivers/block/floppy.c +5 -15
@@ -4491,23 +4491,15 @@ static bool floppy_available(int drive)static int floppy_alloc_disk (unsigned int drive,unsigned int type) {struct gendisk *disk; -int err; - - disk =alloc_disk (1 ); -if (!disk) -return -ENOMEM ; - disk->queue =blk_mq_init_queue (&tag_sets[drive]); -if (IS_ERR (disk->queue)) { - err =PTR_ERR (disk->queue); - disk->queue =NULL ; -put_disk (disk); -return err; - } + disk =blk_mq_alloc_disk (&tag_sets[drive],NULL ); +if (IS_ERR (disk)) +return PTR_ERR (disk);blk_queue_max_hw_sectors (disk->queue,64 ); disk->major =FLOPPY_MAJOR ; disk->first_minor =TOMINOR (drive) | (type <<2 ); + disk->minors =1 ; disk->fops = &floppy_fops; disk->events =DISK_EVENT_MEDIA_CHANGE ;if (type)
@@ -4727,10 +4719,8 @@ static int __init do_floppy_init(void)if (!disks[drive][0 ])break ;del_timer_sync (&motor_off_timer[drive]); -blk_cleanup_queue (disks[drive][0 ]->queue); - disks[drive][0 ]->queue =NULL ; +blk_cleanup_disk (disks[drive][0 ]);blk_mq_free_tag_set (&tag_sets[drive]); -put_disk (disks[drive][0 ]); }return err; }
Signature · 6 lines
2.30.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH 18/30 loop: 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.
--- drivers/block/loop.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)
drivers/block/loop.c +6 -13
@@ -2117,12 +2117,12 @@ static int loop_add(struct loop_device **l, int i)if (err) goto out_free_idr; - lo->lo_queue =blk_mq_init_queue (&lo->tag_set); -if (IS_ERR (lo->lo_queue)) { - err =PTR_ERR (lo->lo_queue); + disk = lo->lo_disk =blk_mq_alloc_disk (&lo->tag_set, lo); +if (IS_ERR (disk)) { + err =PTR_ERR (disk); goto out_cleanup_tags; } - lo->lo_queue->queuedata = lo; + lo->lo_queue = lo->lo_disk->queue;blk_queue_max_hw_sectors (lo->lo_queue,BLK_DEF_MAX_SECTORS );
@@ -2134,11 +2134,6 @@ static int loop_add(struct loop_device **l, int i)*/ blk_queue_flag_set (QUEUE_FLAG_NOMERGES , lo->lo_queue); - err = -ENOMEM ; - disk = lo->lo_disk =alloc_disk (1 << part_shift); -if (!disk) - goto out_free_queue; -/* * Disable partition scanning by default. The in-kernel partition * scanning can be requested individually per-device during its
@@ -2166,6 +2161,7 @@ static int loop_add(struct loop_device **l, int i)spin_lock_init (&lo->lo_lock); disk->major =LOOP_MAJOR ; disk->first_minor = i << part_shift; + disk->minors =1 << part_shift; disk->fops = &lo_fops; disk->private_data = lo; disk->queue = lo->lo_queue;
@@ -2174,8 +2170,6 @@ static int loop_add(struct loop_device **l, int i) *l = lo;return lo->lo_number; -out_free_queue: -blk_cleanup_queue (lo->lo_queue); out_cleanup_tags:blk_mq_free_tag_set (&lo->tag_set); out_free_idr:
@@ -2189,9 +2183,8 @@ static int loop_add(struct loop_device **l, int i)static void loop_remove (struct loop_device *lo) {del_gendisk (lo->lo_disk); -blk_cleanup_queue (lo->lo_queue);blk_mq_free_tag_set (&lo->tag_set); -put_disk (lo->lo_disk); +blk_cleanup_disk (lo->lo_disk);mutex_destroy (&lo->lo_mutex);kfree (lo); }
Signature · 6 lines
2.30.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH 18/30] loop: use blk_mq_alloc_disk and blk_cleanup_disk
Quoted 4 lines · Christoph Hellwig
Use
blk_mq_alloc_diskandblk_cleanup_diskto simplify the gendisk andrequest_queueallocation.Signed-off-by Christoph Hellwig <[email protected]>
Looks good.
PATCH 19/30 nbd: 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.
--- drivers/block/nbd.c | 53 ++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 32 deletions(-)
drivers/block/nbd.c +21 -32
@@ -219,15 +219,11 @@ static const struct device_attribute pid_attr = {static void nbd_dev_remove (struct nbd_device *nbd) {struct gendisk *disk = nbd->disk; -struct request_queue *q;if (disk) { - q = disk->queue;del_gendisk (disk); -blk_cleanup_queue (q);blk_mq_free_tag_set (&nbd->tag_set); - disk->private_data =NULL ; -put_disk (disk); +blk_cleanup_disk (disk); }/*
@@ -1646,15 +1642,24 @@ static int nbd_dev_add(int index) {struct nbd_device *nbd;struct gendisk *disk; -struct request_queue *q;int err = -ENOMEM ; nbd =kzalloc (sizeof (struct nbd_device ),GFP_KERNEL );if (!nbd) goto out; - disk =alloc_disk (1 << part_shift); -if (!disk) + nbd->tag_set.ops = &nbd_mq_ops; + nbd->tag_set.nr_hw_queues =1 ; + nbd->tag_set.queue_depth =128 ; + nbd->tag_set.numa_node =NUMA_NO_NODE ; + nbd->tag_set.cmd_size =sizeof (struct nbd_cmd ); + nbd->tag_set.flags =BLK_MQ_F_SHOULD_MERGE | +BLK_MQ_F_BLOCKING ; + nbd->tag_set.driver_data = nbd; + nbd->destroy_complete =NULL ; + + err =blk_mq_alloc_tag_set (&nbd->tag_set); +if (err) goto out_free_nbd;if (index >=0 ) {
@@ -1668,30 +1673,15 @@ static int nbd_dev_add(int index) index = err; }if (err <0 ) - goto out_free_disk; - + goto out_free_tags; nbd->index = index; - nbd->disk = disk; - nbd->tag_set.ops = &nbd_mq_ops; - nbd->tag_set.nr_hw_queues =1 ; - nbd->tag_set.queue_depth =128 ; - nbd->tag_set.numa_node =NUMA_NO_NODE ; - nbd->tag_set.cmd_size =sizeof (struct nbd_cmd ); - nbd->tag_set.flags =BLK_MQ_F_SHOULD_MERGE | -BLK_MQ_F_BLOCKING ; - nbd->tag_set.driver_data = nbd; - nbd->destroy_complete =NULL ; - err =blk_mq_alloc_tag_set (&nbd->tag_set); -if (err) + disk =blk_mq_alloc_disk (&nbd->tag_set,NULL ); +if (IS_ERR (disk)) { + err =PTR_ERR (disk); goto out_free_idr; - - q =blk_mq_init_queue (&nbd->tag_set); -if (IS_ERR (q)) { - err =PTR_ERR (q); - goto out_free_tags; } - disk->queue = q; + nbd->disk = disk;/* * Tell the block layer that we are not a rotational device
@@ -1712,6 +1702,7 @@ static int nbd_dev_add(int index)INIT_LIST_HEAD (&nbd->list); disk->major =NBD_MAJOR ; disk->first_minor = index << part_shift; + disk->minors =1 << part_shift; disk->fops = &nbd_fops; disk->private_data = nbd;sprintf (disk->disk_name,"nbd%d" , index);
@@ -1719,12 +1710,10 @@ static int nbd_dev_add(int index) nbd_total_devices++;return index; -out_free_tags: -blk_mq_free_tag_set (&nbd->tag_set); out_free_idr:idr_remove (&nbd_index_idr, index); -out_free_disk: -put_disk (disk); +out_free_tags: +blk_mq_free_tag_set (&nbd->tag_set); out_free_nbd:kfree (nbd); out:
Signature · 6 lines
2.30.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH 20/30 nullb: use blk_mq_alloc_disk
In reply to Christoph HellwigUse blk_mq_alloc_disk and blk_cleanup_disk to simplify the gendisk and request_queue allocation.
--- drivers/block/null_blk/main.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/block/null_blk/main.c +5 -6
@@ -1851,13 +1851,12 @@ static int null_add_dev(struct nullb_device *dev) rv = -ENOMEM ; nullb->tag_set->timeout =5 *HZ ; - nullb->q =blk_mq_init_queue_data (nullb->tag_set, nullb); -if (IS_ERR (nullb->q)) - goto out_cleanup_tags; - nullb->disk =alloc_disk_node (1 , nullb->dev->home_node); -if (!nullb->disk) + nullb->disk =blk_mq_alloc_disk (nullb->tag_set, nullb); +if (IS_ERR (nullb->disk)) { + rv =PTR_ERR (nullb->disk); goto out_cleanup_disk; - nullb->disk->queue = nullb->q; + } + nullb->q = nullb->disk->queue; }else if (dev->queue_mode ==NULL_Q_BIO ) { rv = -ENOMEM ; nullb->disk =blk_alloc_disk (nullb->dev->home_node);
Signature · 6 lines
2.30.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH 20/30] nullb: use blk_mq_alloc_disk
Quoted 13 lines · Christoph Hellwig
Use
blk_mq_alloc_diskandblk_cleanup_diskto simplify the gendisk andrequest_queueallocation.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/block/null_blk/main.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)drivers/block/null_blk/main.c +0
-0
drivers/block/null_blk/main.c static int null_add_dev(struct nullb_device *dev) · line 1852
Quoted 2 lines
drivers/block/null_blk/main.c +0
-0@@ -1851,13 +1851,12 @@ static int null_add_dev(struct nullb_device *dev) rv = -ENOMEM ;
Is above initialization needed ?
Quoted 16 lines
drivers/block/null_blk/main.c +5
-6nullb->tag_set->timeout =5 *HZ ; - nullb->q =blk_mq_init_queue_data (nullb->tag_set, nullb); -if (IS_ERR (nullb->q)) - goto out_cleanup_tags; - nullb->disk =alloc_disk_node (1 , nullb->dev->home_node); -if (!nullb->disk) + nullb->disk =blk_mq_alloc_disk (nullb->tag_set, nullb); +if (IS_ERR (nullb->disk)) { + rv =PTR_ERR (nullb->disk); goto out_cleanup_disk; - nullb->disk->queue = nullb->q; + } + nullb->q = nullb->disk->queue; }else if (dev->queue_mode ==NULL_Q_BIO ) { rv = -ENOMEM ; nullb->disk =blk_alloc_disk (nullb->dev->home_node);
Re: [PATCH 20/30] nullb: use blk_mq_alloc_disk
Quoted 9 lines · Chaitanya Kulkarni
drivers/block/null_blk/main.c static int null_add_dev(struct nullb_device *dev) · line 1852
Quoted 7 lines
drivers/block/null_blk/main.c +0
-0@@ -1851,13 +1851,12 @@ static int null_add_dev(struct nullb_device *dev) rv = -ENOMEM ;Is above initialization needed ?
It isn't strictly required any more.
PATCH 21/30 pd: 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.
--- drivers/block/paride/pd.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-)
drivers/block/paride/pd.c +12 -18
@@ -879,18 +879,6 @@ static void pd_probe_drive(struct pd_unit *disk) {struct gendisk *p; - p =alloc_disk (1 <<PD_BITS ); -if (!p) -return ; - -strcpy (p->disk_name, disk->name); - p->fops = &pd_fops; - p->major = major; - p->first_minor = (disk - pd) <<PD_BITS ; - p->events =DISK_EVENT_MEDIA_CHANGE ; - disk->gd = p; - p->private_data = disk; -memset (&disk->tag_set,0 ,sizeof (disk->tag_set)); disk->tag_set.ops = &pd_mq_ops; disk->tag_set.cmd_size =sizeof (struct pd_req );
@@ -903,14 +891,21 @@ static void pd_probe_drive(struct pd_unit *disk)if (blk_mq_alloc_tag_set (&disk->tag_set))return ; - p->queue =blk_mq_init_queue (&disk->tag_set); -if (IS_ERR (p->queue)) { + p =blk_mq_alloc_disk (&disk->tag_set, disk); +if (!p) {blk_mq_free_tag_set (&disk->tag_set); - p->queue =NULL ;return ; } + disk->gd = p; + +strcpy (p->disk_name, disk->name); + p->fops = &pd_fops; + p->major = major; + p->first_minor = (disk - pd) <<PD_BITS ; + p->minors =1 <<PD_BITS ; + p->events =DISK_EVENT_MEDIA_CHANGE ; + p->private_data = disk; - p->queue->queuedata = disk;blk_queue_max_hw_sectors (p->queue, cluster);blk_queue_bounce_limit (p->queue,BLK_BOUNCE_HIGH );
@@ -1019,9 +1014,8 @@ static void __exit pd_exit(void)if (p) { disk->gd =NULL ;del_gendisk (p); -blk_cleanup_queue (p->queue);blk_mq_free_tag_set (&disk->tag_set); -put_disk (p); +blk_cleanup_disk (p);pi_release (disk->pi); } }
Signature · 6 lines
2.30.2 -- dm-devel mailing list [email protected] https://listman.redhat.com/mailman/listinfo/dm-devel
PATCH 22/30 rbd: 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.
--- drivers/block/rbd.c | 52 ++++++++++++++++----------------------------- 1 file changed, 18 insertions(+), 34 deletions(-)
drivers/block/rbd.c +18 -34
@@ -4750,9 +4750,8 @@ static blk_status_t rbd_queue_rq(struct blk_mq_hw_ctx *hctx,static void rbd_free_disk (struct rbd_device *rbd_dev) { -blk_cleanup_queue (rbd_dev->disk->queue); +blk_cleanup_disk (rbd_dev->disk);blk_mq_free_tag_set (&rbd_dev->tag_set); -put_disk (rbd_dev->disk); rbd_dev->disk =NULL ; }
@@ -4922,22 +4921,6 @@ static int rbd_init_disk(struct rbd_device *rbd_dev) rbd_dev->layout.object_size * rbd_dev->layout.stripe_count;int err; -/* create gendisk info */ - disk =alloc_disk (single_major ? - (1 <<RBD_SINGLE_MAJOR_PART_SHIFT ) : -RBD_MINORS_PER_MAJOR ); -if (!disk) -return -ENOMEM ; - -snprintf (disk->disk_name,sizeof (disk->disk_name),RBD_DRV_NAME "%d" , - rbd_dev->dev_id); - disk->major = rbd_dev->major; - disk->first_minor = rbd_dev->minor; -if (single_major) - disk->flags |=GENHD_FL_EXT_DEVT ; - disk->fops = &rbd_bd_ops; - disk->private_data = rbd_dev; -memset (&rbd_dev->tag_set,0 ,sizeof (rbd_dev->tag_set)); rbd_dev->tag_set.ops = &rbd_mq_ops; rbd_dev->tag_set.queue_depth = rbd_dev->opts->queue_depth;
@@ -4948,13 +4931,26 @@ static int rbd_init_disk(struct rbd_device *rbd_dev) err =blk_mq_alloc_tag_set (&rbd_dev->tag_set);if (err) - goto out_disk; +return err; - q =blk_mq_init_queue (&rbd_dev->tag_set); -if (IS_ERR (q)) { - err =PTR_ERR (q); + disk =blk_mq_alloc_disk (&rbd_dev->tag_set, rbd_dev); +if (IS_ERR (disk)) { + err =PTR_ERR (disk); goto out_tag_set; } + q = disk->queue; + +snprintf (disk->disk_name,sizeof (disk->disk_name),RBD_DRV_NAME "%d" , + rbd_dev->dev_id); + disk->major = rbd_dev->major; + disk->first_minor = rbd_dev->minor; +if (single_major) { + disk->minors = (1 <<RBD_SINGLE_MAJOR_PART_SHIFT ); + disk->flags |=GENHD_FL_EXT_DEVT ; + }else { + disk->minors =RBD_MINORS_PER_MAJOR ; + } + disk->fops = &rbd_bd_ops;blk_queue_flag_set (QUEUE_FLAG_NONROT , q);/* QUEUE_FLAG_ADD_RANDOM is off by default for blk-mq */
@@ -4976,21 +4972,11 @@ static int rbd_init_disk(struct rbd_device *rbd_dev)if (!ceph_test_opt (rbd_dev->rbd_client->client,NOCRC ))blk_queue_flag_set (QUEUE_FLAG_STABLE_WRITES , q); -/* -* disk_release() expects a queue ref from add_disk() and will -* put it. Hold an extra ref until add_disk() is called. -*/ -WARN_ON (!blk_get_queue (q)); - disk->queue = q; - q->queuedata = rbd_dev; - rbd_dev->disk = disk;return 0 ; out_tag_set:blk_mq_free_tag_set (&rbd_dev->tag_set); -out_disk: -put_disk (disk);return err; }
@@ -7088,8 +7074,6 @@ static ssize_t do_rbd_add(struct bus_type *bus, goto err_out_image_lock;device_add_disk (&rbd_dev->dev, rbd_dev->disk,NULL ); -/* see rbd_init_disk() */ -blk_put_queue (rbd_dev->disk->queue);spin_lock (&rbd_dev_list_lock);list_add_tail (&rbd_dev->node, &rbd_dev_list);
Signature · 6 lines
2.30.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH 23/30 rnbd: 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.
--- drivers/block/rnbd/rnbd-clt.c | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-)
drivers/block/rnbd/rnbd-clt.c +8 -27
@@ -1353,18 +1353,6 @@ static void rnbd_init_mq_hw_queues(struct rnbd_clt_dev *dev) } } -static int setup_mq_dev (struct rnbd_clt_dev *dev) -{ - dev->queue =blk_mq_init_queue (&dev->sess->tag_set); -if (IS_ERR (dev->queue)) { -rnbd_clt_err (dev,"Initializing multiqueue queue failed, err: %ld\n" , -PTR_ERR (dev->queue)); -return PTR_ERR (dev->queue); - } -rnbd_init_mq_hw_queues (dev); -return 0 ; -} -static void setup_request_queue (struct rnbd_clt_dev *dev) {blk_queue_logical_block_size (dev->queue, dev->logical_block_size);
@@ -1393,13 +1381,13 @@ static void setup_request_queue(struct rnbd_clt_dev *dev)blk_queue_io_opt (dev->queue, dev->sess->max_io_size);blk_queue_virt_boundary (dev->queue,SZ_4K -1 );blk_queue_write_cache (dev->queue, dev->wc, dev->fua); - dev->queue->queuedata = dev; }static void rnbd_clt_setup_gen_disk (struct rnbd_clt_dev *dev,int idx) { dev->gd->major = rnbd_client_major; dev->gd->first_minor = idx <<RNBD_PART_BITS ; + dev->gd->minors =1 <<RNBD_PART_BITS ; dev->gd->fops = &rnbd_client_ops; dev->gd->queue = dev->queue; dev->gd->private_data = dev;
@@ -1426,24 +1414,18 @@ static void rnbd_clt_setup_gen_disk(struct rnbd_clt_dev *dev, int idx)static int rnbd_client_setup_device (struct rnbd_clt_dev *dev) { -int err, idx = dev->clt_device_id; +int idx = dev->clt_device_id; dev->size = dev->nsectors * dev->logical_block_size; - err =setup_mq_dev (dev); -if (err) -return err; + dev->gd =blk_mq_alloc_disk (&dev->sess->tag_set, dev); +if (IS_ERR (dev->gd)) +return PTR_ERR (dev->gd); + dev->queue = dev->gd->queue; +rnbd_init_mq_hw_queues (dev);setup_request_queue (dev); - - dev->gd =alloc_disk_node (1 <<RNBD_PART_BITS ,NUMA_NO_NODE ); -if (!dev->gd) { -blk_cleanup_queue (dev->queue); -return -ENOMEM ; - } -rnbd_clt_setup_gen_disk (dev, idx); -return 0 ; }
@@ -1650,8 +1632,7 @@ struct rnbd_clt_dev *rnbd_clt_map_device(const char *sessname,static void destroy_gen_disk (struct rnbd_clt_dev *dev) {del_gendisk (dev->gd); -blk_cleanup_queue (dev->queue); -put_disk (dev->gd); +blk_cleanup_disk (dev->gd); } static void destroy_sysfs(struct rnbd_clt_dev *dev,
Signature · 6 lines
2.30.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH 23/30] rnbd: use blk_mq_alloc_disk and blk_cleanup_disk
Quoted 89 lines · Christoph Hellwig
Use
blk_mq_alloc_diskandblk_cleanup_diskto simplify the gendisk andrequest_queueallocation.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/block/rnbd/rnbd-clt.c | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-)drivers/block/rnbd/rnbd-clt.c +8
-28@@ -1353,18 +1353,6 @@ static void rnbd_init_mq_hw_queues(struct rnbd_clt_dev *dev) } } -static int setup_mq_dev (struct rnbd_clt_dev *dev) -{ - dev->queue =blk_mq_init_queue (&dev->sess->tag_set); -if (IS_ERR (dev->queue)) { -rnbd_clt_err (dev,"Initializing multiqueue queue failed, err: %ld\n" , -PTR_ERR (dev->queue)); -return PTR_ERR (dev->queue); - } -rnbd_init_mq_hw_queues (dev); -return 0 ; -} -static void setup_request_queue (struct rnbd_clt_dev *dev) {blk_queue_logical_block_size (dev->queue, dev->logical_block_size);@@ -1393,13 +1381,13 @@ static void setup_request_queue(struct rnbd_clt_dev *dev)blk_queue_io_opt (dev->queue, dev->sess->max_io_size);blk_queue_virt_boundary (dev->queue,SZ_4K -1 );blk_queue_write_cache (dev->queue, dev->wc, dev->fua); - dev->queue->queuedata = dev; }static void rnbd_clt_setup_gen_disk (struct rnbd_clt_dev *dev,int idx) { dev->gd->major = rnbd_client_major; dev->gd->first_minor = idx <<RNBD_PART_BITS ; + dev->gd->minors =1 <<RNBD_PART_BITS ; dev->gd->fops = &rnbd_client_ops; dev->gd->queue = dev->queue; dev->gd->private_data = dev;@@ -1426,24 +1414,18 @@ static void rnbd_clt_setup_gen_disk(struct rnbd_clt_dev *dev, int idx)static int rnbd_client_setup_device (struct rnbd_clt_dev *dev) { -int err, idx = dev->clt_device_id; +int idx = dev->clt_device_id; dev->size = dev->nsectors * dev->logical_block_size; - err =setup_mq_dev (dev); -if (err) -return err; + dev->gd =blk_mq_alloc_disk (&dev->sess->tag_set, dev); +if (IS_ERR (dev->gd)) +return PTR_ERR (dev->gd); + dev->queue = dev->gd->queue; +rnbd_init_mq_hw_queues (dev);setup_request_queue (dev); - - dev->gd =alloc_disk_node (1 <<RNBD_PART_BITS ,NUMA_NO_NODE ); -if (!dev->gd) { -blk_cleanup_queue (dev->queue); -return -ENOMEM ; - } -rnbd_clt_setup_gen_disk (dev, idx); -return 0 ; }@@ -1650,8 +1632,7 @@ struct rnbd_clt_dev *rnbd_clt_map_device(const char *sessname,static void destroy_gen_disk (struct rnbd_clt_dev *dev) {del_gendisk (dev->gd); -blk_cleanup_queue (dev->queue); -put_disk (dev->gd); +blk_cleanup_disk (dev->gd); } static void destroy_sysfs(struct rnbd_clt_dev *dev, --
Quoted 1 line
2.30.2
Looks good to me, thx!
Quoted 1 line
PATCH 24/30 sx8: 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.
--- drivers/block/sx8.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-)
drivers/block/sx8.c +7 -16
@@ -1343,32 +1343,25 @@ static int carm_init_disk(struct carm_host *host, unsigned int port_no) {struct carm_port *port = &host->port[port_no];struct gendisk *disk; -struct request_queue *q; port->host = host; port->port_no = port_no; - disk =alloc_disk (CARM_MINORS_PER_MAJOR ); -if (!disk) -return -ENOMEM ; + disk =blk_mq_alloc_disk (&host->tag_set, port); +if (IS_ERR (disk)) +return PTR_ERR (disk); port->disk = disk;sprintf (disk->disk_name,DRV_NAME "/%u" , (unsigned int )host->id *CARM_MAX_PORTS + port_no); disk->major = host->major; disk->first_minor = port_no *CARM_MINORS_PER_MAJOR ; + disk->minors =CARM_MINORS_PER_MAJOR ; disk->fops = &carm_bd_ops; disk->private_data = port; - q =blk_mq_init_queue (&host->tag_set); -if (IS_ERR (q)) -return PTR_ERR (q); - -blk_queue_max_segments (q,CARM_MAX_REQ_SG ); -blk_queue_segment_boundary (q,CARM_SG_BOUNDARY ); - - q->queuedata = port; - disk->queue = q; +blk_queue_max_segments (disk->queue,CARM_MAX_REQ_SG ); +blk_queue_segment_boundary (disk->queue,CARM_SG_BOUNDARY );return 0 ; }
@@ -1382,9 +1375,7 @@ static void carm_free_disk(struct carm_host *host, unsigned int port_no)if (disk->flags &GENHD_FL_UP )del_gendisk (disk); -if (disk->queue) -blk_cleanup_queue (disk->queue); -put_disk (disk); +blk_cleanup_disk (disk); }static int carm_init_shm (struct carm_host *host)
Signature · 6 lines
2.30.2 -- dm-devel mailing list [email protected] https://listman.redhat.com/mailman/listinfo/dm-devel
PATCH 25/30 xen-blkfront: 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.
--- drivers/block/xen-blkfront.c | 96 +++++++++++++++--------------------- 1 file changed, 39 insertions(+), 57 deletions(-)
drivers/block/xen-blkfront.c +39 -57
@@ -968,48 +968,6 @@ static void blkif_set_queue_limits(struct blkfront_info *info)blk_queue_dma_alignment (rq,511 ); } -static int xlvbd_init_blk_queue (struct gendisk *gd,u16 sector_size, -unsigned int physical_sector_size) -{ -struct request_queue *rq; -struct blkfront_info *info = gd->private_data; - -memset (&info->tag_set,0 ,sizeof (info->tag_set)); - info->tag_set.ops = &blkfront_mq_ops; - info->tag_set.nr_hw_queues = info->nr_rings; -if (HAS_EXTRA_REQ && info->max_indirect_segments ==0 ) { -/* -* When indirect descriptior is not supported, the I/O request -* will be split between multiple request in the ring. -* To avoid problems when sending the request, divide by -* 2 the depth of the queue. -*/ - info->tag_set.queue_depth =BLK_RING_SIZE (info) /2 ; - }else - info->tag_set.queue_depth =BLK_RING_SIZE (info); - info->tag_set.numa_node =NUMA_NO_NODE ; - info->tag_set.flags =BLK_MQ_F_SHOULD_MERGE ; - info->tag_set.cmd_size =sizeof (struct blkif_req ); - info->tag_set.driver_data = info; - -if (blk_mq_alloc_tag_set (&info->tag_set)) -return -EINVAL ; - rq =blk_mq_init_queue (&info->tag_set); -if (IS_ERR (rq)) { -blk_mq_free_tag_set (&info->tag_set); -return PTR_ERR (rq); - } - - rq->queuedata = info; - info->rq = gd->queue = rq; - info->gd = gd; - info->sector_size = sector_size; - info->physical_sector_size = physical_sector_size; -blkif_set_queue_limits (info); - -return 0 ; -} -static const char *flush_info (struct blkfront_info *info) {if (info->feature_flush && info->feature_fua)
@@ -1146,12 +1104,36 @@ static int xlvbd_alloc_gendisk(blkif_sector_t capacity, err =xlbd_reserve_minors (minor, nr_minors);if (err) - goto out; +return err; err = -ENODEV ; - gd =alloc_disk (nr_minors); -if (gd ==NULL ) - goto release; +memset (&info->tag_set,0 ,sizeof (info->tag_set)); + info->tag_set.ops = &blkfront_mq_ops; + info->tag_set.nr_hw_queues = info->nr_rings; +if (HAS_EXTRA_REQ && info->max_indirect_segments ==0 ) { +/* +* When indirect descriptior is not supported, the I/O request +* will be split between multiple request in the ring. +* To avoid problems when sending the request, divide by +* 2 the depth of the queue. +*/ + info->tag_set.queue_depth =BLK_RING_SIZE (info) /2 ; + }else + info->tag_set.queue_depth =BLK_RING_SIZE (info); + info->tag_set.numa_node =NUMA_NO_NODE ; + info->tag_set.flags =BLK_MQ_F_SHOULD_MERGE ; + info->tag_set.cmd_size =sizeof (struct blkif_req ); + info->tag_set.driver_data = info; + + err =blk_mq_alloc_tag_set (&info->tag_set); +if (err) + goto out_release_minors; + + gd =blk_mq_alloc_disk (&info->tag_set, info); +if (IS_ERR (gd)) { + err =PTR_ERR (gd); + goto out_free_tag_set; + }strcpy (gd->disk_name,DEV_NAME ); ptr =encode_disk_name (gd->disk_name +sizeof (DEV_NAME ) -1 , offset);
@@ -1164,14 +1146,16 @@ static int xlvbd_alloc_gendisk(blkif_sector_t capacity, gd->major =XENVBD_MAJOR ; gd->first_minor = minor; + gd->minors = nr_minors; gd->fops = &xlvbd_block_fops; gd->private_data = info;set_capacity (gd, capacity); -if (xlvbd_init_blk_queue (gd, sector_size, physical_sector_size)) { -del_gendisk (gd); - goto release; - } + info->rq = gd->queue; + info->gd = gd; + info->sector_size = sector_size; + info->physical_sector_size = physical_sector_size; +blkif_set_queue_limits (info);xlvbd_flush (info);
@@ -1186,9 +1170,10 @@ static int xlvbd_alloc_gendisk(blkif_sector_t capacity,return 0 ; - release: +out_free_tag_set: +blk_mq_free_tag_set (&info->tag_set); +out_release_minors:xlbd_release_minors (minor, nr_minors); - out:return err; }
@@ -1217,12 +1202,9 @@ static void xlvbd_release_gendisk(struct blkfront_info *info) nr_minors = info->gd->minors;xlbd_release_minors (minor, nr_minors); -blk_cleanup_queue (info->rq); -blk_mq_free_tag_set (&info->tag_set); - info->rq =NULL ; - -put_disk (info->gd); +blk_cleanup_disk (info->gd); info->gd =NULL ; +blk_mq_free_tag_set (&info->tag_set); }/* Already hold rinfo->ring_lock. */
Signature · 6 lines
2.30.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH 26/30 ubi: 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.
--- drivers/mtd/ubi/block.c | 68 ++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 39 deletions(-)
drivers/mtd/ubi/block.c +29 -39
@@ -394,53 +394,46 @@ int ubiblock_create(struct ubi_volume_info *vi) dev->vol_id = vi->vol_id; dev->leb_size = vi->usable_leb_size; + dev->tag_set.ops = &ubiblock_mq_ops; + dev->tag_set.queue_depth =64 ; + dev->tag_set.numa_node =NUMA_NO_NODE ; + dev->tag_set.flags =BLK_MQ_F_SHOULD_MERGE ; + dev->tag_set.cmd_size =sizeof (struct ubiblock_pdu ); + dev->tag_set.driver_data = dev; + dev->tag_set.nr_hw_queues =1 ; + + ret =blk_mq_alloc_tag_set (&dev->tag_set); +if (ret) { +dev_err (disk_to_dev (dev->gd),"blk_mq_alloc_tag_set failed" ); + goto out_free_dev;; + } + +/* Initialize the gendisk of this ubiblock device */ - gd =alloc_disk (1 ); -if (!gd) { -pr_err ("UBI: block: alloc_disk failed\n" ); - ret = -ENODEV ; - goto out_free_dev; + gd =blk_mq_alloc_disk (&dev->tag_set, dev); +if (IS_ERR (gd)) { + ret =PTR_ERR (gd); + goto out_free_tags; } gd->fops = &ubiblock_ops; gd->major = ubiblock_major; + gd->minors =1 ; gd->first_minor =idr_alloc (&ubiblock_minor_idr, dev,0 ,0 ,GFP_KERNEL );if (gd->first_minor <0 ) {dev_err (disk_to_dev (gd),"block: dynamic minor allocation failed" ); ret = -ENODEV ; - goto out_put_disk; + goto out_cleanup_disk; } gd->private_data = dev;sprintf (gd->disk_name,"ubiblock%d_%d" , dev->ubi_num, dev->vol_id);set_capacity (gd, disk_capacity); dev->gd = gd; - dev->tag_set.ops = &ubiblock_mq_ops; - dev->tag_set.queue_depth =64 ; - dev->tag_set.numa_node =NUMA_NO_NODE ; - dev->tag_set.flags =BLK_MQ_F_SHOULD_MERGE ; - dev->tag_set.cmd_size =sizeof (struct ubiblock_pdu ); - dev->tag_set.driver_data = dev; - dev->tag_set.nr_hw_queues =1 ; - - ret =blk_mq_alloc_tag_set (&dev->tag_set); -if (ret) { -dev_err (disk_to_dev (dev->gd),"blk_mq_alloc_tag_set failed" ); - goto out_remove_minor; - } - - dev->rq =blk_mq_init_queue (&dev->tag_set); -if (IS_ERR (dev->rq)) { -dev_err (disk_to_dev (gd),"blk_mq_init_queue failed" ); - ret =PTR_ERR (dev->rq); - goto out_free_tags; - } + dev->rq = gd->queue;blk_queue_max_segments (dev->rq,UBI_MAX_SG_COUNT ); - dev->rq->queuedata = dev; - dev->gd->queue = dev->rq; -/* * Create one workqueue per volume (per registered block device). * Rembember workqueues are cheap, they're not threads.
@@ -448,7 +441,7 @@ int ubiblock_create(struct ubi_volume_info *vi) dev->wq =alloc_workqueue ("%s" ,0 ,0 , gd->disk_name);if (!dev->wq) { ret = -ENOMEM ; - goto out_free_queue; + goto out_remove_minor; }list_add_tail (&dev->list, &ubiblock_devices);
@@ -460,14 +453,12 @@ int ubiblock_create(struct ubi_volume_info *vi)mutex_unlock (&devices_mutex);return 0 ; -out_free_queue: -blk_cleanup_queue (dev->rq); -out_free_tags: -blk_mq_free_tag_set (&dev->tag_set); out_remove_minor:idr_remove (&ubiblock_minor_idr, gd->first_minor); -out_put_disk: -put_disk (dev->gd); +out_cleanup_disk: +blk_cleanup_disk (dev->gd); +out_free_tags: +blk_mq_free_tag_set (&dev->tag_set); out_free_dev:kfree (dev); out_unlock:
@@ -483,11 +474,10 @@ static void ubiblock_cleanup(struct ubiblock *dev)/* Flush pending work */ destroy_workqueue (dev->wq);/* Finally destroy the blk queue */ -blk_cleanup_queue (dev->rq); -blk_mq_free_tag_set (&dev->tag_set);dev_info (disk_to_dev (dev->gd),"released" ); +blk_cleanup_disk (dev->gd); +blk_mq_free_tag_set (&dev->tag_set);idr_remove (&ubiblock_minor_idr, dev->gd->first_minor); -put_disk (dev->gd); }int ubiblock_remove (struct ubi_volume_info *vi)
Signature · 6 lines
2.30.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH 27/30 scm_blk: 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.
--- drivers/s390/block/scm_blk.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-)
drivers/s390/block/scm_blk.c +6 -15
@@ -462,12 +462,12 @@ int scm_blk_dev_setup(struct scm_blk_dev *bdev, struct scm_device *scmdev)if (ret) goto out; - rq =blk_mq_init_queue (&bdev->tag_set); -if (IS_ERR (rq)) { - ret =PTR_ERR (rq); + bdev->gendisk =blk_mq_alloc_disk (&bdev->tag_set, scmdev); +if (IS_ERR (bdev->gendisk)) { + ret =PTR_ERR (bdev->gendisk); goto out_tag; } - bdev->rq = rq; + rq = bdev->rq = bdev->gendisk->queue; nr_max_blk =min (scmdev->nr_max_block, (unsigned int ) (PAGE_SIZE /sizeof (struct aidaw )));
@@ -477,17 +477,11 @@ int scm_blk_dev_setup(struct scm_blk_dev *bdev, struct scm_device *scmdev)blk_queue_flag_set (QUEUE_FLAG_NONROT , rq);blk_queue_flag_clear (QUEUE_FLAG_ADD_RANDOM , rq); - bdev->gendisk =alloc_disk (SCM_NR_PARTS ); -if (!bdev->gendisk) { - ret = -ENOMEM ; - goto out_queue; - } - rq->queuedata = scmdev; bdev->gendisk->private_data = scmdev; bdev->gendisk->fops = &scm_blk_devops; - bdev->gendisk->queue = rq; bdev->gendisk->major = scm_major; bdev->gendisk->first_minor = devindex *SCM_NR_PARTS ; + bdev->gendisk->minors =SCM_NR_PARTS ; len =snprintf (bdev->gendisk->disk_name,DISK_NAME_LEN ,"scm" );if (devindex >25 ) {
@@ -504,8 +498,6 @@ int scm_blk_dev_setup(struct scm_blk_dev *bdev, struct scm_device *scmdev)device_add_disk (&scmdev->dev, bdev->gendisk,NULL );return 0 ; -out_queue: -blk_cleanup_queue (rq); out_tag:blk_mq_free_tag_set (&bdev->tag_set); out:
@@ -516,9 +508,8 @@ int scm_blk_dev_setup(struct scm_blk_dev *bdev, struct scm_device *scmdev)void scm_blk_dev_cleanup (struct scm_blk_dev *bdev) {del_gendisk (bdev->gendisk); -blk_cleanup_queue (bdev->gendisk->queue); +blk_cleanup_disk (bdev->gendisk);blk_mq_free_tag_set (&bdev->tag_set); -put_disk (bdev->gendisk); }void scm_blk_set_available (struct scm_blk_dev *bdev)
Signature · 6 lines
2.30.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH 27/30] scm_blk: use blk_mq_alloc_disk and blk_cleanup_disk
Quoted 58 lines · Christoph Hellwig
Use
blk_mq_alloc_diskandblk_cleanup_diskto simplify the gendisk andrequest_queueallocation.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/s390/block/scm_blk.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-)drivers/s390/block/scm_blk.c +5
-13@@ -462,12 +462,12 @@ int scm_blk_dev_setup(struct scm_blk_dev *bdev, struct scm_device *scmdev)if (ret) goto out; - rq =blk_mq_init_queue (&bdev->tag_set); -if (IS_ERR (rq)) { - ret =PTR_ERR (rq); + bdev->gendisk =blk_mq_alloc_disk (&bdev->tag_set, scmdev); +if (IS_ERR (bdev->gendisk)) { + ret =PTR_ERR (bdev->gendisk); goto out_tag; } - bdev->rq = rq; + rq = bdev->rq = bdev->gendisk->queue; nr_max_blk =min (scmdev->nr_max_block, (unsigned int ) (PAGE_SIZE /sizeof (struct aidaw )));@@ -477,17 +477,11 @@ int scm_blk_dev_setup(struct scm_blk_dev *bdev, struct scm_device *scmdev)blk_queue_flag_set (QUEUE_FLAG_NONROT , rq);blk_queue_flag_clear (QUEUE_FLAG_ADD_RANDOM , rq); - bdev->gendisk =alloc_disk (SCM_NR_PARTS ); -if (!bdev->gendisk) { - ret = -ENOMEM ; - goto out_queue; - } - rq->queuedata = scmdev; bdev->gendisk->private_data = scmdev; bdev->gendisk->fops = &scm_blk_devops; - bdev->gendisk->queue = rq; bdev->gendisk->major = scm_major; bdev->gendisk->first_minor = devindex *SCM_NR_PARTS ; + bdev->gendisk->minors =SCM_NR_PARTS ; len =snprintf (bdev->gendisk->disk_name,DISK_NAME_LEN ,"scm" );if (devindex >25 ) {@@ -504,8 +498,6 @@ int scm_blk_dev_setup(struct scm_blk_dev *bdev, struct scm_device *scmdev)device_add_disk (&scmdev->dev, bdev->gendisk,NULL );return 0 ; -out_queue: -blk_cleanup_queue (rq); out_tag:blk_mq_free_tag_set (&bdev->tag_set); out:
drivers/s390/block/scm_blk.c int scm_blk_dev_setup(struct scm_blk_dev *bdev, struct scm_device *scmdev) · line 515
Quoted 10 lines
drivers/s390/block/scm_blk.c +1
-2@@ -516,9 +508,8 @@ int scm_blk_dev_setup(struct scm_blk_dev *bdev, struct scm_device *scmdev)void scm_blk_dev_cleanup (struct scm_blk_dev *bdev) {del_gendisk (bdev->gendisk); -blk_cleanup_queue (bdev->gendisk->queue); +blk_cleanup_disk (bdev->gendisk);blk_mq_free_tag_set (&bdev->tag_set); -put_disk (bdev->gendisk); }void scm_blk_set_available (struct scm_blk_dev *bdev)
Not an expert on SCM or this code but I gave this a quick test and it seems to work fine.
PATCH 28/30 amiflop: 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.
--- drivers/block/amiflop.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
drivers/block/amiflop.c +4 -12
@@ -1781,15 +1781,13 @@ static int fd_alloc_disk(int drive, int system) {struct gendisk *disk; - disk =alloc_disk (1 ); -if (!disk) - goto out; - disk->queue =blk_mq_init_queue (&unit[drive].tag_set); -if (IS_ERR (disk->queue)) - goto out_put_disk; + disk =blk_mq_alloc_disk (&unit[drive].tag_set,NULL ); +if (IS_ERR (disk)) +return PTR_ERR (disk); disk->major =FLOPPY_MAJOR ; disk->first_minor = drive + system; + disk->minors =1 ; disk->fops = &floppy_fops; disk->events =DISK_EVENT_MEDIA_CHANGE ;if (system)
@@ -1802,12 +1800,6 @@ static int fd_alloc_disk(int drive, int system) unit[drive].gendisk[system] = disk;add_disk (disk);return 0 ; - -out_put_disk: - disk->queue =NULL ; -put_disk (disk); -out: -return -ENOMEM ; }static int fd_alloc_drive (int drive)
Signature · 6 lines
2.30.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH 29/30 ataflop: 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.
--- drivers/block/ataflop.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
drivers/block/ataflop.c +4 -12
@@ -1968,22 +1968,14 @@ static const struct blk_mq_ops ataflop_mq_ops = {static int ataflop_alloc_disk (unsigned int drive,unsigned int type) {struct gendisk *disk; -int ret; - - disk =alloc_disk (1 ); -if (!disk) -return -ENOMEM ; - disk->queue =blk_mq_init_queue (&unit[drive].tag_set); -if (IS_ERR (disk->queue)) { - ret =PTR_ERR (disk->queue); - disk->queue =NULL ; -put_disk (disk); -return ret; - } + disk =blk_mq_alloc_disk (&unit[drive].tag_set,NULL ); +if (IS_ERR (disk)) +return PTR_ERR (disk); disk->major =FLOPPY_MAJOR ; disk->first_minor = drive + (type <<2 ); + disk->minors =1 ;sprintf (disk->disk_name,"fd%d" , drive); disk->fops = &floppy_fops; disk->events =DISK_EVENT_MEDIA_CHANGE ;
Signature · 6 lines
2.30.2 -- dm-devel mailing list [email protected] https://listman.redhat.com/mailman/listinfo/dm-devel
PATCH 30/30 z2ram: 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.
--- drivers/block/z2ram.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
drivers/block/z2ram.c +4 -11
@@ -323,27 +323,20 @@ static const struct blk_mq_ops z2_mq_ops = {static int z2ram_register_disk (int minor) { -struct request_queue *q;struct gendisk *disk; - disk =alloc_disk (1 ); -if (!disk) -return -ENOMEM ; - - q =blk_mq_init_queue (&tag_set); -if (IS_ERR (q)) { -put_disk (disk); -return PTR_ERR (q); - } + disk =blk_mq_alloc_disk (&tag_set,NULL ); +if (IS_ERR (disk)) +return PTR_ERR (disk); disk->major =Z2RAM_MAJOR ; disk->first_minor = minor; + disk->minors =1 ; disk->fops = &z2_fops;if (minor)sprintf (disk->disk_name,"z2ram%d" , minor);else sprintf (disk->disk_name,"z2ram" ); - disk->queue = q; z2ram_gendisk[minor] = disk;add_disk (disk);
Signature · 6 lines
2.30.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Quoted 1 line · Christoph Hellwig
Hi all,
Hi!
You wouldn't have a nice git repo to pull so one can test it easily?
Thank you!
Cc-ing Boris/Juergen - pls see below xen.
Quoted 34 lines
this series is the scond part of cleaning up lifetimes and allocation of the gendisk and
request_queuestructure. It adds a new interface to allocate the disk and queue together for blk based drivers, and uses that in all drivers that do not have any caveats in their gendisk andrequest_queuelifetime rules.Diffstat:
block/blk-mq.c | 91 +++++++++++++++------------------- block/blk.h | 1 block/elevator.c | 2 drivers/block/amiflop.c | 16 +----- drivers/block/aoe/aoeblk.c | 33 ++++-------- drivers/block/aoe/aoedev.c | 3 - drivers/block/ataflop.c | 16 +----- drivers/block/floppy.c | 20 +------ drivers/block/loop.c | 19 ++----- drivers/block/nbd.c | 53 +++++++------------ drivers/block/null_blk/main.c | 11 +--- drivers/block/paride/pcd.c | 19 +++---- drivers/block/paride/pd.c | 30 ++++------- drivers/block/paride/pf.c | 18 ++---- drivers/block/ps3disk.c | 36 +++++-------- drivers/block/rbd.c | 52 ++++++------------- drivers/block/rnbd/rnbd-clt.c | 35 +++---------- drivers/block/sunvdc.c | 47 ++++------------- drivers/block/swim.c | 34 +++++------- drivers/block/swim3.c | 33 +++++------- drivers/block/sx8.c | 23 ++------ drivers/block/virtio_blk.c | 26 ++------- drivers/block/xen-blkfront.c | 96 ++++++++++++++---------------------- drivers/block/z2ram.c | 15 +---- drivers/cdrom/gdrom.c | 45 +++++++--------- drivers/md/dm-rq.c | 9 +--
Quoted 8 lines
drivers/memstick/core/ms_block.c | 25 +++------ drivers/memstick/core/mspro_block.c | 26 ++++----- drivers/mtd/mtd_blkdevs.c | 48 ++++++++---------- drivers/mtd/ubi/block.c | 68 ++++++++++--------------- drivers/s390/block/scm_blk.c | 21 ++----- include/linux/blk-mq.h | 24 ++++++--- include/linux/elevator.h | 1 33 files changed, 386 insertions(+), 610 deletions(-)
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Quoted 6 lines · Konrad Rzeszutek Wilk
Quoted 1 line · Christoph Hellwig
Hi all,
Hi!
You wouldn't have a nice git repo to pull so one can test it easily?
git://git.infradead.org/users/hch/block.git alloc_disk-part2
Quoted 7 lines · Christoph Hellwig
Hi all,
this series is the scond part of cleaning up lifetimes and allocation of the gendisk and
request_queuestructure. It adds a new interface to allocate the disk and queue together for blk based drivers, and uses that in all drivers that do not have any caveats in their gendisk andrequest_queuelifetime rules.
Applied, thanks.
Signature · 1 line
Jens Axboe