vfs: bug fixes

Author: ilobilo

kernel/include/libc/elf.h

@@ -170,11 +170,19 @@ typedef struct
 #define ELF64_R_SYM(i) ((i) >> 32)
 #define ELF64_R_TYPE(i) ((i) & 0xffffffff)
 
+#define R_X86_64_NONE 0
 #define R_X86_64_64 1
+#define R_X86_64_COPY 5
 #define R_X86_64_GLOB_DAT 6
 #define R_X86_64_JUMP_SLOT 7
 #define R_X86_64_RELATIVE 8
 
+#define R_AARCH64_NONE 0
+#define R_AARCH64_COPY 1024
+#define R_AARCH64_GLOB_DAT 1025
+#define R_AARCH64_JUMP_SLOT 1026
+#define R_AARCH64_RELATIVE 1027
+
 #define AT_NULL 0
 #define AT_IGNORE 1
 #define AT_EXECFD 2

kernel/interfaces/arch/x86_64/drivers/output/e9.cppm

@@ -4,6 +4,5 @@ export module x86_64.drivers.output.e9;
 
 export namespace x86_64::output::e9
 {
-    void printc(char chr);
     void init();
 } // export namespace x86_64::output::e9

kernel/interfaces/boot/boot.cppm

@@ -44,7 +44,7 @@ export namespace boot
     };
 
     [[gnu::used, gnu::section(".limine_requests")]]
-    volatile std::uint64_t limine_base_revision[] = LIMINE_BASE_REVISION(5);
+    volatile std::uint64_t limine_base_revision[] = LIMINE_BASE_REVISION(6);
 
     namespace requests
     {

kernel/interfaces/drivers/fs/dev/dev.cppm

@@ -2,6 +2,6 @@
 
 export module drivers.fs.dev;
 
-export import drivers.fs.dev.mem;
+// export import drivers.fs.dev.mem;
 export import drivers.fs.dev.pty;
 export import drivers.fs.dev.tty;

kernel/interfaces/drivers/fs/dev/mem.cppm

@@ -10,4 +10,6 @@ export namespace fs::devtmpfs
 {
     lib::initgraph::stage *registered_stage();
     lib::initgraph::stage *mounted_stage();
+
+    lib::expect<void> create(lib::path path, mode_t mode, dev_t rdev = 0);
 } // export namespace fs::devtmpfs

kernel/interfaces/drivers/fs/devtmpfs.cppm

@@ -23,11 +23,17 @@ export namespace fs::tmpfs
             return instance;
         }
 
-        lib::expect<std::size_t> read(std::shared_ptr<vfs::file> file, std::uint64_t offset, lib::maybe_uspan<std::byte> buffer) override;
-        lib::expect<std::size_t> write(std::shared_ptr<vfs::file> file, std::uint64_t offset, lib::maybe_uspan<std::byte> buffer) override;
-        lib::expect<void> trunc(std::shared_ptr<vfs::file> file, std::size_t size) override;
+        lib::expect<std::size_t> read(
+            std::shared_ptr<vfs::file> file, std::uint64_t offset,
+            lib::maybe_uspan<std::byte> buffer
+        ) override;
+
+        lib::expect<std::size_t> write(
+            std::shared_ptr<vfs::file> file, std::uint64_t offset,
+            lib::maybe_uspan<std::byte> buffer
+        ) override;
 
-        lib::expect<std::size_t> getdents(std::shared_ptr<vfs::file> file, std::uint64_t &offset, lib::maybe_uspan<std::byte> buffer) override;
+        lib::expect<void> trunc(std::shared_ptr<vfs::file> file, std::size_t size) override;
 
         lib::expect<vmm::object::ptr> map(std::shared_ptr<vfs::file> file) override;
     };
