Skip to contentSkip to conversation

Race-free NAND device removal

PATCH Richard Weinberger 3 participants 8 messages Jul 3, 2016 – Jul 4, 2016

Subsystems (2)
lore
Share & tools
lore

Richard Weinberger

author maintainer
#0 lore raw

Hi!

While working on nandsim I realized that nand_release() ignores the return value from mtd_device_unregister().

That means NAND devices cannot removed in a race-free manner. Consider a NAND driver that registers ->_get_device() and ->_put_device() callbacks for refcounting. In its removal function it will return -EBUSY whenever the refcount is > 0.
But when device is claimed while removing it, it can happen that the refcount increments after the check.
MTD can deal with that and mtd_device_unregister() will return EBUSY. But nand_release() won't notice and the NAND driver continues with the tear down process.

Would be a change like the following one acceptable or is a NAND driver allowed to call mtd_device_unregister() itself?
AFAICT the additional call to mtd_device_unregister() in nand_release() would be an nop then.

drivers/mtd/nand/nand_base.c +8 -3
index 0b0dc29..dc76bc6 100644
@@ -4604,16 +4604,19 @@ EXPORT_SYMBOL(nand_scan);
  * nand_release - [NAND Interface] Free resources held by the NAND device
  * @mtd: MTD device structure
  */
-void nand_release(struct mtd_info *mtd)
+int nand_release(struct mtd_info *mtd)
 {
+	int ret;
 	struct nand_chip *chip = mtd_to_nand(mtd);
 
+	ret = mtd_device_unregister(mtd);
+	if (ret)
+		return ret;
+
 	if (chip->ecc.mode == NAND_ECC_SOFT &&
 	    chip->ecc.algo == NAND_ECC_BCH)
 		nand_bch_free((struct nand_bch_control *)chip->ecc.priv);
 
-	mtd_device_unregister(mtd);
-
 	/* Free bad block table memory */
 	kfree(chip->bbt);
 	if (!(chip->options & NAND_OWN_BUFFERS))
@@ -4623,6 +4626,8 @@ void nand_release(struct mtd_info *mtd)
 	if (chip->badblock_pattern && chip->badblock_pattern->options
 			& NAND_BBT_DYNAMICSTRUCT)
 		kfree(chip->badblock_pattern);
+
+	return 0;
 }
 EXPORT_SYMBOL_GPL(nand_release);
 
include/linux/mtd/nand.h +1 -1
index fbe8e16..c15b1c4 100644
@@ -39,7 +39,7 @@ extern int nand_scan_ident(struct mtd_info *mtd, int max_chips,
 extern int nand_scan_tail(struct mtd_info *mtd);
 
 /* Free resources held by the NAND device */
-extern void nand_release(struct mtd_info *mtd);
+extern int nand_release(struct mtd_info *mtd);
 
 /* Internal helper for board drivers which need to override command function */
 extern void nand_wait_ready(struct mtd_info *mtd);

Thanks,
//richard

#1 lore raw
Quoted 5 lines · On Sun, 3 Jul 2016 15:38:42 +0200 Richard Weinberger <[email protected]> wrote:

Hi!

While working on nandsim I realized that nand_release() ignores the return value from mtd_device_unregister().

Quoted 9 lines

That means NAND devices cannot removed in a race-free manner. Consider a NAND driver that registers ->_get_device() and ->_put_device() callbacks for refcounting. In its removal function it will return -EBUSY whenever the refcount is > 0.
But when device is claimed while removing it, it can happen that the refcount increments after the check.
MTD can deal with that and mtd_device_unregister() will return EBUSY. But nand_release() won't notice and the NAND driver continues with the tear down process.

Yes, I already noticed that, and apparently all NAND controller drivers seem to assume that nand_release() always succeed. It's definitely a bug, since the MTD device will still be exposed, but the underlying NAND structure (and the associated data + implementation) will be gone :-/.

Quoted 5 lines

Would be a change like the following one acceptable or is a NAND driver allowed to call mtd_device_unregister() itself?
AFAICT the additional call to mtd_device_unregister() in nand_release() would be an nop then.

This patch looks good, but NAND controller drivers will keep ignoring the nand_release() return code and release their own private data, so implementations are still buggy ;).

This whole NAND dev registration/deregistration is unsafe, and I plan to rework it when moving to a controller <-> chips infrastructure.

Are you fixing a real bug or just a potential one? Cause I'm not sure doing that is any safer if we don't patch all the NAND controller drivers...

