Skip to contentSkip to conversation

init: make rootdelay=N consistent with rootwait behaviour

PATCH In review Paul Gortmaker 2 participants 3 messages Jun 4, 2014 – Jun 23, 2014 VFS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 init: make rootdelay=N consistent with rootwait behaviour

Currently rootdelay=N and rootwait behave differently (aside from the obvious unbounded wait duration) because they are at different places in the init sequence.

The difference manifests itself for md devices because the call to md_run_setup() lives between rootdelay and rootwait, so if you try to use rootdelay=20 to try and allow a slow RAID0 array to assemble, you get this:

[    4.526011] sd 6:0:0:0: [sdc] Attached SCSI removable disk
[   22.972079] md: Waiting for all devices to be available before autodetect

i.e. you've achieved nothing other than delaying the probing 20s, when what you wanted was a 20s delay _after_ the probing for md devices was initiated.

Here we move the rootdelay code to be right beside the rootwait code, so that their behaviour is consistent.

It should be noted that in doing so, the actions based on the saved_root_name[0] and initrd_load() were previously put on hold by rootdelay=N and now currently will not be delayed. However, I think consistent behaviour is more important than matching historical behaviour of delaying the above two operations.

---
 init/do_mounts.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
init/do_mounts.c +6 -6
index 82f22885c87e..b6237c31b0e2 100644
@@ -539,12 +539,6 @@ void __init prepare_namespace(void)
 {
 	int is_floppy;
 
-	if (root_delay) {
-		printk(KERN_INFO "Waiting %d sec before mounting root device...\n",
-		       root_delay);
-		ssleep(root_delay);
-	}
-
 	/*
 	 * wait for the known devices to complete their probing
 	 *
@@ -571,6 +565,12 @@ void __init prepare_namespace(void)
 	if (initrd_load())
 		goto out;
 
+	if (root_delay) {
+		pr_info("Waiting %d sec before mounting root device...\n",
+			root_delay);
+		ssleep(root_delay);
+	}
+
 	/* wait for any asynchronous scanning to complete */
 	if ((ROOT_DEV == 0) && root_wait) {
 		printk(KERN_INFO "Waiting for root device %s...\n",
Signature · 1 line
1.9.1
#1 lore raw
Quoted 16 lines · On Wed, 4 Jun 2014 14:01:35 -0400 Paul Gortmaker…

Currently rootdelay=N and rootwait behave differently (aside from the obvious unbounded wait duration) because they are at different places in the init sequence.

The difference manifests itself for md devices because the call to md_run_setup() lives between rootdelay and rootwait, so if you try to use rootdelay=20 to try and allow a slow RAID0 array to assemble, you get this:

[    4.526011] sd 6:0:0:0: [sdc] Attached SCSI removable disk
[   22.972079] md: Waiting for all devices to be available before autodetect

i.e. you've achieved nothing other than delaying the probing 20s, when what you wanted was a 20s delay _after_ the probing for md devices was initiated.

Quoted 8 lines

Here we move the rootdelay code to be right beside the rootwait code, so that their behaviour is consistent.

It should be noted that in doing so, the actions based on the saved_root_name[0] and initrd_load() were previously put on hold by rootdelay=N and now currently will not be delayed. However, I think consistent behaviour is more important than matching historical behaviour of delaying the above two operations.

hm. There may be good reasons for inserting a delay between scsi init and MD init - give things time to settle down before MD starts playing with the disks? And I think your patch takes away that option?

The kernel-parameters.txt documentation for these things is rather vague. We have three distinct phases, I think?

a) scsi init
b) [md init]
c) root mount

It's not terribly clear where rootdelay and rootwait are operating and I expect there are gaps in the implementation anyway.

Do you think it's worth cleaning and clearing all this up in some fashion?

The whole thing is a bit of an admission of failure anyway, isn't it? Why should the kernel ever need to perform arbitrary dopey delays like this? Are we working around unresolved underlying bugs?

#2 lore raw
Quoted 27 lines · Andrew Morton
Quoted 16 lines · On Wed, 4 Jun 2014 14:01:35 -0400 Paul Gortmaker…

Currently rootdelay=N and rootwait behave differently (aside from the obvious unbounded wait duration) because they are at different places in the init sequence.

The difference manifests itself for md devices because the call to md_run_setup() lives between rootdelay and rootwait, so if you try to use rootdelay=20 to try and allow a slow RAID0 array to assemble, you get this:

[    4.526011] sd 6:0:0:0: [sdc] Attached SCSI removable disk
[   22.972079] md: Waiting for all devices to be available before autodetect

i.e. you've achieved nothing other than delaying the probing 20s, when what you wanted was a 20s delay _after_ the probing for md devices was initiated.

Quoted 8 lines

Here we move the rootdelay code to be right beside the rootwait code, so that their behaviour is consistent.

It should be noted that in doing so, the actions based on the saved_root_name[0] and initrd_load() were previously put on hold by rootdelay=N and now currently will not be delayed. However, I think consistent behaviour is more important than matching historical behaviour of delaying the above two operations.

Quoted 3 lines

hm. There may be good reasons for inserting a delay between scsi init and MD init - give things time to settle down before MD starts playing with the disks? And I think your patch takes away that option?

In theory, md should never need that, since as per the message above, MD does a wait_for_device_probe(). I was trying to get a wait inserted between md0 creation and mount of root, which failed as noted.

Quoted 4 lines

The kernel-parameters.txt documentation for these things is rather vague. We have three distinct phases, I think?

Quoted 8 lines

a) scsi init
b) [md init]
c) root mount

It's not terribly clear where rootdelay and rootwait are operating and I expect there are gaps in the implementation anyway.

Do you think it's worth cleaning and clearing all this up in some fashion?

Sure. Not clear how though. One option would be to deprecate rootwait in favour of rootdelay=-1 (or rootdelay=0) as an indication that the user wants infinite wait. That still means only one delay point in your a-b-c chain above though, but I'm hoping that is OK. Other ideas?

Quoted 4 lines

The whole thing is a bit of an admission of failure anyway, isn't it? Why should the kernel ever need to perform arbitrary dopey delays like this? Are we working around unresolved underlying bugs?

Well to be fair, I'd agree with the above. I was trying it as a last ditch attempt to fix an unrelated issue (and imagine that, it failed to fix anything) but in that attempt, I noted the glaring inconsistency between rootdelay= and rootwait.

Paul.
--

Quoted 1 line