@@ -36,12 +42,28 @@ export namespace fs::tmpfs
     {
         struct instance : vfs::filesystem::instance, std::enable_shared_from_this<instance>
         {
-            auto create(std::shared_ptr<vfs::inode> &parent, std::string_view name, mode_t mode, dev_t rdev) -> lib::expect<std::shared_ptr<vfs::inode>> override;
-            auto symlink(std::shared_ptr<vfs::inode> &parent, std::string_view name, lib::path target) -> lib::expect<std::shared_ptr<vfs::inode>> override;
-            auto link(std::shared_ptr<vfs::inode> &parent, std::string_view name, std::shared_ptr<vfs::inode> target) -> lib::expect<std::shared_ptr<vfs::inode>> override;
+            auto create(
+                std::shared_ptr<vfs::inode> &parent,
+                std::string_view name, mode_t mode, dev_t rdev
+            ) -> lib::expect<std::shared_ptr<vfs::inode>> override;
+
+            auto symlink(
+                std::shared_ptr<vfs::inode> &parent,
+                std::string_view name, lib::path target
+            ) -> lib::expect<std::shared_ptr<vfs::inode>> override;
+
+            auto link(
+                std::shared_ptr<vfs::inode> &parent,
+                std::string_view name, std::shared_ptr<vfs::inode> target
+            ) -> lib::expect<std::shared_ptr<vfs::inode>> override;
+
             auto unlink(std::shared_ptr<vfs::inode> &node) -> lib::expect<void> override;
 
-            auto populate(std::shared_ptr<vfs::inode> &node, std::string_view name = "") -> lib::expect<lib::list<std::pair<std::string, std::shared_ptr<vfs::inode>>>> override;
+            auto readdir(std::shared_ptr<vfs::dentry> dir, std::size_t cookie)
+                -> lib::expect<lib::list<vfs::dir_entry>> override;
+
+            auto lookup(std::shared_ptr<vfs::dentry> dir,std::string_view name)
+                -> lib::expect<std::optional<vfs::dir_entry>> override;
 
             auto write_inode(std::shared_ptr<vfs::inode> &inode) -> lib::expect<void> override;
             auto dirty_inode(std::shared_ptr<vfs::inode> &inode) -> lib::expect<void> override;

kernel/interfaces/drivers/fs/tmpfs.cppm

@@ -31,6 +31,7 @@ export namespace lib
         no_such_device,
         invalid_device_or_address,
         invalid_mount,
+        invalid_path,
         invalid_symlink,
         invalid_flags,
         invalid_type,
@@ -93,6 +94,7 @@ export namespace lib
             case err::invalid_device_or_address:
                 return ENXIO;
             case err::invalid_mount:
+            case err::invalid_path:
             case err::invalid_symlink:
             case err::invalid_flags:
             case err::invalid_type:

kernel/interfaces/lib/error.cppm

@@ -54,13 +54,13 @@ export namespace lib::log
     {
         void (*prints)(std::string_view str);
 
-        void (*start)();
-        void (*stop)();
+        void (*lock)();
+        void (*unlock)();
 
         logger *next;
 
-        constexpr logger(auto prints, auto start, auto stop)
-            : prints { prints }, start { start }, stop { stop }, next { nullptr } { }
+        constexpr logger(auto prints, auto lock, auto unlock)
+            : prints { prints }, lock { lock }, unlock { unlock }, next { nullptr } { }
     };
 
     void register_logger(logger *lg);

kernel/interfaces/lib/log.cppm

@@ -6,8 +6,8 @@ import std;
 
 namespace lib::lock
 {
-    bool acquire_irq();
-    void release_irq(bool irq);
+    void acquire_irq();
+    void release_irq();
 
     void acquire_preempt();
     void release_preempt();
@@ -98,18 +98,15 @@ export namespace lib
     template<>
     class spinlock_base<lock_type::irq> : public spinlock_base<lock_type::none>
     {
-        private:
-        bool _interrupts;
-
         public:
         constexpr spinlock_base()
-            : spinlock_base<lock_type::none> { }, _interrupts { false } { }
+            : spinlock_base<lock_type::none> { } { }
 
         using spinlock_base<lock_type::none>::spinlock_base;
 
         void lock()
         {
-            _interrupts = lock::acquire_irq();
+            lock::acquire_irq();
             spinlock_base<lock_type::none>::lock();
         }
 
@@ -118,7 +115,7 @@ export namespace lib
             if (!spinlock_base<lock_type::none>::unlock())
                 return false;
 
-            lock::release_irq(_interrupts);
+            lock::release_irq();
             return true;
         }
     };