lib/vfscore: Introduce `ukopts`, a new `vfs.fstab` option and `mkmp`, a `ukopts` option #1145

mogasergiu · 2023-10-23T13:52:16Z

Prerequisite checklist

Read the contribution guidelines regarding submitting new changes to the project;
Tested your changes against relevant architectures and platforms;
Ran the checkpatch.uk on your commit series before opening this PR;
Updated relevant documentation.

Base target

Architecture(s): [N/A]
Platform(s): [N/A]
Application(s): [N/A]

Additional configuration

Description of changes

Allow the vfs.fstab option arguments to receive an additional
option that is Unikraft specific and that enables one to change
a volume's mount behavior depending on the passed option.

Thus, now the vfs.fstab syntax is as follows:

vfs.fstab=[                                                              
      "<src_dev>:<mntpoint>:<fsdriver>[:<flags>:<opts>:<ukopts>]"                                                                                           
       "<src_dev>:<mntpoint>:<fsdriver>[:<flags>:<opts>:<ukopts>]"                                                                                           
      ...                                                              
]

The ukopts options will have the same separator as fstab, that
being :.

Furthermore, in case someone may want to mount a filesystem to a directory
that does not currently exist in the rootfs, allow them to do so
without having to rebuild the rootfs by exposing a ukopts
option called mkpath. This option will let fstab know that
it must ensure that the mount path exists before attempting to
mount.

nderjung

Tested my side, this works. :) Thanks!

Reviewed-by: Alexander Jung alex@unikraft.io

lib/vfscore/automount.c

mogasergiu · 2023-10-27T11:58:39Z

Sorry, I know, lots of pushes, I messed up some rebasing 🙃

skuenzer

Hi @mogasergiu, thanks a lot for your work. I just noticed some little things with the update but overall looks very good already!

lib/vfscore/automount.c

The Unikraft Core supports, following the merge of [0], the ability to specify Unikraft-specific options as part of the `vfstab` list of options. This commit accommodates for that basic change. [0]: unikraft/unikraft#1145 Signed-off-by: Alexander Jung <alex@unikraft.io>

Allow the `vfs.fstab` option arguments to receive an additional option that is Unikraft specific and that enables one to change a volume's mount behavior depending on the passed option. Thus, now the `vfs.fstab` syntax is as follows: ``` vfs.fstab=[ "<src_dev>:<mntpoint>:<fsdriver>[:<flags>:<opts>:<ukopts>]" "<src_dev>:<mntpoint>:<fsdriver>[:<flags>:<opts>:<ukopts>]" ... ] ``` The `ukopts` options will have the same separator as `fstab`, that being `:`. Signed-off-by: Sergiu Moga <sergiu@unikraft.io>

In case someone may want to mount a filesystem to a directory that does not currently exist in the rootfs, allow them to do so without having to rebuild the rootfs by exposing a `ukopts` option called `mkmp`. This option will let `fstab` know that it must ensure that the mount path exists before attempting to mount. Signed-off-by: Sergiu Moga <sergiu@unikraft.io>

skuenzer

Thanks a lot for your work and updates!

Reviewed-by: Simon Kuenzer simon@unikraft.io
Approved-by: Simon Kuenzer simon@unikraft.io

Allow the `vfs.fstab` option arguments to receive an additional option that is Unikraft specific and that enables one to change a volume's mount behavior depending on the passed option. Thus, now the `vfs.fstab` syntax is as follows: ``` vfs.fstab=[ "<src_dev>:<mntpoint>:<fsdriver>[:<flags>:<opts>:<ukopts>]" "<src_dev>:<mntpoint>:<fsdriver>[:<flags>:<opts>:<ukopts>]" ... ] ``` The `ukopts` options will have the same separator as `fstab`, that being `:`. Signed-off-by: Sergiu Moga <sergiu@unikraft.io> Reviewed-by: Simon Kuenzer <simon@unikraft.io> Approved-by: Simon Kuenzer <simon@unikraft.io> GitHub-Closes: unikraft#1145

In case someone may want to mount a filesystem to a directory that does not currently exist in the rootfs, allow them to do so without having to rebuild the rootfs by exposing a `ukopts` option called `mkmp`. This option will let `fstab` know that it must ensure that the mount path exists before attempting to mount. Signed-off-by: Sergiu Moga <sergiu@unikraft.io> Reviewed-by: Simon Kuenzer <simon@unikraft.io> Approved-by: Simon Kuenzer <simon@unikraft.io> GitHub-Closes: unikraft#1145

Following the merge of [0], the name of the Unikraft-specific VFSTAB cli option for creating a non-existing directory is called `mkmp` and not `mkpath`. The latter was the original name which was changed during the review process of [0]. [0]: unikraft/unikraft#1145 Signed-off-by: Alexander Jung <alex@unikraft.io>

Allow the `vfs.fstab` option arguments to receive an additional option that is Unikraft specific and that enables one to change a volume's mount behavior depending on the passed option. Thus, now the `vfs.fstab` syntax is as follows: ``` vfs.fstab=[ "<src_dev>:<mntpoint>:<fsdriver>[:<flags>:<opts>:<ukopts>]" "<src_dev>:<mntpoint>:<fsdriver>[:<flags>:<opts>:<ukopts>]" ... ] ``` The `ukopts` options will have the same separator as `fstab`, that being `:`. Signed-off-by: Sergiu Moga <sergiu@unikraft.io> Reviewed-by: Simon Kuenzer <simon@unikraft.io> Approved-by: Simon Kuenzer <simon@unikraft.io> GitHub-Closes: unikraft#1145

