Skip to contentSkip to conversation

block2mtd.c: Make kernel boot command line arguments work (try 3)

PATCH In review Ville Herva 3 participants 12 messages Jul 7, 2006 – Jul 13, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 block2mtd.c: Make kernel boot command line arguments work (try 3)

Trying to pass kernel command line arguments to block2mtd at boot-time does not work currently. block2mtd_setup() is called so early that kmalloc() fails nevermind being able to do open_bdev_excl() (which requires rootfs to be mounted. This patch only saves the option string at the early boot stage, and parses them later when block2mtd_init() is called. If open_bdev_excl() fails, open_by_devnum(name_to_dev_t()) is tried instead, which makes it possible to initialize the driver before rootfs has been mounted. Also gets rid of the superfluous parse_name() that only checks if name is longer than 80 chars and copies it to a string that is not kfreed.

With this patch, I can boot statically compiled block2mtd, and mount jffs2 as rootfs (without modules or initrd), with lilo config like this:

root=/dev/mtdblock0
append="rootfstype=jffs2 block2mtd.block2mtd=/dev/hdc2,65536"

(Note that rootfstype=jffs2 is required, since the kernel only tries filesystems without "nodev" attribute by default, and jffs is "nodev").

Compared to first version of this patch, this one does not copy the parameters to the global buffer if init has already been called, and the global array is marked as __initdata.

Compared to the second version of this patch, module build is fixed.

From: Ville Herva <[email protected]>

drivers/mtd/devices/block2mtd.c +62 -30
@@ -18,6 +18,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/buffer_head.h>
 #include <linux/mutex.h>
+#include <linux/mount.h>
 
 #define VERSION "$Revision: 1.30 $"
 
@@ -236,6 +237,8 @@ static int _block2mtd_write(struct block
 	}
 	return 0;
 }
