From a46b2f43d9d502e8d4045fb8aff6777c1fb81c89 Mon Sep 17 00:00:00 2001 From: Bananymous Date: Tue, 7 Nov 2023 02:35:44 +0200 Subject: [PATCH] Kernel: Make ProcFS use the new TmpFS internally --- kernel/include/kernel/FS/ProcFS/FileSystem.h | 11 +++----- kernel/include/kernel/FS/ProcFS/Inode.h | 20 ++++++++------ kernel/include/kernel/FS/TmpFS/FileSystem.h | 3 +- kernel/include/kernel/FS/TmpFS/Inode.h | 10 ++++--- kernel/include/kernel/Process.h | 2 ++ kernel/kernel/FS/ProcFS/FileSystem.cpp | 21 ++++++++------ kernel/kernel/FS/ProcFS/Inode.cpp | 29 ++++++++++++-------- kernel/kernel/FS/TmpFS/Inode.cpp | 2 +- 8 files changed, 56 insertions(+), 42 deletions(-) diff --git a/kernel/include/kernel/FS/ProcFS/FileSystem.h b/kernel/include/kernel/FS/ProcFS/FileSystem.h index becef480ef..159cdfd3c5 100644 --- a/kernel/include/kernel/FS/ProcFS/FileSystem.h +++ b/kernel/include/kernel/FS/ProcFS/FileSystem.h @@ -1,13 +1,13 @@ #pragma once -#include -#include +#include +#include #include namespace Kernel { - class ProcFileSystem final : public RamFileSystem + class ProcFileSystem final : public TmpFileSystem { public: static void initialize(); @@ -17,10 +17,7 @@ namespace Kernel void on_process_delete(Process&); private: - ProcFileSystem(size_t size); - - private: - BAN::RefPtr m_root_inode; + ProcFileSystem(); }; } \ No newline at end of file diff --git a/kernel/include/kernel/FS/ProcFS/Inode.h b/kernel/include/kernel/FS/ProcFS/Inode.h index 628b9c7154..189bdc141d 100644 --- a/kernel/include/kernel/FS/ProcFS/Inode.h +++ b/kernel/include/kernel/FS/ProcFS/Inode.h @@ -1,41 +1,43 @@ #pragma once -#include -#include +#include +#include #include namespace Kernel { - class ProcPidInode final : public RamDirectoryInode + class ProcPidInode final : public TmpDirectoryInode { public: - static BAN::ErrorOr> create(Process&, RamFileSystem&, mode_t, uid_t, gid_t); + static BAN::ErrorOr> create_new(Process&, TmpFileSystem&, mode_t, uid_t, gid_t); ~ProcPidInode() = default; + void cleanup(); + private: - ProcPidInode(Process&, RamFileSystem&, const FullInodeInfo&); + ProcPidInode(Process&, TmpFileSystem&, const TmpInodeInfo&); private: Process& m_process; }; - class ProcROInode final : public RamInode + class ProcROInode final : public TmpInode { public: - static BAN::ErrorOr> create(Process&, size_t (Process::*callback)(off_t, BAN::ByteSpan) const, RamFileSystem&, mode_t, uid_t, gid_t); + static BAN::ErrorOr> create_new(Process&, size_t (Process::*callback)(off_t, BAN::ByteSpan) const, TmpFileSystem&, mode_t, uid_t, gid_t); ~ProcROInode() = default; protected: virtual BAN::ErrorOr read_impl(off_t, BAN::ByteSpan) override; // You may not write here and this is always non blocking - virtual BAN::ErrorOr write_impl(off_t, BAN::ConstByteSpan) override { return BAN::Error::from_errno(EINVAL); } + virtual BAN::ErrorOr write_impl(off_t, BAN::ConstByteSpan) override { return BAN::Error::from_errno(EINVAL); } virtual BAN::ErrorOr truncate_impl(size_t) override { return BAN::Error::from_errno(EINVAL); } virtual bool has_data_impl() const override { return true; } private: - ProcROInode(Process&, size_t (Process::*)(off_t, BAN::ByteSpan) const, RamFileSystem&, const FullInodeInfo&); + ProcROInode(Process&, size_t (Process::*)(off_t, BAN::ByteSpan) const, TmpFileSystem&, const TmpInodeInfo&); private: Process& m_process; diff --git a/kernel/include/kernel/FS/TmpFS/FileSystem.h b/kernel/include/kernel/FS/TmpFS/FileSystem.h index 775b49598d..5205ff17fe 100644 --- a/kernel/include/kernel/FS/TmpFS/FileSystem.h +++ b/kernel/include/kernel/FS/TmpFS/FileSystem.h @@ -88,10 +88,11 @@ namespace Kernel size_t index; }; - private: + protected: TmpFileSystem(size_t max_pages); BAN::ErrorOr initialize(mode_t, uid_t, gid_t); + private: InodeLocation find_inode(ino_t ino); paddr_t find_block(size_t index); diff --git a/kernel/include/kernel/FS/TmpFS/Inode.h b/kernel/include/kernel/FS/TmpFS/Inode.h index fa385185c9..2738aee977 100644 --- a/kernel/include/kernel/FS/TmpFS/Inode.h +++ b/kernel/include/kernel/FS/TmpFS/Inode.h @@ -97,7 +97,11 @@ namespace Kernel ~TmpDirectoryInode(); + BAN::ErrorOr link_inode(TmpInode&, BAN::StringView); + protected: + TmpDirectoryInode(TmpFileSystem&, ino_t, const TmpInodeInfo&); + virtual BAN::ErrorOr prepare_unlink() override; protected: @@ -108,14 +112,12 @@ namespace Kernel virtual BAN::ErrorOr unlink_impl(BAN::StringView) override final; private: - TmpDirectoryInode(TmpFileSystem&, ino_t, const TmpInodeInfo&); - - BAN::ErrorOr link_inode(TmpInode&, BAN::StringView); - template void for_each_valid_entry(F callback); friend class TmpInode; }; + TmpInodeInfo create_inode_info(mode_t mode, uid_t uid, gid_t gid); + } diff --git a/kernel/include/kernel/Process.h b/kernel/include/kernel/Process.h index 95139aee79..033fcd1541 100644 --- a/kernel/include/kernel/Process.h +++ b/kernel/include/kernel/Process.h @@ -60,6 +60,8 @@ namespace Kernel bool is_session_leader() const { return pid() == sid(); } + const Credentials& credentials() const { return m_credentials; } + BAN::ErrorOr sys_exit(int status); BAN::ErrorOr sys_gettermios(::termios*); diff --git a/kernel/kernel/FS/ProcFS/FileSystem.cpp b/kernel/kernel/FS/ProcFS/FileSystem.cpp index 451862f7e6..b7fe645e3a 100644 --- a/kernel/kernel/FS/ProcFS/FileSystem.cpp +++ b/kernel/kernel/FS/ProcFS/FileSystem.cpp @@ -1,6 +1,5 @@ #include #include -#include #include namespace Kernel @@ -11,11 +10,10 @@ namespace Kernel void ProcFileSystem::initialize() { ASSERT(s_instance == nullptr); - s_instance = new ProcFileSystem(1024 * 1024); + s_instance = new ProcFileSystem(); ASSERT(s_instance); - s_instance->m_root_inode = MUST(RamDirectoryInode::create(*s_instance, 0, 0555, 0, 0)); - MUST(s_instance->set_root_inode(s_instance->m_root_inode)); + MUST(s_instance->TmpFileSystem::initialize(0555, 0, 0)); } ProcFileSystem& ProcFileSystem::get() @@ -24,23 +22,28 @@ namespace Kernel return *s_instance; } - ProcFileSystem::ProcFileSystem(size_t size) - : RamFileSystem(size) + ProcFileSystem::ProcFileSystem() + : TmpFileSystem(-1) { } BAN::ErrorOr ProcFileSystem::on_process_create(Process& process) { auto path = BAN::String::formatted("{}", process.pid()); - auto inode = TRY(ProcPidInode::create(process, *this, 0555, 0, 0)); - TRY(m_root_inode->add_inode(path, inode)); + auto inode = TRY(ProcPidInode::create_new(process, *this, 0555, process.credentials().ruid(), process.credentials().rgid())); + TRY(reinterpret_cast(root_inode().ptr())->link_inode(*inode, path)); return {}; } void ProcFileSystem::on_process_delete(Process& process) { auto path = BAN::String::formatted("{}", process.pid()); - MUST(m_root_inode->unlink(path)); + + auto inode = MUST(root_inode()->find_inode(path)); + reinterpret_cast(inode.ptr())->cleanup(); + + if (auto ret = root_inode()->unlink(path); ret.is_error()) + dwarnln("{}", ret.error()); } } diff --git a/kernel/kernel/FS/ProcFS/Inode.cpp b/kernel/kernel/FS/ProcFS/Inode.cpp index e74e6237ee..c881341989 100644 --- a/kernel/kernel/FS/ProcFS/Inode.cpp +++ b/kernel/kernel/FS/ProcFS/Inode.cpp @@ -3,31 +3,38 @@ namespace Kernel { - BAN::ErrorOr> ProcPidInode::create(Process& process, RamFileSystem& fs, mode_t mode, uid_t uid, gid_t gid) + BAN::ErrorOr> ProcPidInode::create_new(Process& process, TmpFileSystem& fs, mode_t mode, uid_t uid, gid_t gid) { - FullInodeInfo inode_info(fs, mode, uid, gid); + auto inode_info = create_inode_info(Mode::IFDIR | mode, uid, gid); auto* inode_ptr = new ProcPidInode(process, fs, inode_info); if (inode_ptr == nullptr) return BAN::Error::from_errno(ENOMEM); auto inode = BAN::RefPtr::adopt(inode_ptr); - TRY(inode->add_inode("meminfo"sv, MUST(ProcROInode::create(process, &Process::proc_meminfo, fs, 0755, 0, 0)))); - TRY(inode->add_inode("cmdline"sv, MUST(ProcROInode::create(process, &Process::proc_cmdline, fs, 0755, 0, 0)))); - TRY(inode->add_inode("environ"sv, MUST(ProcROInode::create(process, &Process::proc_environ, fs, 0755, 0, 0)))); + TRY(inode->link_inode(*MUST(ProcROInode::create_new(process, &Process::proc_meminfo, fs, 0400, uid, gid)), "meminfo"sv)); + TRY(inode->link_inode(*MUST(ProcROInode::create_new(process, &Process::proc_cmdline, fs, 0400, uid, gid)), "cmdline"sv)); + TRY(inode->link_inode(*MUST(ProcROInode::create_new(process, &Process::proc_environ, fs, 0400, uid, gid)), "environ"sv)); return inode; } - ProcPidInode::ProcPidInode(Process& process, RamFileSystem& fs, const FullInodeInfo& inode_info) - : RamDirectoryInode(fs, inode_info, fs.root_inode()->ino()) + ProcPidInode::ProcPidInode(Process& process, TmpFileSystem& fs, const TmpInodeInfo& inode_info) + : TmpDirectoryInode(fs, MUST(fs.allocate_inode(inode_info)), inode_info) , m_process(process) { } - BAN::ErrorOr> ProcROInode::create(Process& process, size_t (Process::*callback)(off_t, BAN::ByteSpan) const, RamFileSystem& fs, mode_t mode, uid_t uid, gid_t gid) + void ProcPidInode::cleanup() { - FullInodeInfo inode_info(fs, mode, uid, gid); + (void)TmpDirectoryInode::unlink_impl("meminfo"sv); + (void)TmpDirectoryInode::unlink_impl("cmdline"sv); + (void)TmpDirectoryInode::unlink_impl("environ"sv); + } + + BAN::ErrorOr> ProcROInode::create_new(Process& process, size_t (Process::*callback)(off_t, BAN::ByteSpan) const, TmpFileSystem& fs, mode_t mode, uid_t uid, gid_t gid) + { + auto inode_info = create_inode_info(Mode::IFREG | mode, uid, gid); auto* inode_ptr = new ProcROInode(process, callback, fs, inode_info); if (inode_ptr == nullptr) @@ -35,8 +42,8 @@ namespace Kernel return BAN::RefPtr::adopt(inode_ptr); } - ProcROInode::ProcROInode(Process& process, size_t (Process::*callback)(off_t, BAN::ByteSpan) const, RamFileSystem& fs, const FullInodeInfo& inode_info) - : RamInode(fs, inode_info) + ProcROInode::ProcROInode(Process& process, size_t (Process::*callback)(off_t, BAN::ByteSpan) const, TmpFileSystem& fs, const TmpInodeInfo& inode_info) + : TmpInode(fs, MUST(fs.allocate_inode(inode_info)), inode_info) , m_process(process) , m_callback(callback) { diff --git a/kernel/kernel/FS/TmpFS/Inode.cpp b/kernel/kernel/FS/TmpFS/Inode.cpp index 7bfed1ae44..0c2afc612b 100644 --- a/kernel/kernel/FS/TmpFS/Inode.cpp +++ b/kernel/kernel/FS/TmpFS/Inode.cpp @@ -5,7 +5,7 @@ namespace Kernel { - static TmpInodeInfo create_inode_info(mode_t mode, uid_t uid, gid_t gid) + TmpInodeInfo create_inode_info(mode_t mode, uid_t uid, gid_t gid) { auto current_time = SystemTimer::get().real_time();