From 22bdfe6ed296a8a9d95e9d88a856bad8f1c870b7 Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Fri, 1 Mar 2024 13:26:53 -0500 Subject: kernel: vfs: Simplify mounting logic Signed-off-by: Ian Moffett --- sys/include/sys/vfs.h | 4 -- sys/kern/vfs_cache.c | 126 -------------------------------------------- sys/kern/vfs_init.c | 7 +-- sys/kern/vfs_mount.c | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++ sys/kern/vfs_subr.c | 36 ------------- 5 files changed, 142 insertions(+), 172 deletions(-) delete mode 100644 sys/kern/vfs_cache.c create mode 100644 sys/kern/vfs_mount.c diff --git a/sys/include/sys/vfs.h b/sys/include/sys/vfs.h index 2c056a1..40b27af 100644 --- a/sys/include/sys/vfs.h +++ b/sys/include/sys/vfs.h @@ -42,10 +42,6 @@ struct vnode *vfs_path_to_node(const char *path); char *vfs_get_fname_at(const char *path, size_t idx); bool vfs_is_valid_path(const char *path); size_t vfs_hash_path(const char *path); - -void vfs_init_cache(void); -int vfs_cache_mp(struct mount *mp, const char *path); -int vfs_cache_fetch_mp(const char *path, struct mount **mp); #endif /* defined(_KERNEL) */ #endif /* !_SYS_VFS_H_ */ diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c deleted file mode 100644 index fe31c75..0000000 --- a/sys/kern/vfs_cache.c +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright (c) 2023-2024 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 -#include -#include -#include -#include -#include -#include - -/* For caching */ -#define MOUNTLIST_SIZE 8 - -/* Mountlist cache entry */ -struct mountlist_entry { - TAILQ_HEAD(, mount) buckets; -}; - -static struct mountlist_entry *mountlist = NULL; - -/* - * Cache a mountpoint - * - * @mp: Mountpoint to cache - * @path: Path this mountpoint belongs to - * - * If this cache entry already exists, -EEXIST - * will be returned. - */ -int -vfs_cache_mp(struct mount *mp, const char *path) -{ - size_t hash = vfs_hash_path(path); - struct mountlist_entry *entry; - - if (hash == 0) { - /* Something is wrong with the path */ - return -EINVAL; - } - - if (vfs_cache_fetch_mp(path, NULL) == 0) { - /* Cache hit, do not duplicate this entry */ - return -EEXIST; - } - - mp->phash = hash; - entry = &mountlist[hash % MOUNTLIST_SIZE]; - TAILQ_INSERT_TAIL(&entry->buckets, mp, link); - return 0; -} - -/* - * Fetch mountpoint from cache - * - * @path: Path of target mountpoint - * @mp: Pointer of variable where mountpoint fetched will - * be stored - * - * Returns 0 upon a cache hit, on a cache miss this - * function returns -ENOENT. - */ -int -vfs_cache_fetch_mp(const char *path, struct mount **mp) -{ - size_t hash = vfs_hash_path(path); - struct mountlist_entry *entry; - struct mount *mount_iter; - - if (hash == 0) { - /* Something is wrong with the path */ - return -EINVAL; - } - - entry = &mountlist[hash % MOUNTLIST_SIZE]; - TAILQ_FOREACH(mount_iter, &entry->buckets, link) { - if (mount_iter->phash == hash) { - /* Cache hit */ - if (mp != NULL) *mp = mount_iter; - return 0; - } - } - - /* Cache miss */ - return -ENOENT; -} - -/* - * Init all caches - */ -void -vfs_init_cache(void) -{ - mountlist = dynalloc(sizeof(struct mountlist_entry) * MOUNTLIST_SIZE); - __assert(mountlist != NULL); - - for (size_t i = 0; i < MOUNTLIST_SIZE; ++i) { - TAILQ_INIT(&mountlist[i].buckets); - } -} diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c index bcda0dd..8decace 100644 --- a/sys/kern/vfs_init.c +++ b/sys/kern/vfs_init.c @@ -61,7 +61,7 @@ vfs_init(void) struct fs_info *info; struct vfsops *vfsops; - vfs_init_cache(); + vfs_mount_init(); for (int i = 0; i < __ARRAY_COUNT(filesystems); ++i) { info = &filesystems[i]; @@ -69,10 +69,5 @@ vfs_init(void) __assert(vfsops->init != NULL); vfsops->init(info); - - if (strcmp(info->name, "initramfs") == 0) { - /* Initramfs must be mounted */ - vfs_mount(&info->mp_root, "/ramdisk", MNT_RDONLY); - } } } diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c new file mode 100644 index 0000000..53df6a2 --- /dev/null +++ b/sys/kern/vfs_mount.c @@ -0,0 +1,141 @@ +/* + * Copyright (c) 2023-2024 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 +#include +#include +#include +#include +#include +#include + +/* TODO: Make this more flexible */ +#define MOUNTLIST_SIZE 8 + +/* Mountlist entry */ +struct mountlist_entry { + TAILQ_HEAD(, mount) buckets; +}; + +static struct mountlist_entry *mountlist = NULL; + +static int +vfs_create_mp(const char *path, int mntflags, struct mount **mp_out) +{ + struct mount *mp; + + mp = dynalloc(sizeof(struct mount)); + if (mp == NULL) { + return -ENOMEM; + } + + mp->flags = mntflags; + *mp_out = mp; + return 0; +} + +/* + * Mount a mountpoint + * + * @mp: Mountpoint to mount + * @path: Path this mountpoint belongs to + * + * If this mount entry already exists, -EEXIST + * will be returned. + */ +int +vfs_mount(const char *path, int mntflags) +{ + size_t hash = vfs_hash_path(path); + int status; + struct mountlist_entry *entry; + struct mount *mp; + + if ((status = vfs_create_mp(path, mntflags, &mp)) != 0) { + return status; + } + if (hash == 0) { + /* Something is wrong with the path */ + return -EINVAL; + } + + if (vfs_get_mp(path, NULL) == 0) { + /* mount hit, do not duplicate this entry */ + return -EEXIST; + } + + mp->phash = hash; + entry = &mountlist[hash % MOUNTLIST_SIZE]; + TAILQ_INSERT_TAIL(&entry->buckets, mp, link); + return 0; +} + +/* + * Fetch mountpoint + * + * @path: Path of target mountpoint + * @mp: Pointer of variable where mountpoint fetched will + * be stored + * + * Returns 0 upon a mplist hit, on a mplist miss this + * function returns -ENOENT. + */ +int +vfs_get_mp(const char *path, struct mount **mp) +{ + size_t hash = vfs_hash_path(path); + struct mountlist_entry *entry; + struct mount *mount_iter; + + if (hash == 0) { + /* Something is wrong with the path */ + return -EINVAL; + } + + entry = &mountlist[hash % MOUNTLIST_SIZE]; + TAILQ_FOREACH(mount_iter, &entry->buckets, link) { + if (mount_iter->phash == hash) { + if (mp != NULL) *mp = mount_iter; + return 0; + } + } + + return -ENOENT; +} + +void +vfs_mount_init(void) +{ + mountlist = dynalloc(sizeof(struct mountlist_entry) * MOUNTLIST_SIZE); + __assert(mountlist != NULL); + + for (size_t i = 0; i < MOUNTLIST_SIZE; ++i) { + TAILQ_INIT(&mountlist[i].buckets); + } +} diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 6646f79..ac8a16b 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -158,39 +158,3 @@ vfs_alloc_vnode(struct vnode **vnode, struct mount *mp, int type) *vnode = new_vnode; return 0; } - -/* - * This function mounts a `mount' structure - * at a specific path. - * - * @mp_out: Where to store copy of new mountpoint (NULL if none) - * @path: Path to mount on. - * @mnt_flags: Mount flags (MNT_* from sys/mount.h) - * - * Returns 0 upon success, otherwise a < 0 value. - * - * XXX: This function assumes the mountpoint has its mount - * routine set in its vfsops. - */ -int -vfs_mount(struct mount **mp_out, const char *path, int mnt_flags) -{ - struct mount *mp; - int cache_status; - - mp = dynalloc(sizeof(struct mount)); - if (mp == NULL) { - return -ENOMEM; - } - - mp->flags = mnt_flags; - cache_status = vfs_cache_mp(mp, path); - - if (cache_status != 0) { - dynfree(mp); - return cache_status; - } - - *mp_out = mp; - return 0; -} -- cgit v1.2.3