X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/a7384053efe345d199440720b437a28e91058ff3..96cf56ea15a22b8b362aac6c3ab202d2608e9151:/lunaix-os/kernel/fs/vfs.c

diff --git a/lunaix-os/kernel/fs/vfs.c b/lunaix-os/kernel/fs/vfs.c
index b879185..83bd0bd 100644
--- a/lunaix-os/kernel/fs/vfs.c
+++ b/lunaix-os/kernel/fs/vfs.c
@@ -56,22 +56,6 @@
 
 #include <lunaix/fs/twifs.h>
 
-#define PATH_DELIM '/'
-
-#define unlock_inode(inode) mutex_unlock(&inode->lock)
-#define lock_inode(inode)                                                      \
-    ({                                                                         \
-        mutex_lock(&inode->lock);                                              \
-        lru_use_one(inode_lru, &inode->lru);                                   \
-    })
-
-#define unlock_dnode(dnode) mutex_unlock(&dnode->lock)
-#define lock_dnode(dnode)                                                      \
-    ({                                                                         \
-        mutex_lock(&dnode->lock);                                              \
-        lru_use_one(dnode_lru, &dnode->lru);                                   \
-    })
-
 static struct cake_pile* dnode_pile;
 static struct cake_pile* inode_pile;
 static struct cake_pile* file_pile;
@@ -81,7 +65,7 @@ static struct cake_pile* fd_pile;
 struct v_dnode* vfs_sysroot;
 static struct hbucket* dnode_cache;
 
-static struct lru_zone *dnode_lru, *inode_lru;
+struct lru_zone *dnode_lru, *inode_lru;
 
 struct hstr vfs_ddot = HSTR("..", 2);
 struct hstr vfs_dot = HSTR(".", 1);
@@ -120,6 +104,7 @@ vfs_init()
 
     // 创建一个根dnode。
     vfs_sysroot = vfs_d_alloc(NULL, &vfs_empty);
+    vfs_sysroot->parent = vfs_sysroot;
     atomic_fetch_add(&vfs_sysroot->ref_count, 1);
 }
 
@@ -142,7 +127,7 @@ vfs_dcache_lookup(struct v_dnode* parent, struct hstr* str)
         return parent;
 
     if (HSTR_EQ(str, &vfs_ddot)) {
-        return parent->parent ? parent->parent : parent;
+        return parent->parent;
     }
 
     uint32_t hash = str->hash;
