新增 procfs, 重写 mount 系统调用, 修改文件系统注册逻辑.

取消 modfs pipefs tmpfs 的内核主动性挂载 (由用户态 mount 命令挂载)
修复 modfs 的偏移计算读取问题.

Author: xiaoyi1212

assets/readme.txt

@@ -1,2 +1,5 @@
 Welcome to CoolPotOS. This file is a test description.
 All source code of this operating system is licensed under the MIT open-source license.
+
+open-source: https://github.com/plos-clan/CoolPotOS
+website: https://cpos.plos-clan.org

module/all_include/fs_subsystem.h

@@ -104,7 +104,7 @@ struct vfs_node {           // vfs节点
 
 errno_t    vfs_mkdir(const char *name);
 errno_t    vfs_mkfile(const char *name);
-int        vfs_regist(const char *name, vfs_callback_t callback);
+int        vfs_regist(const char *name, vfs_callback_t callback, int register_id);
 vfs_node_t vfs_child_append(vfs_node_t parent, const char *name, void *handle);
 vfs_node_t vfs_node_alloc(vfs_node_t parent, const char *name);
 errno_t    vfs_close(vfs_node_t node);

module/extfs/ext.c

@@ -306,7 +306,7 @@ int ext_mkdir(void *parent, const char *name, vfs_node_t node) {
     return ret;
 }
 
-int ext_delete(void *parent, vfs_node_t node) {
+errno_t ext_delete(void *parent, vfs_node_t node) {
     spin_lock(rwlock);
 
     char *path = vfs_get_fullpath(node);
@@ -366,7 +366,7 @@ static struct vfs_callback callbacks = {
     .mkfile   = ext_mkfile,
     .link     = ext_link,
     .symlink  = ext_symlink,
-    .delete   = (vfs_del_t)ext_delete,
+    .delete   = ext_delete,
     .rename   = (vfs_rename_t)ext_rename,
     .map      = (vfs_mapfile_t)ext_map,
     .stat     = ext_stat,
@@ -376,7 +376,7 @@ static struct vfs_callback callbacks = {
 };
 
 __attribute__((used)) __attribute__((visibility("default"))) int dlmain(void) {
-    ext_fsid = vfs_regist("extfs", &callbacks);
+    ext_fsid = vfs_regist("extfs", &callbacks, 0);
     if (ext_fsid == -1) {
         printk("Cannot register extfs file system.\n");
         return -EFAULT;

src/x86_64/boot/limine_req.c

@@ -46,6 +46,14 @@ LIMINE_REQUEST struct limine_rsdp_request rsdp_request = {.id = LIMINE_RSDP_REQU
 LIMINE_REQUEST struct limine_framebuffer_request framebuffer_request = {
     .id = LIMINE_FRAMEBUFFER_REQUEST, .revision = 0};
 
+LIMINE_REQUEST struct limine_executable_cmdline_request cmdline_request = {
+    .id = LIMINE_EXECUTABLE_CMDLINE_REQUEST,
+};
+
+char *get_kernel_cmdline() {
+    return cmdline_request.response->cmdline;
+}
+
 const char *get_bootloader_name() {
     struct limine_bootloader_info_response *limine_bootloader_request = info_request.response;
 

src/x86_64/driver/pty.c

@@ -519,8 +519,8 @@ static struct vfs_callback pts_callbacks = {
 };
 
 static void setup_ptmx_device() {
-    ptmx_fsid      = vfs_regist("ptyfs_master", &ptmx_callbacks);
-    pts_fsid       = vfs_regist("ptyfs_slave", &pts_callbacks);
+    ptmx_fsid      = vfs_regist("ptyfs_master", &ptmx_callbacks, 0);
+    pts_fsid       = vfs_regist("ptyfs_slave", &pts_callbacks, 0);
     ptmx_list_head = malloc(sizeof(struct llist_header));
     llist_init_head(ptmx_list_head);
     if (ptmx_fsid == VFS_STATUS_FAILED) {

src/x86_64/fs/cpio/cpfs.c

@@ -36,6 +36,7 @@ void cpfs_open(void *parent, const char *name, vfs_node_t node) {
             node->handle = pos;
             node->fsid   = cpfs_id;
             node->type   = pos->is_dir ? file_dir : file_none;
+            node->size   = pos->is_dir ? 0 : pos->size;
             if (pos->is_symlink) node->type |= file_symlink;
             node->refcount = 1;
             return;
@@ -220,5 +221,5 @@ static struct vfs_callback cpfs_callbacks = {
 };
 
 void cpfs_setup() {
-    cpfs_id = vfs_regist("cpfs", &cpfs_callbacks);
+    cpfs_id = vfs_regist("cpfs", &cpfs_callbacks, CPFS_REGISTER_ID);
 }

src/x86_64/fs/devfs.c

@@ -210,7 +210,7 @@ static struct vfs_callback devfs_callbacks = {
 };
 
 void devfs_setup() {
-    devfs_id = vfs_regist("devfs", &devfs_callbacks);
+    devfs_id = vfs_regist("devfs", &devfs_callbacks, DEVFS_REGISTER_ID);
     vfs_mkdir("/dev");
     vfs_node_t dev = vfs_open("/dev");
     if (dev == NULL) {

src/x86_64/fs/fatfs/fatfs.c

@@ -333,6 +333,6 @@ static struct vfs_callback fatfs_callbacks = {
 };
 
 void fatfs_init() {
-    fatfs_id = vfs_regist("fatfs", &fatfs_callbacks);
+    fatfs_id = vfs_regist("fatfs", &fatfs_callbacks, 0);
     if (fatfs_id == VFS_STATUS_FAILED) { kerror("Failed to register fat filesystem\n"); }
 }

src/x86_64/fs/iso9660.c

@@ -328,8 +328,8 @@ void iso9660_open(void *parent, const char *name, vfs_node_t node) {
     l9660_dir   *c_dir  = (l9660_dir *)malloc(sizeof(l9660_dir));
     l9660_file  *c_file = (l9660_file *)malloc(sizeof(l9660_file));
     l9660_status status;
-    file_t new = (file_t)malloc(sizeof(struct file));
-    status     = l9660_openat(c_file, p_dir, name);
+    file_t       new = (file_t)malloc(sizeof(struct file));
+    status           = l9660_openat(c_file, p_dir, name);
 
     if (status != L9660_OK) {
         status = l9660_opendirat(c_dir, p_dir, name);
@@ -427,5 +427,5 @@ static struct vfs_callback iso_callbacks = {
 };
 
 void iso9660_regist() {
-    iso9660_id = vfs_regist("iso9660", &iso_callbacks);
+    iso9660_id = vfs_regist("iso9660", &iso_callbacks, 0);
 }

src/x86_64/fs/modfs.c

@@ -30,6 +30,10 @@ static int modfs_mount(const char *handle, vfs_node_t node) {
     }
     node->fsid = modfs_id;
     modfs_root = node;
+    for (int i = 0; i < module_count; i++) {
+        vfs_child_append(modfs_root, module_ls[i].module_name, NULL);
+        rbtree_sp_insert(mod_rbtree, module_ls[i].module_name, (void *)&module_ls[i]);
+    }
     return VFS_STATUS_SUCCESS;
 }
 
@@ -56,7 +60,7 @@ static size_t modfs_read(void *file, void *addr, size_t offset, size_t size) {
     cp_module_t *mod = (cp_module_t *)file;
     if (offset > mod->size) { return VFS_STATUS_FAILED; }
     void *buffer = mod->data + offset;
-    memcpy(addr, buffer, (mod->size - offset) > size ? size : mod->size - offset);
+    memcpy(addr, buffer, (size + offset) > mod->size ? size : mod->size - offset);
     return size;
 }
 
@@ -103,20 +107,5 @@ static struct vfs_callback modfs_callbacks = {
 };
 
 void modfs_setup() {
-    modfs_id = vfs_regist("modfs", &modfs_callbacks);
-    vfs_mkdir("/mod");
-    vfs_node_t mod = vfs_open("/mod");
-    if (mod == NULL) {
-        kerror("'mod' handle is null.");
-        return;
-    }
-    if (vfs_mount((const char *)MODFS_REGISTER_ID, mod) == VFS_STATUS_FAILED) {
-        kerror("Cannot mount module file system.");
-        return;
-    }
-
-    for (int i = 0; i < module_count; i++) {
-        vfs_child_append(modfs_root, module_ls[i].module_name, NULL);
-        rbtree_sp_insert(mod_rbtree, module_ls[i].module_name, (void *)&module_ls[i]);
-    }
+    modfs_id = vfs_regist("modfs", &modfs_callbacks, MODFS_REGISTER_ID);
 }