Skip to contentSkip to conversation

The initmpfs patches.

PATCH RESEND In review Rob Landley 5 participants 12 messages Jul 10, 2013 – Jul 18, 2013

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

PATCH RESEND 1/1 The initmpfs patches.

Attached, so you don't have to fish them out of:

http://lkml.indiana.edu/hypermail/linux/kernel/1306.3/04204.html

Do they look worth applying, or should I wash it through linux-next for a bit? (Which I'm not sure how to do if I don't host a git tree on a server, or I'd have done it already.)

There was a previous post with a patch demonstrating the basic concept a while ago (https://lwn.net/Articles/545740/). This is the cleaned up, broken up, tested in as many ways as I could think of, does not have section mismatches, allows you to disable it at runtime, passes checkpatch.pl version. Still applies to a git pull from 3 minutes ago (two patches have offsets, but no fuzz).

Thanks,

Rob

From: Rob Landley <[email protected]>
Subject: [PATCH 0/5] initmpfs: use tmpfs instead of ramfs for rootfs
To: [email protected]
Cc: Alexander Viro <[email protected]>
Cc: Al Viro <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: "Eric W. Biederman" <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Hugh Dickins <[email protected]>
Cc: Jeff Layton <[email protected]>
Cc: Jens Axboe <[email protected]>
Cc: Jim Cromie <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: Rusty Russell <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Cc: Stephen Warren <[email protected]>

Use tmpfs for rootfs when CONFIG_TMPFS=y and there's no root=. Specify rootfstype=ramfs to get the old initramfs behavior.

The previous initramfs code provided a fairly crappy root filesystem:
didn't let you --bind mount directories out of it, reported zero size/usage so it didn't show up in "df" and couldn't run things like rpm that query available space before proceeding, would fill up all available memory and panic the system if you wrote too much to it...

Using tmpfs instead provides a much better root filesystem.

From: Rob Landley <[email protected]>
Subject: [PATCH 1/5] initmpfs: replace MS_NOUSER in initramfs
To: [email protected]
Cc: Al Viro <[email protected]>
Cc: "Eric W. Biederman" <[email protected]>

From: Rob Landley <[email protected]>

Mounting MS_NOUSER prevents --bind mounts from rootfs. Prevent new rootfs mounts with a different mechanism that doesn't affect bind mounts.

---

 fs/ramfs/inode.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
fs/ramfs/inode.c +8 -1
index c24f1e1..14b9c35 100644
@@ -247,7 +247,14 @@ struct dentry *ramfs_mount(struct file_system_type *fs_type,
 static struct dentry *rootfs_mount(struct file_system_type *fs_type,
 	int flags, const char *dev_name, void *data)
 {
-	return mount_nodev(fs_type, flags|MS_NOUSER, data, ramfs_fill_super);
+	static int once;
+
+	if (once)
+		return ERR_PTR(-ENODEV);
+	else
+		once++;
+
+	return mount_nodev(fs_type, flags, data, ramfs_fill_super);
 }
 
 static void ramfs_kill_sb(struct super_block *sb)

From: Rob Landley <[email protected]>
Subject: [PATCH 2/5] initmpfs: Move bdi setup from init_rootfs to init_ramfs
To: [email protected]
Cc: Al Viro <[email protected]>
Cc: "Eric W. Biederman" <[email protected]>

From: Rob Landley <[email protected]>

Even though ramfs hasn't got a backing device, commit e0bf68ddec4f added one anyway, and put the initialization in init_rootfs() since that's the first user, leaving it out of init_ramfs() to avoid duplication.

But initmpfs uses init_tmpfs() instead, so move the init into the filesystem's init function, add a "once" guard to prevent duplicate initialization, and call the filesystem init from rootfs init.

This goes part of the way to allowing ramfs to be built as a module.

---

 fs/ramfs/inode.c |   25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)
fs/ramfs/inode.c +20 -5
@@ -277,21 +277,36 @@
 
 static int __init init_ramfs_fs(void)
 {
-	return register_filesystem(&ramfs_fs_type);
+	static int once;
+	int err;
+
+	if (once)
+		return 0;
+	else
+		once++;
+
+	err = bdi_init(&ramfs_backing_dev_info);
+	if (err)
+		return err;
+
+	err = register_filesystem(&ramfs_fs_type);
+	if (err)
+		bdi_destroy(&ramfs_backing_dev_info);
+
+	return err;
 }
 module_init(init_ramfs_fs)
 
 int __init init_rootfs(void)
 {
-	int err;
+	int err = register_filesystem(&rootfs_fs_type);
 
-	err = bdi_init(&ramfs_backing_dev_info);
 	if (err)
 		return err;
 
-	err = register_filesystem(&rootfs_fs_type);
+	err = init_ramfs_fs();
 	if (err)
-		bdi_destroy(&ramfs_backing_dev_info);
+		unregister_filesystem(&rootfs_fs_type);
 
 	return err;
 }

From: Rob Landley <[email protected]>
Subject: [PATCH 3/5] initmpfs: Move rootfs code from fs/ramfs/ to init/
To: [email protected]
Cc: [email protected]
Cc: Jeff Layton <[email protected]>
Cc: Jens Axboe <[email protected]>
Cc: Stephen Warren <[email protected]>
Cc: Rusty Russell <[email protected]>
Cc: Jim Cromie <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: "Eric W. Biederman" <[email protected]>
Cc: Alexander Viro <[email protected]>

From: Rob Landley <[email protected]>

When the rootfs code was a wrapper around ramfs, having them in the same file made sense. Now that it can wrap another filesystem type, move it in with the init code instead.

This also allows a subsequent patch to access rootfstype= command line arg.

---

 fs/namespace.c        |    2 +-
 fs/ramfs/inode.c      |   34 +---------------------------------
 include/linux/init.h  |    1 +
 include/linux/ramfs.h |    2 +-
 init/do_mounts.c      |   34 ++++++++++++++++++++++++++++++++++
 5 files changed, 38 insertions(+), 35 deletions(-)
fs/namespace.c +1 -1
@@ -17,7 +17,7 @@
 #include <linux/security.h>
 #include <linux/idr.h>
 #include <linux/acct.h>		/* acct_auto_close_mnt */
-#include <linux/ramfs.h>	/* init_rootfs */
+#include <linux/init.h>		/* init_rootfs */
 #include <linux/fs_struct.h>	/* get_fs_root et.al. */
 #include <linux/fsnotify.h>	/* fsnotify_vfsmount_delete */
 #include <linux/uaccess.h>
fs/ramfs/inode.c +1 -33
@@ -244,19 +244,6 @@
 	return mount_nodev(fs_type, flags, data, ramfs_fill_super);
 }
 
-static struct dentry *rootfs_mount(struct file_system_type *fs_type,
-	int flags, const char *dev_name, void *data)
-{
-	static int once;
-
-	if (once)
-		return ERR_PTR(-ENODEV);
-	else
-		once++;
-
-	return mount_nodev(fs_type, flags, data, ramfs_fill_super);
-}
-
 static void ramfs_kill_sb(struct super_block *sb)
 {
 	kfree(sb->s_fs_info);
@@ -269,13 +256,8 @@
 	.kill_sb	= ramfs_kill_sb,
 	.fs_flags	= FS_USERNS_MOUNT,
 };
-static struct file_system_type rootfs_fs_type = {
-	.name		= "rootfs",
-	.mount		= rootfs_mount,
-	.kill_sb	= kill_litter_super,
-};
 
-static int __init init_ramfs_fs(void)
+int __init init_ramfs_fs(void)
 {
 	static int once;
 	int err;
@@ -296,17 +276,3 @@
 	return err;
 }
 module_init(init_ramfs_fs)
-
-int __init init_rootfs(void)
-{
-	int err = register_filesystem(&rootfs_fs_type);
-
-	if (err)
-		return err;
-
-	err = init_ramfs_fs();
-	if (err)
-		unregister_filesystem(&rootfs_fs_type);
-
-	return err;
-}
include/linux/init.h +1 -0
@@ -154,6 +154,7 @@
 void setup_arch(char **);
 void prepare_namespace(void);
 void __init load_default_modules(void);
+int __init init_rootfs(void);
 
 extern void (*late_time_init)(void);
 
include/linux/ramfs.h +1 -1
@@ -25,7 +25,7 @@
 
 extern const struct file_operations ramfs_file_operations;
 extern const struct vm_operations_struct generic_file_vm_ops;
-extern int __init init_rootfs(void);
+extern int __init init_ramfs_fs(void);
 
 int ramfs_fill_super(struct super_block *sb, void *data, int silent);
 
init/do_mounts.c +34 -0
@@ -26,6 +26,7 @@
 #include <linux/async.h>
 #include <linux/fs_struct.h>
 #include <linux/slab.h>
+#include <linux/ramfs.h>
 
 #include <linux/nfs_fs.h>
 #include <linux/nfs_fs_sb.h>
@@ -588,3 +589,36 @@
 	sys_mount(".", "/", NULL, MS_MOVE, NULL);
 	sys_chroot(".");
 }
