diff options
| -rw-r--r-- | sys/fs/tmpfs.c | 54 | ||||
| -rw-r--r-- | sys/inc/fs/tmpfs.h | 37 | ||||
| -rw-r--r-- | sys/inc/os/mount.h | 96 | ||||
| -rw-r--r-- | sys/inc/os/vfs.h | 49 | ||||
| -rw-r--r-- | sys/kern/Makefile | 1 | ||||
| -rw-r--r-- | sys/kern/kern_init.c | 2 | ||||
| -rw-r--r-- | sys/kern/vfs_init.c | 108 | ||||
| -rw-r--r-- | sys/kern/vfs_mount.c | 116 |
8 files changed, 463 insertions, 0 deletions
diff --git a/sys/fs/tmpfs.c b/sys/fs/tmpfs.c new file mode 100644 index 0000000..648f60e --- /dev/null +++ b/sys/fs/tmpfs.c @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2025 Ian Marco Moffett and the Osmora Team. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Hyra nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include <os/mount.h> +#include <fs/tmpfs.h> + +/* + * Mount a filesystem + */ +static int +tmpfs_mount(struct fs_info *fip, void *data) +{ + struct mount_args mountargs; + int error; + + mountargs.target = "/tmp"; + mountargs.fstype = MOUNT_TMPFS; + error = mount(&mountargs); + if (error < 0) { + return error; + } + + return 0; +} + +struct vfsops g_tmpfs_ops = { + .mount = tmpfs_mount +}; diff --git a/sys/inc/fs/tmpfs.h b/sys/inc/fs/tmpfs.h new file mode 100644 index 0000000..f7a7ece --- /dev/null +++ b/sys/inc/fs/tmpfs.h @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2025 Ian Marco Moffett and the Osmora Team. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Hyra nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _FS_TMPFS_H_ +#define _FS_TMPFS_H_ + +#include <os/mount.h> + +extern struct vfsops g_tmpfs_ops; + +#endif /* !_FS_TMPFS_H_ */ diff --git a/sys/inc/os/mount.h b/sys/inc/os/mount.h new file mode 100644 index 0000000..6cfff2f --- /dev/null +++ b/sys/inc/os/mount.h @@ -0,0 +1,96 @@ +/* + * Copyright (c) 2025 Ian Marco Moffett and the Osmora Team. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Hyra nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _OS_MOUNT_H_ +#define _OS_MOUNT_H_ 1 + +#include <sys/types.h> +#include <sys/queue.h> +#include <os/vnode.h> + +/* Filesystem names */ +#define MOUNT_TMPFS "tmpfs" + +struct fs_info; + +/* + * Represents arguments passed to mount() + */ +struct mount_args { + const char *source; + const char *target; + const char *fstype; + uint32_t flags; + void *data; +}; + +/* + * Represents VFS operations that can be performed + * on filesystem objects + */ +struct vfsops { + int(*mount)(struct fs_info *fip, void *data); +}; + +/* + * Represents filesystem operation + * + * @name: Name of filesystem + * @vfsops: Represents operations that can be performed + * @is_mounted: Set if filesystem is mounted + */ +struct fs_info { + char *name; + struct vfsops *vfsops; + uint8_t is_mounted : 1; +}; + +/* + * Represents a mountpoint + * + * @fip: Target filesystem interface + * @vp: Vnode pointer length + * @link: Connects mountpoints + */ +struct mount { + struct fs_info *fip; + struct vnode *vp; + TAILQ_ENTRY(mount) link; +}; + +/* + * Mount a filesystem and make it visible for access + * + * @margs: Mount arguments + * + * Returns zero on success + */ +int mount(struct mount_args *margs); + +#endif /* !_OS_MOUNT_H_ */ diff --git a/sys/inc/os/vfs.h b/sys/inc/os/vfs.h new file mode 100644 index 0000000..e5ce607 --- /dev/null +++ b/sys/inc/os/vfs.h @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2025 Ian Marco Moffett and the Osmora Team. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Hyra nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _OS_VFS_H_ +#define _OS_VFS_H_ 1 + +#include <os/mount.h> + +/* + * Initialize the virtual file system + */ +void vfs_init(void); + +/* + * Get a file system information descriptor + * by name + * + * @name: Name to lookup + * @res: Result pointer is written here + */ +int vfs_byname(const char *name, struct fs_info **res); + +#endif /* _!OS_VFS_H_ */ diff --git a/sys/kern/Makefile b/sys/kern/Makefile index b15e8b6..32e2830 100644 --- a/sys/kern/Makefile +++ b/sys/kern/Makefile @@ -8,6 +8,7 @@ CFILES += $(shell find ../vm -name "*.c") CFILES += $(shell find ../dev -name "*.c") CFILES += $(shell find ../mu -name "*.c") CFILES += $(shell find ../acpi -name "*.c") +CFILES += $(shell find ../fs -name "*.c") OFILES = $(CFILES:.c=.o) DFILES = $(CFILES:.c=.d) CC = diff --git a/sys/kern/kern_init.c b/sys/kern/kern_init.c index 0c4f286..8f00906 100644 --- a/sys/kern/kern_init.c +++ b/sys/kern/kern_init.c @@ -31,6 +31,7 @@ #include <dev/cons/cons.h> #include <os/trace.h> #include <os/sched.h> +#include <os/vfs.h> #include <acpi/acpi.h> #include <mu/cpu.h> #include <vm/phys.h> @@ -51,5 +52,6 @@ kmain(void) acpi_init(); vm_kalloc_init(); cpu_conf(&g_bsp); + vfs_init(); cpu_start_aps(&g_bsp); } diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c new file mode 100644 index 0000000..2f282cf --- /dev/null +++ b/sys/kern/vfs_init.c @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2025 Ian Marco Moffett and the Osmora Team. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Hyra nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/param.h> +#include <sys/cdefs.h> +#include <lib/string.h> +#include <fs/tmpfs.h> +#include <os/mount.h> +#include <os/trace.h> +#include <os/vfs.h> + +#define dtrace(fmt, ...) trace("vfs: " fmt, ##__VA_ARGS__) + +static uint16_t fs_count = 0; +static struct fs_info fs_list[] = { + { MOUNT_TMPFS, &g_tmpfs_ops } +}; + +int +vfs_byname(const char *name, struct fs_info **res) +{ + if (name == NULL || res == NULL) { + return -ENOMEM; + } + + if (fs_count == 0) { + fs_count = NELEM(fs_list); + } + + for (uint16_t i = 0; i < fs_count; ++i) { + if (__likely(*name != *fs_list[i].name)) { + continue; + } + + if (strcmp(name, fs_list[i].name) == 0) { + *res = &fs_list[i]; + return 0; + } + } + + return -ENOENT; +} + +void +vfs_init(void) +{ + struct fs_info *fip; + struct vfsops *ops; + uint16_t mount_count = 0; + int error; + + fs_count = NELEM(fs_list); + for (uint16_t i = 0; i < fs_count; ++i) { + fip = &fs_list[i]; + ops = fip->vfsops; + + /* We rely on the name */ + if (__unlikely(fip->name == NULL)) { + continue; + } + + /* Mount if we can */ + if (ops->mount != NULL) { + error = ops->mount(fip, NULL); + } + + if (error != 0) { + dtrace("failed to mount %s\n", fip->name); + continue; + } + + dtrace("mounted %s\n", fip->name); + fip->is_mounted = 1; + ++mount_count; + } + + if (mount_count > 0) { + dtrace("mounted %d filesystem(s)\n", mount_count); + } +} diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c new file mode 100644 index 0000000..d733a3f --- /dev/null +++ b/sys/kern/vfs_mount.c @@ -0,0 +1,116 @@ +/* + * Copyright (c) 2025 Ian Marco Moffett and the Osmora Team. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Hyra nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include <sys/types.h> +#include <sys/errno.h> +#include <sys/param.h> +#include <kern/spinlock.h> +#include <kern/panic.h> +#include <os/mount.h> +#include <os/vfs.h> +#include <lib/stdbool.h> +#include <vm/kalloc.h> + +/* + * We can't quite distribute this lock in a sane way without + * complicating things significantly and thus the practicality + * of such is questionable. Unfortunately, having a global lock + * comes with some performance penalties due to contention. At + * the very least, we can prevent it from bouncing around between + * caches on multicore systems by aligning it to a cacheline boundary. + */ +__cacheline_aligned +static struct spinlock mount_lock; + +/* Mount list */ +static TAILQ_HEAD(, mount) mountlist; +static bool is_mountlist_init = false; + +/* + * Initialize the mountlist + */ +static void +mountlist_init(void) +{ + if (is_mountlist_init) { + return; + } + + TAILQ_INIT(&mountlist); + if (spinlock_init("mount", &mount_lock) != 0) { + panic("mount: failed to initialize mountlist\n"); + } + is_mountlist_init = true; +} + +int +mount(struct mount_args *margs) +{ + struct fs_info *fip; + struct mount *mp; + int error; + + if (margs == NULL) { + return -EINVAL; + } + + if (margs->target == NULL || margs->fstype == NULL) { + return -EINVAL; + } + + /* Initialize the mountlist if needed */ + if (!is_mountlist_init) { + mountlist_init(); + } + + error = vfs_byname(margs->fstype, &fip); + if (error != 0) { + return error; + } + + mp = kalloc(sizeof(*mp)); + if (mp == NULL) { + return -ENOMEM; + } + + mp->fip = fip; + error = vnode_init(&mp->vp, VDIR); + if (error < 0) { + kfree(mp); + return error; + } + + /* + * TODO: We'd need to do a namei() here, add by-path + */ + spinlock_acquire(&mount_lock, false); + TAILQ_INSERT_TAIL(&mountlist, mp, link); + spinlock_release(&mount_lock, false); + return 0; +} |