genhd: register default groups with device_add_disk()
Subsystems (23)
v4 cover genhd: register default groups with device_add_disk()
device_add_disk() doesn't allow to register with default sysfs groups, which introduces a race with udev as these groups have to be created after the uevent has been sent.
This patchset updates device_add_disk() to accept a 'groups' argument to avoid this race and updates the obvious drivers to use it. There are some more drivers which might benefit from this (eg loop or md), but the interface is not straightforward so I haven't attempted it.
As usual, comments and reviews are welcome.
Changes to v3:
- Better check in is_visible for lightnvm attributes as suggested by hch
Changes to v2:
- Fold lightnvm attributes into the generic attribute group as suggested by Bart
Changes to v1:
- Drop first patch
- Convert lightnvm sysfs attributes as suggested by Bart
Hannes Reinecke (5):
block: genhd: add 'groups' argument to device_add_disk
nvme: register ns_id attributes as default sysfs groups
aoe: register default groups with device_add_disk()
zram: register default groups with device_add_disk()
virtio-blk: modernize sysfs attribute creation
arch/um/drivers/ubd_kern.c | 2 +- block/genhd.c | 19 +++++-- drivers/block/aoe/aoe.h | 1 - drivers/block/aoe/aoeblk.c | 21 +++----- drivers/block/aoe/aoedev.c | 1 - drivers/block/floppy.c | 2 +- drivers/block/mtip32xx/mtip32xx.c | 2 +- drivers/block/ps3disk.c | 2 +- drivers/block/ps3vram.c | 2 +- drivers/block/rsxx/dev.c | 2 +- drivers/block/skd_main.c | 2 +- drivers/block/sunvdc.c | 2 +- drivers/block/virtio_blk.c | 68 +++++++++++++---------- drivers/block/xen-blkfront.c | 2 +- drivers/block/zram/zram_drv.c | 28 +++------- drivers/ide/ide-cd.c | 2 +- drivers/ide/ide-gd.c | 2 +- drivers/memstick/core/ms_block.c | 2 +- drivers/memstick/core/mspro_block.c | 2 +- drivers/mmc/core/block.c | 2 +- drivers/mtd/mtd_blkdevs.c | 2 +- drivers/nvdimm/blk.c | 2 +- drivers/nvdimm/btt.c | 2 +- drivers/nvdimm/pmem.c | 2 +- drivers/nvme/host/core.c | 21 ++++---- drivers/nvme/host/lightnvm.c | 105 +++++++++++++++--------------------- drivers/nvme/host/multipath.c | 15 ++---- drivers/nvme/host/nvme.h | 10 +--- drivers/s390/block/dasd_genhd.c | 2 +- drivers/s390/block/dcssblk.c | 2 +- drivers/s390/block/scm_blk.c | 2 +- drivers/scsi/sd.c | 2 +- drivers/scsi/sr.c | 2 +- include/linux/genhd.h | 5 +- 34 files changed, 152 insertions(+), 188 deletions(-)
Signature · 1 line
2.16.4
PATCH v4 1/5 block: genhd: add 'groups' argument to device_add_disk
Update device_add_disk() to take an 'groups' argument so that individual drivers can register a device with additional sysfs attributes.
This avoids race condition the driver would otherwise have if these groups were to be created with sysfs_add_groups().
--- arch/um/drivers/ubd_kern.c | 2 +- block/genhd.c | 19 ++++++++++++++----- drivers/block/floppy.c | 2 +- drivers/block/mtip32xx/mtip32xx.c | 2 +- drivers/block/ps3disk.c | 2 +- drivers/block/ps3vram.c | 2 +- drivers/block/rsxx/dev.c | 2 +- drivers/block/skd_main.c | 2 +- drivers/block/sunvdc.c | 2 +- drivers/block/virtio_blk.c | 2 +- drivers/block/xen-blkfront.c | 2 +- drivers/ide/ide-cd.c | 2 +- drivers/ide/ide-gd.c | 2 +- drivers/memstick/core/ms_block.c | 2 +- drivers/memstick/core/mspro_block.c | 2 +- drivers/mmc/core/block.c | 2 +- drivers/mtd/mtd_blkdevs.c | 2 +- drivers/nvdimm/blk.c | 2 +- drivers/nvdimm/btt.c | 2 +- drivers/nvdimm/pmem.c | 2 +- drivers/nvme/host/core.c | 2 +- drivers/nvme/host/multipath.c | 2 +- drivers/s390/block/dasd_genhd.c | 2 +- drivers/s390/block/dcssblk.c | 2 +- drivers/s390/block/scm_blk.c | 2 +- drivers/scsi/sd.c | 2 +- drivers/scsi/sr.c | 2 +- include/linux/genhd.h | 5 +++-- 28 files changed, 43 insertions(+), 33 deletions(-)
arch/um/drivers/ubd_kern.c +1 -1
@@ -891,7 +891,7 @@ static int ubd_disk_register(int major, u64 size, int unit, disk->private_data = &ubd_devs[unit]; disk->queue = ubd_devs[unit].queue; -device_add_disk (parent, disk); +device_add_disk (parent, disk,NULL ); *disk_out = disk;return 0 ;
block/genhd.c +14 -5
@@ -567,7 +567,8 @@ static int exact_lock(dev_t devt, void *data)return 0 ; } -static void register_disk (struct device *parent,struct gendisk *disk) +static void register_disk (struct device *parent,struct gendisk *disk, +const struct attribute_group **groups) {struct device *ddev =disk_to_dev (disk);struct block_device *bdev;
@@ -582,6 +583,10 @@ static void register_disk(struct device *parent, struct gendisk *disk)/* delay uevents, until we scanned partition table */ dev_set_uevent_suppress (ddev,1 ); +if (groups) { +WARN_ON (ddev->groups); + ddev->groups = groups; + }if (device_add (ddev))return ;if (!sysfs_deprecated) {
@@ -647,6 +652,7 @@ static void register_disk(struct device *parent, struct gendisk *disk)* __device_add_disk - add disk information to kernel list * @parent: parent device for the disk * @disk: per-device partitioning information +* @groups: Additional per-device sysfs groups * @register_queue: register the queue if set to true * * This function registers the partitioning information in @disk
@@ -655,6 +661,7 @@ static void register_disk(struct device *parent, struct gendisk *disk)* FIXME: error handling */ static void __device_add_disk (struct device *parent,struct gendisk *disk, +const struct attribute_group **groups,bool register_queue) {dev_t devt;
@@ -698,7 +705,7 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk,blk_register_region (disk_devt (disk), disk->minors,NULL , exact_match, exact_lock, disk); } -register_disk (parent, disk); +register_disk (parent, disk, groups);if (register_queue)blk_register_queue (disk);
@@ -712,15 +719,17 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk,blk_integrity_add (disk); } -void device_add_disk (struct device *parent,struct gendisk *disk) +void device_add_disk (struct device *parent,struct gendisk *disk, +const struct attribute_group **groups) + { -__device_add_disk (parent, disk, true); +__device_add_disk (parent, disk, groups, true); }EXPORT_SYMBOL (device_add_disk);void device_add_disk_no_queue_reg (struct device *parent,struct gendisk *disk) { -__device_add_disk (parent, disk, false); +__device_add_disk (parent, disk,NULL , false); }EXPORT_SYMBOL (device_add_disk_no_queue_reg);
drivers/block/floppy.c +1 -1
@@ -4676,7 +4676,7 @@ static int __init do_floppy_init(void)/* to be cleaned up... */ disks[drive]->private_data = (void *)(long )drive; disks[drive]->flags |=GENHD_FL_REMOVABLE ; -device_add_disk (&floppy_device[drive].dev, disks[drive]); +device_add_disk (&floppy_device[drive].dev, disks[drive],NULL ); }return 0 ;
drivers/block/mtip32xx/mtip32xx.c +1 -1
@@ -3861,7 +3861,7 @@ static int mtip_block_initialize(struct driver_data *dd)set_capacity (dd->disk, capacity);/* Enable the block device and add it to /dev */ -device_add_disk (&dd->pdev->dev, dd->disk); +device_add_disk (&dd->pdev->dev, dd->disk,NULL ); dd->bdev =bdget_disk (dd->disk,0 );/*
drivers/block/ps3disk.c +1 -1
@@ -500,7 +500,7 @@ static int ps3disk_probe(struct ps3_system_bus_device *_dev) gendisk->disk_name, priv->model, priv->raw_capacity >>11 , get_capacity(gendisk) >> 11); -device_add_disk (&dev->sbd.core, gendisk); +device_add_disk (&dev->sbd.core, gendisk,NULL );return 0 ; fail_cleanup_queue:
drivers/block/ps3vram.c +1 -1
@@ -769,7 +769,7 @@ static int ps3vram_probe(struct ps3_system_bus_device *dev)dev_info (&dev->core,"%s: Using %lu MiB of GPU memory\n" , gendisk->disk_name,get_capacity (gendisk) >>11 ); -device_add_disk (&dev->core, gendisk); +device_add_disk (&dev->core, gendisk,NULL );return 0 ; fail_cleanup_queue:
drivers/block/rsxx/dev.c +1 -1
@@ -226,7 +226,7 @@ int rsxx_attach_dev(struct rsxx_cardinfo *card)set_capacity (card->gendisk, card->size8 >>9 ); else set_capacity(card->gendisk, 0); -device_add_disk (CARD_TO_DEV (card), card->gendisk); +device_add_disk (CARD_TO_DEV (card), card->gendisk,NULL ); card->bdev_attached =1 ; }
drivers/block/skd_main.c +1 -1
@@ -3104,7 +3104,7 @@ static int skd_bdev_getgeo(struct block_device *bdev, struct hd_geometry *geo)static int skd_bdev_attach (struct device *parent,struct skd_device *skdev) {dev_dbg (&skdev->pdev->dev,"add_disk\n" ); -device_add_disk (parent, skdev->disk); +device_add_disk (parent, skdev->disk,NULL );return 0 ; }
drivers/block/sunvdc.c +1 -1
@@ -850,7 +850,7 @@ static int probe_disk(struct vdc_port *port) port->vdisk_size, (port->vdisk_size >> (20 -9 )), port->vio.ver.major, port->vio.ver.minor); -device_add_disk (&port->vio.vdev->dev, g); +device_add_disk (&port->vio.vdev->dev, g,NULL );return 0 ; }
drivers/block/virtio_blk.c +1 -1
@@ -780,7 +780,7 @@ static int virtblk_probe(struct virtio_device *vdev)virtblk_update_capacity (vblk, false);virtio_device_ready (vdev); -device_add_disk (&vdev->dev, vblk->disk); +device_add_disk (&vdev->dev, vblk->disk,NULL ); err =device_create_file (disk_to_dev (vblk->disk), &dev_attr_serial);if (err) goto out_del_disk;
drivers/block/xen-blkfront.c +1 -1
@@ -2420,7 +2420,7 @@ static void blkfront_connect(struct blkfront_info *info)for (i =0 ; i < info->nr_rings; i++)kick_pending_request_queues (&info->rinfo[i]); -device_add_disk (&info->xbdev->dev, info->gd); +device_add_disk (&info->xbdev->dev, info->gd,NULL ); info->is_ready =1 ;return ;
drivers/ide/ide-cd.c +1 -1
@@ -1784,7 +1784,7 @@ static int ide_cd_probe(ide_drive_t *drive)ide_cd_read_toc (drive); g->fops = &idecd_ops; g->flags |=GENHD_FL_REMOVABLE |GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE ; -device_add_disk (&drive->gendev, g); +device_add_disk (&drive->gendev, g,NULL );return 0 ; out_free_disk:
drivers/ide/ide-gd.c +1 -1
@@ -416,7 +416,7 @@ static int ide_gd_probe(ide_drive_t *drive)if (drive->dev_flags &IDE_DFLAG_REMOVABLE ) g->flags =GENHD_FL_REMOVABLE ; g->fops = &ide_gd_ops; -device_add_disk (&drive->gendev, g); +device_add_disk (&drive->gendev, g,NULL );return 0 ; out_free_disk:
drivers/memstick/core/ms_block.c +1 -1
@@ -2146,7 +2146,7 @@ static int msb_init_disk(struct memstick_dev *card)set_disk_ro (msb->disk,1 );msb_start (card); -device_add_disk (&card->dev, msb->disk); +device_add_disk (&card->dev, msb->disk,NULL );dbg ("Disk added" );return 0 ;
drivers/memstick/core/mspro_block.c +1 -1
@@ -1236,7 +1236,7 @@ static int mspro_block_init_disk(struct memstick_dev *card)set_capacity (msb->disk, capacity);dev_dbg (&card->dev,"capacity set %ld\n" , capacity); -device_add_disk (&card->dev, msb->disk); +device_add_disk (&card->dev, msb->disk,NULL ); msb->active =1 ;return 0 ;
drivers/mmc/core/block.c +1 -1
@@ -2698,7 +2698,7 @@ static int mmc_add_disk(struct mmc_blk_data *md)int ret;struct mmc_card *card = md->queue.card; -device_add_disk (md->parent, md->disk); +device_add_disk (md->parent, md->disk,NULL ); md->force_ro.show = force_ro_show; md->force_ro.store = force_ro_store;sysfs_attr_init (&md->force_ro.attr);
drivers/mtd/mtd_blkdevs.c +1 -1
@@ -447,7 +447,7 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)if (new->readonly)set_disk_ro (gd,1 ); -device_add_disk (&new->mtd->dev, gd); +device_add_disk (&new->mtd->dev, gd,NULL );if (new->disk_attributes) { ret = sysfs_create_group(&disk_to_dev(gd)->kobj,
drivers/nvdimm/blk.c +1 -1
@@ -290,7 +290,7 @@ static int nsblk_attach_disk(struct nd_namespace_blk *nsblk) }set_capacity (disk, available_disk_size >>SECTOR_SHIFT ); -device_add_disk (dev, disk); +device_add_disk (dev, disk,NULL );revalidate_disk (disk);return 0 ; }
drivers/nvdimm/btt.c +1 -1
@@ -1556,7 +1556,7 @@ static int btt_blk_init(struct btt *btt) } }set_capacity (btt->btt_disk, btt->nlba * btt->sector_size >>9 ); -device_add_disk (&btt->nd_btt->dev, btt->btt_disk); +device_add_disk (&btt->nd_btt->dev, btt->btt_disk,NULL ); btt->nd_btt->size = btt->nlba * (u64 )btt->sector_size;revalidate_disk (btt->btt_disk);
drivers/nvdimm/pmem.c +1 -1
@@ -474,7 +474,7 @@ static int pmem_attach_disk(struct device *dev, gendev =disk_to_dev (disk); gendev->groups = pmem_attribute_groups; -device_add_disk (dev, disk); +device_add_disk (dev, disk,NULL );if (devm_add_action_or_reset (dev, pmem_release_disk, pmem))return -ENOMEM ;
drivers/nvme/host/core.c +1 -1
@@ -3099,7 +3099,7 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)nvme_get_ctrl (ctrl); -device_add_disk (ctrl->device, ns->disk); +device_add_disk (ctrl->device, ns->disk,NULL );if (sysfs_create_group (&disk_to_dev (ns->disk)->kobj, &nvme_ns_id_attr_group)) pr_warn("%s: failed to create sysfs group for identification\n",
drivers/nvme/host/multipath.c +1 -1
@@ -283,7 +283,7 @@ static void nvme_mpath_set_live(struct nvme_ns *ns)return ;if (!(head->disk->flags &GENHD_FL_UP )) { -device_add_disk (&head->subsys->dev, head->disk); +device_add_disk (&head->subsys->dev, head->disk,NULL );if (sysfs_create_group (&disk_to_dev (head->disk)->kobj, &nvme_ns_id_attr_group)) dev_warn(&head->subsys->dev,
drivers/s390/block/dasd_genhd.c +1 -1
@@ -76,7 +76,7 @@ int dasd_gendisk_alloc(struct dasd_block *block) gdp->queue = block->request_queue; block->gdp = gdp;set_capacity (block->gdp,0 ); -device_add_disk (&base->cdev->dev, block->gdp); +device_add_disk (&base->cdev->dev, block->gdp,NULL );return 0 ; }
drivers/s390/block/dcssblk.c +1 -1
@@ -685,7 +685,7 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char }get_device (&dev_info->dev); -device_add_disk (&dev_info->dev, dev_info->gd); +device_add_disk (&dev_info->dev, dev_info->gd,NULL );switch (dev_info->segment_type) {case SEG_TYPE_SR :
drivers/s390/block/scm_blk.c +1 -1
@@ -500,7 +500,7 @@ int scm_blk_dev_setup(struct scm_blk_dev *bdev, struct scm_device *scmdev)/* 512 byte sectors */ set_capacity (bdev->gendisk, scmdev->size >>9 ); -device_add_disk (&scmdev->dev, bdev->gendisk); +device_add_disk (&scmdev->dev, bdev->gendisk,NULL );return 0 ; out_queue:
drivers/scsi/sd.c +1 -1
@@ -3271,7 +3271,7 @@ static void sd_probe_async(void *data, async_cookie_t cookie) }blk_pm_runtime_init (sdp->request_queue, dev); -device_add_disk (dev, gd); +device_add_disk (dev, gd,NULL );if (sdkp->capacity)sd_dif_config_host (sdkp);
drivers/scsi/sr.c +1 -1
@@ -758,7 +758,7 @@ static int sr_probe(struct device *dev)dev_set_drvdata (dev, cd); disk->flags |=GENHD_FL_REMOVABLE ; -device_add_disk (&sdev->sdev_gendev, disk); +device_add_disk (&sdev->sdev_gendev, disk,NULL );sdev_printk (KERN_DEBUG , sdev,"Attached scsi CD-ROM %s\n" , cd->cdi.name);
include/linux/genhd.h +3 -2
@@ -399,10 +399,11 @@ static inline void free_part_info(struct hd_struct *part)extern void part_round_stats (struct request_queue *q,int cpu,struct hd_struct *part);/* block/genhd.c */ -extern void device_add_disk (struct device *parent,struct gendisk *disk); +extern void device_add_disk (struct device *parent,struct gendisk *disk, +const struct attribute_group **groups);static inline void add_disk (struct gendisk *disk) { -device_add_disk (NULL , disk); +device_add_disk (NULL , disk,NULL ); }extern void device_add_disk_no_queue_reg (struct device *parent,struct gendisk *disk);static inline void add_disk_no_queue_reg (struct gendisk *disk)
Signature · 1 line
2.16.4
PATCH v4 2/5 nvme: register ns_id attributes as default sysfs groups
In reply to Hannes ReineckeWe should be registering the ns_id attribute as default sysfs attribute groups, otherwise we have a race condition between the uevent and the attributes appearing in sysfs.
--- drivers/nvme/host/core.c | 21 ++++----- drivers/nvme/host/lightnvm.c | 105 ++++++++++++++++++------------------------ drivers/nvme/host/multipath.c | 15 ++---- drivers/nvme/host/nvme.h | 10 +--- 4 files changed, 59 insertions(+), 92 deletions(-)
drivers/nvme/host/core.c +9 -12
@@ -2734,6 +2734,14 @@ const struct attribute_group nvme_ns_id_attr_group = { .is_visible = nvme_ns_id_attrs_are_visible, }; +const struct attribute_group *nvme_ns_id_attr_groups[] = { + &nvme_ns_id_attr_group, +#ifdef CONFIG_NVM + &nvme_nvm_attr_group, +#endif +NULL , +}; +#define nvme_show_str_function (field) \ static ssize_t field##_show(struct device *dev, \ struct device_attribute *attr, char *buf) \
@@ -3099,14 +3107,7 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)nvme_get_ctrl (ctrl); -device_add_disk (ctrl->device, ns->disk,NULL ); -if (sysfs_create_group (&disk_to_dev (ns->disk)->kobj, - &nvme_ns_id_attr_group)) -pr_warn ("%s: failed to create sysfs group for identification\n" , - ns->disk->disk_name); -if (ns->ndev &&nvme_nvm_register_sysfs (ns)) -pr_warn ("%s: failed to register lightnvm sysfs group for identification\n" , - ns->disk->disk_name); +device_add_disk (ctrl->device, ns->disk, nvme_ns_id_attr_groups);nvme_mpath_add_disk (ns, id);nvme_fault_inject_init (ns);
@@ -3132,10 +3133,6 @@ static void nvme_ns_remove(struct nvme_ns *ns)nvme_fault_inject_fini (ns);if (ns->disk && ns->disk->flags &GENHD_FL_UP ) { -sysfs_remove_group (&disk_to_dev (ns->disk)->kobj, - &nvme_ns_id_attr_group); -if (ns->ndev) -nvme_nvm_unregister_sysfs (ns);del_gendisk (ns->disk);blk_cleanup_queue (ns->queue);if (blk_get_integrity (ns->disk))
drivers/nvme/host/lightnvm.c +44 -61
147 lines not on this page · raw message
drivers/nvme/host/multipath.c +4 -11
@@ -282,13 +282,9 @@ static void nvme_mpath_set_live(struct nvme_ns *ns)if (!head->disk)return ; -if (!(head->disk->flags &GENHD_FL_UP )) { -device_add_disk (&head->subsys->dev, head->disk,NULL ); -if (sysfs_create_group (&disk_to_dev (head->disk)->kobj, - &nvme_ns_id_attr_group)) -dev_warn (&head->subsys->dev, -"failed to create id group.\n" ); - } +if (!(head->disk->flags &GENHD_FL_UP )) +device_add_disk (&head->subsys->dev, head->disk, + nvme_ns_id_attr_groups);kblockd_schedule_work (&ns->head->requeue_work); }
@@ -494,11 +490,8 @@ void nvme_mpath_remove_disk(struct nvme_ns_head *head) {if (!head->disk)return ; -if (head->disk->flags &GENHD_FL_UP ) { -sysfs_remove_group (&disk_to_dev (head->disk)->kobj, - &nvme_ns_id_attr_group); +if (head->disk->flags &GENHD_FL_UP )del_gendisk (head->disk); - }blk_set_queue_dying (head->disk->queue);/* make sure all pending bios are cleaned up */ kblockd_schedule_work (&head->requeue_work);
drivers/nvme/host/nvme.h +2 -8
@@ -459,7 +459,7 @@ int nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl);int nvme_get_log (struct nvme_ctrl *ctrl,u32 nsid,u8 log_page,u8 lsp,void *log,size_t size,u64 offset); -extern const struct attribute_group nvme_ns_id_attr_group; +extern const struct attribute_group *nvme_ns_id_attr_groups[];extern const struct block_device_operations nvme_ns_head_ops;#ifdef CONFIG_NVME_MULTIPATH
@@ -551,8 +551,7 @@ static inline void nvme_mpath_stop(struct nvme_ctrl *ctrl)void nvme_nvm_update_nvm_info (struct nvme_ns *ns);int nvme_nvm_register (struct nvme_ns *ns,char *disk_name,int node);void nvme_nvm_unregister (struct nvme_ns *ns); -int nvme_nvm_register_sysfs (struct nvme_ns *ns); -void nvme_nvm_unregister_sysfs (struct nvme_ns *ns); +extern const struct attribute_group nvme_nvm_attr_group;int nvme_nvm_ioctl (struct nvme_ns *ns,unsigned int cmd,unsigned long arg);#else static inline void nvme_nvm_update_nvm_info (struct nvme_ns *ns) {};
@@ -563,11 +562,6 @@ static inline int nvme_nvm_register(struct nvme_ns *ns, char *disk_name, }static inline void nvme_nvm_unregister (struct nvme_ns *ns) {}; -static inline int nvme_nvm_register_sysfs (struct nvme_ns *ns) -{ -return 0 ; -} -static inline void nvme_nvm_unregister_sysfs (struct nvme_ns *ns) {};static inline int nvme_nvm_ioctl (struct nvme_ns *ns,unsigned int cmd,unsigned long arg) {
Signature · 1 line
2.16.4
Re: [PATCH 2/5] nvme: register ns_id attributes as default sysfs groups
Quoted 6 lines · Hannes Reinecke
We should be registering the
ns_idattribute as default sysfs attribute groups, otherwise we have a race condition between the uevent and the attributes appearing in sysfs.Suggested-by Bart van Assche <[email protected]>Signed-off-by Hannes Reinecke <[email protected]>
Thanks, looks great!
Re: [PATCH 2/5] nvme: register ns_id attributes as default sysfs groups
In reply to Hannes ReineckeQuoted 3 lines · Hannes Reinecke
We should be registering the
ns_idattribute as default sysfs attribute groups, otherwise we have a race condition between the uevent and the attributes appearing in sysfs.
Looks good,
PATCH v4 3/5 aoe: register default groups with device_add_disk()
In reply to Hannes ReineckeRegister default sysfs groups during device_add_disk() to avoid a race condition with udev during startup.
--- drivers/block/aoe/aoe.h | 1 - drivers/block/aoe/aoeblk.c | 21 +++++++-------------- drivers/block/aoe/aoedev.c | 1 - 3 files changed, 7 insertions(+), 16 deletions(-)
drivers/block/aoe/aoe.h +0 -1
@@ -201,7 +201,6 @@ int aoeblk_init(void);void aoeblk_exit (void );void aoeblk_gdalloc (void *);void aoedisk_rm_debugfs (struct aoedev *d); -void aoedisk_rm_sysfs (struct aoedev *d);int aoechr_init (void );void aoechr_exit (void );
drivers/block/aoe/aoeblk.c +7 -14
@@ -177,10 +177,15 @@ static struct attribute *aoe_attrs[] = { NULL, }; -static const struct attribute_group attr_group = { +static const struct attribute_group aoe_attr_group = { .attrs = aoe_attrs, }; +static const struct attribute_group *aoe_attr_groups[] = { + &aoe_attr_group, +NULL , +}; +static const struct file_operations aoe_debugfs_fops = { .open = aoe_debugfs_open, .read = seq_read,
@@ -219,17 +224,6 @@ aoedisk_rm_debugfs(struct aoedev *d) d->debugfs =NULL ; } -static int -aoedisk_add_sysfs (struct aoedev *d) -{ -return sysfs_create_group (&disk_to_dev (d->gd)->kobj, &attr_group); -} -void -aoedisk_rm_sysfs (struct aoedev *d) -{ -sysfs_remove_group (&disk_to_dev (d->gd)->kobj, &attr_group); -} -static int aoeblk_open (struct block_device *bdev,fmode_t mode) {
@@ -417,8 +411,7 @@ aoeblk_gdalloc(void *vp)spin_unlock_irqrestore (&d->lock, flags); -add_disk (gd); -aoedisk_add_sysfs (d); +device_add_disk (NULL , gd, aoe_attr_groups);aoedisk_add_debugfs (d);spin_lock_irqsave (&d->lock, flags);
drivers/block/aoe/aoedev.c +0 -1
@@ -275,7 +275,6 @@ freedev(struct aoedev *d)del_timer_sync (&d->timer);if (d->gd) {aoedisk_rm_debugfs (d); -aoedisk_rm_sysfs (d);del_gendisk (d->gd);put_disk (d->gd);blk_cleanup_queue (d->blkq);
Signature · 1 line
2.16.4
PATCH v4 4/5 zram: register default groups with device_add_disk()
In reply to Hannes ReineckeRegister default sysfs groups during device_add_disk() to avoid a race condition with udev during startup.
--- drivers/block/zram/zram_drv.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-)
drivers/block/zram/zram_drv.c +7 -21
@@ -1636,6 +1636,11 @@ static const struct attribute_group zram_disk_attr_group = { .attrs = zram_disk_attrs, }; +static const struct attribute_group *zram_disk_attr_groups[] = { + &zram_disk_attr_group, +NULL , +}; +/* * Allocate and initialize new zram device. the function returns * '>= 0' device_id upon success, and negative value otherwise.
@@ -1716,24 +1721,14 @@ static int zram_add(void) zram->disk->queue->backing_dev_info->capabilities |= (BDI_CAP_STABLE_WRITES |BDI_CAP_SYNCHRONOUS_IO ); -add_disk (zram->disk); - - ret =sysfs_create_group (&disk_to_dev (zram->disk)->kobj, - &zram_disk_attr_group); -if (ret <0 ) { -pr_err ("Error creating sysfs group for device %d\n" , - device_id); - goto out_free_disk; - } +device_add_disk (NULL , zram->disk, zram_disk_attr_groups); +strlcpy (zram->compressor, default_compressor,sizeof (zram->compressor));zram_debugfs_register (zram);pr_info ("Added device: %s\n" , zram->disk->disk_name);return device_id; -out_free_disk: -del_gendisk (zram->disk); -put_disk (zram->disk); out_free_queue:blk_cleanup_queue (queue); out_free_idr:
@@ -1762,15 +1757,6 @@ static int zram_remove(struct zram *zram)mutex_unlock (&bdev->bd_mutex);zram_debugfs_unregister (zram); -/* -* Remove sysfs first, so no one will perform a disksize -* store while we destroy the devices. This also helps during -* hot_remove -- zram_reset_device() is the last holder of -* ->init_lock, no later/concurrent disksize_store() or any -* other sysfs handlers are possible. -*/ -sysfs_remove_group (&disk_to_dev (zram->disk)->kobj, - &zram_disk_attr_group);/* Make sure all the pending I/O are finished */ fsync_bdev (bdev);
Signature · 1 line
2.16.4
PATCH v4 5/5 virtio-blk: modernize sysfs attribute creation
In reply to Hannes ReineckeUse new-style DEVICE_ATTR_RO/DEVICE_ATTR_RW to create the sysfs attributes and register the disk with default sysfs attribute groups.
--- drivers/block/virtio_blk.c | 68 ++++++++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 29 deletions(-)
drivers/block/virtio_blk.c +39 -29
@@ -351,8 +351,8 @@ static int minor_to_index(int minor)return minor >>PART_BITS ; } -static ssize_t virtblk_serial_show (struct device *dev, -struct device_attribute *attr,char *buf) +static ssize_t serial_show (struct device *dev, +struct device_attribute *attr,char *buf) {struct gendisk *disk =dev_to_disk (dev);int err;
@@ -371,7 +371,7 @@ static ssize_t virtblk_serial_show(struct device *dev,return err; } -static DEVICE_ATTR(serial, 0444, virtblk_serial_show, NULL); +static DEVICE_ATTR_RO (serial);/* The queue's logical block size must be set before calling this */ static void virtblk_update_capacity (struct virtio_blk *vblk,bool resize)
@@ -545,8 +545,8 @@ static const char *const virtblk_cache_types[] = { };static ssize_t -virtblk_cache_type_store (struct device *dev,struct device_attribute *attr, -const char *buf,size_t count) +cache_type_store (struct device *dev,struct device_attribute *attr, +const char *buf,size_t count) {struct gendisk *disk =dev_to_disk (dev);struct virtio_blk *vblk = disk->private_data;
@@ -564,8 +564,7 @@ virtblk_cache_type_store(struct device *dev, struct device_attribute *attr, }static ssize_t -virtblk_cache_type_show (struct device *dev,struct device_attribute *attr, -char *buf) +cache_type_show (struct device *dev,struct device_attribute *attr,char *buf) {struct gendisk *disk =dev_to_disk (dev);struct virtio_blk *vblk = disk->private_data;
@@ -575,12 +574,38 @@ virtblk_cache_type_show(struct device *dev, struct device_attribute *attr,return snprintf (buf,40 ,"%s\n" , virtblk_cache_types[writeback]); } -static const struct device_attribute dev_attr_cache_type_ro = -__ATTR (cache_type,0444 , - virtblk_cache_type_show,NULL ); -static const struct device_attribute dev_attr_cache_type_rw = -__ATTR (cache_type,0644 , - virtblk_cache_type_show, virtblk_cache_type_store); +static DEVICE_ATTR_RW (cache_type); + +static struct attribute *virtblk_attrs[] = { + &dev_attr_serial.attr, + &dev_attr_cache_type.attr, +NULL , +}; + +static umode_t virtblk_attrs_are_visible (struct kobject *kobj, +struct attribute *a,int n) +{ + struct device *dev = container_of(kobj, struct device, kobj); +struct gendisk *disk =dev_to_disk (dev); +struct virtio_blk *vblk = disk->private_data; +struct virtio_device *vdev = vblk->vdev; + +if (a == &dev_attr_cache_type.attr && + !virtio_has_feature (vdev,VIRTIO_BLK_F_CONFIG_WCE )) +return S_IRUGO ; + +return a->mode; +} + +static const struct attribute_group virtblk_attr_group = { + .attrs = virtblk_attrs, + .is_visible = virtblk_attrs_are_visible, +}; + +static const struct attribute_group *virtblk_attr_groups[] = { + &virtblk_attr_group, +NULL , +};static int virtblk_init_request (struct blk_mq_tag_set *set,struct request *rq,unsigned int hctx_idx,unsigned int numa_node)
@@ -780,24 +805,9 @@ static int virtblk_probe(struct virtio_device *vdev)virtblk_update_capacity (vblk, false);virtio_device_ready (vdev); -device_add_disk (&vdev->dev, vblk->disk,NULL ); - err =device_create_file (disk_to_dev (vblk->disk), &dev_attr_serial); -if (err) - goto out_del_disk; - -if (virtio_has_feature (vdev,VIRTIO_BLK_F_CONFIG_WCE )) - err =device_create_file (disk_to_dev (vblk->disk), - &dev_attr_cache_type_rw); -else - err =device_create_file (disk_to_dev (vblk->disk), - &dev_attr_cache_type_ro); -if (err) - goto out_del_disk; +device_add_disk (&vdev->dev, vblk->disk, virtblk_attr_groups);return 0 ; -out_del_disk: -del_gendisk (vblk->disk); -blk_cleanup_queue (vblk->disk->queue); out_free_tags:blk_mq_free_tag_set (&vblk->tag_set); out_put_disk:
Signature · 1 line
2.16.4
Jens Axboe
maintainerQuoted 7 lines · Hannes Reinecke
device_add_disk()doesn't allow to register with default sysfs groups, which introduces a race with udev as these groups have to be created after the uevent has been sent.
This patchset updatesdevice_add_disk()to accept a 'groups' argument to avoid this race and updates the obvious drivers to use it. There are some more drivers which might benefit from this (eg loop or md), but the interface is not straightforward so I haven't attempted it.
Thanks Hannes, applied for 4.20.
Signature · 1 line
Jens Axboe