In case someone may want to mount a filesystem to a directory that does not currently exist in the rootfs, allow them to do so without having to rebuild the rootfs by exposing a `ukopts` option called `mkmp`. This option will let `fstab` know that it must ensure that the mount path exists before attempting to mount. Signed-off-by: Sergiu Moga <sergiu@unikraft.io> Reviewed-by: Simon Kuenzer <simon@unikraft.io> Approved-by: Simon Kuenzer <simon@unikraft.io> GitHub-Closes: unikraft#1145

mogasergiu requested a review from a team as a code owner October 23, 2023 13:52

mogasergiu added a commit to mogasergiu/unikraft that referenced this pull request Oct 23, 2023

PR unikraft#1145

10304e5

mogasergiu mentioned this pull request Oct 23, 2023

lib/vfscore: Re-enable the mounting of initrd's through fstab #1144

Merged

4 tasks

mogasergiu force-pushed the smoga/fstab_ukopts_mkpath branch from 0080305 to 6cc4aef Compare October 23, 2023 16:34

nderjung approved these changes Oct 23, 2023

View reviewed changes

skuenzer self-assigned this Oct 23, 2023

mogasergiu commented Oct 24, 2023

View reviewed changes

lib/vfscore/automount.c Outdated Show resolved Hide resolved

skuenzer requested changes Oct 26, 2023

View reviewed changes

mogasergiu added a commit to mogasergiu/unikraft that referenced this pull request Oct 27, 2023

PR unikraft#1145

41dfb16

mogasergiu force-pushed the smoga/fstab_ukopts_mkpath branch 4 times, most recently from a0a8f2d to 19c4e54 Compare October 27, 2023 11:53

mogasergiu force-pushed the smoga/fstab_ukopts_mkpath branch 2 times, most recently from 198bf42 to 8f42060 Compare October 27, 2023 12:24

mogasergiu changed the title ~~lib/vfscore: Introduce ukopts, a new vfs.fstab option and mkpath, a ukopts option~~ lib/vfscore: Introduce ukopts, a new vfs.fstab option and mkmp, a ukopts option Oct 27, 2023

mogasergiu added a commit to mogasergiu/unikraft that referenced this pull request Oct 27, 2023

PR unikraft#1145

bb8df39

mogasergiu added a commit to mogasergiu/unikraft that referenced this pull request Oct 27, 2023

PR unikraft#1145

a31bf9b

mogasergiu force-pushed the smoga/fstab_ukopts_mkpath branch 2 times, most recently from ee07fe8 to 71f9074 Compare October 27, 2023 13:46

skuenzer requested changes Oct 31, 2023

View reviewed changes

nderjung mentioned this pull request Nov 1, 2023

feat: Handle initrd in fstab entries unikraft/kraftkit#965

Merged

4 tasks

mogasergiu added 2 commits November 6, 2023 11:06

mogasergiu force-pushed the smoga/fstab_ukopts_mkpath branch from 71f9074 to 65926f5 Compare November 6, 2023 09:11

mogasergiu requested a review from skuenzer November 6, 2023 09:11

razvand added the lib/vfscore VFS Core Interface label Nov 28, 2023

razvand added this to the v0.16.0 (Telesto) milestone Nov 28, 2023

razvand added kind/enhancement New feature or request lang/c Issues or PRs to do with C/C++ labels Nov 28, 2023

skuenzer approved these changes Dec 8, 2023

View reviewed changes

skuenzer changed the base branch from staging to staging-1145 December 9, 2023 00:01

skuenzer merged commit 2965775 into unikraft:staging-1145 Dec 9, 2023
8 of 9 checks passed

nderjung mentioned this pull request Dec 9, 2023

fix(machine): Use correct Unikraft vfstap mount option name unikraft/kraftkit#1075

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

lib/vfscore: Introduce `ukopts`, a new `vfs.fstab` option and `mkmp`, a `ukopts` option #1145

lib/vfscore: Introduce `ukopts`, a new `vfs.fstab` option and `mkmp`, a `ukopts` option #1145

mogasergiu commented Oct 23, 2023 •

edited

nderjung left a comment

mogasergiu commented Oct 27, 2023

skuenzer left a comment

skuenzer left a comment

lib/vfscore: Introduce ukopts, a new vfs.fstab option and mkmp, a ukopts option #1145

lib/vfscore: Introduce ukopts, a new vfs.fstab option and mkmp, a ukopts option #1145

Conversation

mogasergiu commented Oct 23, 2023 • edited

Prerequisite checklist

Base target

Additional configuration

Description of changes

nderjung left a comment

Choose a reason for hiding this comment

mogasergiu commented Oct 27, 2023

skuenzer left a comment

Choose a reason for hiding this comment

skuenzer left a comment

Choose a reason for hiding this comment

lib/vfscore: Introduce `ukopts`, a new `vfs.fstab` option and `mkmp`, a `ukopts` option #1145

lib/vfscore: Introduce `ukopts`, a new `vfs.fstab` option and `mkmp`, a `ukopts` option #1145

mogasergiu commented Oct 23, 2023 •

edited