* [PATCH] md: add missing sysfs_notify on array_state update
From: Tomasz Majchrzak @ 2016-06-30 8:47 UTC (permalink / raw)
To: linux-raid
Changeset 6791875e2e53 has added early return from a function so there is no
sysfs notification for 'active' and 'clean' state change.
Signed-off-by: Tomasz Majchrzak <tomasz.majchrzak@intel.com>
---
drivers/md/md.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/md/md.c b/drivers/md/md.c
index c068f17..8d52f44 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3930,6 +3930,8 @@ array_state_store(struct mddev *mddev, const char *buf, size_t len)
} else
err = -EBUSY;
}
+ if (!err)
+ sysfs_notify_dirent_safe(mddev->sysfs_state);
spin_unlock(&mddev->lock);
return err ?: len;
}
--
1.8.3.1
^ permalink raw reply related
* Re: [PATCH v2 00/12] gendisk: Generate uevent after attribute available
From: Christoph Hellwig @ 2016-06-30 6:38 UTC (permalink / raw)
To: Fam Zheng
Cc: Sergey Senozhatsky, Michael S. Tsirkin, Benjamin Herrenschmidt,
linux-nvme, virtualization, Keith Busch, Paul Mackerras,
Michael Ellerman, Christoph Hellwig, Shaohua Li, Nitin Gupta,
Jiri Kosina, linux-raid, dan.j.williams, Ed L. Cashin, Jens Axboe,
linux-block, David Woodhouse, linux-mmc, linux-kernel,
Minchan Kim, linux-mtd, Brian Norris, linuxppc-dev
In-Reply-To: <20160630063554.GE23296@ad.usersys.redhat.com>
On Thu, Jun 30, 2016 at 02:35:54PM +0800, Fam Zheng wrote:
> also more code and less flexible IMO. For example, we need at least two
> variants, for attribute_group and device_attribute separately, right?
Yes, or maybe just a calling convention that just passes both.
^ permalink raw reply
* Re: [PATCH v2 00/12] gendisk: Generate uevent after attribute available
From: Fam Zheng @ 2016-06-30 6:35 UTC (permalink / raw)
To: Christoph Hellwig
Cc: Sergey Senozhatsky, Michael S. Tsirkin, Benjamin Herrenschmidt,
linux-nvme, virtualization, Keith Busch, Paul Mackerras,
Michael Ellerman, Shaohua Li, Nitin Gupta, Jiri Kosina,
linux-block, dan.j.williams, Ed L. Cashin, Jens Axboe, linux-raid,
David Woodhouse, linux-mmc, linux-kernel, Minchan Kim, linux-mtd,
Brian Norris, linuxppc-dev
In-Reply-To: <20160630062442.GA19761@infradead.org>
On Wed, 06/29 23:24, Christoph Hellwig wrote:
> On Thu, Jun 30, 2016 at 09:59:41AM +0800, Fam Zheng wrote:
> > Documentation/kobject.txt:
> > > Use the KOBJ_ADD action for when the kobject is first added to the kernel.
> > > This should be done only after any attributes or children of the kobject
> > > have been initialized properly, as userspace will instantly start to look
> > > for them when this call happens.
> >
> > Unfortunately it seems impossible to fix this generally without touching the
> > offending callers. The approach I'm proposing here is adding a flag to
> > suppress uevent in add_disk(), which is patch 1, then in later patches, convert
> > any caller to only trigger the uevent when attributes are added.
>
> We (or rather Dan) is touching most add_disk callers anyway for the
> driverfs_dev removal. Let's just pass the array of attributes to
> a disk_add variant and solve the issue for real.
I thought about that. Its usage is more compact compared to this series, but is
also more code and less flexible IMO. For example, we need at least two
variants, for attribute_group and device_attribute separately, right?
Fam
^ permalink raw reply
* Re: [PATCH v2 00/12] gendisk: Generate uevent after attribute available
From: Christoph Hellwig @ 2016-06-30 6:24 UTC (permalink / raw)
To: Fam Zheng
Cc: Sergey Senozhatsky, Michael S. Tsirkin, Benjamin Herrenschmidt,
linux-nvme, virtualization, Keith Busch, Paul Mackerras,
Michael Ellerman, Shaohua Li, Nitin Gupta, Jiri Kosina,
linux-block, dan.j.williams, Ed L. Cashin, Jens Axboe, linux-raid,
David Woodhouse, linux-mmc, linux-kernel, Minchan Kim, linux-mtd,
Brian Norris, linuxppc-dev
In-Reply-To: <20160630015953.6888-1-famz@redhat.com>
On Thu, Jun 30, 2016 at 09:59:41AM +0800, Fam Zheng wrote:
> Documentation/kobject.txt:
> > Use the KOBJ_ADD action for when the kobject is first added to the kernel.
> > This should be done only after any attributes or children of the kobject
> > have been initialized properly, as userspace will instantly start to look
> > for them when this call happens.
>
> Unfortunately it seems impossible to fix this generally without touching the
> offending callers. The approach I'm proposing here is adding a flag to
> suppress uevent in add_disk(), which is patch 1, then in later patches, convert
> any caller to only trigger the uevent when attributes are added.
We (or rather Dan) is touching most add_disk callers anyway for the
driverfs_dev removal. Let's just pass the array of attributes to
a disk_add variant and solve the issue for real.
^ permalink raw reply
* Re: [PATCH v2 02/12] genhd: Honor gen_uevent and add disk_gen_uevents
From: kbuild test robot @ 2016-06-30 3:26 UTC (permalink / raw)
Cc: Sergey Senozhatsky, Michael S. Tsirkin, Benjamin Herrenschmidt,
linux-nvme, virtualization, Keith Busch, Paul Mackerras,
Michael Ellerman, Christoph Hellwig, Shaohua Li, Nitin Gupta,
famz, Jiri Kosina, linux-block, Ed L. Cashin, Jens Axboe,
linux-raid, David Woodhouse, linux-mmc, linux-kernel, Minchan Kim,
kbuild-all, linux-mtd, Brian Norris, linuxppc-dev
In-Reply-To: <20160630015953.6888-3-famz@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 2046 bytes --]
Hi,
[auto build test WARNING on block/for-next]
[also build test WARNING on v4.7-rc5]
[cannot apply to next-20160629]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Fam-Zheng/gendisk-Generate-uevent-after-attribute-available/20160630-100720
base: https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git for-next
reproduce: make htmldocs
All warnings (new ones prefixed by >>):
lib/crc32.c:148: warning: No description found for parameter 'tab)[256]'
lib/crc32.c:148: warning: Excess function parameter 'tab' description in 'crc32_le_generic'
lib/crc32.c:293: warning: No description found for parameter 'tab)[256]'
lib/crc32.c:293: warning: Excess function parameter 'tab' description in 'crc32_be_generic'
lib/crc32.c:1: warning: no structured comments found
mm/memory.c:2881: warning: No description found for parameter 'old'
>> block/genhd.c:575: warning: No description found for parameter 'disk'
>> block/genhd.c:575: warning: No description found for parameter 'disk'
vim +/disk +575 block/genhd.c
559 blkdev_put(bdev, FMODE_READ);
560
561 exit:
562 /* announce disk after possible partitions are created */
563 dev_set_uevent_suppress(ddev, 0);
564 if (gen_uevent)
565 disk_gen_uevents(disk);
566 }
567
568 /**
569 * disk_gen_uevents
570 * @disk - the disk to generate uevent
571 *
572 * Generate KOBJ_ADD uevents on the disk and partitions.
573 */
574 void disk_gen_uevents(struct gendisk *disk)
> 575 {
576 struct device *ddev = disk_to_dev(disk);
577 struct disk_part_iter piter;
578 struct hd_struct *part;
579
580 kobject_uevent(&ddev->kobj, KOBJ_ADD);
581
582 /* announce possible partitions */
583 disk_part_iter_init(&piter, disk, 0);
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 6370 bytes --]
[-- Attachment #3: Type: text/plain, Size: 183 bytes --]
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
^ permalink raw reply
* [PATCH v2 12/12] nvme: Generate uevent after attribute available
From: Fam Zheng @ 2016-06-30 1:59 UTC (permalink / raw)
To: linux-kernel
Cc: Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman,
Jens Axboe, Ed L. Cashin, Jiri Kosina, Michael S. Tsirkin,
Minchan Kim, Nitin Gupta, Sergey Senozhatsky, Shaohua Li,
Ulf Hansson, David Woodhouse, Brian Norris, Keith Busch,
linuxppc-dev, linux-block, virtualization, linux-raid, linux-mmc,
linux-mtd, linux-nvme, Christoph Hellwig, famz
In-Reply-To: <20160630015953.6888-1-famz@redhat.com>
It is documented that KOBJ_ADD should be generated after the object's
attributes and children are ready. We can achieve this with the new
disk_gen_uevents interface.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
drivers/nvme/host/core.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index fd70894..2655521 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1462,11 +1462,12 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
if (ns->type == NVME_NS_LIGHTNVM)
return;
- add_disk(ns->disk, true);
+ add_disk(ns->disk, false);
if (sysfs_create_group(&disk_to_dev(ns->disk)->kobj,
&nvme_ns_attr_group))
pr_warn("%s: failed to create sysfs group for identification\n",
ns->disk->disk_name);
+ disk_gen_uevents(ns->disk);
return;
out_free_disk:
kfree(disk);
--
2.9.0
^ permalink raw reply related
* [PATCH v2 11/12] mtd: Generate uevent after attribute available
From: Fam Zheng @ 2016-06-30 1:59 UTC (permalink / raw)
To: linux-kernel
Cc: Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman,
Jens Axboe, Ed L. Cashin, Jiri Kosina, Michael S. Tsirkin,
Minchan Kim, Nitin Gupta, Sergey Senozhatsky, Shaohua Li,
Ulf Hansson, David Woodhouse, Brian Norris, Keith Busch,
linuxppc-dev, linux-block, virtualization, linux-raid, linux-mmc,
linux-mtd, linux-nvme, Christoph Hellwig, famz
In-Reply-To: <20160630015953.6888-1-famz@redhat.com>
It is documented that KOBJ_ADD should be generated after the object's
attributes and children are ready. We can achieve this with the new
disk_gen_uevents interface.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
drivers/mtd/mtd_blkdevs.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index ab3bc22..6848141 100644
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -436,13 +436,14 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)
if (new->readonly)
set_disk_ro(gd, 1);
- add_disk(gd, true);
+ add_disk(gd, false);
if (new->disk_attributes) {
ret = sysfs_create_group(&disk_to_dev(gd)->kobj,
new->disk_attributes);
WARN_ON(ret);
}
+ disk_gen_uevents(gd);
return 0;
error4:
blk_cleanup_queue(new->rq);
--
2.9.0
^ permalink raw reply related
* [PATCH v2 10/12] mmc: Generate uevent after attribute available
From: Fam Zheng @ 2016-06-30 1:59 UTC (permalink / raw)
To: linux-kernel
Cc: Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman,
Jens Axboe, Ed L. Cashin, Jiri Kosina, Michael S. Tsirkin,
Minchan Kim, Nitin Gupta, Sergey Senozhatsky, Shaohua Li,
Ulf Hansson, David Woodhouse, Brian Norris, Keith Busch,
linuxppc-dev, linux-block, virtualization, linux-raid, linux-mmc,
linux-mtd, linux-nvme, Christoph Hellwig, famz
In-Reply-To: <20160630015953.6888-1-famz@redhat.com>
It is documented that KOBJ_ADD should be generated after the object's
attributes and children are ready. We can achieve this with the new
disk_gen_uevents interface.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
drivers/mmc/card/block.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 94cf51e..4007106 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -2457,7 +2457,7 @@ static int mmc_add_disk(struct mmc_blk_data *md)
int ret;
struct mmc_card *card = md->queue.card;
- add_disk(md->disk, true);
+ add_disk(md->disk, false);
md->force_ro.show = force_ro_show;
md->force_ro.store = force_ro_store;
sysfs_attr_init(&md->force_ro.attr);
@@ -2466,6 +2466,7 @@ static int mmc_add_disk(struct mmc_blk_data *md)
ret = device_create_file(disk_to_dev(md->disk), &md->force_ro);
if (ret)
goto force_ro_fail;
+ disk_gen_uevents(md->disk);
if ((md->area_type & MMC_BLK_DATA_AREA_BOOT) &&
card->ext_csd.boot_ro_lockable) {
--
2.9.0
^ permalink raw reply related
* [PATCH v2 09/12] md: Generate uevent after attribute available
From: Fam Zheng @ 2016-06-30 1:59 UTC (permalink / raw)
To: linux-kernel
Cc: Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman,
Jens Axboe, Ed L. Cashin, Jiri Kosina, Michael S. Tsirkin,
Minchan Kim, Nitin Gupta, Sergey Senozhatsky, Shaohua Li,
Ulf Hansson, David Woodhouse, Brian Norris, Keith Busch,
linuxppc-dev, linux-block, virtualization, linux-raid, linux-mmc,
linux-mtd, linux-nvme, Christoph Hellwig, famz
In-Reply-To: <20160630015953.6888-1-famz@redhat.com>
It is documented that KOBJ_ADD should be generated after the object's
attributes and children are ready. We can achieve this with the new
disk_gen_uevents interface.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
drivers/md/md.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 1391c72..dcd09ea 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -5055,7 +5055,7 @@ static int md_alloc(dev_t dev, char *name)
* through to md_open, so make sure it doesn't get too far
*/
mutex_lock(&mddev->open_mutex);
- add_disk(disk, true);
+ add_disk(disk, false);
error = kobject_init_and_add(&mddev->kobj, &md_ktype,
&disk_to_dev(disk)->kobj, "%s", "md");
@@ -5070,6 +5070,7 @@ static int md_alloc(dev_t dev, char *name)
if (mddev->kobj.sd &&
sysfs_create_group(&mddev->kobj, &md_bitmap_group))
printk(KERN_DEBUG "pointless warning\n");
+ disk_gen_uevents(disk);
mutex_unlock(&mddev->open_mutex);
abort:
mutex_unlock(&disks_mutex);
--
2.9.0
^ permalink raw reply related
* [PATCH v2 08/12] zram: Generate uevent after attribute available
From: Fam Zheng @ 2016-06-30 1:59 UTC (permalink / raw)
To: linux-kernel
Cc: Sergey Senozhatsky, Michael S. Tsirkin, Benjamin Herrenschmidt,
linux-nvme, virtualization, Keith Busch, Paul Mackerras,
Michael Ellerman, Christoph Hellwig, Shaohua Li, Nitin Gupta,
famz, Jiri Kosina, linux-block, Ed L. Cashin, Jens Axboe,
linux-raid, David Woodhouse, linux-mmc, Minchan Kim, linux-mtd,
Brian Norris, linuxppc-dev
In-Reply-To: <20160630015953.6888-1-famz@redhat.com>
It is documented that KOBJ_ADD should be generated after the object's
attributes and children are ready. We can achieve this with the new
disk_gen_uevents interface.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
drivers/block/zram/zram_drv.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index d735513..83f10a0 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -1287,7 +1287,7 @@ static int zram_add(void)
zram->disk->queue->limits.discard_zeroes_data = 0;
queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, zram->disk->queue);
- add_disk(zram->disk, true);
+ add_disk(zram->disk, false);
ret = sysfs_create_group(&disk_to_dev(zram->disk)->kobj,
&zram_disk_attr_group);
@@ -1296,6 +1296,7 @@ static int zram_add(void)
device_id);
goto out_free_disk;
}
+ disk_gen_uevents(zram->disk);
strlcpy(zram->compressor, default_compressor, sizeof(zram->compressor));
zram->meta = NULL;
--
2.9.0
^ permalink raw reply related
* [PATCH v2 07/12] pktcdvd: Generate uevent after attribute available
From: Fam Zheng @ 2016-06-30 1:59 UTC (permalink / raw)
To: linux-kernel
Cc: Sergey Senozhatsky, Michael S. Tsirkin, Benjamin Herrenschmidt,
linux-nvme, virtualization, Keith Busch, Paul Mackerras,
Michael Ellerman, Christoph Hellwig, Shaohua Li, Nitin Gupta,
famz, Jiri Kosina, linux-block, Ed L. Cashin, Jens Axboe,
linux-raid, David Woodhouse, linux-mmc, Minchan Kim, linux-mtd,
Brian Norris, linuxppc-dev
In-Reply-To: <20160630015953.6888-1-famz@redhat.com>
It is documented that KOBJ_ADD should be generated after the object's
attributes and children are ready. We can achieve this with the new
disk_gen_uevents interface.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
drivers/block/pktcdvd.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 00928406..a4e6bb7 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -2785,11 +2785,13 @@ static int pkt_setup_dev(dev_t dev, dev_t* pkt_dev)
disk->events = pd->bdev->bd_disk->events;
disk->async_events = pd->bdev->bd_disk->async_events;
- add_disk(disk, true);
+ add_disk(disk, false);
pkt_sysfs_dev_new(pd);
pkt_debugfs_dev_new(pd);
+ disk_gen_uevents(disk);
+
pkt_devs[idx] = pd;
if (pkt_dev)
*pkt_dev = pd->pkt_dev;
--
2.9.0
^ permalink raw reply related
* [PATCH v2 06/12] mtip32xx: Generate uevent after attribute available
From: Fam Zheng @ 2016-06-30 1:59 UTC (permalink / raw)
To: linux-kernel
Cc: Sergey Senozhatsky, Michael S. Tsirkin, Benjamin Herrenschmidt,
linux-nvme, virtualization, Keith Busch, Paul Mackerras,
Michael Ellerman, Christoph Hellwig, Shaohua Li, Nitin Gupta,
famz, Jiri Kosina, linux-block, Ed L. Cashin, Jens Axboe,
linux-raid, David Woodhouse, linux-mmc, Minchan Kim, linux-mtd,
Brian Norris, linuxppc-dev
In-Reply-To: <20160630015953.6888-1-famz@redhat.com>
It is documented that KOBJ_ADD should be generated after the object's
attributes and children are ready. We can achieve this with the new
disk_gen_uevents interface.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
drivers/block/mtip32xx/mtip32xx.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index 2d09fae..8c1cf03 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -4042,7 +4042,7 @@ skip_create_disk:
set_capacity(dd->disk, capacity);
/* Enable the block device and add it to /dev */
- add_disk(dd->disk, true);
+ add_disk(dd->disk, false);
dd->bdev = bdget_disk(dd->disk, 0);
/*
@@ -4054,6 +4054,7 @@ skip_create_disk:
mtip_hw_sysfs_init(dd, kobj);
kobject_put(kobj);
}
+ disk_gen_uevents(dd->disk);
if (dd->mtip_svc_handler) {
set_bit(MTIP_DDF_INIT_DONE_BIT, &dd->dd_flag);
--
2.9.0
^ permalink raw reply related
* [PATCH v2 05/12] aoeblk: Generate uevent after attribute available
From: Fam Zheng @ 2016-06-30 1:59 UTC (permalink / raw)
To: linux-kernel
Cc: Sergey Senozhatsky, Michael S. Tsirkin, Benjamin Herrenschmidt,
linux-nvme, virtualization, Keith Busch, Paul Mackerras,
Michael Ellerman, Christoph Hellwig, Shaohua Li, Nitin Gupta,
famz, Jiri Kosina, linux-block, Ed L. Cashin, Jens Axboe,
linux-raid, David Woodhouse, linux-mmc, Minchan Kim, linux-mtd,
Brian Norris, linuxppc-dev
In-Reply-To: <20160630015953.6888-1-famz@redhat.com>
It is documented that KOBJ_ADD should be generated after the object's
attributes and children are ready. We can achieve this with the new
disk_gen_uevents interface.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
drivers/block/aoe/aoeblk.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index e91c5f1..f0cf4d6 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -417,9 +417,10 @@ aoeblk_gdalloc(void *vp)
spin_unlock_irqrestore(&d->lock, flags);
- add_disk(gd, true);
+ add_disk(gd, false);
aoedisk_add_sysfs(d);
aoedisk_add_debugfs(d);
+ disk_gen_uevents(gd);
spin_lock_irqsave(&d->lock, flags);
WARN_ON(!(d->flags & DEVFL_GD_NOW));
--
2.9.0
^ permalink raw reply related
* [PATCH v2 04/12] axonrom: Generate uevent after attribute available
From: Fam Zheng @ 2016-06-30 1:59 UTC (permalink / raw)
To: linux-kernel
Cc: Sergey Senozhatsky, Michael S. Tsirkin, Benjamin Herrenschmidt,
linux-nvme, virtualization, Keith Busch, Paul Mackerras,
Michael Ellerman, Christoph Hellwig, Shaohua Li, Nitin Gupta,
famz, Jiri Kosina, linux-block, Ed L. Cashin, Jens Axboe,
linux-raid, David Woodhouse, linux-mmc, Minchan Kim, linux-mtd,
Brian Norris, linuxppc-dev
In-Reply-To: <20160630015953.6888-1-famz@redhat.com>
It is documented that KOBJ_ADD should be generated after the object's
attributes and children are ready. We can achieve this with the new
disk_gen_uevents interface.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
arch/powerpc/sysdev/axonram.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c
index 4efd69b..27e7175 100644
--- a/arch/powerpc/sysdev/axonram.c
+++ b/arch/powerpc/sysdev/axonram.c
@@ -238,7 +238,7 @@ static int axon_ram_probe(struct platform_device *device)
set_capacity(bank->disk, bank->size >> AXON_RAM_SECTOR_SHIFT);
blk_queue_make_request(bank->disk->queue, axon_ram_make_request);
blk_queue_logical_block_size(bank->disk->queue, AXON_RAM_SECTOR_SIZE);
- add_disk(bank->disk, true);
+ add_disk(bank->disk, false);
bank->irq_id = irq_of_parse_and_map(device->dev.of_node, 0);
if (bank->irq_id == NO_IRQ) {
@@ -262,6 +262,7 @@ static int axon_ram_probe(struct platform_device *device)
rc = -EFAULT;
goto failed;
}
+ disk_gen_uevents(bank->disk);
azfs_minor += bank->disk->minors;
--
2.9.0
^ permalink raw reply related
* [PATCH v2 03/12] virtio-blk: Generate uevent after attribute available
From: Fam Zheng @ 2016-06-30 1:59 UTC (permalink / raw)
To: linux-kernel
Cc: Sergey Senozhatsky, Michael S. Tsirkin, Benjamin Herrenschmidt,
linux-nvme, virtualization, Keith Busch, Paul Mackerras,
Michael Ellerman, Christoph Hellwig, Shaohua Li, Nitin Gupta,
famz, Jiri Kosina, linux-block, Ed L. Cashin, Jens Axboe,
linux-raid, David Woodhouse, linux-mmc, Minchan Kim, linux-mtd,
Brian Norris, linuxppc-dev
In-Reply-To: <20160630015953.6888-1-famz@redhat.com>
Userspace listens to the KOBJ_ADD uevent generated in add_disk. At that
point we haven't created the serial attribute file, therefore depending
on how fast udev reacts, the /dev/disk/by-id/ entry doesn't always get
created.
This race condition can be easily reproduced by hot plugging a number of
virtio-blk disks.
Also in systemd, there used to be a related workaround in udev rules
called 'WAIT_FOR="serial"', but it is removed in later versions.
Now let's generate a KOBJ_CHANGE event after the attributes are ready.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
drivers/block/virtio_blk.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index f3a59f9..cd9a036 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -733,7 +733,7 @@ static int virtblk_probe(struct virtio_device *vdev)
virtio_device_ready(vdev);
- add_disk(vblk->disk, true);
+ add_disk(vblk->disk, false);
err = device_create_file(disk_to_dev(vblk->disk), &dev_attr_serial);
if (err)
goto out_del_disk;
@@ -746,6 +746,7 @@ static int virtblk_probe(struct virtio_device *vdev)
&dev_attr_cache_type_ro);
if (err)
goto out_del_disk;
+ disk_gen_uevents(vblk->disk);
return 0;
out_del_disk:
--
2.9.0
^ permalink raw reply related
* [PATCH v2 02/12] genhd: Honor gen_uevent and add disk_gen_uevents
From: Fam Zheng @ 2016-06-30 1:59 UTC (permalink / raw)
To: linux-kernel
Cc: Sergey Senozhatsky, Michael S. Tsirkin, Benjamin Herrenschmidt,
linux-nvme, virtualization, Keith Busch, Paul Mackerras,
Michael Ellerman, Christoph Hellwig, Shaohua Li, Nitin Gupta,
famz, Jiri Kosina, linux-block, Ed L. Cashin, Jens Axboe,
linux-raid, David Woodhouse, linux-mmc, Minchan Kim, linux-mtd,
Brian Norris, linuxppc-dev
In-Reply-To: <20160630015953.6888-1-famz@redhat.com>
In add_disk(), don't send uevent to userspace when gen_uevent is true;
also export the refactored function disk_gen_uevents for later use.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
block/genhd.c | 23 +++++++++++++++++++----
include/linux/genhd.h | 1 +
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/block/genhd.c b/block/genhd.c
index 8e1bfa1..9b66953 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -506,12 +506,10 @@ static int exact_lock(dev_t devt, void *data)
return 0;
}
-static void register_disk(struct gendisk *disk)
+static void register_disk(struct gendisk *disk, bool gen_uevent)
{
struct device *ddev = disk_to_dev(disk);
struct block_device *bdev;
- struct disk_part_iter piter;
- struct hd_struct *part;
int err;
ddev->parent = disk->driverfs_dev;
@@ -563,6 +561,22 @@ static void register_disk(struct gendisk *disk)
exit:
/* announce disk after possible partitions are created */
dev_set_uevent_suppress(ddev, 0);
+ if (gen_uevent)
+ disk_gen_uevents(disk);
+}
+
+/**
+ * disk_gen_uevents
+ * @disk - the disk to generate uevent
+ *
+ * Generate KOBJ_ADD uevents on the disk and partitions.
+ */
+void disk_gen_uevents(struct gendisk *disk)
+{
+ struct device *ddev = disk_to_dev(disk);
+ struct disk_part_iter piter;
+ struct hd_struct *part;
+
kobject_uevent(&ddev->kobj, KOBJ_ADD);
/* announce possible partitions */
@@ -571,6 +585,7 @@ exit:
kobject_uevent(&part_to_dev(part)->kobj, KOBJ_ADD);
disk_part_iter_exit(&piter);
}
+EXPORT_SYMBOL(disk_gen_uevents);
/**
* add_disk - add partitioning information to kernel list
@@ -618,7 +633,7 @@ void add_disk(struct gendisk *disk, bool gen_uevent)
blk_register_region(disk_devt(disk), disk->minors, NULL,
exact_match, exact_lock, disk);
- register_disk(disk);
+ register_disk(disk, gen_uevent);
blk_register_queue(disk);
/*
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 038be80..87ad9e5 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -416,6 +416,7 @@ extern void part_round_stats(int cpu, struct hd_struct *part);
/* block/genhd.c */
extern void add_disk(struct gendisk *disk, bool gen_uevent);
extern void del_gendisk(struct gendisk *gp);
+extern void disk_gen_uevents(struct gendisk *disk);
extern struct gendisk *get_gendisk(dev_t dev, int *partno);
extern struct block_device *bdget_disk(struct gendisk *disk, int partno);
--
2.9.0
^ permalink raw reply related
* [PATCH v2 01/12] genhd: Add "gen_uevent" parameter to add_disk
From: Fam Zheng @ 2016-06-30 1:59 UTC (permalink / raw)
To: linux-kernel
Cc: Sergey Senozhatsky, Michael S. Tsirkin, Benjamin Herrenschmidt,
linux-nvme, virtualization, Keith Busch, Paul Mackerras,
Michael Ellerman, Christoph Hellwig, Shaohua Li, Nitin Gupta,
famz, Jiri Kosina, linux-block, Ed L. Cashin, Jens Axboe,
linux-raid, David Woodhouse, linux-mmc, Minchan Kim, linux-mtd,
Brian Norris, linuxppc-dev
In-Reply-To: <20160630015953.6888-1-famz@redhat.com>
The parameter will be used to control whether add_disk should generate
the KOBJ_ADD uevent already.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
arch/m68k/emu/nfblock.c | 2 +-
arch/powerpc/sysdev/axonram.c | 2 +-
arch/um/drivers/ubd_kern.c | 2 +-
arch/xtensa/platforms/iss/simdisk.c | 2 +-
block/genhd.c | 3 ++-
drivers/block/DAC960.c | 2 +-
drivers/block/amiflop.c | 2 +-
drivers/block/aoe/aoeblk.c | 2 +-
drivers/block/ataflop.c | 2 +-
drivers/block/brd.c | 4 ++--
drivers/block/cciss.c | 2 +-
drivers/block/drbd/drbd_main.c | 2 +-
drivers/block/floppy.c | 2 +-
drivers/block/hd.c | 2 +-
drivers/block/loop.c | 2 +-
drivers/block/mg_disk.c | 2 +-
drivers/block/mtip32xx/mtip32xx.c | 2 +-
drivers/block/nbd.c | 2 +-
drivers/block/null_blk.c | 2 +-
drivers/block/osdblk.c | 2 +-
drivers/block/paride/pcd.c | 2 +-
drivers/block/paride/pd.c | 2 +-
drivers/block/paride/pf.c | 2 +-
drivers/block/pktcdvd.c | 2 +-
drivers/block/ps3disk.c | 2 +-
drivers/block/ps3vram.c | 2 +-
drivers/block/rbd.c | 2 +-
drivers/block/rsxx/dev.c | 2 +-
drivers/block/skd_main.c | 2 +-
drivers/block/sunvdc.c | 2 +-
drivers/block/swim.c | 2 +-
drivers/block/swim3.c | 2 +-
drivers/block/sx8.c | 2 +-
drivers/block/umem.c | 2 +-
drivers/block/virtio_blk.c | 2 +-
drivers/block/xen-blkfront.c | 2 +-
drivers/block/xsysace.c | 2 +-
drivers/block/z2ram.c | 2 +-
drivers/block/zram/zram_drv.c | 2 +-
drivers/cdrom/gdrom.c | 2 +-
drivers/ide/ide-cd.c | 2 +-
drivers/ide/ide-gd.c | 2 +-
drivers/lightnvm/core.c | 2 +-
drivers/md/bcache/super.c | 4 ++--
drivers/md/dm.c | 2 +-
drivers/md/md.c | 2 +-
drivers/memstick/core/ms_block.c | 2 +-
drivers/memstick/core/mspro_block.c | 2 +-
drivers/mmc/card/block.c | 2 +-
drivers/mtd/mtd_blkdevs.c | 2 +-
drivers/mtd/ubi/block.c | 2 +-
drivers/nvdimm/blk.c | 2 +-
drivers/nvdimm/btt.c | 2 +-
drivers/nvdimm/pmem.c | 2 +-
drivers/nvme/host/core.c | 2 +-
drivers/s390/block/dasd_genhd.c | 2 +-
drivers/s390/block/dcssblk.c | 2 +-
drivers/s390/block/scm_blk.c | 2 +-
drivers/s390/block/xpram.c | 2 +-
drivers/sbus/char/jsflash.c | 2 +-
drivers/scsi/sd.c | 2 +-
drivers/scsi/sr.c | 2 +-
drivers/staging/lustre/lustre/llite/lloop.c | 2 +-
include/linux/genhd.h | 2 +-
64 files changed, 67 insertions(+), 66 deletions(-)
diff --git a/arch/m68k/emu/nfblock.c b/arch/m68k/emu/nfblock.c
index e9110b9..4252568 100644
--- a/arch/m68k/emu/nfblock.c
+++ b/arch/m68k/emu/nfblock.c
@@ -138,7 +138,7 @@ static int __init nfhd_init_one(int id, u32 blocks, u32 bsize)
set_capacity(dev->disk, (sector_t)blocks * (bsize / 512));
dev->disk->queue = dev->queue;
- add_disk(dev->disk);
+ add_disk(dev->disk, true);
list_add_tail(&dev->list, &nfhd_list);
diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c
index ff75d70..4efd69b 100644
--- a/arch/powerpc/sysdev/axonram.c
+++ b/arch/powerpc/sysdev/axonram.c
@@ -238,7 +238,7 @@ static int axon_ram_probe(struct platform_device *device)
set_capacity(bank->disk, bank->size >> AXON_RAM_SECTOR_SHIFT);
blk_queue_make_request(bank->disk->queue, axon_ram_make_request);
blk_queue_logical_block_size(bank->disk->queue, AXON_RAM_SECTOR_SIZE);
- add_disk(bank->disk);
+ add_disk(bank->disk, true);
bank->irq_id = irq_of_parse_and_map(device->dev.of_node, 0);
if (bank->irq_id == NO_IRQ) {
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 17e96dc..c2eea65 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -828,7 +828,7 @@ static int ubd_disk_register(int major, u64 size, int unit,
disk->private_data = &ubd_devs[unit];
disk->queue = ubd_devs[unit].queue;
- add_disk(disk);
+ add_disk(disk, true);
*disk_out = disk;
return 0;
diff --git a/arch/xtensa/platforms/iss/simdisk.c b/arch/xtensa/platforms/iss/simdisk.c
index f58a4e6..59951a5 100644
--- a/arch/xtensa/platforms/iss/simdisk.c
+++ b/arch/xtensa/platforms/iss/simdisk.c
@@ -288,7 +288,7 @@ static int __init simdisk_setup(struct simdisk *dev, int which,
dev->gd->private_data = dev;
snprintf(dev->gd->disk_name, 32, "simdisk%d", which);
set_capacity(dev->gd, 0);
- add_disk(dev->gd);
+ add_disk(dev->gd, true);
dev->procfile = proc_create_data(tmp, 0644, procdir, &fops, dev);
return 0;
diff --git a/block/genhd.c b/block/genhd.c
index 9f42526..8e1bfa1 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -575,13 +575,14 @@ exit:
/**
* add_disk - add partitioning information to kernel list
* @disk: per-device partitioning information
+ * @gen_uevent: whether to generate the KOBJ_ADD uevent
*
* This function registers the partitioning information in @disk
* with the kernel.
*
* FIXME: error handling
*/
-void add_disk(struct gendisk *disk)
+void add_disk(struct gendisk *disk, bool gen_uevent)
{
struct backing_dev_info *bdi;
dev_t devt;
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 811e11c..c18fc2c 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -3175,7 +3175,7 @@ DAC960_Probe(struct pci_dev *dev, const struct pci_device_id *entry)
for (disk = 0; disk < DAC960_MaxLogicalDrives; disk++) {
set_capacity(Controller->disks[disk], disk_size(Controller, disk));
- add_disk(Controller->disks[disk]);
+ add_disk(Controller->disks[disk], true);
}
DAC960_CreateProcEntries(Controller);
return 0;
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index 5fd50a2..c226b30 100644
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -1738,7 +1738,7 @@ static int __init fd_probe_drives(void)
sprintf(disk->disk_name, "fd%d", drive);
disk->private_data = &unit[drive];
set_capacity(disk, 880*2);
- add_disk(disk);
+ add_disk(disk, true);
}
if ((drives > 0) || (nomem == 0)) {
if (drives == 0)
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index ec9d861..e91c5f1 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -417,7 +417,7 @@ aoeblk_gdalloc(void *vp)
spin_unlock_irqrestore(&d->lock, flags);
- add_disk(gd);
+ add_disk(gd, true);
aoedisk_add_sysfs(d);
aoedisk_add_debugfs(d);
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 2104b1b..0feae71 100644
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -1969,7 +1969,7 @@ static int __init atari_floppy_init (void)
if (!unit[i].disk->queue)
goto Enomem;
set_capacity(unit[i].disk, MAX_DISK_SIZE * 2);
- add_disk(unit[i].disk);
+ add_disk(unit[i].disk, true);
}
blk_register_region(MKDEV(FLOPPY_MAJOR, 0), 256, THIS_MODULE,
diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index c04bd9b..7101343 100644
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -552,7 +552,7 @@ static struct brd_device *brd_init_one(int i, bool *new)
brd = brd_alloc(i);
if (brd) {
- add_disk(brd->brd_disk);
+ add_disk(brd->brd_disk, true);
list_add_tail(&brd->brd_list, &brd_devices);
}
*new = true;
@@ -620,7 +620,7 @@ static int __init brd_init(void)
/* point of no return */
list_for_each_entry(brd, &brd_devices, brd_list)
- add_disk(brd->brd_disk);
+ add_disk(brd->brd_disk, true);
blk_register_region(MKDEV(RAMDISK_MAJOR, 0), 1UL << MINORBITS,
THIS_MODULE, brd_probe, NULL, NULL);
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 63c2064..ab93075 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1973,7 +1973,7 @@ static int cciss_add_disk(ctlr_info_t *h, struct gendisk *disk,
/* allows the interrupt handler to start the queue */
wmb();
h->drv[drv_index]->queue = disk->queue;
- add_disk(disk);
+ add_disk(disk, true);
return 0;
cleanup_queue:
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 2ba1494..7c54597 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -2820,7 +2820,7 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig
goto out_idr_remove_vol;
}
- add_disk(disk);
+ add_disk(disk, true);
/* inherit the connection state */
device->state.conn = first_connection(resource)->cstate;
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 84708a5..228e8f7 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4350,7 +4350,7 @@ static int __init do_floppy_init(void)
disks[drive]->private_data = (void *)(long)drive;
disks[drive]->flags |= GENHD_FL_REMOVABLE;
disks[drive]->driverfs_dev = &floppy_device[drive].dev;
- add_disk(disks[drive]);
+ add_disk(disks[drive], true);
}
return 0;
diff --git a/drivers/block/hd.c b/drivers/block/hd.c
index 3abb121..6751c42 100644
--- a/drivers/block/hd.c
+++ b/drivers/block/hd.c
@@ -767,7 +767,7 @@ static int __init hd_init(void)
/* Let them fly */
for (drive = 0; drive < NR_HD; drive++)
- add_disk(hd_gendisk[drive]);
+ add_disk(hd_gendisk[drive], true);
return 0;
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 1fa8cc2..3223a23 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -1800,7 +1800,7 @@ static int loop_add(struct loop_device **l, int i)
disk->private_data = lo;
disk->queue = lo->lo_queue;
sprintf(disk->disk_name, "loop%d", i);
- add_disk(disk);
+ add_disk(disk, true);
*l = lo;
return lo->lo_number;
diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c
index 145ce2a..9def46b 100644
--- a/drivers/block/mg_disk.c
+++ b/drivers/block/mg_disk.c
@@ -1009,7 +1009,7 @@ static int mg_probe(struct platform_device *plat_dev)
set_capacity(host->gd, host->n_sectors);
- add_disk(host->gd);
+ add_disk(host->gd, true);
return err;
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index 6053e46..2d09fae 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -4042,7 +4042,7 @@ skip_create_disk:
set_capacity(dd->disk, capacity);
/* Enable the block device and add it to /dev */
- add_disk(dd->disk);
+ add_disk(dd->disk, true);
dd->bdev = bdget_disk(dd->disk, 0);
/*
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 6a48ed4..4d011c1 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1089,7 +1089,7 @@ static int __init nbd_init(void)
disk->private_data = &nbd_dev[i];
sprintf(disk->disk_name, "nbd%d", i);
nbd_reset(&nbd_dev[i]);
- add_disk(disk);
+ add_disk(disk, true);
}
return 0;
diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c
index cab9759..bc4c495 100644
--- a/drivers/block/null_blk.c
+++ b/drivers/block/null_blk.c
@@ -740,7 +740,7 @@ static int null_add_dev(void)
disk->queue = nullb->q;
strncpy(disk->disk_name, nullb->disk_name, DISK_NAME_LEN);
- add_disk(disk);
+ add_disk(disk, true);
done:
mutex_lock(&lock);
diff --git a/drivers/block/osdblk.c b/drivers/block/osdblk.c
index c2854a2..5a750e2 100644
--- a/drivers/block/osdblk.c
+++ b/drivers/block/osdblk.c
@@ -448,7 +448,7 @@ static int osdblk_init_disk(struct osdblk_device *osdev)
/* finally, announce the disk to the world */
set_capacity(disk, obj_size / 512ULL);
- add_disk(disk);
+ add_disk(disk, true);
printk(KERN_INFO "%s: Added of size 0x%llx\n",
disk->disk_name, (unsigned long long)obj_size);
diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c
index 9336236..9d03cbe 100644
--- a/drivers/block/paride/pcd.c
+++ b/drivers/block/paride/pcd.c
@@ -970,7 +970,7 @@ static int __init pcd_init(void)
register_cdrom(&cd->info);
cd->disk->private_data = cd;
cd->disk->queue = pcd_queue;
- add_disk(cd->disk);
+ add_disk(cd->disk, true);
}
}
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index 78a39f7..da45f07 100644
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -906,7 +906,7 @@ static int pd_detect(void)
for (unit = 0, disk = pd; unit < PD_UNITS; unit++, disk++) {
if (disk->gd) {
set_capacity(disk->gd, disk->capacity);
- add_disk(disk->gd);
+ add_disk(disk->gd, true);
found = 1;
}
}
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index 7a7d977..9b7f885 100644
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -989,7 +989,7 @@ static int __init pf_init(void)
continue;
disk->private_data = pf;
disk->queue = pf_queue;
- add_disk(disk);
+ add_disk(disk, true);
}
return 0;
}
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index d06c62e..00928406 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -2785,7 +2785,7 @@ static int pkt_setup_dev(dev_t dev, dev_t* pkt_dev)
disk->events = pd->bdev->bd_disk->events;
disk->async_events = pd->bdev->bd_disk->async_events;
- add_disk(disk);
+ add_disk(disk, true);
pkt_sysfs_dev_new(pd);
pkt_debugfs_dev_new(pd);
diff --git a/drivers/block/ps3disk.c b/drivers/block/ps3disk.c
index 4b7e405..bd72d79 100644
--- a/drivers/block/ps3disk.c
+++ b/drivers/block/ps3disk.c
@@ -499,7 +499,7 @@ static int ps3disk_probe(struct ps3_system_bus_device *_dev)
gendisk->disk_name, priv->model, priv->raw_capacity >> 11,
get_capacity(gendisk) >> 11);
- add_disk(gendisk);
+ add_disk(gendisk, true);
return 0;
fail_cleanup_queue:
diff --git a/drivers/block/ps3vram.c b/drivers/block/ps3vram.c
index 56847fc..ab6acc5 100644
--- a/drivers/block/ps3vram.c
+++ b/drivers/block/ps3vram.c
@@ -780,7 +780,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);
- add_disk(gendisk);
+ add_disk(gendisk, true);
return 0;
fail_cleanup_queue:
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 81666a5..bee01ae 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -5158,7 +5158,7 @@ static int rbd_dev_device_setup(struct rbd_device *rbd_dev)
set_bit(RBD_DEV_FLAG_EXISTS, &rbd_dev->flags);
up_write(&rbd_dev->header_rwsem);
- add_disk(rbd_dev->disk);
+ add_disk(rbd_dev->disk, true);
pr_info("%s: added with size 0x%llx\n", rbd_dev->disk->disk_name,
(unsigned long long) rbd_dev->mapping.size);
diff --git a/drivers/block/rsxx/dev.c b/drivers/block/rsxx/dev.c
index e1b8b70..b4dc913 100644
--- a/drivers/block/rsxx/dev.c
+++ b/drivers/block/rsxx/dev.c
@@ -230,7 +230,7 @@ int rsxx_attach_dev(struct rsxx_cardinfo *card)
set_capacity(card->gendisk, card->size8 >> 9);
else
set_capacity(card->gendisk, 0);
- add_disk(card->gendisk);
+ add_disk(card->gendisk, true);
card->bdev_attached = 1;
}
diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c
index 910e065..a7de9bb 100644
--- a/drivers/block/skd_main.c
+++ b/drivers/block/skd_main.c
@@ -4693,7 +4693,7 @@ static int skd_bdev_getgeo(struct block_device *bdev, struct hd_geometry *geo)
static int skd_bdev_attach(struct skd_device *skdev)
{
pr_debug("%s:%s:%d add_disk\n", skdev->name, __func__, __LINE__);
- add_disk(skdev->disk);
+ add_disk(skdev->disk, true);
return 0;
}
diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c
index 4b911ed..c762c31 100644
--- a/drivers/block/sunvdc.c
+++ b/drivers/block/sunvdc.c
@@ -835,7 +835,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);
- add_disk(g);
+ add_disk(g, true);
return 0;
}
diff --git a/drivers/block/swim.c b/drivers/block/swim.c
index b5afd49..c1ff0ee 100644
--- a/drivers/block/swim.c
+++ b/drivers/block/swim.c
@@ -858,7 +858,7 @@ static int swim_floppy_init(struct swim_priv *swd)
swd->unit[drive].disk->private_data = &swd->unit[drive];
swd->unit[drive].disk->queue = swd->queue;
set_capacity(swd->unit[drive].disk, 2880);
- add_disk(swd->unit[drive].disk);
+ add_disk(swd->unit[drive].disk, true);
}
blk_register_region(MKDEV(FLOPPY_MAJOR, 0), 256, THIS_MODULE,
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index c264f2d..6940593 100644
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -1240,7 +1240,7 @@ static int swim3_attach(struct macio_dev *mdev,
disk->flags |= GENHD_FL_REMOVABLE;
sprintf(disk->disk_name, "fd%d", index);
set_capacity(disk, 2880);
- add_disk(disk);
+ add_disk(disk, true);
return 0;
}
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index ba4bfe9..ed285f0 100644
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -1333,7 +1333,7 @@ static void carm_fsm_task (struct work_struct *work)
struct gendisk *disk = port->disk;
set_capacity(disk, port->capacity);
- add_disk(disk);
+ add_disk(disk, true);
activated++;
}
diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index 7939b9f..5f6ed17 100644
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -1098,7 +1098,7 @@ static int __init mm_init(void)
disk->private_data = &cards[i];
disk->queue = cards[i].queue;
set_capacity(disk, cards[i].mm_size << 1);
- add_disk(disk);
+ add_disk(disk, true);
}
init_battery_timer();
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 42758b5..f3a59f9 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -733,7 +733,7 @@ static int virtblk_probe(struct virtio_device *vdev)
virtio_device_ready(vdev);
- add_disk(vblk->disk);
+ add_disk(vblk->disk, true);
err = device_create_file(disk_to_dev(vblk->disk), &dev_attr_serial);
if (err)
goto out_del_disk;
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 2e6d1e9..175983a 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -2452,7 +2452,7 @@ static void blkfront_connect(struct blkfront_info *info)
for (i = 0; i < info->nr_rings; i++)
kick_pending_request_queues(&info->rinfo[i]);
- add_disk(info->gd);
+ add_disk(info->gd, true);
info->is_ready = 1;
}
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index c4328d9..7e060e0 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -1057,7 +1057,7 @@ static int ace_setup(struct ace_device *ace)
ace_revalidate_disk(ace->gd);
/* Make the sysace device 'live' */
- add_disk(ace->gd);
+ add_disk(ace->gd, true);
return 0;
diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c
index 968f9e5..91ccbfb 100644
--- a/drivers/block/z2ram.c
+++ b/drivers/block/z2ram.c
@@ -364,7 +364,7 @@ z2_init(void)
sprintf(z2ram_gendisk->disk_name, "z2ram");
z2ram_gendisk->queue = z2_queue;
- add_disk(z2ram_gendisk);
+ add_disk(z2ram_gendisk, true);
blk_register_region(MKDEV(Z2RAM_MAJOR, 0), Z2MINOR_COUNT, THIS_MODULE,
z2_find, NULL, NULL);
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 8fcad8b..d735513 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -1287,7 +1287,7 @@ static int zram_add(void)
zram->disk->queue->limits.discard_zeroes_data = 0;
queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, zram->disk->queue);
- add_disk(zram->disk);
+ add_disk(zram->disk, true);
ret = sysfs_create_group(&disk_to_dev(zram->disk)->kobj,
&zram_disk_attr_group);
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index 584bc31..25403ee 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -817,7 +817,7 @@ static int probe_gdrom(struct platform_device *devptr)
gd.toc = kzalloc(sizeof(struct gdromtoc), GFP_KERNEL);
if (!gd.toc)
goto probe_fail_toc;
- add_disk(gd.disk);
+ add_disk(gd.disk, true);
return 0;
probe_fail_toc:
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index ef907fd..39125d0 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1780,7 +1780,7 @@ static int ide_cd_probe(ide_drive_t *drive)
ide_cd_read_toc(drive, &sense);
g->fops = &idecd_ops;
g->flags |= GENHD_FL_REMOVABLE | GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE;
- add_disk(g);
+ add_disk(g, true);
return 0;
out_free_disk:
diff --git a/drivers/ide/ide-gd.c b/drivers/ide/ide-gd.c
index 838996a..6a82457 100644
--- a/drivers/ide/ide-gd.c
+++ b/drivers/ide/ide-gd.c
@@ -417,7 +417,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;
- add_disk(g);
+ add_disk(g, true);
return 0;
out_free_disk:
diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
index 160c1a6..392886c 100644
--- a/drivers/lightnvm/core.c
+++ b/drivers/lightnvm/core.c
@@ -843,7 +843,7 @@ static int nvm_create_target(struct nvm_dev *dev,
blk_queue_max_hw_sectors(tqueue, 8 * dev->ops->max_phys_sect);
set_capacity(tdisk, tt->capacity(targetdata));
- add_disk(tdisk);
+ add_disk(tdisk, true);
t->type = tt;
t->disk = tdisk;
diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
index f5dbb4e..ecb401c 100644
--- a/drivers/md/bcache/super.c
+++ b/drivers/md/bcache/super.c
@@ -865,7 +865,7 @@ void bch_cached_dev_run(struct cached_dev *dc)
closure_sync(&cl);
}
- add_disk(d->disk);
+ add_disk(d->disk, true);
bd_link_disk_holder(dc->bdev, dc->disk.disk);
/* won't show up in the uevent file, use udevadm monitor -e instead
* only class / kset properties are persistent */
@@ -1228,7 +1228,7 @@ static int flash_dev_run(struct cache_set *c, struct uuid_entry *u)
bcache_device_attach(d, c, u - c->uuids);
bch_flash_dev_request_init(d);
- add_disk(d->disk);
+ add_disk(d->disk, true);
if (kobject_add(&d->kobj, &disk_to_dev(d->disk)->kobj, "bcache"))
goto err;
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 1b2f962..ad48d4e 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -2399,7 +2399,7 @@ static struct mapped_device *alloc_dev(int minor)
md->disk->queue = md->queue;
md->disk->private_data = md;
sprintf(md->disk->disk_name, "dm-%d", minor);
- add_disk(md->disk);
+ add_disk(md->disk, true);
format_dev_t(md->name, MKDEV(_major, minor));
md->wq = alloc_workqueue("kdmflush", WQ_MEM_RECLAIM, 0);
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 866825f..1391c72 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -5055,7 +5055,7 @@ static int md_alloc(dev_t dev, char *name)
* through to md_open, so make sure it doesn't get too far
*/
mutex_lock(&mddev->open_mutex);
- add_disk(disk);
+ add_disk(disk, true);
error = kobject_init_and_add(&mddev->kobj, &md_ktype,
&disk_to_dev(disk)->kobj, "%s", "md");
diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c
index 3cd6815..9fe45ba 100644
--- a/drivers/memstick/core/ms_block.c
+++ b/drivers/memstick/core/ms_block.c
@@ -2163,7 +2163,7 @@ static int msb_init_disk(struct memstick_dev *card)
set_disk_ro(msb->disk, 1);
msb_start(card);
- add_disk(msb->disk);
+ add_disk(msb->disk, true);
dbg("Disk added");
return 0;
diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
index 0fb27d3..cd4e16d 100644
--- a/drivers/memstick/core/mspro_block.c
+++ b/drivers/memstick/core/mspro_block.c
@@ -1255,7 +1255,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);
- add_disk(msb->disk);
+ add_disk(msb->disk, true);
msb->active = 1;
return 0;
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index e62fde3..94cf51e 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -2457,7 +2457,7 @@ static int mmc_add_disk(struct mmc_blk_data *md)
int ret;
struct mmc_card *card = md->queue.card;
- add_disk(md->disk);
+ add_disk(md->disk, true);
md->force_ro.show = force_ro_show;
md->force_ro.store = force_ro_store;
sysfs_attr_init(&md->force_ro.attr);
diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index 74ae243..ab3bc22 100644
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -436,7 +436,7 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)
if (new->readonly)
set_disk_ro(gd, 1);
- add_disk(gd);
+ add_disk(gd, true);
if (new->disk_attributes) {
ret = sysfs_create_group(&disk_to_dev(gd)->kobj,
diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
index ebf46ad..125716d 100644
--- a/drivers/mtd/ubi/block.c
+++ b/drivers/mtd/ubi/block.c
@@ -445,7 +445,7 @@ int ubiblock_create(struct ubi_volume_info *vi)
mutex_unlock(&devices_mutex);
/* Must be the last step: anyone can call file ops from now on */
- add_disk(dev->gd);
+ add_disk(dev->gd, true);
dev_info(disk_to_dev(dev->gd), "created from ubi%d:%d(%s)",
dev->ubi_num, dev->vol_id, vi->name);
return 0;
diff --git a/drivers/nvdimm/blk.c b/drivers/nvdimm/blk.c
index 495e06d9..0175c6c 100644
--- a/drivers/nvdimm/blk.c
+++ b/drivers/nvdimm/blk.c
@@ -294,7 +294,7 @@ static int nsblk_attach_disk(struct nd_namespace_blk *nsblk)
disk->flags = GENHD_FL_EXT_DEVT;
nvdimm_namespace_disk_name(&nsblk->common, disk->disk_name);
set_capacity(disk, 0);
- add_disk(disk);
+ add_disk(disk, true);
if (nsblk_meta_size(nsblk)) {
int rc = nd_integrity_init(disk, nsblk_meta_size(nsblk));
diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c
index 68a7c3c..4a54a92 100644
--- a/drivers/nvdimm/btt.c
+++ b/drivers/nvdimm/btt.c
@@ -1258,7 +1258,7 @@ static int btt_blk_init(struct btt *btt)
btt->btt_queue->queuedata = btt;
set_capacity(btt->btt_disk, 0);
- add_disk(btt->btt_disk);
+ add_disk(btt->btt_disk, true);
if (btt_meta_size(btt)) {
int rc = nd_integrity_init(btt->btt_disk, btt_meta_size(btt));
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 608fc44..b23a946 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -304,7 +304,7 @@ static int pmem_attach_disk(struct device *dev,
return -ENOMEM;
nvdimm_badblocks_populate(to_nd_region(dev->parent), &pmem->bb, res);
disk->bb = &pmem->bb;
- add_disk(disk);
+ add_disk(disk, true);
revalidate_disk(disk);
return 0;
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 1a51584..fd70894 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1462,7 +1462,7 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
if (ns->type == NVME_NS_LIGHTNVM)
return;
- add_disk(ns->disk);
+ add_disk(ns->disk, true);
if (sysfs_create_group(&disk_to_dev(ns->disk)->kobj,
&nvme_ns_attr_group))
pr_warn("%s: failed to create sysfs group for identification\n",
diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c
index 31d544a..5db81d5 100644
--- a/drivers/s390/block/dasd_genhd.c
+++ b/drivers/s390/block/dasd_genhd.c
@@ -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);
- add_disk(block->gdp);
+ add_disk(block->gdp, true);
return 0;
}
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index bed53c4..63a6fba 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -655,7 +655,7 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
goto put_dev;
get_device(&dev_info->dev);
- add_disk(dev_info->gd);
+ add_disk(dev_info->gd, true);
switch (dev_info->segment_type) {
case SEG_TYPE_SR:
diff --git a/drivers/s390/block/scm_blk.c b/drivers/s390/block/scm_blk.c
index e6f54d3..c3110e0 100644
--- a/drivers/s390/block/scm_blk.c
+++ b/drivers/s390/block/scm_blk.c
@@ -531,7 +531,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);
- add_disk(bdev->gendisk);
+ add_disk(bdev->gendisk, true);
return 0;
out_queue:
diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c
index 288f59a..e18c58c 100644
--- a/drivers/s390/block/xpram.c
+++ b/drivers/s390/block/xpram.c
@@ -377,7 +377,7 @@ static int __init xpram_setup_blkdev(void)
disk->queue = xpram_queues[i];
sprintf(disk->disk_name, "slram%d", i);
set_capacity(disk, xpram_sizes[i] << 1);
- add_disk(disk);
+ add_disk(disk, true);
}
return 0;
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index a40ee1e..d45e193 100644
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
@@ -590,7 +590,7 @@ static int jsfd_init(void)
set_capacity(disk, jdp->dsize >> 9);
disk->private_data = jdp;
disk->queue = jsf_queue;
- add_disk(disk);
+ add_disk(disk, true);
set_disk_ro(disk, 1);
}
return 0;
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 60bff78..35515a2 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2996,7 +2996,7 @@ static void sd_probe_async(void *data, async_cookie_t cookie)
}
blk_pm_runtime_init(sdp->request_queue, dev);
- add_disk(gd);
+ add_disk(gd, true);
if (sdkp->capacity)
sd_dif_config_host(sdkp);
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 64c8674..57ea120 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -730,7 +730,7 @@ static int sr_probe(struct device *dev)
dev_set_drvdata(dev, cd);
disk->flags |= GENHD_FL_REMOVABLE;
- add_disk(disk);
+ add_disk(disk, true);
sdev_printk(KERN_DEBUG, sdev,
"Attached scsi CD-ROM %s\n", cd->cdi.name);
diff --git a/drivers/staging/lustre/lustre/llite/lloop.c b/drivers/staging/lustre/lustre/llite/lloop.c
index 813a9a3..748f6fd 100644
--- a/drivers/staging/lustre/lustre/llite/lloop.c
+++ b/drivers/staging/lustre/lustre/llite/lloop.c
@@ -835,7 +835,7 @@ static int __init lloop_init(void)
/* We cannot fail after we call this, so another loop!*/
for (i = 0; i < max_loop; i++)
- add_disk(disks[i]);
+ add_disk(disks[i], true);
return 0;
out_mem4:
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 359a8e4..038be80 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -414,7 +414,7 @@ static inline void free_part_info(struct hd_struct *part)
extern void part_round_stats(int cpu, struct hd_struct *part);
/* block/genhd.c */
-extern void add_disk(struct gendisk *disk);
+extern void add_disk(struct gendisk *disk, bool gen_uevent);
extern void del_gendisk(struct gendisk *gp);
extern struct gendisk *get_gendisk(dev_t dev, int *partno);
extern struct block_device *bdget_disk(struct gendisk *disk, int partno);
--
2.9.0
^ permalink raw reply related
* [PATCH v2 00/12] gendisk: Generate uevent after attribute available
From: Fam Zheng @ 2016-06-30 1:59 UTC (permalink / raw)
To: linux-kernel
Cc: Sergey Senozhatsky, Michael S. Tsirkin, Benjamin Herrenschmidt,
linux-nvme, virtualization, Keith Busch, Paul Mackerras,
Michael Ellerman, Christoph Hellwig, Shaohua Li, Nitin Gupta,
famz, Jiri Kosina, linux-block, Ed L. Cashin, Jens Axboe,
linux-raid, David Woodhouse, linux-mmc, Minchan Kim, linux-mtd,
Brian Norris, linuxppc-dev
The race condition is noticed between disk_add() and disk attributes, on
virtio-blk hotplug.
Userspace listens to the KOBJ_ADD uevent generated in add_disk(). At that
point we haven't created the serial attribute file, therefore depending
on how fast udev reacts, the /dev/disk/by-id/ entry doesn't always get
created.
As pointed out by Christoph Hellwig in the specific fix [1], virtio-blk is not
the only driver that suffers from this, so we cannot count on every driver to
send events manually. Moreover as suggested in uevent documentation, it is
advised to defer the KOBJ_ADD event until all attributes are ready:
Documentation/kobject.txt:
> Use the KOBJ_ADD action for when the kobject is first added to the kernel.
> This should be done only after any attributes or children of the kobject
> have been initialized properly, as userspace will instantly start to look
> for them when this call happens.
Unfortunately it seems impossible to fix this generally without touching the
offending callers. The approach I'm proposing here is adding a flag to
suppress uevent in add_disk(), which is patch 1, then in later patches, convert
any caller to only trigger the uevent when attributes are added.
[1] https://lkml.org/lkml/2016/6/28/550
Fam Zheng (12):
genhd: Add "gen_uevent" parameter to add_disk
genhd: Honor gen_uevent and add disk_gen_uevents
virtio-blk: Generate uevent after attribute available
axonrom: Generate uevent after attribute available
aoeblk: Generate uevent after attribute available
mtip32xx: Generate uevent after attribute available
pktcdvd: Generate uevent after attribute available
zram: Generate uevent after attribute available
md: Generate uevent after attribute available
mmc: Generate uevent after attribute available
mtd: Generate uevent after attribute available
nvme: Generate uevent after attribute available
arch/m68k/emu/nfblock.c | 2 +-
arch/powerpc/sysdev/axonram.c | 3 ++-
arch/um/drivers/ubd_kern.c | 2 +-
arch/xtensa/platforms/iss/simdisk.c | 2 +-
block/genhd.c | 26 +++++++++++++++++++++-----
drivers/block/DAC960.c | 2 +-
drivers/block/amiflop.c | 2 +-
drivers/block/aoe/aoeblk.c | 3 ++-
drivers/block/ataflop.c | 2 +-
drivers/block/brd.c | 4 ++--
drivers/block/cciss.c | 2 +-
drivers/block/drbd/drbd_main.c | 2 +-
drivers/block/floppy.c | 2 +-
drivers/block/hd.c | 2 +-
drivers/block/loop.c | 2 +-
drivers/block/mg_disk.c | 2 +-
drivers/block/mtip32xx/mtip32xx.c | 3 ++-
drivers/block/nbd.c | 2 +-
drivers/block/null_blk.c | 2 +-
drivers/block/osdblk.c | 2 +-
drivers/block/paride/pcd.c | 2 +-
drivers/block/paride/pd.c | 2 +-
drivers/block/paride/pf.c | 2 +-
drivers/block/pktcdvd.c | 4 +++-
drivers/block/ps3disk.c | 2 +-
drivers/block/ps3vram.c | 2 +-
drivers/block/rbd.c | 2 +-
drivers/block/rsxx/dev.c | 2 +-
drivers/block/skd_main.c | 2 +-
drivers/block/sunvdc.c | 2 +-
drivers/block/swim.c | 2 +-
drivers/block/swim3.c | 2 +-
drivers/block/sx8.c | 2 +-
drivers/block/umem.c | 2 +-
drivers/block/virtio_blk.c | 3 ++-
drivers/block/xen-blkfront.c | 2 +-
drivers/block/xsysace.c | 2 +-
drivers/block/z2ram.c | 2 +-
drivers/block/zram/zram_drv.c | 3 ++-
drivers/cdrom/gdrom.c | 2 +-
drivers/ide/ide-cd.c | 2 +-
drivers/ide/ide-gd.c | 2 +-
drivers/lightnvm/core.c | 2 +-
drivers/md/bcache/super.c | 4 ++--
drivers/md/dm.c | 2 +-
drivers/md/md.c | 3 ++-
drivers/memstick/core/ms_block.c | 2 +-
drivers/memstick/core/mspro_block.c | 2 +-
drivers/mmc/card/block.c | 3 ++-
drivers/mtd/mtd_blkdevs.c | 3 ++-
drivers/mtd/ubi/block.c | 2 +-
drivers/nvdimm/blk.c | 2 +-
drivers/nvdimm/btt.c | 2 +-
drivers/nvdimm/pmem.c | 2 +-
drivers/nvme/host/core.c | 3 ++-
drivers/s390/block/dasd_genhd.c | 2 +-
drivers/s390/block/dcssblk.c | 2 +-
drivers/s390/block/scm_blk.c | 2 +-
drivers/s390/block/xpram.c | 2 +-
drivers/sbus/char/jsflash.c | 2 +-
drivers/scsi/sd.c | 2 +-
drivers/scsi/sr.c | 2 +-
drivers/staging/lustre/lustre/llite/lloop.c | 2 +-
include/linux/genhd.h | 3 ++-
64 files changed, 98 insertions(+), 70 deletions(-)
--
2.9.0
^ permalink raw reply
* --detail --test exit status
From: Xavier Nicollet @ 2016-06-29 21:19 UTC (permalink / raw)
To: linux-raid
Hi,
I've hit the same problem as this one:
https://www.mail-archive.com/linux-raid@vger.kernel.org/msg06567.html
Basically with raid1 "mdadm --detail --test /dev/md0" returns 0 even if
only one drive is still alive.
I think it's coming from the enough() function from util.c:
int enough(int level, int raid_disks, int layout, int clean, char
*avail)
/.../
case 1:
return avail_disks >= 1;
/.../
It's called from Detail.c:
if (c->test && !enough(array.level, array.raid_disks, array.layout,
1, avail))
rv = 2;
I think each time we print DEGRADED or FAILED, we should modify rv
accordingly.
I am missing something?
--
Xavier Nicollet
^ permalink raw reply
* Re: URE, link resets, user hostile defaults
From: Edward Kuns @ 2016-06-29 18:16 UTC (permalink / raw)
To: Zygo Blaxell; +Cc: Chris Murphy, Hannes Reinecke, Linux-RAID
In-Reply-To: <20160629121751.GT15597@hungrycats.org>
On Wed, Jun 29, 2016 at 7:17 AM, Zygo Blaxell
<u0oo5pgu@umail.furryterror.org> wrote:
> OK, but the two links you provided are not examples of these.
But there *are* plenty of examples of this. I've run into this
personally, before I knew to specifically check the ERC/TLER/whatever
configuration on all my drives and pro-actively configure them
properly.
When the only two options are 1) long kernel timeout and URE is caught
and fixed, or 2) short kernel timeout and the drive is detected as
failed and kicked from all arrays, then I'll take #1 please.
Obviously, trying to detect misconfiguration and drives that don't
support ERC/TLER and fixing the timeout accordingly would be better.
I agree with others, the current default behavior is unintentionally
user-hostile.
> Long timeouts don't really serve anyone, even in single-disk cases.
This statement is too dogmatic. It depends on the drive. For a drive
with the proper features and settings, that is guaranteed to respond
in a few seconds unless it has truly totally failed, I agree with you.
For a drive with those features but misconfigured (e.g., by default),
best is to configure it properly, so in that case I agree with you but
changes are needed somewhere to get the configuration to occur
automatically. For a consumer drive that lacks those features
entirely, I disagree with you. Although for that case, it would be
worth having an alarm of some sort be triggered perhaps similar to the
EMails generated when an array degrades. That would let the user know
that the drive is responding very slowly (probably indicating
recoverable read errors) and may fail soon. Again, changes are needed
to do that.
Eddie
^ permalink raw reply
* Re: [PATCH 1/2] dm: update table type check for dax
From: Kani, Toshimitsu @ 2016-06-29 15:19 UTC (permalink / raw)
To: snitzer-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
Cc: linux-nvdimm-y27Ovi1pjclAfugRpC6u6w@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-raid-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
dm-devel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org,
agk-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
In-Reply-To: <20160629004049.GA9721-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
On Tue, 2016-06-28 at 20:40 -0400, Mike Snitzer wrote:
> On Tue, Jun 28 2016 at 4:23pm -0400,
> Kani, Toshimitsu <toshi.kani@hpe.com> wrote:
>
> > On Tue, 2016-06-28 at 16:07 -0400, Mike Snitzer wrote:
> > >
> > > On Tue, Jun 28 2016 at 3:37pm -0400,
> > > Toshi Kani <toshi.kani@hpe.com> wrote:
> > :
> > >
> > > You said in the 0th header: "Patch 1 solves an error when lvremove is
> > > made to a snapshot device."
> > >
> > > I'm not seeing why this patch 1 fixes anything specific to snapshot
> > > device removal (but I can see why patch 2 makes snapshot creation
> > > "work"). I'll apply your 2nd patch and see if I can see what you mean.
> > >
> > > I actually see this error, without either of your 2 proposed patches
> > > applied, when I try to create a snapshot of a DAX capable LV:
> > >
> > > # lvcreate -s -n snap -L 100M pmem/lv
> > > device-mapper: reload ioctl on (253:7) failed: Invalid argument
> > > Failed to lock logical volume pmem/lv.
> > > Aborting. Manual intervention required.
> > > Jun 28 15:57:28 rhel-storage-02 kernel: device-mapper: ioctl: can't
> > > change device type after initial table load.
> >
> > Yes, patch 2 fixes this error.
> >
> > I have not looked into why lvremove does this, but lvremove to a snapshot
> > device fails to reload DM table of "<dev>-lvsnap" device (which is marked
> > as DM_TYPE_BIO_BASED) with DM_TYPE_DAX_BIO_BASED. Patch 1 fixes this
> > error.
>
> It looks like a strange intermediate state that lvm2 uses during
> snapshot removal.
>
> Full listing of snapshot related DM tables (before lvremove):
>
> pmem-lv-real: 0 6086656 linear 259:0 2048
> pmem-lv: 0 6086656 snapshot-origin 253:5
> pmem-snap-cow: 0 204800 linear 259:0 6088704
> pmem-snap: 0 6086656 snapshot 253:5 253:6 P 8
>
> When removing this snapshot we're wanting to be left with:
>
> pmem-lv: 0 6086656 linear 259:0 2048
>
> I augmented the DM core error to be more expressive, resulting in:
> device-mapper: ioctl: 253:7: can't change device type (from 1 to 4) after
> initial table load.
>
> 1 is DM_TYPE_BIO_BASED and 4 is DM_TYPE_DAX_BIO_BASED -- which makes
> sense given the linear target is DM_TYPE_DAX_BIO_BASED.
>
> The previous DM table for 253:7 was:
> pmem-snap: 0 6086656 snapshot 253:5 253:6 P 8
>
> The intermediate table that lvm2 is trying to load for 253:7 is:
> 0 204800 linear 259:0 6088704
>
> (this linear target was previously pmem-snap-cow)
Yes, that is consistent with what I saw.
> >
> > I think it also generally makes sense to allow this case.
>
> You're probably right but I need to think about it a little bit more.
Sounds good.
Thanks!
-Toshi
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm
^ permalink raw reply
* Re: URE, link resets, user hostile defaults
From: Zygo Blaxell @ 2016-06-29 12:17 UTC (permalink / raw)
To: Chris Murphy; +Cc: Hannes Reinecke, linux-raid
In-Reply-To: <CAJCQCtQ=DXWg6qK1+9bwQxrzpKUsRvaiaAnatYR-dupg7JOVzQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 3969 bytes --]
On Tue, Jun 28, 2016 at 11:33:36AM -0600, Chris Murphy wrote:
> On Tue, Jun 28, 2016 at 12:33 AM, Hannes Reinecke <hare@suse.de> wrote:
> > Can you post a message log detailing this problem?
>
> Just over the weekend Phil Turmel posted an email with a bunch of back
> reading on the subject of timeout mismatches for someone to read. I've
> lost track of how many user emails he's replied to, discovering this
> common misconfiguration, and get it straightened out and more often
> than not helping the user recover data that otherwise would have been
> lost *because* of hard link resetting instead of explicit read errors.
OK, but the two links you provided are not examples of these.
> http://www.spinics.net/lists/raid/msg50289.html
This one is basically a software or pilot-error problem that lead to a
partition table being destroyed (with a dash of terrible advice along
the way, like "pull two disks out of the machine and see if the array
recovers"). The one SATA link reset in the logs took all of 9ms to
report a drive error about 4 seconds after boot. Nothing about this
would be affected by changing the 30-second SATA timeout.
> http://www.spinics.net/lists/raid/msg52789.html
This one is a RAID5 array that was in degraded mode for a *year* before
it was finally taken out by a second disk failure. Data loss is the
expected outcome given those conditions--you don't get to keep your
data if you ignore drive failures for a year! Changing the timeout
to expose latent UREs could not have helped in that case--errors were
already detected, but the admin ignored their monitoring responsibility
and just left the array to die.
> He isn't the only list regular who helps educate users tirelessly with
> this very repetitive work around
He repeats it a lot, to be sure, and he's not wrong--but it doesn't seem
to be relevant in those specific examples. Timeout mismatch mitigation
is presented before any causal analysis of the reported failure.
There's a use case for the long timeout in situations where the system
is no longer healthy and ddrescue/myrescue-style tools are in play.
In redundant setups that are still healthy, the time to error detection
should be as short as possible so repair can start sooner, while still
long enough to avoid crazy numbers of false positives. Unfortunately
that's not what seems to happen if the Linux-side timeout is shortened.
> for a very old misconfiguration that
> as far as I can tell only exists on Linux. And it's the default
> behavior.
[...]
> Usually recoveries don't take minutes. But they can take minutes. And
> that's where the problem comes in. I don't see why the user should be
> the one punished by the kernel, which is in effect what a 30 second
> default command timer is doing.
Long timeouts don't really serve anyone, even in single-disk cases.
I was once presented a machine with an obvious disk failure--painfully
slow multi-minute application startup times, and the disk was making loud
clicking/rattling noises--but the drive was never reporting any problems
to the OS (Windows, as it happened). The machine's owners would not
believe that its disk had failed due to the lack of reported errors, and
would not authorize a test build with a new disk restored from backups
(an expensive proposition since there weren't any, and making a copy
of this broken disk would have taken days if it was successful at all).
The owners were convinced it was some sort of software problem. Finally I
told the users to run a drive self-test over a weekend and--after about
40 hours and only 4% of the disk tested--it finally found a bad sector
it couldn't read, and generated an error code that would get the drive
replaced. Apparently the machine's users had been living with this
for three months before I got there, and the machine was unusable the
whole time. A much shorter error timeout would at least have provided
evidence of a hardware problem, even if it was the wrong one.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
^ permalink raw reply
* Re: URE, link resets, user hostile defaults
From: Pasi Kärkkäinen @ 2016-06-29 10:48 UTC (permalink / raw)
To: Hannes Reinecke; +Cc: Chris Murphy, linux-raid
In-Reply-To: <57736454.6050607@suse.de>
On Wed, Jun 29, 2016 at 08:01:56AM +0200, Hannes Reinecke wrote:
> On 06/28/2016 07:33 PM, Chris Murphy wrote:
> > On Tue, Jun 28, 2016 at 12:33 AM, Hannes Reinecke <hare@suse.de> wrote:
> >> On 06/27/2016 06:42 PM, Chris Murphy wrote:
> >>> Hi,
> >>>
> >>> Drives with SCT ERC not supported or unset, result in potentially long
> >>> error recoveries for marginal or bad sectors: upwards of 180 second
> >>> recovers are suggested.
> >>>
> >>> The kernel's SCSI command timer default of 30 seconds, i.e.
> >>>
> >>> cat /sys/block/<dev>/device/timeout
> >>>
> >>> conspires to undermine the deep recovery of most drives now on the
> >>> market. This by default misconfiguration results in problems list
> >>> regulars are very well aware of. It affects all raid configurations,
> >>> and even affects the non-RAID single drive use case. And it does so in
> >>> a way that doesn't happen on either Windows or macOS. Basically it is
> >>> linux kernel induced data loss, the drive very possibly could present
> >>> the requested data upon deep recovery being permitted, but the
> >>> kernel's command timer is reached before recovery completes, and
> >>> obliterates any possibility of recovering that data. By default.
> >>>
> >>> This now seems to affect the majority of use cases. At one time 30
> >>> seconds might have been sane for a world with drives that had less
> >>> than 30 second recoveries for bad sectors. But that's no longer the
> >>> case.
> >>>
> >> 'Majority of use cases'.
> >> Hardly. I'm not aware of any issues here.
> >
> > This list is prolific with this now common misconfiguration. It
> > manifests on average about weekly, as a message from libata that it's
> > "hard resetting link". In every single case where the user is
> > instructed to either set SCT ERC lower than 30 seconds if possible, or
> > increase the kernel SCSI command timer well above 30 seconds (180 is
> > often recommended on this list), suddenly the user's problems start to
> > go away.
> >
> > Now the md driver gets an explicit read failure from the drive, after
> > 30 seconds, instead of a link reset. And this includes the LBA for the
> > bad sector, which is apparently what md wants to write the fixup back
> > to that drive.
> >
> > However the manifestation of the problem and the nature of this list
> > self-selects the user reports. Of course people with failed mdadm
> > based RAID come here. But this problem is also manifesting on Btrfs
> > for the same reasons. It also manifests, more rarely, with users who
> > have just a single drive if the drive does "deep recovery" reads on
> > marginally bad sectors, but the kernel flips out at 30 seconds
> > preventing that recovery. Of course not every drive model has such
> > deep recoveries, but by now it's extremely common. I have yet to see a
> > single consumer hard drive, ever, configured out of the box with SCT
> > ERC enabled.
> >
> So we should rather implement SCT ERC support in libata, and set ERC to
> the scsi command timeout, no?
> Then the user could tweak the scsi command timeout however he likes it
> to, and that timeout would be reflected into the ERC setting.
>
> And then we could add an initialisation bit which reads the current ERC
> values, increasing the SCSI command timeout as required.
>
But this still leaves the "consumer" (non-NAS, non-RAID) drives broken as a default,
until the user tweaks the SCSI command timeout for the disk to much bigger value (longer than the drive's internal timeout, whatever it is, 180 seconds or so..) ?
-- Pasi
> Cheers,
>
> Hannes
> --
> Dr. Hannes Reinecke Teamlead Storage & Networking
> hare@suse.de +49 911 74053 688
> SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
> GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
> HRB 21284 (AG Nürnberg)
--
To unsubscribe from this list: send the line "unsubscribe linux-raid" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [RESEND PATCH 1/3] bcache: Remove redundant parameter for cache_alloc()
From: Coly Li @ 2016-06-29 10:20 UTC (permalink / raw)
To: Yijing Wang, axboe, Kent Overstreet
Cc: Eric Wheeler, Coly Li, linux-bcache, linux-raid, linux-kernel
In-Reply-To: <1466561446-30443-1-git-send-email-wangyijing@huawei.com>
在 16/6/22 上午10:10, Yijing Wang 写道:
> Cache_sb is not used in cache_alloc, and we have copied
> sb info to cache->sb already, remove it.
>
> Signed-off-by: Yijing Wang <wangyijing@huawei.com>
> ---
> drivers/md/bcache/super.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
> index f5dbb4e..aecaace 100644
> --- a/drivers/md/bcache/super.c
> +++ b/drivers/md/bcache/super.c
> @@ -1803,7 +1803,7 @@ void bch_cache_release(struct kobject *kobj)
> module_put(THIS_MODULE);
> }
>
> -static int cache_alloc(struct cache_sb *sb, struct cache *ca)
> +static int cache_alloc(struct cache *ca)
> {
> size_t free;
> struct bucket *b;
> @@ -1858,7 +1858,7 @@ static int register_cache(struct cache_sb *sb, struct page *sb_page,
> if (blk_queue_discard(bdev_get_queue(ca->bdev)))
> ca->discard = CACHE_DISCARD(&ca->sb);
>
> - ret = cache_alloc(sb, ca);
> + ret = cache_alloc(ca);
I am not sure whether struct cache_b *sb will be used in future, I
suggest to let it be for now.
> if (ret != 0)
> goto err;
>
>
--
Coly Li
^ permalink raw reply
* Re: [RESEND PATCH 2/3] bcache: update document info
From: Coly Li @ 2016-06-29 10:16 UTC (permalink / raw)
To: Yijing Wang, axboe, Kent Overstreet
Cc: Eric Wheeler, Coly Li, linux-bcache, linux-raid, linux-kernel
In-Reply-To: <1466561534-17595-1-git-send-email-wangyijing@huawei.com>
在 16/6/22 上午10:12, Yijing Wang 写道:
> There is no return in continue_at(), update the documentation.
>
There are 2 modification of this patch. The first one is about a typo,
it is correct.
But I doubt your second modification is proper. The line removed in your
patch is,
> - * continue_at() also, critically, is a macro that returns the
calling function.
> - * There's good reason for this.
> - *
I think this is exactly what original author wants to say. It does not
mean return a value, it means return to the calling function. And the
bellowed lines explains the reason.
> Signed-off-by: Yijing Wang <wangyijing@huawei.com>
> ---
> drivers/md/bcache/closure.c | 2 +-
> drivers/md/bcache/closure.h | 3 ---
> 2 files changed, 1 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/md/bcache/closure.c b/drivers/md/bcache/closure.c
> index 9eaf1d6..864e673 100644
> --- a/drivers/md/bcache/closure.c
> +++ b/drivers/md/bcache/closure.c
> @@ -112,7 +112,7 @@ bool closure_wait(struct closure_waitlist *waitlist, struct closure *cl)
> EXPORT_SYMBOL(closure_wait);
>
> /**
> - * closure_sync - sleep until a closure a closure has nothing left to wait on
> + * closure_sync - sleep until a closure has nothing left to wait on
Yes, this modification is good.
> *
> * Sleeps until the refcount hits 1 - the thread that's running the closure owns
> * the last refcount.
> diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
> index 782cc2c..f51188d 100644
> --- a/drivers/md/bcache/closure.h
> +++ b/drivers/md/bcache/closure.h
> @@ -31,9 +31,6 @@
> * passing it, as you might expect, the function to run when nothing is pending
> * and the workqueue to run that function out of.
> *
> - * continue_at() also, critically, is a macro that returns the calling function.
> - * There's good reason for this.
> - *
> * To use safely closures asynchronously, they must always have a refcount while
> * they are running owned by the thread that is running them. Otherwise, suppose
> * you submit some bios and wish to have a function run when they all complete:
>
--
Coly Li
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox