Skip to contentSkip to conversation

init/do_mounts.c: add virtiofs root fs support

PATCH In review Stefan Hajnoczi 4 participants 8 messages Sep 6, 2019 – Sep 18, 2019 VFS

lore
Share & tools
lore
#0 lore raw

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

Make it possible to boot directly from a virtiofs file system with tag 'myfs' using the following kernel parameters:

rootfstype=virtiofs root=myfs rw

Booting directly from virtiofs makes it possible to use a directory on the host as the root file system. This is convenient for testing and situations where manipulating disk image files is cumbersome.

---
This patch is based on linux-next (next-20190904) but should apply cleanly to other virtiofs trees.

 init/do_mounts.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
init/do_mounts.c +10 -0
index 9634ecf3743d..030be2f1999a 100644
@@ -554,6 +554,16 @@ void __init mount_root(void)
 			change_floppy("root floppy");
 	}
 #endif
+#ifdef CONFIG_VIRTIO_FS
+	if (root_fs_names && !strcmp(root_fs_names, "virtiofs")) {
+		if (!do_mount_root(root_device_name, "virtiofs",
+				   root_mountflags, root_mount_data))
+			return;
+
+		panic("VFS: Unable to mount root fs \"%s\" from virtiofs",
+		      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 26 lines · Stefan Hajnoczi

Make it possible to boot directly from a virtiofs file system with tag 'myfs' using the following kernel parameters:

rootfstype=virtiofs root=myfs rw

Booting directly from virtiofs makes it possible to use a directory on the host as the root file system. This is convenient for testing and situations where manipulating disk image files is cumbersome.

---
This patch is based on linux-next (next-20190904) but should apply cleanly to other virtiofs trees.

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

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

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

I think you don't need this, you can abuse a hack for mtd/ubi in prepare_namespace().
At least for 9p it works well:
qemu-system-x86_64 -m 4G -M pc,accel=kvm -nographic -kernel arch/x86/boot/bzImage -append "rootfstype=9p rootflags=trans=virtio,version=9p2000.L root=mtdfake console=ttyS0 ro init=/bin/sh" -virtfs local,id=rootfs,path=/,security_model=passthrough,mount_tag=mtdfake

If this works too for virtiofs I suggest to cleanup the hack and generalize it. B-)

Signature · 2 lines
Thanks,
//richard
#2 lore raw
Quoted 38 lines · Richard Weinberger
Quoted 26 lines · Stefan Hajnoczi

Make it possible to boot directly from a virtiofs file system with tag 'myfs' using the following kernel parameters:

rootfstype=virtiofs root=myfs rw

Booting directly from virtiofs makes it possible to use a directory on the host as the root file system. This is convenient for testing and situations where manipulating disk image files is cumbersome.

---
This patch is based on linux-next (next-20190904) but should apply cleanly to other virtiofs trees.

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

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

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

I think you don't need this, you can abuse a hack for mtd/ubi in prepare_namespace().
At least for 9p it works well:
qemu-system-x86_64 -m 4G -M pc,accel=kvm -nographic -kernel arch/x86/boot/bzImage -append "rootfstype=9p rootflags=trans=virtio,version=9p2000.L root=mtdfake console=ttyS0 ro init=/bin/sh" -virtfs local,id=rootfs,path=/,security_model=passthrough,mount_tag=mtdfake

That is worse because:
1. The file system must be named "mtd*" or "ubi*".
2. When mounting fails you get confusing error messages about block devices and partitions. These do not apply to virtio-fs or virtio-9p.

Quoted 2 lines

If this works too for virtiofs I suggest to cleanup the hack and generalize it. B-)

Why mtd and ubi block devices even have a special case? Maybe this code was added because ROOT_DEV = name_to_dev_t(root_device_name) doesn't work for "mtd:partition" device names so the regular CONFIG_BLOCK code path doesn't work for these devices.

Given the ordering/fallback logic in prepare_namespace()/mount_root() I don't feel comfortable changing other code paths. It's likely to break something.

If you or others have a concrete suggestion for how to generalize this I'm happy to try implementing it.

Stefan

#3 lore raw
Quoted 62 lines · Stefan Hajnoczi
Quoted 38 lines · Richard Weinberger
Quoted 26 lines · Stefan Hajnoczi

Make it possible to boot directly from a virtiofs file system with tag 'myfs' using the following kernel parameters:

rootfstype=virtiofs root=myfs rw

Booting directly from virtiofs makes it possible to use a directory on the host as the root file system. This is convenient for testing and situations where manipulating disk image files is cumbersome.

---
This patch is based on linux-next (next-20190904) but should apply cleanly to other virtiofs trees.

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

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

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