@@ -161,6 +146,8 @@ vfs_dcache_lookup(struct v_dnode* parent, struct hstr* str)
 void
 vfs_dcache_add(struct v_dnode* parent, struct v_dnode* dnode)
 {
+    assert(parent);
+
     atomic_fetch_add(&dnode->ref_count, 1);
     dnode->parent = parent;
     llist_append(&parent->children, &dnode->siblings);
@@ -172,6 +159,7 @@ vfs_dcache_add(struct v_dnode* parent, struct v_dnode* dnode)
 void
 vfs_dcache_remove(struct v_dnode* dnode)
 {
+    assert(dnode);
     assert(dnode->ref_count == 1);
 
     llist_delete(&dnode->siblings);
@@ -184,170 +172,13 @@ vfs_dcache_remove(struct v_dnode* dnode)
 void
 vfs_dcache_rehash(struct v_dnode* new_parent, struct v_dnode* dnode)
 {
+    assert(new_parent);
+
     hstr_rehash(&dnode->name, HSTR_FULL_HASH);
     vfs_dcache_remove(dnode);
     vfs_dcache_add(new_parent, dnode);
 }
 
-int
-__vfs_walk(struct v_dnode* start,
-           const char* path,
-           struct v_dnode** dentry,
-           struct hstr* component,
-           int walk_options)
-{
-    int errno = 0;
-    int i = 0, j = 0;
-
-    if (path[0] == PATH_DELIM || !start) {
-        if ((walk_options & VFS_WALK_FSRELATIVE) && start) {
-            start = start->super_block->root;
-        } else {
-            start = vfs_sysroot;
-            if (!vfs_sysroot->mnt) {
-                panick("vfs: no root");
-            }
-        }
-        i++;
-    }
-
-    struct v_dnode* dnode;
-    struct v_dnode* current_level = start;
-
-    char name_content[VFS_NAME_MAXLEN];
-    struct hstr name = HSTR(name_content, 0);
-
-    char current = path[i++], lookahead;
-    while (current && current_level) {
-        lookahead = path[i++];
-        if (current != PATH_DELIM) {
-            if (j >= VFS_NAME_MAXLEN - 1) {
-                return ENAMETOOLONG;
-            }
-            if (!VFS_VALID_CHAR(current)) {
-                return EINVAL;
-            }
-            name_content[j++] = current;
-            if (lookahead) {
-                goto cont;
-            }
-        }
-
-        // handling cases like /^.*(\/+).*$/
-        if (lookahead == PATH_DELIM) {
-            goto cont;
-        }
-
-        lock_dnode(current_level);
-
-        name_content[j] = 0;
-        name.len = j;
-        hstr_rehash(&name, HSTR_FULL_HASH);
-
-        if (!lookahead && (walk_options & VFS_WALK_PARENT)) {
-            if (component) {
-                component->hash = name.hash;
-                component->len = j;
-                strcpy(component->value, name_content);
-            }
-            unlock_dnode(current_level);
-            break;
-        }
-
-        dnode = vfs_dcache_lookup(current_level, &name);
-
-        if (!dnode) {
-            dnode = vfs_d_alloc(current_level, &name);
-
-            if (!dnode) {
-                errno = ENOMEM;
-                goto error;
-            }
-
-            struct v_inode* current_inode = current_level->inode;
-
-            lock_inode(current_inode);
-
-            errno = current_inode->ops->dir_lookup(current_inode, dnode);
-
-            if (errno == ENOENT && (walk_options & VFS_WALK_MKPARENT)) {
-                if (!current_inode->ops->mkdir) {
-                    errno = ENOTSUP;
-                } else {
-                    errno = current_inode->ops->mkdir(current_inode, dnode);
-                }
-            }
-
-            vfs_dcache_add(current_level, dnode);
-            unlock_inode(current_inode);
-
-            if (errno) {
-                unlock_dnode(current_level);
-                goto cleanup;
-            }
-        }
-
-        unlock_dnode(current_level);
-
-        j = 0;
-        current_level = dnode;
-    cont:
-        current = lookahead;
-    };
-
-    *dentry = current_level;
-    return 0;
-
-cleanup:
-    vfs_d_free(dnode);
-error:
-    *dentry = NULL;
-    return errno;
-}
-
-#define VFS_MAX_SYMLINK 16
-
-int
-vfs_walk(struct v_dnode* start,
-         const char* path,
-         struct v_dnode** dentry,
-         struct hstr* component,
-         int options)
-{
-    struct v_dnode* interim;
-    const char* pathname = path;
-    int errno = __vfs_walk(start, path, &interim, component, options);
-    int counter = 0;
-
-    // FIXME This is NOT a correct way to resolve symlink!
-    while (!errno && interim->inode && (options & VFS_WALK_NOFOLLOW)) {
-        if (counter >= VFS_MAX_SYMLINK) {
-            errno = ELOOP;
-            continue;
-        }
-        if ((interim->inode->itype & VFS_IFSYMLINK) &&
-            interim->inode->ops->read_symlink) {
-
-            lock_inode(interim->inode);
-            errno =
-              interim->inode->ops->read_symlink(interim->inode, &pathname);
-            unlock_inode(interim->inode);
-
-            if (errno) {
-                break;
-            }
-        } else {
-            break;
-        }
-        errno = __vfs_walk(start, pathname, &interim, component, options);
-        counter++;
-    }
-
-    *dentry = errno ? 0 : interim;
-
-    return errno;
-}
-
 int
 vfs_open(struct v_dnode* dnode, struct v_file** file)
 {
@@ -405,6 +236,10 @@ vfs_link(struct v_dnode* to_link, struct v_dnode* name)
 {
     int errno;
 
+    if ((errno = vfs_check_writable(to_link))) {
+        return errno;
+    }
+
     lock_inode(to_link->inode);
     if (to_link->super_block->root != name->super_block->root) {
         errno = EXDEV;
@@ -436,11 +271,16 @@ vfs_close(struct v_file* file)
 int
 vfs_fsync(struct v_file* file)
 {
+    int errno;
+    if ((errno = vfs_check_writable(file->dnode))) {
+        return errno;
+    }
+
     lock_inode(file->inode);
 
-    int errno = ENOTSUP;
     pcache_commit_all(file->inode);
 
+    errno = ENOTSUP;
     if (file->ops->sync) {
         errno = file->ops->sync(file);
     }
@@ -598,6 +438,7 @@ vfs_i_alloc(struct v_superblock* sb)
 
     memset(inode, 0, sizeof(*inode));
     mutex_init(&inode->lock);
+    llist_init_head(&inode->xattrs);
 
     sb->ops.init_inode(sb, inode);
 
@@ -628,7 +469,7 @@ vfs_i_free(struct v_inode* inode)
 #define FLOCATE_CREATE_EMPTY 1
 
 int
-__vfs_getfd(int fd, struct v_fd** fd_s)
+vfs_getfd(int fd, struct v_fd** fd_s)
 {
     if (TEST_FD(fd) && (*fd_s = __current->fdtable->fds[fd])) {
         return 0;
@@ -645,8 +486,7 @@ __vfs_try_locate_file(const char* path,
     char name_str[VFS_NAME_MAXLEN];
     struct hstr name = HSTR(name_str, 0);
     int errno;
-    if ((errno =
-           vfs_walk(__current->cwd, path, fdir, &name, VFS_WALK_PARENT))) {
+    if ((errno = vfs_walk_proc(path, fdir, &name, VFS_WALK_PARENT))) {
         return errno;
     }
 
@@ -714,7 +554,7 @@ __DEFINE_LXSYSCALL1(int, close, int, fd)
 {
     struct v_fd* fd_s;
     int errno = 0;
-    if ((errno = __vfs_getfd(fd, &fd_s))) {
+    if ((errno = vfs_getfd(fd, &fd_s))) {
         goto done_err;
     }
 
@@ -748,7 +588,7 @@ __DEFINE_LXSYSCALL2(int, readdir, int, fd, struct dirent*, dent)
     struct v_fd* fd_s;
     int errno;
 
-    if ((errno = __vfs_getfd(fd, &fd_s))) {
+    if ((errno = vfs_getfd(fd, &fd_s))) {
         goto done;
     }
 
@@ -789,7 +629,7 @@ __DEFINE_LXSYSCALL3(int, read, int, fd, void*, buf, size_t, count)
 {
     int errno = 0;
     struct v_fd* fd_s;
-    if ((errno = __vfs_getfd(fd, &fd_s))) {
+    if ((errno = vfs_getfd(fd, &fd_s))) {
         goto done;
     }
 
@@ -827,11 +667,16 @@ __DEFINE_LXSYSCALL3(int, write, int, fd, void*, buf, size_t, count)
 {
     int errno = 0;
     struct v_fd* fd_s;
-    if ((errno = __vfs_getfd(fd, &fd_s))) {
+    if ((errno = vfs_getfd(fd, &fd_s))) {
         goto done;
     }
 
     struct v_file* file = fd_s->file;
+
+    if ((errno = vfs_check_writable(file->dnode))) {
+        goto done;
+    }
+
     if ((file->inode->itype & VFS_IFDIR)) {
         errno = EISDIR;
         goto done;
@@ -865,27 +710,36 @@ __DEFINE_LXSYSCALL3(int, lseek, int, fd, int, offset, int, options)
 {
     int errno = 0;
     struct v_fd* fd_s;
-    if ((errno = __vfs_getfd(fd, &fd_s))) {
+    if ((errno = vfs_getfd(fd, &fd_s))) {
         goto done;
     }
 
     struct v_file* file = fd_s->file;
 
+    if (!file->ops->seek) {
+        errno = ENOTSUP;
+        goto done;
+    }
+
     lock_inode(file->inode);
 
-    size_t fpos = file->f_pos;
+    int overflow = 0;
+    int fpos = file->f_pos;
     switch (options) {
         case FSEEK_CUR:
-            fpos = (size_t)((int)file->f_pos + offset);
+            overflow = __builtin_sadd_overflow((int)file->f_pos, offset, &fpos);
             break;
         case FSEEK_END:
-            fpos = (size_t)((int)file->inode->fsize + offset);
+            overflow =
+              __builtin_sadd_overflow((int)file->inode->fsize, offset, &fpos);
             break;
         case FSEEK_SET:
             fpos = offset;
             break;
     }
-    if (!(errno = file->ops->seek(file->inode, fpos))) {
+    if (overflow) {
+        errno = EOVERFLOW;
+    } else if (!(errno = file->ops->seek(file->inode, fpos))) {
         file->f_pos = fpos;
     }
 
@@ -898,12 +752,12 @@ done:
 int
 vfs_get_path(struct v_dnode* dnode, char* buf, size_t size, int depth)
 {
-    if (!dnode) {
+    if (!dnode || dnode->parent == dnode) {
         return 0;
     }
 
     if (depth > 64) {
-        return ELOOP;
+        return ENAMETOOLONG;
     }
 
     size_t len = vfs_get_path(dnode->parent, buf, size, depth + 1);
@@ -912,14 +766,12 @@ vfs_get_path(struct v_dnode* dnode, char* buf, size_t size, int depth)
         return len;
     }
 
+    buf[len++] = VFS_PATH_DELIM;
+
     size_t cpy_size = MIN(dnode->name.len, size - len);
     strncpy(buf + len, dnode->name.value, cpy_size);
     len += cpy_size;
 
-    if (len < size) {
-        buf[len++] = PATH_DELIM;
-    }
-
     return len;
 }
 
@@ -944,7 +796,7 @@ __DEFINE_LXSYSCALL3(int, realpathat, int, fd, char*, buf, size_t, size)
 {
     int errno;
     struct v_fd* fd_s;
-    if ((errno = __vfs_getfd(fd, &fd_s))) {
+    if ((errno = vfs_getfd(fd, &fd_s))) {
         goto done;
     }
 
@@ -963,8 +815,7 @@ __DEFINE_LXSYSCALL3(int, readlink, const char*, path, char*, buf, size_t, size)
 {
     int errno;
     struct v_dnode* dnode;
-    if (!(errno =
-            vfs_walk(__current->cwd, path, &dnode, NULL, VFS_WALK_NOFOLLOW))) {
+    if (!(errno = vfs_walk_proc(path, &dnode, NULL, VFS_WALK_NOFOLLOW))) {
         errno = vfs_readlink(dnode, buf, size);
     }
 
@@ -988,7 +839,7 @@ __DEFINE_LXSYSCALL4(int,
 {
     int errno;
     struct v_fd* fd_s;
-    if ((errno = __vfs_getfd(dirfd, &fd_s))) {
+    if ((errno = vfs_getfd(dirfd, &fd_s))) {
         goto done;
     }
 
@@ -1018,12 +869,16 @@ __DEFINE_LXSYSCALL1(int, rmdir, const char*, pathname)
 {
     int errno;
     struct v_dnode* dnode;
-    if ((errno = vfs_walk(__current->cwd, pathname, &dnode, NULL, 0))) {
+    if ((errno = vfs_walk_proc(pathname, &dnode, NULL, 0))) {
         return DO_STATUS(errno);
     }
 
     lock_dnode(dnode);
 
+    if ((errno = vfs_check_writable(dnode))) {
+        goto done;
+    }
+
     if ((dnode->super_block->fs->types & FSTYPE_ROFS)) {
         errno = EROFS;
         goto done;
@@ -1073,17 +928,18 @@ __DEFINE_LXSYSCALL1(int, mkdir, const char*, path)
     char name_value[VFS_NAME_MAXLEN];
     struct hstr name = HHSTR(name_value, 0, 0);
 
-    if (!dir) {
-        errno = ENOMEM;
+    if ((errno = vfs_walk_proc(path, &parent, &name, VFS_WALK_PARENT))) {
         goto done;
     }
 
-    if ((errno =
-           vfs_walk(__current->cwd, path, &parent, &name, VFS_WALK_PARENT))) {
+    if ((errno = vfs_check_writable(parent))) {
         goto done;
     }
 
-    dir = vfs_d_alloc(parent, &name);
+    if (!(dir = vfs_d_alloc(parent, &name))) {
+        errno = ENOMEM;
+        goto done;
+    }
 
     lock_dnode(parent);
     lock_inode(parent->inode);
@@ -1111,15 +967,19 @@ done:
 int
 __vfs_do_unlink(struct v_dnode* dnode)
 {
+    int errno;
     struct v_inode* inode = dnode->inode;
 
     if (dnode->ref_count > 1) {
         return EBUSY;
     }
 
+    if ((errno = vfs_check_writable(dnode))) {
+        return errno;
+    }
+
     lock_inode(inode);
 
-    int errno;
     if (inode->open_count) {
         errno = EBUSY;
     } else if (!(inode->itype & VFS_IFDIR)) {
@@ -1142,11 +1002,7 @@ __DEFINE_LXSYSCALL1(int, unlink, const char*, pathname)
 {
     int errno;
     struct v_dnode* dnode;
-    if ((errno = vfs_walk(__current->cwd, pathname, &dnode, NULL, 0))) {
-        goto done;
-    }
-    if ((dnode->super_block->fs->types & FSTYPE_ROFS)) {
-        errno = EROFS;
+    if ((errno = vfs_walk_proc(pathname, &dnode, NULL, 0))) {
         goto done;
     }
 
@@ -1160,7 +1016,7 @@ __DEFINE_LXSYSCALL2(int, unlinkat, int, fd, const char*, pathname)
 {
     int errno;
     struct v_fd* fd_s;
-    if ((errno = __vfs_getfd(fd, &fd_s))) {
+    if ((errno = vfs_getfd(fd, &fd_s))) {
         goto done;
     }
 
@@ -1195,7 +1051,8 @@ __DEFINE_LXSYSCALL1(int, fsync, int, fildes)
 {
     int errno;
     struct v_fd* fd_s;
-    if (!(errno = __vfs_getfd(fildes, &fd_s))) {
+
+    if (!(errno = vfs_getfd(fildes, &fd_s))) {
         errno = vfs_fsync(fd_s->file);
     }
 
@@ -1226,7 +1083,7 @@ vfs_dup2(int oldfd, int newfd)
 
     int errno;
     struct v_fd *oldfd_s, *newfd_s;
-    if ((errno = __vfs_getfd(oldfd, &oldfd_s))) {
+    if ((errno = vfs_getfd(oldfd, &oldfd_s))) {
         goto done;
     }
 
@@ -1258,7 +1115,7 @@ __DEFINE_LXSYSCALL1(int, dup, int, oldfd)
 {
     int errno, newfd;
     struct v_fd *oldfd_s, *newfd_s;
-    if ((errno = __vfs_getfd(oldfd, &oldfd_s))) {
+    if ((errno = vfs_getfd(oldfd, &oldfd_s))) {
         goto done;
     }
 
@@ -1281,13 +1138,14 @@ __DEFINE_LXSYSCALL2(int,
 {
     int errno;
     struct v_dnode* dnode;
-    if ((errno = vfs_walk(__current->cwd, pathname, &dnode, NULL, 0))) {
+    if ((errno = vfs_walk_proc(pathname, &dnode, NULL, 0))) {
         goto done;
     }
-    if ((dnode->super_block->fs->types & FSTYPE_ROFS)) {
-        errno = EROFS;
+
+    if (errno = vfs_check_writable(dnode)) {
         goto done;
     }
+
     if (!dnode->inode->ops->set_symlink) {
         errno = ENOTSUP;
         goto done;
@@ -1335,7 +1193,7 @@ __DEFINE_LXSYSCALL1(int, chdir, const char*, path)
     struct v_dnode* dnode;
     int errno = 0;
 
-    if ((errno = vfs_walk(__current->cwd, path, &dnode, NULL, 0))) {
+    if ((errno = vfs_walk_proc(path, &dnode, NULL, 0))) {
         goto done;
     }
 
@@ -1350,7 +1208,7 @@ __DEFINE_LXSYSCALL1(int, fchdir, int, fd)
     struct v_fd* fd_s;
     int errno = 0;
 
-    if ((errno = __vfs_getfd(fd, &fd_s))) {
+    if ((errno = vfs_getfd(fd, &fd_s))) {
         goto done;
     }
 
@@ -1372,7 +1230,7 @@ __DEFINE_LXSYSCALL2(char*, getcwd, char*, buf, size_t, size)
     size_t len = 0;
 
     if (!__current->cwd) {
-        *buf = PATH_DELIM;
+        *buf = VFS_PATH_DELIM;
         len = 1;
     } else {
         len = vfs_get_path(__current->cwd, buf, size, 0);
@@ -1394,11 +1252,16 @@ done:
 int
 vfs_do_rename(struct v_dnode* current, struct v_dnode* target)
 {
+    int errno = 0;
     if (current->inode->id == target->inode->id) {
         // hard link
         return 0;
     }
 
+    if (errno = vfs_check_writable(current)) {
+        return errno;
+    }
+
     if (current->ref_count > 1 || target->ref_count > 1) {
         return EBUSY;
     }
@@ -1407,8 +1270,6 @@ vfs_do_rename(struct v_dnode* current, struct v_dnode* target)
         return EXDEV;
     }
 
-    int errno = 0;
-
     struct v_dnode* oldparent = current->parent;
     struct v_dnode* newparent = target->parent;
 
@@ -1456,7 +1317,7 @@ __DEFINE_LXSYSCALL2(int, rename, const char*, oldpath, const char*, newpath)
     struct hstr name = HSTR(valloc(VFS_NAME_MAXLEN), 0);
     int errno = 0;
 
-    if ((errno = vfs_walk(__current->cwd, oldpath, &cur, NULL, 0))) {
+    if ((errno = vfs_walk_proc(oldpath, &cur, NULL, 0))) {
         goto done;
     }