Quoted 53 lines
drivers/mtd/nand/nand_base.c +8 -3
index 0b0dc29..dc76bc6 100644
@@ -4604,16 +4604,19 @@ EXPORT_SYMBOL(nand_scan);
  * nand_release - [NAND Interface] Free resources held by the NAND device
  * @mtd: MTD device structure
  */
-void nand_release(struct mtd_info *mtd)
+int nand_release(struct mtd_info *mtd)
 {
+	int ret;
 	struct nand_chip *chip = mtd_to_nand(mtd);
 
+	ret = mtd_device_unregister(mtd);
+	if (ret)
+		return ret;
+
 	if (chip->ecc.mode == NAND_ECC_SOFT &&
 	    chip->ecc.algo == NAND_ECC_BCH)
 		nand_bch_free((struct nand_bch_control *)chip->ecc.priv);
 
-	mtd_device_unregister(mtd);
-
 	/* Free bad block table memory */
 	kfree(chip->bbt);
 	if (!(chip->options & NAND_OWN_BUFFERS))
@@ -4623,6 +4626,8 @@ void nand_release(struct mtd_info *mtd)
 	if (chip->badblock_pattern && chip->badblock_pattern->options
 			& NAND_BBT_DYNAMICSTRUCT)
 		kfree(chip->badblock_pattern);
+
+	return 0;
 }
 EXPORT_SYMBOL_GPL(nand_release);
 
include/linux/mtd/nand.h +1 -1
index fbe8e16..c15b1c4 100644
@@ -39,7 +39,7 @@ extern int nand_scan_ident(struct mtd_info *mtd, int max_chips,
 extern int nand_scan_tail(struct mtd_info *mtd);
 
 /* Free resources held by the NAND device */
-extern void nand_release(struct mtd_info *mtd);
+extern int nand_release(struct mtd_info *mtd);
 
 /* Internal helper for board drivers which need to override command function */
 extern void nand_wait_ready(struct mtd_info *mtd);

Thanks,
//richard

author maintainer
#2 lore raw

Am 04.07.2016 um 11:16 schrieb Boris Brezillon:

Quoted 18 lines
Quoted 5 lines · On Sun, 3 Jul 2016 15:38:42 +0200 Richard Weinberger <[email protected]> wrote:

Hi!

While working on nandsim I realized that nand_release() ignores the return value from mtd_device_unregister().

Quoted 9 lines

That means NAND devices cannot removed in a race-free manner. Consider a NAND driver that registers ->_get_device() and ->_put_device() callbacks for refcounting. In its removal function it will return -EBUSY whenever the refcount is > 0.
But when device is claimed while removing it, it can happen that the refcount increments after the check.
MTD can deal with that and mtd_device_unregister() will return EBUSY. But nand_release() won't notice and the NAND driver continues with the tear down process.

Quoted 5 lines

Yes, I already noticed that, and apparently all NAND controller drivers seem to assume that nand_release() always succeed. It's definitely a bug, since the MTD device will still be exposed, but the underlying NAND structure (and the associated data + implementation) will be gone :-/.

Well, in most cases it will work since the module refcounting kicks in. And no NAND drivers create/remove MTDs during runtime.

Quoted 10 lines
Quoted 5 lines

Would be a change like the following one acceptable or is a NAND driver allowed to call mtd_device_unregister() itself?
AFAICT the additional call to mtd_device_unregister() in nand_release() would be an nop then.

This patch looks good, but NAND controller drivers will keep ignoring the nand_release() return code and release their own private data, so implementations are still buggy ;).

Quoted 6 lines

This whole NAND dev registration/deregistration is unsafe, and I plan to rework it when moving to a controller <-> chips infrastructure.

Are you fixing a real bug or just a potential one? Cause I'm not sure doing that is any safer if we don't patch all the NAND controller drivers...

I'm facing a real issue on nandsim.
Currently I'm heavily reworking nandsim.
One of the new features is that you can add/remove NAND MTDs during runtime using a userspace tool. It works like losetup.

$ nandsimctl --backend file /home/rw/work/XXX/broken_mtd.raw --id-bytes 0x....

While getting this race free I found that issue.

Thanks,
//richard

#3 lore raw
Quoted 19 lines · On Mon, 4 Jul 2016 11:44:03 +0200 Richard Weinberger <[email protected]> wrote:

Am 04.07.2016 um 11:16 schrieb Boris Brezillon:

Quoted 18 lines
Quoted 14 lines · On Sun, 3 Jul 2016 15:38:42 +0200 Richard Weinberger <[email protected]> wrote:

Hi!

While working on nandsim I realized that nand_release() ignores the return value from mtd_device_unregister().