+
+static struct dentry *rootfs_mount(struct file_system_type *fs_type,
+	int flags, const char *dev_name, void *data)
+{
+	static int once;
+
+	if (once)
+		return ERR_PTR(-ENODEV);
+	else
+		once++;
+
+	return mount_nodev(fs_type, flags, data, ramfs_fill_super);
+}
+
+static struct file_system_type rootfs_fs_type = {
+	.name		= "rootfs",
+	.mount		= rootfs_mount,
+	.kill_sb	= kill_litter_super,
+};
+
+int __init init_rootfs(void)
+{
+	int err = register_filesystem(&rootfs_fs_type);
+
+	if (err)
+		return err;
+
+	err = init_ramfs_fs();
+	if (err)
+		unregister_filesystem(&rootfs_fs_type);
+
+	return err;
+}
fs/ramfs/inode.c +0 -0
index c24f1e1..3b9f114 100644

From: Rob Landley <[email protected]>
Subject: [PATCH 4/5] initmpfs: Make rootfs use tmpfs when CONFIG_TMPFS enabled.
To: [email protected]
Cc: [email protected]
Cc: Al Viro <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Jens Axboe <[email protected]>
Cc: Stephen Warren <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Hugh Dickins <[email protected]>

From: Rob Landley <[email protected]>

