Skip to contentSkip to conversation

init/do_mounts.c: add virtio_fs root fs support

PATCH In review Stefan Hajnoczi 2 participants 3 messages Jul 26, 2019 – Jul 31, 2019 VFS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 init/do_mounts.c: add virtio_fs root fs support

It is useful to mount the root file system via virtio_fs. During testing a monolithic kernel is more convenient than an initramfs but we'll need to teach the kernel how to boot directly from virtio_fs.

---
 init/do_mounts.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
init/do_mounts.c +10 -0
index f8c230c77035..b2d9650488d7 100644
@@ -553,6 +553,16 @@ void __init mount_root(void)
 			change_floppy("root floppy");
 	}
 #endif
+#ifdef CONFIG_VIRTIO_FS
+	if (root_fs_names && !strcmp(root_fs_names, "virtio_fs")) {
+		if (!do_mount_root(root_device_name, "virtio_fs",
+				   root_mountflags, root_mount_data))
+			return;
+
+		panic("VFS: Unable to mount root fs \"%s\" from virtio_fs",
+		      root_device_name);
+	}
+#endif
 #ifdef CONFIG_BLOCK
 	{
 		int err = create_dev("/dev/root", ROOT_DEV);
Signature · 1 line
2.21.0
#1 lore raw
Quoted 17 lines · * Stefan Hajnoczi ([email protected]) wrote:

It is useful to mount the root file system via virtio_fs. During testing a monolithic kernel is more convenient than an initramfs but we'll need to teach the kernel how to boot directly from virtio_fs.

---
 init/do_mounts.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
init/do_mounts.c +0 -0
index f8c230c77035..b2d9650488d7 100644
@@ -553,6 +553,16 @@ void __init mount_root(void)
 			change_floppy("root floppy");
 	}
 #endif

init/do_mounts.c void __init mount_root(void) · line 565

Quoted 10 lines
init/do_mounts.c +10 -0
+#ifdef CONFIG_VIRTIO_FS
+	if (root_fs_names && !strcmp(root_fs_names, "virtio_fs")) {
+		if (!do_mount_root(root_device_name, "virtio_fs",
+				   root_mountflags, root_mount_data))
+			return;
+
+		panic("VFS: Unable to mount root fs \"%s\" from virtio_fs",
+		      root_device_name);
+	}
+#endif

I wonder if it's possible to make this more generic; I see that filesystems have a flag, FS_REQUIRES_DEV - should this work for most filesystems that don't have that set?

Dave

Quoted 10 lines
init/do_mounts.c +0 -0
 #ifdef CONFIG_BLOCK
 	{
 		int err = create_dev("/dev/root", ROOT_DEV);
Signature · 6 lines
2.21.0

_______________________________________________
Virtio-fs mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/virtio-fs

--
Dr. David Alan Gilbert / [email protected] / Manchester, UK

#2 lore raw
Quoted 24 lines · Dr. David Alan Gilbert
Quoted 23 lines · * Stefan Hajnoczi ([email protected]) wrote:

It is useful to mount the root file system via virtio_fs. During testing a monolithic kernel is more convenient than an initramfs but we'll need to teach the kernel how to boot directly from virtio_fs.

---
 init/do_mounts.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
init/do_mounts.c +6 -0
index f8c230c77035..b2d9650488d7 100644
@@ -553,6 +553,16 @@ void __init mount_root(void)
 			change_floppy("root floppy");
 	}
 #endif
+#ifdef CONFIG_VIRTIO_FS
+	if (root_fs_names && !strcmp(root_fs_names, "virtio_fs")) {
+		if (!do_mount_root(root_device_name, "virtio_fs",
+				   root_mountflags, root_mount_data))
+			return;
+
Quoted 8 lines

init/do_mounts.c void __init mount_root(void) · line 565

Quoted 4 lines
init/do_mounts.c +4 -0
+		panic("VFS: Unable to mount root fs \"%s\" from virtio_fs",
+		      root_device_name);
+	}
+#endif

I wonder if it's possible to make this more generic; I see that filesystems have a flag, FS_REQUIRES_DEV - should this work for most filesystems that don't have that set?

I don't know the answer. We'll have to ask when upstreaming.

Stefan