dm init: add dm-mod.waitfor to wait for asynchronously probed block devices
Subsystems (2)
PATCH v2 1/1 dm init: add dm-mod.waitfor to wait for asynchronously probed block devices
Just calling wait_for_device_probe() is not enough to ensure that asynchronously probed block devices are available (E.G. mmc, usb, ..), so add a "dm-mod.waitfor=<device1>[,..,<deviceN>]" parameter to get dm-init to explicitly wait for specific block devices before initializing the tables with logic similar to the rootwait logic in init/do_mounts.c.
E.G. with dm-verity on mmc with dm-mod.waitfor="PARTLABEL=hash-a,PARTLABEL=root-a"
[ 0.671671] device-mapper: init: waiting for all devices to be available before creating mapped devices [ 0.671679] device-mapper: init: waiting for PARTLABEL=hash-a [ 0.710695] mmc0: new HS200 MMC card at address 0001 [ 0.711158] mmcblk0: mmc0:0001 004GA0 3.69 GiB [ 0.715954] mmcblk0boot0: mmc0:0001 004GA0 partition 1 2.00 MiB [ 0.722085] mmcblk0boot1: mmc0:0001 004GA0 partition 2 2.00 MiB [ 0.728093] mmcblk0rpmb: mmc0:0001 004GA0 partition 3 512 KiB, chardev (249:0) [ 0.738274] mmcblk0: p1 p2 p3 p4 p5 p6 p7 [ 0.751282] device-mapper: init: waiting for PARTLABEL=root-a [ 0.751306] device-mapper: init: all devices available [ 0.751683] device-mapper: verity: sha256 using implementation "sha256-generic" [ 0.759344] device-mapper: ioctl: dm-0 (vroot) is ready [ 0.766540] VFS: Mounted root (squashfs filesystem) readonly on device 254:0.
---
Changes since v1:
- Fix s/dm-init/dm-mod/ typo in documentation, drop trailing newline
.../admin-guide/device-mapper/dm-init.rst | 8 +++++++ drivers/md/dm-init.c | 23 ++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-)
Documentation/admin-guide/device-mapper/dm-init.rst +8 -0
@@ -123,3 +123,11 @@ Other examples (per target): 0 1638400 verity 1 8:1 8:2 4096 4096 204800 1 sha256 fb1a5a0f00deb908d8b53cb270858975e76cf64105d412ce764225d53b8f3cfd 51934789604d1b92399c52e7cb149d1b3a1b74bbbcb103b2a0aaacbed5c08584 + +For setups using device-mapper on top of asynchronously probed block +devices (MMC, USB, ..), it may be necessary to tell dm-init to +explicitly wait for them to become available before setting up the +device-mapper tables. This can be done with the "dm-mod.waitfor=" +module parameter, which takes a list of devices to wait for:: + + dm-mod.waitfor=<device1>[,..,<deviceN>]
drivers/md/dm-init.c +22 -1
@@ -8,6 +8,7 @@*/ #include <linux/ctype.h> +#include <linux/delay.h> #include <linux/device.h> #include <linux/device-mapper.h> #include <linux/init.h>
@@ -18,12 +19,17 @@#define DM_MAX_DEVICES 256#define DM_MAX_TARGETS 256#define DM_MAX_STR_SIZE 4096 +#define DM_MAX_WAITFOR 256static char *create; +static char *waitfor[DM_MAX_WAITFOR ]; +/* * Format: dm-mod.create=<name>,<uuid>,<minor>,<flags>,<table>[,<table>+][;<name>,<uuid>,<minor>,<flags>,<table>[,<table>+]+] * Table format: <start_sector> <num_sectors> <target_type> <target_args> +* Block devices to wait for to become available before setting up tables: +* dm-mod.waitfor=<device1>[,..,<deviceN>] * * See Documentation/admin-guide/device-mapper/dm-init.rst for dm-mod.create="..." format * details.
@@ -266,7 +272,7 @@ static int __init dm_init_init(void)struct dm_device *dev;LIST_HEAD (devices);char *str; -int r; +int i, r;if (!create)return 0 ;
@@ -286,6 +292,18 @@ static int __init dm_init_init(void)DMINFO ("waiting for all devices to be available before creating mapped devices" );wait_for_device_probe (); +for (i =0 ; i <ARRAY_SIZE (waitfor); i++) { +if (waitfor[i]) { +DMINFO ("waiting for %s" , waitfor[i]); + +while (!dm_get_dev_t (waitfor[i])) +msleep (20 ); + } + } + +if (waitfor[0 ]) +DMINFO ("all devices available" ); +list_for_each_entry (dev, &devices, list) {if (dm_early_create (&dev->dmi, dev->table, dev->target_args_array))
@@ -301,3 +319,6 @@ late_initcall(dm_init_init);module_param (create, charp,0 );MODULE_PARM_DESC (create,"Create a mapped device in early boot" ); + +module_param_array (waitfor, charp,NULL ,0 ); +MODULE_PARM_DESC (waitfor,"Devices to wait for before setting up tables" );
Signature · 6 lines
2.30.2 -- dm-devel mailing list [email protected] https://listman.redhat.com/mailman/listinfo/dm-devel
Quoted 25 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Korsgaard <[email protected]> writes:
Just calling
wait_for_device_probe()is not enough to ensure that asynchronously probed block devices are available (E.G. mmc, usb, ..), so add a "dm-mod.waitfor=<device1>[,..,<deviceN>]" parameter to get dm-init to explicitly wait for specific block devices before initializing the tables with logic similar to the rootwait logic ininit/do_mounts.c.E.G. with dm-verity on mmc with dm-mod.waitfor="PARTLABEL=hash-a,PARTLABEL=root-a"
[ 0.671671] device-mapper: init: waiting for all devices to be available before creating mapped devices [ 0.671679] device-mapper: init: waiting for PARTLABEL=hash-a [ 0.710695] mmc0: new HS200 MMC card at address 0001 [ 0.711158] mmcblk0: mmc0:0001 004GA0 3.69 GiB [ 0.715954] mmcblk0boot0: mmc0:0001 004GA0 partition 1 2.00 MiB [ 0.722085] mmcblk0boot1: mmc0:0001 004GA0 partition 2 2.00 MiB [ 0.728093] mmcblk0rpmb: mmc0:0001 004GA0 partition 3 512 KiB, chardev (249:0) [ 0.738274] mmcblk0: p1 p2 p3 p4 p5 p6 p7 [ 0.751282] device-mapper: init: waiting for PARTLABEL=root-a [ 0.751306] device-mapper: init: all devices available [ 0.751683] device-mapper: verity: sha256 using implementation "sha256-generic" [ 0.759344] device-mapper: ioctl: dm-0 (vroot) is ready [ 0.766540] VFS: Mounted root (squashfs filesystem) readonly on device 254:0.
Quoted 4 lines
Signed-off-by Peter Korsgaard <[email protected]>---
Changes since v1:
- Fix s/dm-init/dm-mod/ typo in documentation, drop trailing newline
Ping?
FYI: I was recently made aware that other patches fixing this issue (but less nice, E.G. with a fixed delay) have been posted in the past, so there seems to be a general need for something like this.
E.G:
https://lore.kernel.org/all/[email protected]/
Quoted 67 lines
.../admin-guide/device-mapper/dm-init.rst | 8 +++++++ drivers/md/dm-init.c | 23 ++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-)Documentation/admin-guide/device-mapper/dm-init.rst +8
-0@@ -123,3 +123,11 @@ Other examples (per target): 0 1638400 verity 1 8:1 8:2 4096 4096 204800 1 sha256 fb1a5a0f00deb908d8b53cb270858975e76cf64105d412ce764225d53b8f3cfd 51934789604d1b92399c52e7cb149d1b3a1b74bbbcb103b2a0aaacbed5c08584 + +For setups using device-mapper on top of asynchronously probed block +devices (MMC, USB, ..), it may be necessary to tell dm-init to +explicitly wait for them to become available before setting up the +device-mapper tables. This can be done with the "dm-mod.waitfor=" +module parameter, which takes a list of devices to wait for:: + + dm-mod.waitfor=<device1>[,..,<deviceN>]drivers/md/dm-init.c +11
-1@@ -8,6 +8,7 @@*/ #include <linux/ctype.h> +#include <linux/delay.h> #include <linux/device.h> #include <linux/device-mapper.h> #include <linux/init.h> @@ -18,12 +19,17 @@#define DM_MAX_DEVICES 256#define DM_MAX_TARGETS 256#define DM_MAX_STR_SIZE 4096 +#define DM_MAX_WAITFOR 256static char *create; +static char *waitfor[DM_MAX_WAITFOR ]; +/* * Format: dm-mod.create=<name>,<uuid>,<minor>,<flags>,<table>[,<table>+][;<name>,<uuid>,<minor>,<flags>,<table>[,<table>+]+] * Table format: <start_sector> <num_sectors> <target_type> <target_args> +* Block devices to wait for to become available before setting up tables: +* dm-mod.waitfor=<device1>[,..,<deviceN>] * * See Documentation/admin-guide/device-mapper/dm-init.rst for dm-mod.create="..." format * details. @@ -266,7 +272,7 @@ static int __init dm_init_init(void)struct dm_device *dev;LIST_HEAD (devices);char *str; -int r; +int i, r;if (!create)return 0 ;@@ -286,6 +292,18 @@ static int __init dm_init_init(void)DMINFO ("waiting for all devices to be available before creating mapped devices" );wait_for_device_probe (); +for (i =0 ; i <ARRAY_SIZE (waitfor); i++) { +if (waitfor[i]) { +DMINFO ("waiting for %s" , waitfor[i]); +
drivers/md/dm-init.c static int __init dm_init_init(void) · line 308
Quoted 10 lines
drivers/md/dm-init.c +8
-0+while (!dm_get_dev_t (waitfor[i])) +msleep (20 ); + } + } + +if (waitfor[0 ]) +DMINFO ("all devices available" ); +list_for_each_entry (dev, &devices, list) { if (dm_early_create(&dev->dmi, dev->table,
dev-> target_args_array))
Quoted 10 lines
drivers/md/dm-init.c +3
-0@@ -301,3 +319,6 @@ late_initcall(dm_init_init);module_param (create, charp,0 );MODULE_PARM_DESC (create,"Create a mapped device in early boot" ); + +module_param_array (waitfor, charp,NULL ,0 ); +MODULE_PARM_DESC (waitfor,"Devices to wait for before setting up tables" );Signature · 1 line
2.30.2
Signature · 6 lines
Bye, Peter Korsgaard -- dm-devel mailing list [email protected] https://listman.redhat.com/mailman/listinfo/dm-devel
Quoted 104 lines · Peter Korsgaard
Quoted 25 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Korsgaard <[email protected]> writes:
Just calling
wait_for_device_probe()is not enough to ensure that asynchronously probed block devices are available (E.G. mmc, usb, ..), so add a "dm-mod.waitfor=<device1>[,..,<deviceN>]" parameter to get dm-init to explicitly wait for specific block devices before initializing the tables with logic similar to the rootwait logic ininit/do_mounts.c.E.G. with dm-verity on mmc with dm-mod.waitfor="PARTLABEL=hash-a,PARTLABEL=root-a"
[ 0.671671] device-mapper: init: waiting for all devices to be available before creating mapped devices [ 0.671679] device-mapper: init: waiting for PARTLABEL=hash-a [ 0.710695] mmc0: new HS200 MMC card at address 0001 [ 0.711158] mmcblk0: mmc0:0001 004GA0 3.69 GiB [ 0.715954] mmcblk0boot0: mmc0:0001 004GA0 partition 1 2.00 MiB [ 0.722085] mmcblk0boot1: mmc0:0001 004GA0 partition 2 2.00 MiB [ 0.728093] mmcblk0rpmb: mmc0:0001 004GA0 partition 3 512 KiB, chardev (249:0) [ 0.738274] mmcblk0: p1 p2 p3 p4 p5 p6 p7 [ 0.751282] device-mapper: init: waiting for PARTLABEL=root-a [ 0.751306] device-mapper: init: all devices available [ 0.751683] device-mapper: verity: sha256 using implementation "sha256-generic" [ 0.759344] device-mapper: ioctl: dm-0 (vroot) is ready [ 0.766540] VFS: Mounted root (squashfs filesystem) readonly on device 254:0.Quoted 4 lines
Signed-off-by Peter Korsgaard <[email protected]>---
Changes since v1:
- Fix s/dm-init/dm-mod/ typo in documentation, drop trailing newlinePing?
FYI: I was recently made aware that other patches fixing this issue (but less nice, E.G. with a fixed delay) have been posted in the past, so there seems to be a general need for something like this.
E.G:
https://lore.kernel.org/all/[email protected]/Quoted 62 lines
.../admin-guide/device-mapper/dm-init.rst | 8 +++++++ drivers/md/dm-init.c | 23 ++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-)Documentation/admin-guide/device-mapper/dm-init.rst +8
-0@@ -123,3 +123,11 @@ Other examples (per target): 0 1638400 verity 1 8:1 8:2 4096 4096 204800 1 sha256 fb1a5a0f00deb908d8b53cb270858975e76cf64105d412ce764225d53b8f3cfd 51934789604d1b92399c52e7cb149d1b3a1b74bbbcb103b2a0aaacbed5c08584 + +For setups using device-mapper on top of asynchronously probed block +devices (MMC, USB, ..), it may be necessary to tell dm-init to +explicitly wait for them to become available before setting up the +device-mapper tables. This can be done with the "dm-mod.waitfor=" +module parameter, which takes a list of devices to wait for:: + + dm-mod.waitfor=<device1>[,..,<deviceN>]drivers/md/dm-init.c +7
-1@@ -8,6 +8,7 @@*/ #include <linux/ctype.h> +#include <linux/delay.h> #include <linux/device.h> #include <linux/device-mapper.h> #include <linux/init.h> @@ -18,12 +19,17 @@#define DM_MAX_DEVICES 256#define DM_MAX_TARGETS 256#define DM_MAX_STR_SIZE 4096 +#define DM_MAX_WAITFOR 256static char *create; +static char *waitfor[DM_MAX_WAITFOR ]; +/* * Format: dm-mod.create=<name>,<uuid>,<minor>,<flags>,<table>[,<table>+][;<name>,<uuid>,<minor>,<flags>,<table>[,<table>+]+] * Table format: <start_sector> <num_sectors> <target_type> <target_args> +* Block devices to wait for to become available before setting up tables: +* dm-mod.waitfor=<device1>[,..,<deviceN>] * * See Documentation/admin-guide/device-mapper/dm-init.rst for dm-mod.create="..." format * details. @@ -266,7 +272,7 @@ static int __init dm_init_init(void)struct dm_device *dev;LIST_HEAD (devices);char *str; -int r; +int i, r;if (!create)return 0 ;@@ -286,6 +292,18 @@ static int __init dm_init_init(void)DMINFO ("waiting for all devices to be available before creating mapped devices" );wait_for_device_probe ();
Quoted 12 lines
drivers/md/dm-init.c static int __init dm_init_init(void) · line 306
Quoted 12 lines
drivers/md/dm-init.c +12
-0+for (i =0 ; i <ARRAY_SIZE (waitfor); i++) { +if (waitfor[i]) { +DMINFO ("waiting for %s" , waitfor[i]); + +while (!dm_get_dev_t (waitfor[i])) +msleep (20 ); + } + } + +if (waitfor[0 ]) +DMINFO ("all devices available" ); +
Why 20? Also, why is waiting indefinitely OK? Would really like to hear from other consumers of dm-init that this module param is useful and needed.
Mike
Quoted 5 lines
drivers/md/dm-init.c static int __init dm_init_init(void) · line 308
Quoted 2 lines
drivers/md/dm-init.c +0
-0list_for_each_entry (dev, &devices, list) { if (dm_early_create(&dev->dmi, dev->table,dev->
target_args_array))Quoted 1 line
drivers/md/dm-init.c +0
-0@@ -301,3 +319,6 @@ late_initcall(dm_init_init);
Quoted 13 lines
Quoted 8 lines
drivers/md/dm-init.c +3
-0module_param (create, charp,0 );MODULE_PARM_DESC (create,"Create a mapped device in early boot" ); + +module_param_array (waitfor, charp,NULL ,0 ); +MODULE_PARM_DESC (waitfor,"Devices to wait for before setting up tables" );Signature · 1 line
2.30.2Signature · 1 line
Bye, Peter Korsgaard
--
dm-devel mailing list
[email protected]
https://listman.redhat.com/mailman/listinfo/dm-devel
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Mike" == Mike Snitzer <[email protected]> writes:
Hi,
Quoted 10 lines
Quoted 3 lines · Peter Korsgaard
drivers/md/dm-init.c static int __init dm_init_init(void) · line 306
Quoted 3 lines
drivers/md/dm-init.c +3
-0+if (waitfor[0 ]) +DMINFO ("all devices available" ); +Why 20? Also, why is waiting indefinitely OK? Would really like to hear from other consumers of dm-init that this module param is useful and needed.
Mainly because of checkpatch.pl ;) prepare_namespace() uses msleep(5) but checkpatch complains about it, so I made it 20 instead. It doesn't really matter much, as long as it is small enough to not delay boots too much (E.G. this is typically used for embedded system where boot time is critical).
I would say that it DOES make sense to wait forever, similar to how it is done in prepare_namespace() when rootwait is passed. This waitfor bootargs is used for root-on-dm, so we cannot continue until the underlying devices are available.
As mentioned,
https://lore.kernel.org/all/[email protected]/
is an alternatively (less nice) approach to solve the same issue, so yes
- It is useful and needed.
Signature · 6 lines
Bye, Peter Korsgaard -- dm-devel mailing list [email protected] https://listman.redhat.com/mailman/listinfo/dm-devel
Quoted 26 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Mike" == Mike Snitzer <[email protected]> writes:
Hi,
Quoted 10 lines
Quoted 3 lines · Peter Korsgaard
drivers/md/dm-init.c static int __init dm_init_init(void) · line 306
Quoted 3 lines
drivers/md/dm-init.c +3
-0+if (waitfor[0 ]) +DMINFO ("all devices available" ); +Why 20? Also, why is waiting indefinitely OK? Would really like to hear from other consumers of dm-init that this module param is useful and needed.
Mainly because of checkpatch.pl ;)
prepare_namespace()uses msleep(5) but checkpatch complains about it, so I made it 20 instead. It doesn't really matter much, as long as it is small enough to not delay boots too much (E.G. this is typically used for embedded system where boot time is critical).I would say that it DOES make sense to wait forever, similar to how it is done in
prepare_namespace()when rootwait is passed. This waitfor bootargs is used for root-on-dm, so we cannot continue until the underlying devices are available.
Quoted 4 lines
As mentioned,
https://lore.kernel.org/all/[email protected]/
is an alternatively (less nice) approach to solve the same issue, so yes
- It is useful and needed.
OK, so it should be easy for others to say so, right?
My hesitation is that it feels like something that could be papering over device specific issues with their async initialization? Even if that is the case, it'd be nice to know _why_ this change is needed. IMHO, the patch header stops short of offering compelling and informed justification.
Mike
--
dm-devel mailing list
[email protected]
https://listman.redhat.com/mailman/listinfo/dm-devel
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Mike" == Mike Snitzer <[email protected]> writes:
Hi,
Quoted 6 lines
Quoted 4 lines
As mentioned,
https://lore.kernel.org/all/[email protected]/
is an alternatively (less nice) approach to solve the same issue, so yes
- It is useful and needed.OK, so it should be easy for others to say so, right?
Yes. Fabio, you pointed me to the earlier patch, so you presumably need something like this as well, right?
Quoted 5 lines
My hesitation is that it feels like something that could be papering over device specific issues with their async initialization? Even if that is the case, it'd be nice to know _why_ this change is needed. IMHO, the patch header stops short of offering compelling and informed justification.
Well, it is exactly like the rootwait option we have for normal (non-dm) root= handling, so it is for the same use cases / issues.
A lot of embedded / non-initramfs setups use rootwait today because of the async initialization logic. If those setups want to use root-on-dm (E.G. for dm-verity) then they need to use this dm_mod.waitfor= instead of rootwait.
rootwait was added by:
commit cc1ed7542c8c26af0f501da8006b9fce03e9aaca
Author: Pierre Ossman <[email protected]> Date: Sun Jul 15 23:40:35 2007 -0700
init: wait for asynchronously scanned block devices
Some buses (e.g. USB and MMC) do their scanning of devices in the background, causing a race between them and prepare_namespace(). In order to be able to use these buses without an initrd, we now wait for the device specified in root= to actually show up.
If the device never shows up than we will hang in an infinite loop. In order to not mess with setups that reboot on panic, the feature must be turned on via the command line option "rootwait".
Signature · 6 lines
Bye, Peter Korsgaard -- dm-devel mailing list [email protected] https://listman.redhat.com/mailman/listinfo/dm-devel
Quoted 46 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Mike" == Mike Snitzer <[email protected]> writes:
Hi,
Quoted 6 lines
Quoted 4 lines
As mentioned,
https://lore.kernel.org/all/[email protected]/
is an alternatively (less nice) approach to solve the same issue, so yes
- It is useful and needed.OK, so it should be easy for others to say so, right?
Yes. Fabio, you pointed me to the earlier patch, so you presumably need something like this as well, right?
Quoted 5 lines
My hesitation is that it feels like something that could be papering over device specific issues with their async initialization? Even if that is the case, it'd be nice to know _why_ this change is needed. IMHO, the patch header stops short of offering compelling and informed justification.
Well, it is exactly like the rootwait option we have for normal (non-dm) root= handling, so it is for the same use cases / issues.
A lot of embedded / non-initramfs setups use rootwait today because of the async initialization logic. If those setups want to use root-on-dm (E.G. for dm-verity) then they need to use this dm_mod.waitfor= instead of rootwait.
rootwait was added by:
commit
cc1ed7542c8c26af0f501da8006b9fce03e9aacaAuthor: Pierre Ossman <[email protected]> Date: Sun Jul 15 23:40:35 2007 -0700init: wait for asynchronously scanned block devices
Some buses (e.g. USB and MMC) do their scanning of devices in the background, causing a race between them and
prepare_namespace(). In order to be able to use these buses without an initrd, we now wait for the device specified in root= to actually show up.If the device never shows up than we will hang in an infinite loop. In order to not mess with setups that reboot on panic, the feature must be turned on via the command line option "rootwait".
Quoted 7 lines
[[email protected]: root_wait can become static]Signed-off-by Pierre Ossman <[email protected]>Cc Al Viro <[email protected]>Cc Christoph Hellwig <[email protected]>Signed-off-by Adrian Bunk <[email protected]>Signed-off-by Andrew Morton <[email protected]>Signed-off-by Linus Torvalds <[email protected]>
OK, I'll accept your patch, but will tweak the DMINFO slightly to look more like rootwait's pr_info (e.g. "Waiting for device %s..." and such).
I'll also change the msleep(20) to msleep(5) like was introduced with commit 39a0e975c37de ("init: reduce rootwait polling interval time to 5ms") -- checkpatch be damned. ;)
Thanks,
Mike
--
dm-devel mailing list
[email protected]
https://listman.redhat.com/mailman/listinfo/dm-devel
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Mike" == Mike Snitzer <[email protected]> writes:
Hi,
Quoted 6 lines
OK, I'll accept your patch, but will tweak the DMINFO slightly to look more like rootwait's
pr_info(e.g. "Waiting for device %s..." and such).I'll also change the msleep(20) to msleep(5) like was introduced with commit
39a0e975c37de("init: reduce rootwait polling interval time to 5ms") -- checkpatch be damned. ;)
Cool, thanks!
Signature · 6 lines
Bye, Peter Korsgaard -- dm-devel mailing list [email protected] https://listman.redhat.com/mailman/listinfo/dm-devel