Conditionally call the appropriate fs_init function and fill_super functions. Add a use once guard to shmem_init() to simply succeed on a second call.

(Note that IS_ENABLED() is a compile time constant so dead code elimination removes unused function calls when CONFIG_TMPFS is disabled.)

---

 init/do_mounts.c |   10 ++++++++--
 mm/shmem.c       |    4 ++++
 2 files changed, 12 insertions(+), 2 deletions(-)
init/do_mounts.c +8 -2
@@ -27,6 +27,7 @@
 #include <linux/fs_struct.h>
 #include <linux/slab.h>
 #include <linux/ramfs.h>
+#include <linux/shmem_fs.h>
 
 #include <linux/nfs_fs.h>
 #include <linux/nfs_fs_sb.h>
@@ -600,7 +599,8 @@
 	else
 		once++;
 
-	return mount_nodev(fs_type, flags, data, ramfs_fill_super);
+	return mount_nodev(fs_type, flags, data,
+		IS_ENABLED(CONFIG_TMPFS) ? shmem_fill_super : ramfs_fill_super);
 }
 
 static struct file_system_type rootfs_fs_type = {
@@ -616,7 +616,11 @@
 	if (err)
 		return err;
 
-	err = init_ramfs_fs();
+	if (IS_ENABLED(CONFIG_TMPFS))
+		err = shmem_init();
+	else
+		err = init_ramfs_fs();
+
 	if (err)
 		unregister_filesystem(&rootfs_fs_type);
 
mm/shmem.c +4 -0
@@ -2787,6 +2787,10 @@
 {
 	int error;
 
+	/* If rootfs called this, don't re-init */
+	if (shmem_inode_cachep)
+		return 0;
+
 	error = bdi_init(&shmem_backing_dev_info);
 	if (error)
 		goto out4;

From: Rob Landley <[email protected]>
Subject: [PATCH 5/5] initmpfs: Use initramfs if rootfstype= or root= specified.
To: [email protected]
Cc: Al Viro <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Jens Axboe <[email protected]>
Cc: Stephen Warren <[email protected]>
Cc: Andrew Morton <[email protected]>

From: Rob Landley <[email protected]>

Command line option rootfstype=ramfs to obtain old initramfs behavior, and use ramfs instead of tmpfs for stub when root= defined (for cosmetic reasons).

---

 init/do_mounts.c |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
init/do_mounts.c +11 -4
@@ -591,18 +591,22 @@
 	sys_chroot(".");
 }
 
+static bool is_tmpfs;
 static struct dentry *rootfs_mount(struct file_system_type *fs_type,
 	int flags, const char *dev_name, void *data)
 {
 	static int once;
+	void *fill = ramfs_fill_super;
 
 	if (once)
 		return ERR_PTR(-ENODEV);
 	else
 		once++;
 
-	return mount_nodev(fs_type, flags, data,
-		IS_ENABLED(CONFIG_TMPFS) ? shmem_fill_super : ramfs_fill_super);
+	if (IS_ENABLED(CONFIG_TMPFS) && is_tmpfs)
+		fill = shmem_fill_super;
+
+	return mount_nodev(fs_type, flags, data, fill);
 }
 
 static struct file_system_type rootfs_fs_type = {
@@ -618,9 +622,12 @@
 	if (err)
 		return err;
 
-	if (IS_ENABLED(CONFIG_TMPFS))
+	if (IS_ENABLED(CONFIG_TMPFS) && !saved_root_name[0] &&
+		(!root_fs_names || strstr(root_fs_names, "tmpfs")))
+	{
 		err = shmem_init();
-	else
+		is_tmpfs = true;
+	} else
 		err = init_ramfs_fs();
 
 	if (err)
maintainer
#1 lore raw
Quoted 3 lines · On Tue, 09 Jul 2013 21:06:39 -0500 Rob Landley <[email protected]> wrote:

Attached, so you don't have to fish them out of:

   http://lkml.indiana.edu/hypermail/linux/kernel/1306.3/04204.html

Too hard. Especially when I want to reply to a patch. Please resend as a patch series in the time-honoured fashion?

Quoted 6 lines
fs/ramfs/inode.c +0 -0
@@ -247,7 +247,14 @@ struct dentry *ramfs_mount(struct file_system_type *fs_type,
 static struct dentry *rootfs_mount(struct file_system_type *fs_type,
 	int flags, const char *dev_name, void *data)
 {

fs/ramfs/inode.c struct dentry *ramfs_mount(struct file_system_type *fs_type, · line 258

Quoted 10 lines
fs/ramfs/inode.c +8 -1
-	return mount_nodev(fs_type, flags|MS_NOUSER, data, ramfs_fill_super);
+	static int once;
+
+	if (once)
+		return ERR_PTR(-ENODEV);
+	else
+		once++;
+
+	return mount_nodev(fs_type, flags, data, ramfs_fill_super);
 }

The patches do this in a couple of places. The treatment of `once' is obviously racy. Probably it is unlikely to matter in these contexts, but it does set a poor example. And it's so trivially fixed with, for example, test_and_set_bit() that I do think it's worth that change.

#2 lore raw
Quoted 8 lines · Andrew Morton
Quoted 3 lines · On Tue, 09 Jul 2013 21:06:39 -0500 Rob Landley <[email protected]> wrote:

Attached, so you don't have to fish them out of:

   http://lkml.indiana.edu/hypermail/linux/kernel/1306.3/04204.html

Too hard. Especially when I want to reply to a patch. Please resend as a patch series in the time-honoured fashion?

Ok.

(Balsa is such an incompetent email client I wrote a python script to do this via raw smtp, and I'm always convinced it's going to screw up the send. But I think I've got it debugged now...)

Quoted 10 lines

fs/ramfs/inode.c struct dentry *ramfs_mount(struct

Quoted 3 lines
fs/ramfs/inode.c +0 -0
@@ -247,7 +247,14 @@ struct dentry *ramfs_mount(struct  

file_system_type *fs_type,

fs/ramfs/inode.c struct dentry *ramfs_mount(struct · line 247

Quoted 1 line
fs/ramfs/inode.c +0 -0
 static struct dentry *rootfs_mount(struct file_system_type  

*fs_type,

fs/ramfs/inode.c struct dentry *ramfs_mount(struct file_system_type *fs_type,

Quoted 3 lines
fs/ramfs/inode.c +0 -1
 	int flags, const char *dev_name, void *data)
 {
-	return mount_nodev(fs_type, flags|MS_NOUSER, data,  

ramfs_fill_super);

Quoted 14 lines

fs/ramfs/inode.c struct dentry *ramfs_mount(struct file_system_type *fs_type, · line 258

Quoted 9 lines
fs/ramfs/inode.c +8 -0
+	static int once;
+
+	if (once)
+		return ERR_PTR(-ENODEV);
+	else
+		once++;
+
+	return mount_nodev(fs_type, flags, data, ramfs_fill_super);
 }

The patches do this in a couple of places. The treatment of `once' is obviously racy. Probably it is unlikely to matter in these contexts, but it does set a poor example. And it's so trivially fixed with, for example, test_and_set_bit() that I do think it's worth that change.

Fixing in new series. Retesting will probably delay the resend until morning.

Thanks,

Rob

#3 lore raw
Quoted 3 lines · Rob Landley

(Balsa is such an incompetent email client I wrote a python script to do this via raw smtp, and I'm always convinced it's going to screw up the send. But I think I've got it debugged now...)

Use the tried-and-tested git-send-email.perl, perhaps?

#4 lore raw
Quoted 8 lines · Ramkumar Ramachandra
Quoted 1 line · Rob Landley

(Balsa is such an incompetent email client I wrote a python script

to do

Quoted 1 line

this via raw smtp, and I'm always convinced it's going to screw up

the send.

Quoted 1 line

But I think I've got it debugged now...)

Use the tried-and-tested git-send-email.perl, perhaps?

Is this script of yours any use for patches that aren't, and never were, in git? (Given that it's not in the kernel tree, I'm guessing "no".)

That said... in my resend this morning I substituted the message-id of the first message instead of the reply-to, didn't I? (Trying to make it a reply to Andrew's most recent message. Confused the list archive, it seems.)

I'll resend again...

Rob

#5 lore raw
Quoted 2 lines · Rob Landley

Is this script of yours any use for patches that aren't, and never were, in git? (Given that it's not in the kernel tree, I'm guessing "no".)

It's part of git.git. And yes, it works with plain mbox files (especially those generated by git format-patch).

#6 lore raw

PATCH 3/5 initmpfs v2: Move rootfs code from fs/ramfs/ to init/

In reply to Andrew Morton

From: Rob Landley <[email protected]>

When the rootfs code was a wrapper around ramfs, having them in the same file made sense. Now that it can wrap another filesystem type, move it in with the init code instead.

This also allows a subsequent patch to access rootfstype= command line arg.

---

 fs/namespace.c        |    2 +-
 fs/ramfs/inode.c      |   32 +-------------------------------
 include/linux/init.h  |    1 +
 include/linux/ramfs.h |    2 +-
 init/do_mounts.c      |   32 ++++++++++++++++++++++++++++++++
 5 files changed, 36 insertions(+), 33 deletions(-)
fs/namespace.c +1 -1
@@ -17,7 +17,7 @@
 #include <linux/security.h>
 #include <linux/idr.h>
 #include <linux/acct.h>		/* acct_auto_close_mnt */
-#include <linux/ramfs.h>	/* init_rootfs */
+#include <linux/init.h>		/* init_rootfs */
 #include <linux/fs_struct.h>	/* get_fs_root et.al. */
 #include <linux/fsnotify.h>	/* fsnotify_vfsmount_delete */
 #include <linux/uaccess.h>
fs/ramfs/inode.c +1 -31
@@ -244,17 +244,6 @@
 	return mount_nodev(fs_type, flags, data, ramfs_fill_super);
 }
 
-static struct dentry *rootfs_mount(struct file_system_type *fs_type,
-	int flags, const char *dev_name, void *data)
-{
-	static unsigned long once;
-
-	if (test_and_set_bit(1, &once))
-		return ERR_PTR(-ENODEV);
-
-	return mount_nodev(fs_type, flags, data, ramfs_fill_super);
-}
-
 static void ramfs_kill_sb(struct super_block *sb)
 {
 	kfree(sb->s_fs_info);
@@ -267,13 +256,8 @@
 	.kill_sb	= ramfs_kill_sb,
 	.fs_flags	= FS_USERNS_MOUNT,
 };
-static struct file_system_type rootfs_fs_type = {
-	.name		= "rootfs",
-	.mount		= rootfs_mount,
-	.kill_sb	= kill_litter_super,
-};
 
-static int __init init_ramfs_fs(void)
+int __init init_ramfs_fs(void)
 {
 	static unsigned long once;
 	int err;
@@ -292,17 +276,3 @@
 	return err;
 }
 module_init(init_ramfs_fs)
-
-int __init init_rootfs(void)
-{
-	int err = register_filesystem(&rootfs_fs_type);
-
-	if (err)
-		return err;
-
-	err = init_ramfs_fs();
-	if (err)
-		unregister_filesystem(&rootfs_fs_type);
-
-	return err;
-}
include/linux/init.h +1 -0
@@ -153,6 +153,7 @@
 void setup_arch(char **);
 void prepare_namespace(void);
 void __init load_default_modules(void);
+int __init init_rootfs(void);
 
 extern void (*late_time_init)(void);
 
include/linux/ramfs.h +1 -1
@@ -25,7 +25,7 @@
 
 extern const struct file_operations ramfs_file_operations;
 extern const struct vm_operations_struct generic_file_vm_ops;
-extern int __init init_rootfs(void);
+extern int __init init_ramfs_fs(void);
 
 int ramfs_fill_super(struct super_block *sb, void *data, int silent);
 
init/do_mounts.c +32 -0
@@ -26,6 +26,7 @@
 #include <linux/async.h>
 #include <linux/fs_struct.h>
 #include <linux/slab.h>
+#include <linux/ramfs.h>
 
 #include <linux/nfs_fs.h>
 #include <linux/nfs_fs_sb.h>
@@ -588,3 +589,34 @@
 	sys_mount(".", "/", NULL, MS_MOVE, NULL);
 	sys_chroot(".");
 }
+
+static struct dentry *rootfs_mount(struct file_system_type *fs_type,
+	int flags, const char *dev_name, void *data)
+{
+	static unsigned long once;
+
+	if (test_and_set_bit(1, &once))
+		return ERR_PTR(-ENODEV);
+
+	return mount_nodev(fs_type, flags, data, ramfs_fill_super);
+}
+
+static struct file_system_type rootfs_fs_type = {
+	.name		= "rootfs",
+	.mount		= rootfs_mount,
+	.kill_sb	= kill_litter_super,
+};
+
+int __init init_rootfs(void)
+{
+	int err = register_filesystem(&rootfs_fs_type);
+
+	if (err)
+		return err;
+
+	err = init_ramfs_fs();
+	if (err)
+		unregister_filesystem(&rootfs_fs_type);
+
+	return err;
+}
fs/ramfs/inode.c +0 -0
index c24f1e1..3b9f114 100644
#7 lore raw

PATCH 4/5 initmpfs v2: Make rootfs use tmpfs when CONFIG_TMPFS enabled.

In reply to Andrew Morton

From: Rob Landley <[email protected]>

Conditionally call the appropriate fs_init function and fill_super functions. Add a use once guard to shmem_init() to simply succeed on a second call.

(Note that IS_ENABLED() is a compile time constant so dead code elimination removes unused function calls when CONFIG_TMPFS is disabled.)

---

 init/do_mounts.c |   10 ++++++++--
 mm/shmem.c       |    4 ++++
 2 files changed, 12 insertions(+), 2 deletions(-)
init/do_mounts.c +8 -2
@@ -27,6 +27,7 @@
 #include <linux/fs_struct.h>
 #include <linux/slab.h>
 #include <linux/ramfs.h>
+#include <linux/shmem_fs.h>
 
 #include <linux/nfs_fs.h>
 #include <linux/nfs_fs_sb.h>
@@ -598,7 +597,8 @@
 	if (test_and_set_bit(1, &once))
 		return ERR_PTR(-ENODEV);
 
-	return mount_nodev(fs_type, flags, data, ramfs_fill_super);
+	return mount_nodev(fs_type, flags, data,
+		IS_ENABLED(CONFIG_TMPFS) ? shmem_fill_super : ramfs_fill_super);
 }
 
 static struct file_system_type rootfs_fs_type = {
@@ -614,7 +614,11 @@
 	if (err)
 		return err;
 
-	err = init_ramfs_fs();
+	if (IS_ENABLED(CONFIG_TMPFS))
+		err = shmem_init();
+	else
+		err = init_ramfs_fs();
+
 	if (err)
 		unregister_filesystem(&rootfs_fs_type);
 
mm/shmem.c +4 -0
@@ -2816,6 +2816,10 @@
 {
 	int error;
 
+	/* If rootfs called this, don't re-init */
+	if (shmem_inode_cachep)
+		return 0;
+
 	error = bdi_init(&shmem_backing_dev_info);
 	if (error)
 		goto out4;

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>

maintainer
#8 lore raw

Re: [PATCH 0/5] initmpfs v2: use tmpfs instead of ramfs for rootfs

In reply to Andrew Morton
Quoted 8 lines · On Tue, 16 Jul 2013 08:31:13 -0700 (PDT) Rob Landley <[email protected]> wrote:

Use tmpfs for rootfs when CONFIG_TMPFS=y and there's no root=. Specify rootfstype=ramfs to get the old initramfs behavior.

The previous initramfs code provided a fairly crappy root filesystem:
didn't let you --bind mount directories out of it, reported zero size/usage so it didn't show up in "df" and couldn't run things like rpm that query available space before proceeding, would fill up all available memory and panic the system if you wrote too much to it...

The df problem and the mount --bind thing are ramfs issues, are they not? Can we fix them? If so, that's a less intrusive change, and we also get a fixed ramfs.

Quoted 3 lines

Using tmpfs instead provides a much better root filesystem.

Changes from last time: use test_and_set_bit() for "once" logic.

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>

maintainer
#9 lore raw

Re: [PATCH 0/5] initmpfs v2: use tmpfs instead of ramfs for rootfs

Quoted 11 lines · Andrew Morton
Quoted 8 lines · On Tue, 16 Jul 2013 08:31:13 -0700 (PDT) Rob Landley <[email protected]> wrote:

Use tmpfs for rootfs when CONFIG_TMPFS=y and there's no root=. Specify rootfstype=ramfs to get the old initramfs behavior.

The previous initramfs code provided a fairly crappy root filesystem:
didn't let you --bind mount directories out of it, reported zero size/usage so it didn't show up in "df" and couldn't run things like rpm that query available space before proceeding, would fill up all available memory and panic the system if you wrote too much to it...

Quoted 3 lines

The df problem and the mount --bind thing are ramfs issues, are they not? Can we fix them? If so, that's a less intrusive change, and we also get a fixed ramfs.

I'll leave others to comment on "mount --bind", but with regard to "df":
yes, we could enhance ramfs with accounting such as tmpfs has, to allow it to support non-0 "df". We could have done so years ago; but have always preferred to leave ramfs as minimal, than import tmpfs features into it one by one.

I prefer Rob's approach of making tmpfs usable for rootfs.

Hugh

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>

#10 lore raw

Re: [PATCH 0/5] initmpfs v2: use tmpfs instead of ramfs for rootfs

Andrew: I'll save you the time of reading this message.

tl;dr: "I agree with what Hugh said".

You're welcome. :)

Quoted 15 lines · Hugh Dickins
Quoted 1 line · Andrew Morton

On Tue, 16 Jul 2013 08:31:13 -0700 (PDT) Rob Landley

Quoted 5 lines · <[email protected]> wrote:
Quoted 5 lines

Use tmpfs for rootfs when CONFIG_TMPFS=y and there's no root=. Specify rootfstype=ramfs to get the old initramfs behavior.

The previous initramfs code provided a fairly crappy root

filesystem:

Quoted 2 lines
Quoted 2 lines

didn't let you --bind mount directories out of it, reported zero size/usage so it didn't show up in "df" and couldn't run things

like

Quoted 1 line
Quoted 1 line

rpm that query available space before proceeding, would fill up

all

Quoted 1 line
Quoted 1 line

available memory and panic the system if you wrote too much to

Quoted 8 lines

it...

Quoted 3 lines

The df problem and the mount --bind thing are ramfs issues, are they not? Can we fix them? If so, that's a less intrusive change, and

we

Quoted 1 line

also get a fixed ramfs.

I'll leave others to comment on "mount --bind",

It's unrelated to tmpfs but _is_ related to exposing a non-broken rootfs to the user.

Quoted 5 lines

but with regard to "df":
yes, we could enhance ramfs with accounting such as tmpfs has, to allow it to support non-0 "df". We could have done so years ago; but have always preferred to leave ramfs as minimal, than import tmpfs features into it one by one.

Ramfs reporting 0 size is not a new issue, here it is 13 years ago:

http://lkml.indiana.edu/hypermail/linux/kernel/0011.2/0098.html

And people proposed adding resource limits to ramfs at the time (yes, 13 years ago):

http://lkml.indiana.edu/hypermail/linux/kernel/0011.2/0713.html

And Linus complained about complicating ramfs which he thought was a good educational example and could be turned into a reusable code library. (Somewhere around http://lkml.indiana.edu/hypermail/linux/kernel/0112.3/0257.html
or http://lkml.indiana.edu/hypermail/linux/kernel/0101.0/1167.html or... I'd have to dig for that one. I remember reading it but my google roll missed.)

Way back when Linus also mentioned embedded users benefitting from rootfs, ala:

http://lkml.indiana.edu/hypermail/linux/kernel/0112.3/0307.html

Which is why I documented rootfs to be ramfs "or tmpfs, if that's enabled" back in 2005:

http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/filesystems/ramfs-rootfs-initramfs.txt#n57

And when I found out it still wasn't the case a year later I went "um, hey!" on the list, but ironically I got pushback from the same guy who objected to my perl removal patches as an "academic" exercise because it's not how _he_ uses linux...

http://lkml.indiana.edu/hypermail/linux/kernel/0607.3/2480.html
https://lkml.org/lkml/2013/3/20/321

(And you wonder why embedded guys don't speak up more? I'm an outright "bullhorn and plackard" guy in this community. Random
example: a guy named Rich Felker has been hanging out on the busybox and uclibc lists and IRC channels for years, and recently wrote musl-libc.org from "git init" to "builds linux from scratch" in 2 years. He's on the posix committe list and posts there multiple times per week. Number of times he's posted to
linux-kernel: zero. I'm sure Sarah Sharp just facepalmed...)

I was recently reminded of initmpfs because I'm finishing up a contract at Cray and they wanted to do this on their supercomputers and I went "oh, that's easy", and then had to make it work. (Embedded and supercomputing have always been closer to each other than either is to the desktop...) This is very much Not My Area but I've been waiting a _decade_ for other people to do this and nada. Really, you could see this as just "fixing my documentation" from way back when, by changing the code to match the docs. :)

Quoted 1 line

I prefer Rob's approach of making tmpfs usable for rootfs.

Me too. The resource accounting logic in tmpfs is hundreds of lines, with shmem_default_max_blocks and shmem_default_max_inodes to specify default size limits, mount-time option parsing to specify different values for those limits, plus remount logic (what if you specify a smaller size after the fact?), plus displaying the settings per-mount in /proc/mounts... see mm/shmem.c lines 2414 through 2581 for the largest chunk of it.

That's why we got tmpfs/shmfs as a separate filesystem in the first
place: it's a design decision. Ramfs is intentionally minimalist.

Ramfs can't say how big it is because it doesn't _know_ how big it is. If you write unlimited data to ramfs, the OOM killer zaps everything but init and then the system hangs in a page eviction loop. (The OOM killer can't free pinned page cache with nowhere to evict it to.)

My patch series switching over tmpfs is much smaller than the tmpfs size accounting code, and we get the swap backing store for free. Plus hooking up years-old existing tested code (instead of putting new untested logic in the boot path), without duplicating functionality.

I.E. "what Hugh said."

Rob
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>

#11 lore raw

Re: [PATCH 0/5] initmpfs v2: use tmpfs instead of ramfs for rootfs

In reply to Andrew Morton
Quoted 11 lines · Andrew Morton
Quoted 8 lines · On Tue, 16 Jul 2013 08:31:13 -0700 (PDT) Rob Landley <[email protected]> wrote:

Use tmpfs for rootfs when CONFIG_TMPFS=y and there's no root=. Specify rootfstype=ramfs to get the old initramfs behavior.

The previous initramfs code provided a fairly crappy root filesystem:
didn't let you --bind mount directories out of it, reported zero size/usage so it didn't show up in "df" and couldn't run things like rpm that query available space before proceeding, would fill up all available memory and panic the system if you wrote too much to it...

Quoted 4 lines

The df problem and the mount --bind thing are ramfs issues, are they not? Can we fix them? If so, that's a less intrusive change, and we also get a fixed ramfs.

mount --bind might be useful to fix for ramfs in general (as ramfs should provide minimal standard filesystem functionality, and that one counts, I believe), but honestly... we should have had tmpfs as a root filesystem option either as rootfs or as an automatic overmount a long time ago.

The automatic overmount option (that is tmpfs on top of rootfs) is nice in some ways, as it makes garbage-collecting the inittmpfs trivial; this might save some boot time in the more conventional root scenarios. On the other hand, it doesn't exactly seem to be a big problem to just unlink everything.

-hpa

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>