ensure each gendisk always has a request_queue reference
Subsystems (7)
Christoph Hellwig
maintainerHi Jens,
this is the final batch of the gendisk interface cleanup series. This remove the last uses of the legacy alloc_disk interface and ensures we always have a request_queue reference for a gendisk.
Diffstat:
block/blk-mq.c | 6 ++-- block/genhd.c | 31 ++++++++++--------------- drivers/nvme/host/core.c | 33 ++++++++++---------------- drivers/s390/block/dasd_genhd.c | 7 ++++- drivers/scsi/sd.c | 6 +++- drivers/scsi/sg.c | 32 +++++++------------------- drivers/scsi/sr.c | 7 ++++- drivers/scsi/st.c | 49 +++++++++------------------------------- drivers/scsi/st.h | 2 - include/linux/blk-mq.h | 10 ++------ include/linux/genhd.h | 30 +++--------------------- 11 files changed, 72 insertions(+), 141 deletions(-)
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Christoph Hellwig
maintainerPATCH 1/8 nvme: use blk_mq_alloc_disk
Switch to use the blk_mq_alloc_disk helper for allocating the request_queue and gendisk.
--- drivers/nvme/host/core.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-)
drivers/nvme/host/core.c +13 -20
@@ -3729,9 +3729,14 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid,if (!ns) goto out_free_id; - ns->queue =blk_mq_init_queue (ctrl->tagset); -if (IS_ERR (ns->queue)) + disk =blk_mq_alloc_disk (ctrl->tagset, ns); +if (IS_ERR (disk)) goto out_free_ns; + disk->fops = &nvme_bdev_ops; + disk->private_data = ns; + + ns->disk = disk; + ns->queue = disk->queue;if (ctrl->opts && ctrl->opts->data_digest)blk_queue_flag_set (QUEUE_FLAG_STABLE_WRITES , ns->queue);
@@ -3740,20 +3745,12 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid,if (ctrl->ops->flags &NVME_F_PCI_P2PDMA )blk_queue_flag_set (QUEUE_FLAG_PCI_P2PDMA , ns->queue); - ns->queue->queuedata = ns; ns->ctrl = ctrl;kref_init (&ns->kref);if (nvme_init_ns_head (ns, nsid, ids, id->nmic &NVME_NS_NMIC_SHARED )) - goto out_free_queue; + goto out_cleanup_disk; - disk =alloc_disk_node (0 , node); -if (!disk) - goto out_unlink_ns; - - disk->fops = &nvme_bdev_ops; - disk->private_data = ns; - disk->queue = ns->queue;/* * Without the multipath code enabled, multiple controller per * subsystems are visible as devices and thus we cannot use the
@@ -3762,15 +3759,14 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid,if (!nvme_mpath_set_disk_name (ns, disk->disk_name, &disk->flags))sprintf (disk->disk_name,"nvme%dn%d" , ctrl->instance, ns->head->instance); - ns->disk = disk;if (nvme_update_ns_info (ns, id)) - goto out_put_disk; + goto out_unlink_ns;if ((ctrl->quirks &NVME_QUIRK_LIGHTNVM ) && id->vs[0 ] ==0x1 ) {if (nvme_nvm_register (ns, disk->disk_name, node)) {dev_warn (ctrl->device,"LightNVM init failure\n" ); - goto out_put_disk; + goto out_unlink_ns; } }
@@ -3789,10 +3785,7 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid,kfree (id);return ; - out_put_disk: -/* prevent double queue cleanup */ - ns->disk->queue =NULL ; -put_disk (ns->disk); + out_unlink_ns:mutex_lock (&ctrl->subsys->lock);list_del_rcu (&ns->siblings);
@@ -3800,8 +3793,8 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid,list_del_init (&ns->head->entry);mutex_unlock (&ctrl->subsys->lock);nvme_put_ns_head (ns->head); - out_free_queue: -blk_cleanup_queue (ns->queue); + out_cleanup_disk: +blk_cleanup_disk (disk); out_free_ns:kfree (ns); out_free_id:
Signature · 1 line
2.30.2
Christoph Hellwig
maintainerPATCH 2/8 st: do not allocate a gendisk
In reply to Christoph Hellwigst is a character driver and thus does not need to allocate a gendisk, which is only used for file system-like block layer I/O on block devices.
--- drivers/scsi/st.c | 49 ++++++++++++----------------------------------- drivers/scsi/st.h | 2 +- 2 files changed, 13 insertions(+), 38 deletions(-)
drivers/scsi/st.c +12 -37
@@ -309,13 +309,8 @@ static char * st_incompatible(struct scsi_device* SDp) } -static inline char *tape_name (struct scsi_tape *tape) -{ -return tape->disk->disk_name; -} - #define st_printk(prefix, t, fmt, a...) \ - sdev_prefix_printk(prefix, (t)->device, tape_name(t), fmt, ##a) + sdev_prefix_printk(prefix, (t)->device, (t)->name, fmt, ##a)#ifdef DEBUG #define DEBC_printk(t, fmt, a...) \ if (debugging) { st_printk(ST_DEB_MSG, t, fmt, ##a ); }
@@ -363,7 +358,7 @@ static int st_chk_result(struct scsi_tape *STp, struct st_request * SRpnt)int result = SRpnt->result;u8 scode; DEB(const char *stp;) -char *name =tape_name (STp); +char *name = STp->name;struct st_cmdstatus *cmdstatp;if (!result)
@@ -3841,8 +3836,9 @@ static long st_ioctl_common(struct file *file, unsigned int cmd_in, void __user !capable(CAP_SYS_RAWIO)) i = -EPERM ; else - i =scsi_cmd_ioctl (STp->disk->queue, STp->disk, - file->f_mode, cmd_in, p); + i =scsi_cmd_ioctl (STp->device->request_queue, +NULL , file->f_mode, cmd_in, + p);if (i != -ENOTTY )return i;break ;
@@ -4216,7 +4212,7 @@ static int create_one_cdev(struct scsi_tape *tape, int mode, int rew) i = mode << (4 -ST_NBR_MODE_BITS );snprintf (name,10 ,"%s%s%s" , rew ?"n" :"" , - tape->disk->disk_name, st_formats[i]); + tape->name, st_formats[i]); dev =device_create (&st_sysfs_class, &tape->device->sdev_gendev, cdev_devno, &tape->modes[mode],"%s" , name);
@@ -4271,7 +4267,6 @@ static void remove_cdevs(struct scsi_tape *tape)static int st_probe (struct device *dev) {struct scsi_device *SDp =to_scsi_device (dev); -struct gendisk *disk =NULL ;struct scsi_tape *tpnt =NULL ;struct st_modedef *STm;struct st_partstat *STps;
@@ -4301,27 +4296,13 @@ static int st_probe(struct device *dev) goto out; } - disk =alloc_disk (1 ); -if (!disk) { -sdev_printk (KERN_ERR , SDp, -"st: out of memory. Device not attached.\n" ); - goto out_buffer_free; - } - tpnt =kzalloc (sizeof (struct scsi_tape ),GFP_KERNEL );if (tpnt ==NULL ) {sdev_printk (KERN_ERR , SDp,"st: Can't allocate device descriptor.\n" ); - goto out_put_disk; + goto out_buffer_free; }kref_init (&tpnt->kref); - tpnt->disk = disk; - disk->private_data = &tpnt->driver; -/* SCSI tape doesn't register this gendisk via add_disk(). Manually -* take queue reference that release_disk() expects. */ -if (!blk_get_queue (SDp->request_queue)) - goto out_put_disk; - disk->queue = SDp->request_queue; tpnt->driver = &st_template; tpnt->device = SDp;
@@ -4394,10 +4375,10 @@ static int st_probe(struct device *dev)idr_preload_end ();if (error <0 ) {pr_warn ("st: idr allocation failed: %d\n" , error); - goto out_put_queue; + goto out_free_tape; } tpnt->index = error; -sprintf (disk->disk_name,"st%d" , tpnt->index); +sprintf (tpnt->name,"st%d" , tpnt->index); tpnt->stats =kzalloc (sizeof (struct scsi_tape_stats ),GFP_KERNEL );if (tpnt->stats ==NULL ) { sdev_printk(KERN_ERR, SDp,
@@ -4414,9 +4395,9 @@ static int st_probe(struct device *dev)scsi_autopm_put_device (SDp);sdev_printk (KERN_NOTICE , SDp, -"Attached scsi tape %s\n" ,tape_name (tpnt)); +"Attached scsi tape %s\n" , tpnt->name);sdev_printk (KERN_INFO , SDp,"%s: try direct i/o: %s (alignment %d B)\n" , -tape_name (tpnt), tpnt->try_dio ?"yes" :"no" , + tpnt->name, tpnt->try_dio ?"yes" :"no" ,queue_dma_alignment (SDp->request_queue) +1 );return 0 ;
@@ -4428,10 +4409,7 @@ static int st_probe(struct device *dev)spin_lock (&st_index_lock);idr_remove (&st_index_idr, tpnt->index);spin_unlock (&st_index_lock); -out_put_queue: -blk_put_queue (disk->queue); -out_put_disk: -put_disk (disk); +out_free_tape:kfree (tpnt); out_buffer_free:kfree (buffer);
@@ -4470,7 +4448,6 @@ static int st_remove(struct device *dev)static void scsi_tape_release (struct kref *kref) {struct scsi_tape *tpnt =to_scsi_tape (kref); -struct gendisk *disk = tpnt->disk; tpnt->device =NULL ;
@@ -4480,8 +4457,6 @@ static void scsi_tape_release(struct kref *kref)kfree (tpnt->buffer); } - disk->private_data =NULL ; -put_disk (disk);kfree (tpnt->stats);kfree (tpnt);return ;
drivers/scsi/st.h +1 -1
@@ -187,7 +187,7 @@ struct scsi_tape {unsigned char last_cmnd[6 ];unsigned char last_sense[16 ];#endif -struct gendisk *disk; +char name[DISK_NAME_LEN ];struct kref kref;struct scsi_tape_stats *stats; };
Signature · 1 line
2.30.2
Christoph Hellwig
maintainerPATCH 3/8 sg: do not allocate a gendisk
In reply to Christoph Hellwigsg is a character driver and thus does not need to allocate a gendisk, which is only used for file system-like block layer I/O on block devices.
--- drivers/scsi/sg.c | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-)
drivers/scsi/sg.c +9 -23
@@ -166,7 +166,7 @@ typedef struct sg_device { /* holds the state of each scsi generic device */bool exclude;/* 1->open(O_EXCL) succeeded and is active */ int open_cnt;/* count of opens (perhaps < num(sfds) ) */ char sgdebug;/* 0->off, 1->sense, 9->dump dev, 10-> all devs */ -struct gendisk *disk; +char name[DISK_NAME_LEN ];struct cdev * cdev;/* char_dev [sysfs: /sys/cdev/major/sg<n>] */ struct kref d_ref; } Sg_device;
@@ -202,8 +202,7 @@ static void sg_device_destroy(struct kref *kref);#define SZ_SG_REQ_INFO sizeof(sg_req_info_t) #define sg_printk(prefix, sdp, fmt, a...) \ - sdev_prefix_printk(prefix, (sdp)->device, \ - (sdp)->disk->disk_name, fmt, ##a) + sdev_prefix_printk(prefix, (sdp)->device, (sdp)->name, fmt, ##a)/* * The SCSI interfaces that use read() and write() as an asynchronous variant of
@@ -832,7 +831,7 @@ sg_common_write(Sg_fd * sfp, Sg_request * srp, srp->rq->timeout = timeout;kref_get (&sfp->f_ref);/* sg_rq_end_io() does kref_put(). */ -blk_execute_rq_nowait (sdp->disk, srp->rq, at_head, sg_rq_end_io); +blk_execute_rq_nowait (NULL , srp->rq, at_head, sg_rq_end_io);return 0 ; }
@@ -1119,8 +1118,7 @@ sg_ioctl_common(struct file *filp, Sg_device *sdp, Sg_fd *sfp,return put_user (max_sectors_bytes (sdp->device->request_queue), ip);case BLKTRACESETUP : -return blk_trace_setup (sdp->device->request_queue, - sdp->disk->disk_name, +return blk_trace_setup (sdp->device->request_queue,NULL ,MKDEV (SCSI_GENERIC_MAJOR , sdp->index),NULL , p);case BLKTRACESTART :
@@ -1456,7 +1454,7 @@ static struct class *sg_sysfs_class;static int sg_sysfs_valid =0 ;static Sg_device * -sg_alloc (struct gendisk *disk,struct scsi_device *scsidp) +sg_alloc (struct scsi_device *scsidp) {struct request_queue *q = scsidp->request_queue;Sg_device *sdp;
@@ -1492,9 +1490,7 @@ sg_alloc(struct gendisk *disk, struct scsi_device *scsidp)SCSI_LOG_TIMEOUT (3 ,sdev_printk (KERN_INFO , scsidp,"sg_alloc: dev=%d \n" , k)); -sprintf (disk->disk_name,"sg%d" , k); - disk->first_minor = k; - sdp->disk = disk; +sprintf (sdp->name,"sg%d" , k); sdp->device = scsidp;mutex_init (&sdp->open_rel_lock);INIT_LIST_HEAD (&sdp->sfds);
@@ -1521,19 +1517,11 @@ static int sg_add_device(struct device *cl_dev, struct class_interface *cl_intf) { struct scsi_device *scsidp = to_scsi_device(cl_dev->parent); -struct gendisk *disk;Sg_device *sdp =NULL ;struct cdev * cdev =NULL ;int error;unsigned long iflags; - disk =alloc_disk (1 ); -if (!disk) { -pr_warn ("%s: alloc_disk failed\n" , __func__); -return -ENOMEM ; - } - disk->major =SCSI_GENERIC_MAJOR ; - error = -ENOMEM ; cdev =cdev_alloc ();if (!cdev) {
@@ -1543,7 +1531,7 @@ sg_add_device(struct device *cl_dev, struct class_interface *cl_intf) cdev->owner =THIS_MODULE ; cdev->ops = &sg_fops; - sdp =sg_alloc (disk, scsidp); + sdp =sg_alloc (scsidp);if (IS_ERR (sdp)) {pr_warn ("%s: sg_alloc failed\n" , __func__); error =PTR_ERR (sdp);
@@ -1561,7 +1549,7 @@ sg_add_device(struct device *cl_dev, struct class_interface *cl_intf) sg_class_member =device_create (sg_sysfs_class, cl_dev->parent,MKDEV (SCSI_GENERIC_MAJOR , sdp->index), - sdp,"%s" , disk->disk_name); + sdp,"%s" , sdp->name);if (IS_ERR (sg_class_member)) {pr_err ("%s: device_create failed\n" , __func__); error =PTR_ERR (sg_class_member);
@@ -1589,7 +1577,6 @@ sg_add_device(struct device *cl_dev, struct class_interface *cl_intf)kfree (sdp); out: -put_disk (disk);if (cdev)cdev_del (cdev);return error;
@@ -1613,7 +1600,6 @@ sg_device_destroy(struct kref *kref)SCSI_LOG_TIMEOUT (3 ,sg_printk (KERN_INFO , sdp,"sg_device_destroy\n" )); -put_disk (sdp->disk);kfree (sdp); }
@@ -2606,7 +2592,7 @@ static int sg_proc_seq_show_debug(struct seq_file *s, void *v) goto skip;read_lock (&sdp->sfd_lock);if (!list_empty (&sdp->sfds)) { -seq_printf (s," >>> device=%s " , sdp->disk->disk_name); +seq_printf (s," >>> device=%s " , sdp->name);if (atomic_read (&sdp->detaching))seq_puts (s,"detaching pending close " );else if (sdp->device) {
Signature · 1 line
2.30.2
Christoph Hellwig
maintainerPATCH 4/8 block: cleanup the lockdep handling in *alloc_disk
In reply to Christoph HellwigPass the lockdep name to the low-level __blk_alloc_disk helper and hardcode the name for it given that the number of minors or node_id are not very useful information. While this passes a pointless argument for non-lockdep builds that is not really an issue as disk allocation is a probe time only slow path.
--- block/blk-mq.c | 5 +++-- block/genhd.c | 8 +++++--- include/linux/blk-mq.h | 10 +++------- include/linux/genhd.h | 23 ++++++----------------- 4 files changed, 17 insertions(+), 29 deletions(-)
block/blk-mq.c +3 -2
@@ -3133,7 +3133,8 @@ 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 gendisk *__blk_mq_alloc_disk (struct blk_mq_tag_set *set,void *queuedata, +struct lock_class_key *lkclass) {struct request_queue *q;struct gendisk *disk;
@@ -3142,7 +3143,7 @@ struct gendisk *__blk_mq_alloc_disk(struct blk_mq_tag_set *set, void *queuedata)if (IS_ERR (q))return ERR_CAST (q); - disk =__alloc_disk_node (0 , set->numa_node); + disk =__alloc_disk_node (0 , set->numa_node, lkclass);if (!disk) {blk_cleanup_queue (q);return ERR_PTR (-ENOMEM );
block/genhd.c +5 -3
@@ -1263,7 +1263,8 @@ dev_t blk_lookup_devt(const char *name, int partno)return devt; } -struct gendisk *__alloc_disk_node (int minors,int node_id) +struct gendisk *__alloc_disk_node (int minors,int node_id, +struct lock_class_key *lkclass) {struct gendisk *disk;
@@ -1287,6 +1288,7 @@ struct gendisk *__alloc_disk_node(int minors, int node_id)disk_to_dev (disk)->type = &disk_type;device_initialize (disk_to_dev (disk));inc_diskseq (disk); +lockdep_init_map (&disk->lockdep_map,"(bio completion)" , lkclass,0 );return disk;
@@ -1299,7 +1301,7 @@ struct gendisk *__alloc_disk_node(int minors, int node_id) }EXPORT_SYMBOL (__alloc_disk_node); -struct gendisk *__blk_alloc_disk (int node) +struct gendisk *__blk_alloc_disk (int node,struct lock_class_key *lkclass) {struct request_queue *q;struct gendisk *disk;
@@ -1308,7 +1310,7 @@ struct gendisk *__blk_alloc_disk(int node)if (!q)return NULL ; - disk =__alloc_disk_node (0 , node); + disk =__alloc_disk_node (0 , node, lkclass);if (!disk) {blk_cleanup_queue (q);return NULL ;
include/linux/blk-mq.h +3 -7
@@ -432,18 +432,14 @@ enum { ((policy & ((1 <<BLK_MQ_F_ALLOC_POLICY_BITS ) -1 )) \ << BLK_MQ_F_ALLOC_POLICY_START_BIT) +struct gendisk *__blk_mq_alloc_disk (struct blk_mq_tag_set *set,void *queuedata, +struct lock_class_key *lkclass);#define blk_mq_alloc_disk (set, queuedata) \ ({ \ static struct lock_class_key __key; \ - struct gendisk *__disk = __blk_mq_alloc_disk(set, queuedata); \ \ - if (!IS_ERR(__disk)) \ - lockdep_init_map(&__disk->lockdep_map, \ - "(bio completion)", &__key, 0); \ - __disk; \ + __blk_mq_alloc_disk(set, queuedata, &__key); \ }) -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 *);int blk_mq_init_allocated_queue (struct blk_mq_tag_set *set,struct request_queue *q);
include/linux/genhd.h +6 -17
@@ -262,27 +262,21 @@ static inline sector_t get_capacity(struct gendisk *disk)int bdev_disk_changed (struct gendisk *disk,bool invalidate);void blk_drop_partitions (struct gendisk *disk); -extern struct gendisk *__alloc_disk_node (int minors,int node_id); +struct gendisk *__alloc_disk_node (int minors,int node_id, +struct lock_class_key *lkclass);extern void put_disk (struct gendisk *disk);#define alloc_disk_node (minors, node_id) \ ({ \ static struct lock_class_key __key; \ - const char *__name; \ - struct gendisk *__disk; \ \ - __name = "(gendisk_completion)"#minors"("#node_id")"; \ - \ - __disk = __alloc_disk_node(minors, node_id); \ - \ - if (__disk) \ - lockdep_init_map(&__disk->lockdep_map, __name, &__key, 0); \ - \ - __disk; \ + __alloc_disk_node(minors, node_id, &__key); \ })#define alloc_disk (minors) alloc_disk_node(minors, NUMA_NO_NODE) +struct gendisk *__blk_alloc_disk (int node,struct lock_class_key *lkclass); +/** * blk_alloc_disk - allocate a gendisk structure * @node_id: numa node to allocate on
@@ -294,15 +288,10 @@ extern void put_disk(struct gendisk *disk);*/ #define blk_alloc_disk (node_id) \ ({ \ - struct gendisk *__disk = __blk_alloc_disk(node_id); \ static struct lock_class_key __key; \ \ - if (__disk) \ - lockdep_init_map(&__disk->lockdep_map, \ - "(bio completion)", &__key, 0); \ - __disk; \ + __blk_alloc_disk(node_id, &__key); \ }) -struct gendisk *__blk_alloc_disk (int node);void blk_cleanup_disk (struct gendisk *disk); int __register_blkdev(unsigned int major, const char *name,
Signature · 1 line
2.30.2
Christoph Hellwig
maintainerPATCH 5/8 block: remove alloc_disk and alloc_disk_node
In reply to Christoph HellwigMost drivers should use and have been converted to use blk_alloc_disk and blk_mq_alloc_disk. Only the scsi ULPs and dasd still allocate a disk separately from the request_queue, so don't bother with convenience macros for something that should not see significant new users and remove these wrappers.
--- drivers/s390/block/dasd_genhd.c | 5 ++++- drivers/scsi/sd.c | 3 ++- drivers/scsi/sr.c | 4 +++- include/linux/genhd.h | 10 ---------- 4 files changed, 9 insertions(+), 13 deletions(-)
drivers/s390/block/dasd_genhd.c +4 -1
@@ -24,6 +24,8 @@#include "dasd_int.h" +static struct lock_class_key dasd_bio_compl_lkclass; +/* * Allocate and register gendisk structure for device. */
@@ -38,7 +40,8 @@ int dasd_gendisk_alloc(struct dasd_block *block)if (base->devindex >=DASD_PER_MAJOR )return -EBUSY ; - gdp =alloc_disk (1 <<DASD_PARTN_BITS ); + gdp =__alloc_disk_node (1 <<DASD_PARTN_BITS ,NUMA_NO_NODE , + &dasd_bio_compl_lkclass);if (!gdp)return -ENOMEM ;
drivers/scsi/sd.c +2 -1
@@ -129,6 +129,7 @@ static DEFINE_MUTEX(sd_ref_mutex);static struct kmem_cache *sd_cdb_cache;static mempool_t *sd_cdb_pool;static mempool_t *sd_page_pool; +static struct lock_class_key sd_bio_compl_lkclass;static const char *sd_cache_types[] = {"write through" ,"none" ,"write back" ,
@@ -3408,7 +3409,7 @@ static int sd_probe(struct device *dev)if (!sdkp) goto out; - gd =alloc_disk (SD_MINORS ); + gd =__alloc_disk_node (SD_MINORS ,NUMA_NO_NODE , &sd_bio_compl_lkclass);if (!gd) goto out_free;
drivers/scsi/sr.c +3 -1
@@ -106,6 +106,8 @@ static struct scsi_driver sr_template = {static unsigned long sr_index_bits[SR_DISKS /BITS_PER_LONG ];static DEFINE_SPINLOCK (sr_index_lock); +static struct lock_class_key sr_bio_compl_lkclass; +/* This semaphore is used to mediate the 0->1 reference get in the * face of object destruction (i.e. we can't allow a get on an * object after last put) */
@@ -712,7 +714,7 @@ static int sr_probe(struct device *dev)kref_init (&cd->kref); - disk =alloc_disk (1 ); + disk =__alloc_disk_node (1 ,NUMA_NO_NODE , &sr_bio_compl_lkclass);if (!disk) goto fail_free;mutex_init (&cd->lock);
include/linux/genhd.h +0 -10
@@ -265,16 +265,6 @@ void blk_drop_partitions(struct gendisk *disk);struct gendisk *__alloc_disk_node (int minors,int node_id,struct lock_class_key *lkclass);extern void put_disk (struct gendisk *disk); - -#define alloc_disk_node (minors, node_id) \ -({ \ - static struct lock_class_key __key; \ - \ - __alloc_disk_node(minors, node_id, &__key); \ -}) - -#define alloc_disk (minors) alloc_disk_node(minors, NUMA_NO_NODE) -struct gendisk *__blk_alloc_disk (int node,struct lock_class_key *lkclass);/**
Signature · 1 line
2.30.2
Christoph Hellwig
maintainerPATCH 6/8 block: remove the minors argument to __alloc_disk_node
In reply to Christoph HellwigThis was a leftover from the legacy alloc_disk interface. Switch the scsi ULPs and dasd to set ->minors directly like all other drivers and remove the argument.
--- block/blk-mq.c | 2 +- block/genhd.c | 6 ++---- drivers/s390/block/dasd_genhd.c | 4 ++-- drivers/scsi/sd.c | 3 ++- drivers/scsi/sr.c | 3 ++- include/linux/genhd.h | 3 +-- 6 files changed, 10 insertions(+), 11 deletions(-)
block/blk-mq.c +1 -1
@@ -3143,7 +3143,7 @@ struct gendisk *__blk_mq_alloc_disk(struct blk_mq_tag_set *set, void *queuedata,if (IS_ERR (q))return ERR_CAST (q); - disk =__alloc_disk_node (0 , set->numa_node, lkclass); + disk =__alloc_disk_node (set->numa_node, lkclass);if (!disk) {blk_cleanup_queue (q);return ERR_PTR (-ENOMEM );
block/genhd.c +2 -4
@@ -1263,8 +1263,7 @@ dev_t blk_lookup_devt(const char *name, int partno)return devt; } -struct gendisk *__alloc_disk_node (int minors,int node_id, -struct lock_class_key *lkclass) +struct gendisk *__alloc_disk_node (int node_id,struct lock_class_key *lkclass) {struct gendisk *disk;
@@ -1282,7 +1281,6 @@ struct gendisk *__alloc_disk_node(int minors, int node_id,if (xa_insert (&disk->part_tbl,0 , disk->part0,GFP_KERNEL )) goto out_destroy_part_tbl; - disk->minors = minors;rand_initialize_disk (disk);disk_to_dev (disk)->class = &block_class;disk_to_dev (disk)->type = &disk_type;
@@ -1310,7 +1308,7 @@ struct gendisk *__blk_alloc_disk(int node, struct lock_class_key *lkclass)if (!q)return NULL ; - disk =__alloc_disk_node (0 , node, lkclass); + disk =__alloc_disk_node (node, lkclass);if (!disk) {blk_cleanup_queue (q);return NULL ;
drivers/s390/block/dasd_genhd.c +2 -2
@@ -40,14 +40,14 @@ int dasd_gendisk_alloc(struct dasd_block *block)if (base->devindex >=DASD_PER_MAJOR )return -EBUSY ; - gdp =__alloc_disk_node (1 <<DASD_PARTN_BITS ,NUMA_NO_NODE , - &dasd_bio_compl_lkclass); + gdp =__alloc_disk_node (NUMA_NO_NODE , &dasd_bio_compl_lkclass);if (!gdp)return -ENOMEM ;/* Initialize gendisk structure. */ gdp->major =DASD_MAJOR ; gdp->first_minor = base->devindex <<DASD_PARTN_BITS ; + gdp->minors =1 <<DASD_PARTN_BITS ; gdp->fops = &dasd_device_operations;/*
drivers/scsi/sd.c +2 -1
@@ -3409,7 +3409,7 @@ static int sd_probe(struct device *dev)if (!sdkp) goto out; - gd =__alloc_disk_node (SD_MINORS ,NUMA_NO_NODE , &sd_bio_compl_lkclass); + gd =__alloc_disk_node (NUMA_NO_NODE , &sd_bio_compl_lkclass);if (!gd) goto out_free;
@@ -3455,6 +3455,7 @@ static int sd_probe(struct device *dev) gd->major =sd_major ((index &0xf0 ) >>4 ); gd->first_minor = ((index &0xf ) <<4 ) | (index &0xfff00 ); + gd->minors =SD_MINORS ; gd->fops = &sd_fops; gd->private_data = &sdkp->driver;
drivers/scsi/sr.c +2 -1
@@ -714,7 +714,7 @@ static int sr_probe(struct device *dev)kref_init (&cd->kref); - disk =__alloc_disk_node (1 ,NUMA_NO_NODE , &sr_bio_compl_lkclass); + disk =__alloc_disk_node (NUMA_NO_NODE , &sr_bio_compl_lkclass);if (!disk) goto fail_free;mutex_init (&cd->lock);
@@ -731,6 +731,7 @@ static int sr_probe(struct device *dev) disk->major =SCSI_CDROM_MAJOR ; disk->first_minor = minor; + disk->minors =1 ;sprintf (disk->disk_name,"sr%d" , minor); disk->fops = &sr_bdops; disk->flags =GENHD_FL_CD |GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE ;
include/linux/genhd.h +1 -2
@@ -262,8 +262,7 @@ static inline sector_t get_capacity(struct gendisk *disk)int bdev_disk_changed (struct gendisk *disk,bool invalidate);void blk_drop_partitions (struct gendisk *disk); -struct gendisk *__alloc_disk_node (int minors,int node_id, -struct lock_class_key *lkclass); +struct gendisk *__alloc_disk_node (int node_id,struct lock_class_key *lkclass);extern void put_disk (struct gendisk *disk);struct gendisk *__blk_alloc_disk (int node,struct lock_class_key *lkclass);
Signature · 1 line
2.30.2
Re: [PATCH 6/8] block: remove the minors argument to __alloc_disk_node
Am 12.08.21 um 09:46 schrieb Christoph Hellwig:
Quoted 9 lines
This was a leftover from the legacy
alloc_diskinterface. Switch the scsi ULPs and dasd to set ->minors directly like all other drivers and remove the argument.Signed-off-by Christoph Hellwig <[email protected]>--- block/blk-mq.c | 2 +- block/genhd.c | 6 ++---- drivers/s390/block/dasd_genhd.c | 4 ++--
for the DASD part:
Looks good.
Christoph Hellwig
maintainerPATCH 7/8 block: pass a request_queue to __blk_alloc_disk
In reply to Christoph HellwigPass in a request_queue and assign disk->queue in __blk_alloc_disk to ensure struct gendisk always has a valid ->queue pointer.
--- block/blk-mq.c | 3 +-- block/genhd.c | 7 ++++--- drivers/s390/block/dasd_genhd.c | 4 ++-- drivers/scsi/sd.c | 4 ++-- drivers/scsi/sr.c | 4 ++-- include/linux/genhd.h | 3 ++- 6 files changed, 13 insertions(+), 12 deletions(-)
block/blk-mq.c +1 -2
@@ -3143,12 +3143,11 @@ struct gendisk *__blk_mq_alloc_disk(struct blk_mq_tag_set *set, void *queuedata,if (IS_ERR (q))return ERR_CAST (q); - disk =__alloc_disk_node (set->numa_node, lkclass); + disk =__alloc_disk_node (q, set->numa_node, lkclass);if (!disk) {blk_cleanup_queue (q);return ERR_PTR (-ENOMEM ); } - disk->queue = q;return disk; }EXPORT_SYMBOL (__blk_mq_alloc_disk);
block/genhd.c +4 -3
@@ -1263,7 +1263,8 @@ dev_t blk_lookup_devt(const char *name, int partno)return devt; } -struct gendisk *__alloc_disk_node (int node_id,struct lock_class_key *lkclass) +struct gendisk *__alloc_disk_node (struct request_queue *q,int node_id, +struct lock_class_key *lkclass) {struct gendisk *disk;
@@ -1286,6 +1287,7 @@ struct gendisk *__alloc_disk_node(int node_id, struct lock_class_key *lkclass)disk_to_dev (disk)->type = &disk_type;device_initialize (disk_to_dev (disk));inc_diskseq (disk); + disk->queue = q;lockdep_init_map (&disk->lockdep_map,"(bio completion)" , lkclass,0 );return disk;
@@ -1308,12 +1310,11 @@ struct gendisk *__blk_alloc_disk(int node, struct lock_class_key *lkclass)if (!q)return NULL ; - disk =__alloc_disk_node (node, lkclass); + disk =__alloc_disk_node (q, node, lkclass);if (!disk) {blk_cleanup_queue (q);return NULL ; } - disk->queue = q;return disk; }EXPORT_SYMBOL (__blk_alloc_disk);
drivers/s390/block/dasd_genhd.c +2 -2
@@ -40,7 +40,8 @@ int dasd_gendisk_alloc(struct dasd_block *block)if (base->devindex >=DASD_PER_MAJOR )return -EBUSY ; - gdp =__alloc_disk_node (NUMA_NO_NODE , &dasd_bio_compl_lkclass); + gdp =__alloc_disk_node (block->request_queue,NUMA_NO_NODE , + &dasd_bio_compl_lkclass);if (!gdp)return -ENOMEM ;
@@ -76,7 +77,6 @@ int dasd_gendisk_alloc(struct dasd_block *block) test_bit(DASD_FLAG_DEVICE_RO, &base->flags))set_disk_ro (gdp,1 );dasd_add_link_to_gendisk (gdp, base); - gdp->queue = block->request_queue; block->gdp = gdp;set_capacity (block->gdp,0 );device_add_disk (&base->cdev->dev, block->gdp,NULL );
drivers/scsi/sd.c +2 -2
@@ -3409,7 +3409,8 @@ static int sd_probe(struct device *dev)if (!sdkp) goto out; - gd =__alloc_disk_node (NUMA_NO_NODE , &sd_bio_compl_lkclass); + gd =__alloc_disk_node (sdp->request_queue,NUMA_NO_NODE , + &sd_bio_compl_lkclass);if (!gd) goto out_free;
@@ -3459,7 +3460,6 @@ static int sd_probe(struct device *dev) gd->fops = &sd_fops; gd->private_data = &sdkp->driver; - gd->queue = sdkp->device->request_queue;/* defaults, until the device tells us otherwise */ sdp->sector_size =512 ;
drivers/scsi/sr.c +2 -2
@@ -714,7 +714,8 @@ static int sr_probe(struct device *dev)kref_init (&cd->kref); - disk =__alloc_disk_node (NUMA_NO_NODE , &sr_bio_compl_lkclass); + disk =__alloc_disk_node (sdev->request_queue,NUMA_NO_NODE , + &sr_bio_compl_lkclass);if (!disk) goto fail_free;mutex_init (&cd->lock);
@@ -765,7 +766,6 @@ static int sr_probe(struct device *dev)set_capacity (disk, cd->capacity); disk->private_data = &cd->driver; - disk->queue = sdev->request_queue;if (register_cdrom (disk, &cd->cdi)) goto fail_minor;
include/linux/genhd.h +2 -1
@@ -262,7 +262,8 @@ static inline sector_t get_capacity(struct gendisk *disk)int bdev_disk_changed (struct gendisk *disk,bool invalidate);void blk_drop_partitions (struct gendisk *disk); -struct gendisk *__alloc_disk_node (int node_id,struct lock_class_key *lkclass); +struct gendisk *__alloc_disk_node (struct request_queue *q,int node_id, +struct lock_class_key *lkclass);extern void put_disk (struct gendisk *disk);struct gendisk *__blk_alloc_disk (int node,struct lock_class_key *lkclass);
Signature · 1 line
2.30.2
Christoph Hellwig
maintainerPATCH 8/8 block: hold a request_queue reference for the lifetime of struct gendisk
In reply to Christoph HellwigAcquire the queue ref dropped in disk_release in __blk_alloc_disk so any allocate gendisk always has a queue reference.
--- block/genhd.c | 20 +++++++------------- include/linux/genhd.h | 1 - 2 files changed, 7 insertions(+), 14 deletions(-)
block/genhd.c +7 -13
@@ -544,16 +544,6 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk,register_disk (parent, disk, groups);if (register_queue)blk_register_queue (disk); - -/* -* Take an extra ref on queue which will be put on disk_release() -* so that it sticks around as long as @disk is there. -*/ -if (blk_get_queue (disk->queue)) -set_bit (GD_QUEUE_REF , &disk->state); -else -WARN_ON_ONCE (1 ); -disk_add_events (disk);blk_integrity_add (disk); }
@@ -1096,8 +1086,7 @@ static void disk_release(struct device *dev)disk_release_events (disk);kfree (disk->random);xa_destroy (&disk->part_tbl); -if (test_bit (GD_QUEUE_REF , &disk->state) && disk->queue) -blk_put_queue (disk->queue); +blk_put_queue (disk->queue);iput (disk->part0->bd_inode);/* frees the disk */ }
@@ -1268,9 +1257,12 @@ struct gendisk *__alloc_disk_node(struct request_queue *q, int node_id, {struct gendisk *disk; +if (!blk_get_queue (q)) +return NULL ; + disk =kzalloc_node (sizeof (struct gendisk ),GFP_KERNEL , node_id);if (!disk) -return NULL ; + goto out_put_queue; disk->part0 =bdev_alloc (disk,0 );if (!disk->part0)
@@ -1297,6 +1289,8 @@ struct gendisk *__alloc_disk_node(struct request_queue *q, int node_id,iput (disk->part0->bd_inode); out_free_disk:kfree (disk); +out_put_queue: +blk_put_queue (q);return NULL ; }EXPORT_SYMBOL (__alloc_disk_node);
include/linux/genhd.h +0 -1
@@ -149,7 +149,6 @@ struct gendisk {unsigned long state;#define GD_NEED_PART_SCAN 0#define GD_READ_ONLY 1 -#define GD_QUEUE_REF 2struct mutex open_mutex;/* open/close mutex */ unsigned open_partitions;/* number of open partitions */
Signature · 1 line
2.30.2