That means NAND devices cannot removed in a race-free manner. Consider a NAND driver that registers ->_get_device() and ->_put_device() callbacks for refcounting. In its removal function it will return -EBUSY whenever the refcount is > 0.
But when device is claimed while removing it, it can happen that the refcount increments after the check.
MTD can deal with that and mtd_device_unregister() will return EBUSY. But nand_release() won't notice and the NAND driver continues with the tear down process.

Quoted 8 lines
Quoted 5 lines

Yes, I already noticed that, and apparently all NAND controller drivers seem to assume that nand_release() always succeed. It's definitely a bug, since the MTD device will still be exposed, but the underlying NAND structure (and the associated data + implementation) will be gone :-/.

Well, in most cases it will work since the module refcounting kicks in. And no NAND drivers create/remove MTDs during runtime.

Yep.

Quoted 18 lines
Quoted 11 lines
Quoted 6 lines

Would be a change like the following one acceptable or is a NAND driver allowed to call mtd_device_unregister() itself?
AFAICT the additional call to mtd_device_unregister() in nand_release() would be an nop then.

This patch looks good, but NAND controller drivers will keep ignoring the nand_release() return code and release their own private data, so implementations are still buggy ;).

Quoted 6 lines

This whole NAND dev registration/deregistration is unsafe, and I plan to rework it when moving to a controller <-> chips infrastructure.

Are you fixing a real bug or just a potential one? Cause I'm not sure doing that is any safer if we don't patch all the NAND controller drivers...

Quoted 8 lines

I'm facing a real issue on nandsim.
Currently I'm heavily reworking nandsim.
One of the new features is that you can add/remove NAND MTDs during runtime using a userspace tool. It works like losetup.

$ nandsimctl --backend file /home/rw/work/XXX/broken_mtd.raw --id-bytes 0x....

While getting this race free I found that issue.

Okay, so you modified nandsim code to check nand_release() return code, right? Maybe you can send this change in your nandsim rework series then.

author maintainer
#4 lore raw

Am 04.07.2016 um 12:06 schrieb Boris Brezillon:

Quoted 7 lines
Quoted 3 lines
$ nandsimctl --backend file /home/rw/work/XXX/broken_mtd.raw --id-bytes 0x....

While getting this race free I found that issue.

Okay, so you modified nandsim code to check nand_release() return code, right? Maybe you can send this change in your nandsim rework series then.

Yep. My code checks the result of nand_release().
I'll carry it in my series.

BTW: There is more fun:
When we look into mtdcore.c
int mtd_device_unregister(struct mtd_info *master)

{
        int err;

        if (master->_reboot)
                unregister_reboot_notifier(&master->reboot_notifier);

        err = del_mtd_partitions(master);
        if (err)
                return err;

        if (!device_is_registered(&master->dev))
                return 0;

        return del_mtd_device(master);
}

EXPORT_SYMBOL_GPL(mtd_device_unregister);

Either del_mtd_partitions() or del_mtd_device() will notice that the MTD usage count is > 0 and return -EBUSY.
But at this stage we've already executed the reboot notifier. Bug or feature? ;-)