I think you don't need this, you can abuse a hack for mtd/ubi in prepare_namespace().
At least for 9p it works well:
qemu-system-x86_64 -m 4G -M pc,accel=kvm -nographic -kernel arch/x86/boot/bzImage -append "rootfstype=9p rootflags=trans=virtio,version=9p2000.L root=mtdfake console=ttyS0 ro init=/bin/sh" -virtfs local,id=rootfs,path=/,security_model=passthrough,mount_tag=mtdfake

That is worse because:
1. The file system must be named "mtd*" or "ubi*".
2. When mounting fails you get confusing error messages about block devices and partitions. These do not apply to virtio-fs or virtio-9p.

Quoted 2 lines

If this works too for virtiofs I suggest to cleanup the hack and generalize it. B-)

Why mtd and ubi block devices even have a special case? Maybe this code was added because ROOT_DEV = name_to_dev_t(root_device_name) doesn't work for "mtd:partition" device names so the regular CONFIG_BLOCK code path doesn't work for these devices.

Quoted 6 lines

Given the ordering/fallback logic in prepare_namespace()/mount_root() I don't feel comfortable changing other code paths. It's likely to break something.

If you or others have a concrete suggestion for how to generalize this I'm happy to try implementing it.

Ping

Stefan

#4 lore raw
In reply to Stefan Hajnoczi
Quoted 11 lines · Stefan Hajnoczi
Quoted 9 lines · Richard Weinberger

On Fri, Sep 6, 2019 at 1:15 PM Stefan Hajnoczi <[email protected]> wrote:
I think you don't need this, you can abuse a hack for mtd/ubi in prepare_namespace().
At least for 9p it works well:
qemu-system-x86_64 -m 4G -M pc,accel=kvm -nographic -kernel arch/x86/boot/bzImage -append "rootfstype=9p rootflags=trans=virtio,version=9p2000.L root=mtdfake console=ttyS0 ro init=/bin/sh" -virtfs local,id=rootfs,path=/,security_model=passthrough,mount_tag=mtdfake

Quoted 5 lines

That is worse because:
1. The file system must be named "mtd*" or "ubi*".
2. When mounting fails you get confusing error messages about block devices and partitions. These do not apply to virtio-fs or virtio-9p.

This is the current situation, I'm not saying it is perfect. But before we add another
special case for a filesystem we should at least try to consolidate this stuff.

Quoted 7 lines
Quoted 2 lines

If this works too for virtiofs I suggest to cleanup the hack and generalize it. B-)

Why mtd and ubi block devices even have a special case? Maybe this code was added because ROOT_DEV = name_to_dev_t(root_device_name) doesn't work for "mtd:partition" device names so the regular CONFIG_BLOCK code path doesn't work for these devices.

ubi and mtd are not block devices, they are character devices. That's why the hack with name matching was added a long time ago.

Quoted 6 lines

Given the ordering/fallback logic in prepare_namespace()/mount_root() I don't feel comfortable changing other code paths. It's likely to break something.

If you or others have a concrete suggestion for how to generalize this I'm happy to try implementing it.

mtd, ubi, virtiofs and 9p have one thing in common, they are not block devices. What about a new miscroot= kernel parameter?

Signature · 2 lines
Thanks,
//richard
maintainer
#5 lore raw
Quoted 2 lines · Richard Weinberger

mtd, ubi, virtiofs and 9p have one thing in common, they are not block devices. What about a new miscroot= kernel parameter?

How about something like xfs!sda5 or nfs!foo.local.net/bar, etc.? With ubi et.al. covered by the same syntax...

#6 lore raw
Quoted 7 lines · * Al Viro ([email protected]) wrote:
Quoted 2 lines · Richard Weinberger

mtd, ubi, virtiofs and 9p have one thing in common, they are not block devices. What about a new miscroot= kernel parameter?

How about something like xfs!sda5 or nfs!foo.local.net/bar, etc.? With ubi et.al. covered by the same syntax...

Would Stefan's patch work if there was just a way to test for non-block based fileystsmes and we replaced
!strcmp(root_fs_names, "virtiofs") by not_block_based_fs(root_fs_names)

Or is there some magic that the other filesystems do that's specific?

Dave

Quoted 4 lines

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

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

#7 lore raw
Quoted 9 lines · Dr. David Alan Gilbert
Quoted 7 lines · * Al Viro ([email protected]) wrote:
Quoted 2 lines · Richard Weinberger

mtd, ubi, virtiofs and 9p have one thing in common, they are not block devices. What about a new miscroot= kernel parameter?

How about something like xfs!sda5 or nfs!foo.local.net/bar, etc.? With ubi et.al. covered by the same syntax...

Quoted 6 lines

Would Stefan's patch work if there was just a way to test for non-block based fileystsmes and we replaced
!strcmp(root_fs_names, "virtiofs") by not_block_based_fs(root_fs_names)

Or is there some magic that the other filesystems do that's specific?

I will try this.

Stefan