+
+
 static int block2mtd_write(struct mtd_info *mtd, loff_t to, size_t len,
 		size_t *retlen, const u_char *buf)
 {
@@ -299,6 +302,19 @@ static struct block2mtd_dev *add_device(
 
 	/* Get a handle on the device */
 	bdev = open_bdev_excl(devname, O_RDWR, NULL);
+#ifndef MODULE
+	if (IS_ERR(bdev)) {
+
+		/* We might not have rootfs mounted at this point. Try 
+		   to resolve the device name by other means. */
+
+		dev_t dev = name_to_dev_t(devname);
+		if (dev != 0) {
+			bdev = open_by_devnum(dev, FMODE_WRITE | FMODE_READ);
+		}
+	}
+#endif
+
 	if (IS_ERR(bdev)) {
 		ERROR("error: cannot open device %s", devname);
 		goto devinit_err;
@@ -393,26 +409,6 @@ static int parse_num(size_t *num, const 
 }
 
 
-static int parse_name(char **pname, const char *token, size_t limit)
-{
-	size_t len;
-	char *name;
-
-	len = strlen(token) + 1;
-	if (len > limit)
-		return -ENOSPC;
-
-	name = kmalloc(len, GFP_KERNEL);
-	if (!name)
-		return -ENOMEM;
-
-	strcpy(name, token);
-
-	*pname = name;
-	return 0;
-}
-
-
 static inline void kill_final_newline(char *str)
 {
 	char *newline = strrchr(str, '\n');
@@ -426,9 +422,15 @@ static inline void kill_final_newline(ch
 	return 0;				\
 } while (0)
 
-static int block2mtd_setup(const char *val, struct kernel_param *kp)
+#ifndef MODULE
+static int block2mtd_init_called = 0;
+static __initdata char block2mtd_paramline[80 + 12]; /* 80 for device, 12 for erase size */
+#endif
+
+
+static int block2mtd_setup2(const char *val)
 {
-	char buf[80+12]; /* 80 for device, 12 for erase size */
+	char buf[80 + 12]; /* 80 for device, 12 for erase size */
 	char *str = buf;
 	char *token[2];
 	char *name;
@@ -450,13 +452,9 @@ static int block2mtd_setup(const char *v
 	if (!token[0])
 		parse_err("no argument");
 
-	ret = parse_name(&name, token[0], 80);
-	if (ret == -ENOMEM)
-		parse_err("out of memory");
-	if (ret == -ENOSPC)
-		parse_err("name too long");
-	if (ret)
-		return 0;
+	name = token[0];
+	if (strlen(name) + 1 > 80)
+		parse_err("device name too long");
 
 	if (token[1]) {
 		ret = parse_num(&erase_size, token[1]);
@@ -472,13 +470,47 @@ static int block2mtd_setup(const char *v
 }
 
 
+static int block2mtd_setup(const char *val, struct kernel_param *kp)
+{
+#ifdef MODULE
+	return block2mtd_setup2(val);
+#else
+	/* If more parameters are later passed in via
+	   /sys/module/block2mtd/parameters/block2mtd
+	   and block2mtd_init() has already been called,
+	   we can parse the argument now. */
+
+	if (block2mtd_init_called)
+		return block2mtd_setup2(val);
+	
+	/* During early boot stage, we only save the parameters 
+	   here. We must parse them later: if the param passed 
+	   from kernel boot command line, block2mtd_setup() is 
+	   called so early that it is not possible to resolve 
+	   the device (even kmalloc() fails). Deter that work to 
+	   block2mtd_setup2(). */
+
+	strlcpy(block2mtd_paramline, val, sizeof(block2mtd_paramline));
+
+	return 0;
+#endif
+}
+
+
 module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
 MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\"");
 
 static int __init block2mtd_init(void)
 {
+	int ret = 0;
 	INFO("version " VERSION);
-	return 0;
+
+#ifndef MODULE
+	ret = block2mtd_setup2(block2mtd_paramline);
+	block2mtd_init_called = 1;
+#endif
+
+	return ret;
 }
 
 
#1 lore raw

drivers/mtd/devices/block2mtd.c

Quoted 3 lines · you [Ville Herva]
drivers/mtd/devices/block2mtd.c +0 -0

For the record: I tested this variant of the patch in the following ways:
- block2mtd compiled in statically, no block2mtd.block2mtd kernel parameter
- block2mtd compiled in statically, block2mtd.block2mtd=/dev/hda2 kernel parameter
- block2mtd compiled as a module, no block2mtd.block2mtd kernel parameter
- insert block2mtd.ko with no arguments, later
echo /dev/hda2 > /sys/module/block2mtd/parameters/block2mtd
- insert block2mtd.ko with block2mtd=/dev/hda2 argument
- block2mtd compiled in statically, block2mtd.block2mtd=/dev/hda2 kernel parameter

#2 lore raw
In reply to Ville Herva

Few notes about the admittedly ugly #ifndef MODULE chunks:

drivers/mtd/devices/block2mtd.c static struct block2mtd_dev *add_device( · line 316

Quoted 7 lines · you [Ville Herva]
drivers/mtd/devices/block2mtd.c +0 -0
	bdev = open_bdev_excl(devname, O_RDWR, NULL);
drivers/mtd/devices/block2mtd.c +3 -0
+#ifndef MODULE
+		dev_t dev = name_to_dev_t(devname);
+#endif

Apparently, name_to_dev_t() is not exported to use in modules (which kind of makes sense - there shouldn't be need as rootfs should already be available when a module is being loaded.) So I had to #ifdef it. And on the other hand, open_bdev_excl() should be enough for modules anyway.

drivers/mtd/devices/block2mtd.c static inline void kill_final_newline(ch · line 428

Quoted 4 lines
drivers/mtd/devices/block2mtd.c +4 -0
+#ifndef MODULE
+static int block2mtd_init_called = 0;
+static __initdata char block2mtd_paramline[80 + 12]; /* 80 for device, 12 for erase size */
+#endif

The __initdata variable gave warnings when compiling with -DMODULE (it was referred, but not on a possible call path.) I decided to #ifdef it away, and take block2mtd_init_called away as well. At least this saves some memory.

drivers/mtd/devices/block2mtd.c static int block2mtd_setup(const char *v · line 496

Quoted 9 lines
drivers/mtd/devices/block2mtd.c +9 -0
+{
+#ifdef MODULE
+	return block2mtd_setup2(val);
+#else
+	if (block2mtd_init_called)
+		return block2mtd_setup2(val);
+	strlcpy(block2mtd_paramline, val, sizeof(block2mtd_paramline));
+	return 0;
+#endif

This should make sure that the behaviour is exactly the same as before in -DMODULE and echo XX > /sys/module/block2mtd/parameters/block2mtd cases. Specifically, static char block2mtd_paramline[80 + 12]; instruduced an additional 92 char upper limit for the device name len. With the new patch, this limit is only introduced for the kernel boot param (kernel internal name_to_dev_t() probably won't accept anything longer anyway, but open_bdev_excl() might, as it takes paths to the filesystem.)

Jörn, the #ifdef MODULE do clutter up the code, so I leave it to you as the maintainer to decide if they are worth it.

#3 lore raw
Quoted 3 lines · Ville Herva

Jörn, the #ifdef MODULE do clutter up the code, so I leave it to you as the maintainer to decide if they are worth it.

Good enough for now. If the klibc discussion ever settles, the early initialization code could get moved to userspace.

Jörn

Signature · 2 lines
Schrödinger's cat is <BLINK>not</BLINK> dead.
-- Illiad
#4 lore raw
Quoted 6 lines · you [Jörn Engel]
Quoted 2 lines · Ville Herva

#ifdef MODULE clutter

Good enough for now. If the klibc discussion ever settles, the early initialization code could get moved to userspace.

Good.

One thing I only noticed now, is that while static compile + no boot time argument test case works, it does unnecessarily printk
error: cannot open device ""
since the argument parsing is invoked even when no argument is supplied. This is of course harmless, as nothing really happens, but

- ret = block2mtd_setup2(block2mtd_paramline);
+ if (strlen(block2mtd_paramline))
+ ret = block2mtd_setup2(block2mtd_paramline);

might be sensible in block2mtd_init(). (I'm trusting that .initdata and block2mtd_paramline are zero-initialized.)

-- v --

[email protected]

Acked-by
#5 lore raw
Quoted 11 lines · Ville Herva

One thing I only noticed now, is that while static compile + no boot time argument test case works, it does unnecessarily printk
error: cannot open device ""
since the argument parsing is invoked even when no argument is supplied. This is of course harmless, as nothing really happens, but

(quoted diff) +2 -1
-	ret = block2mtd_setup2(block2mtd_paramline);
+	if (strlen(block2mtd_paramline)) 
+		ret = block2mtd_setup2(block2mtd_paramline);
Quoted 2 lines

might be sensible in block2mtd_init(). (I'm trusting that .initdata and block2mtd_paramline are zero-initialized.)

Looks sane. Can you send a proper patch for this?

Jörn

Signature · 3 lines
People will accept your ideas much more readily if you tell them
that Benjamin Franklin said it first.
-- unknown
#6 lore raw
Quoted 11 lines · you [Jörn Engel]
Quoted 7 lines
(quoted diff) +2 -1
-	ret = block2mtd_setup2(block2mtd_paramline);
+	if (strlen(block2mtd_paramline)) 
+		ret = block2mtd_setup2(block2mtd_paramline);

might be sensible in block2mtd_init(). (I'm trusting that .initdata and block2mtd_paramline are zero-initialized.)

Looks sane. Can you send a proper patch for this?

Sure. Do you prefer an incremental or the whole patch re-done?

-- v --

[email protected]

#7 lore raw
Quoted 2 lines · Ville Herva

Sure. Do you prefer an incremental or the whole patch re-done?

I don't have a strong preference. Dwmw2, do you?

If in doubt, just send an incremental patch. Applying both shouldn't be a problem.

Jörn

Signature · 2 lines
The only real mistake is the one from which we learn nothing.
-- John Powell
#8 lore raw
Quoted 5 lines · Jörn Engel

I don't have a strong preference. Dwmw2, do you?

If in doubt, just send an incremental patch. Applying both shouldn't be a problem.

A combined patch is probably best -- it's easier to apply, without having to go find the current version of the previous patch too.

Signature · 1 line
dwmw2
#9 lore raw
Quoted 9 lines · you [David Woodhouse]
Quoted 5 lines · Jörn Engel

I don't have a strong preference. Dwmw2, do you?

If in doubt, just send an incremental patch. Applying both shouldn't be a problem.

A combined patch is probably best -- it's easier to apply, without having to go find the current version of the previous patch too.

Oops, I already sent an incremental, but fortunately it was blocked by the mailing list software (suspicious headers). I'll do a combined in a jiffy.

-- v --

[email protected]

#10 lore raw

PATCH 1/1 block2mtd.c: Remove unnecessary parsing of empty boot-time argument

In reply to Jörn Engel

Statically compiled block2mtd driver with no boot-time parameter works, but it does unnecessarily printk

error: cannot open device ""

since argument parsing is invoked even when no argument is supplied. This is harmless as no "" device is found, but perhaps worth correcting.

This is an incremental patch against the "Make kernel boot command line arguments work (try 3)" patch.

From: Ville Herva <[email protected]>

drivers/mtd/devices/block2mtd.c +2 -1
@@ -507,7 +507,8 @@ static int __init block2mtd_init(void)
 	INFO("version " VERSION);
 
 #ifndef MODULE	
-	ret = block2mtd_setup2(block2mtd_paramline);
+	if (strlen(block2mtd_paramline))
+		ret = block2mtd_setup2(block2mtd_paramline);
 	block2mtd_init_called = 1;
 #endif