I'm also not sure about the printk in del_mtd_device():

        if (mtd->usecount) {
                printk(KERN_NOTICE "Removing MTD device #%d (%s) with use count %d\n",
                       mtd->index, mtd->name, mtd->usecount);
                ret = -EBUSY;
        } else {

Why do you have to warn the user? Is this 100% a legit use case or is the printk here to warn that a driver is buggy?
At least with the existing UBI glubi driver you can hit this code path.
Same for the upcoming nandsim changes.

Thanks,
//richard

#5 lore raw
Quoted 30 lines · Richard Weinberger

Am 04.07.2016 um 12:06 schrieb Boris Brezillon:

Quoted 7 lines
Quoted 3 lines
$ nandsimctl --backend file /home/rw/work/XXX/broken_mtd.raw --id-bytes 0x....

While getting this race free I found that issue.

Okay, so you modified nandsim code to check nand_release() return code, right? Maybe you can send this change in your nandsim rework series then.

Yep. My code checks the result of nand_release().
I'll carry it in my series.

BTW: There is more fun:
When we look into mtdcore.c
int mtd_device_unregister(struct mtd_info *master)

{
        int err;

        if (master->_reboot)
                unregister_reboot_notifier(&master->reboot_notifier);

        err = del_mtd_partitions(master);
        if (err)
                return err;

        if (!device_is_registered(&master->dev))
                return 0;

        return del_mtd_device(master);
}
Quoted 5 lines

EXPORT_SYMBOL_GPL(mtd_device_unregister);

Either del_mtd_partitions() or del_mtd_device() will notice that the MTD usage count is > 0 and return -EBUSY.
But at this stage we've already executed the reboot notifier. Bug or feature? ;-)

Should be read removed the...

Quoted 18 lines

I'm also not sure about the printk in del_mtd_device():

        if (mtd->usecount) {
                printk(KERN_NOTICE "Removing MTD device #%d (%s) with use count %d\n",
                       mtd->index, mtd->name, mtd->usecount);
                ret = -EBUSY;
        } else {

Why do you have to warn the user? Is this 100% a legit use case or is the printk here to warn that a driver is buggy?
At least with the existing UBI glubi driver you can hit this code path.
Same for the upcoming nandsim changes.

Thanks,
//richard

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

Signature · 2 lines
Thanks,
//richard
#6 lore raw
Quoted 33 lines · On Mon, 4 Jul 2016 13:11:09 +0200 Richard Weinberger…
Quoted 32 lines · Richard Weinberger

Am 04.07.2016 um 12:06 schrieb Boris Brezillon:

Quoted 7 lines
Quoted 3 lines
$ nandsimctl --backend file /home/rw/work/XXX/broken_mtd.raw --id-bytes 0x....

While getting this race free I found that issue.

Okay, so you modified nandsim code to check nand_release() return code, right? Maybe you can send this change in your nandsim rework series then.

Yep. My code checks the result of nand_release().
I'll carry it in my series.

BTW: There is more fun:
When we look into mtdcore.c
int mtd_device_unregister(struct mtd_info *master)

{
        int err;

        if (master->_reboot)
                unregister_reboot_notifier(&master->reboot_notifier);

        err = del_mtd_partitions(master);
        if (err)
                return err;

        if (!device_is_registered(&master->dev))
                return 0;

        return del_mtd_device(master);
}

EXPORT_SYMBOL_GPL(mtd_device_unregister);

Quoted 5 lines
Quoted 3 lines

Either del_mtd_partitions() or del_mtd_device() will notice that the MTD usage count is > 0 and return -EBUSY.
But at this stage we've already executed the reboot notifier. Bug or feature? ;-)

Should be read removed the...

Probably a bug.

Quoted 22 lines
Quoted 19 lines

I'm also not sure about the printk in del_mtd_device():

        if (mtd->usecount) {
                printk(KERN_NOTICE "Removing MTD device #%d (%s) with use count %d\n",
                       mtd->index, mtd->name, mtd->usecount);
                ret = -EBUSY;
        } else {

Why do you have to warn the user? Is this 100% a legit use case or is the printk here to warn that a driver is buggy?
At least with the existing UBI glubi driver you can hit this code path.
Same for the upcoming nandsim changes.

Thanks,
//richard

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

author maintainer
#7 lore raw
In reply to Boris Brezillon

Am 04.07.2016 um 11:16 schrieb Boris Brezillon:

Quoted 34 lines
Quoted 5 lines · On Sun, 3 Jul 2016 15:38:42 +0200 Richard Weinberger <[email protected]> wrote:

Hi!

While working on nandsim I realized that nand_release() ignores the return value from mtd_device_unregister().

Quoted 9 lines

That means NAND devices cannot removed in a race-free manner. Consider a NAND driver that registers ->_get_device() and ->_put_device() callbacks for refcounting. In its removal function it will return -EBUSY whenever the refcount is > 0.
But when device is claimed while removing it, it can happen that the refcount increments after the check.
MTD can deal with that and mtd_device_unregister() will return EBUSY. But nand_release() won't notice and the NAND driver continues with the tear down process.

Yes, I already noticed that, and apparently all NAND controller drivers seem to assume that nand_release() always succeed. It's definitely a bug, since the MTD device will still be exposed, but the underlying NAND structure (and the associated data + implementation) will be gone :-/.

Quoted 5 lines

Would be a change like the following one acceptable or is a NAND driver allowed to call mtd_device_unregister() itself?
AFAICT the additional call to mtd_device_unregister() in nand_release() would be an nop then.

This patch looks good, but NAND controller drivers will keep ignoring the nand_release() return code and release their own private data, so implementations are still buggy ;).

Quoted 6 lines

This whole NAND dev registration/deregistration is unsafe, and I plan to rework it when moving to a controller <-> chips infrastructure.

Are you fixing a real bug or just a potential one? Cause I'm not sure doing that is any safer if we don't patch all the NAND controller drivers...

Just figured that drivers/mtd/nand/r852.c also registers/removes NAND devices during runtime.
AFAICT it is broken.

Thanks,
//richard