mirror of
https://github.com/SerenityOS/serenity
synced 2024-10-07 00:19:27 +00:00
Kernel/FileSystem: Send proper filetypes when traversing RAM-backed FSes
SysFS, ProcFS and DevPtsFS were all sending filetype 0 when traversing their directories, but it is actually very easy to send proper filetypes in these filesystems. This patch binds all RAM backed filesystems to use only one enum for their internal filetype, to simplify the implementation and allow sharing of code. Please note that the Plan9FS case is currently not solved as I am not familiar with this filesystem and its constructs. The ProcFS mostly keeps track of the filetype, and a fix was needed for the /proc root directory - all processes exhibit a directory inside it which makes it very easy to hardcode the directory filetype for them. There's also the `self` symlink inode which is now exposed as DT_LNK. As for SysFS, we could leverage the fact everything inherits from the SysFSComponent class, so we could have a virtual const method to return the proper filetype. Most of the files in SysFS are "regular" files though, so the base class has a non-pure virtual method. Lastly, the DevPtsFS simply hardcodes '.' and '..' as directory file type, and everything else is hardcoded to send the character device file type, as this filesystem is only exposing character pts device files.
This commit is contained in:
Liav A
Andrew Kaster
parent
75bd1308c5
commit
a10e63f08e
|
|
@ -44,6 +44,11 @@ Inode& DevPtsFS::root_inode()
|
|||
return *m_root_inode;
|
||||
}
|
||||
|
||||
u8 DevPtsFS::internal_file_type_to_directory_entry_type(DirectoryEntryView const& entry) const
|
||||
{
|
||||
return ram_backed_file_type_to_directory_entry_type(entry);
|
||||
}
|
||||
|
||||
ErrorOr<NonnullRefPtr<Inode>> DevPtsFS::get_inode(InodeIdentifier inode_id) const
|
||||
{
|
||||
if (inode_id.index() == 1)
|
||||
|
|
|
|||
|
|
@ -28,6 +28,8 @@ public:
|
|||
virtual Inode& root_inode() override;
|
||||
|
||||
private:
|
||||
virtual u8 internal_file_type_to_directory_entry_type(DirectoryEntryView const& entry) const override;
|
||||
|
||||
DevPtsFS();
|
||||
ErrorOr<NonnullRefPtr<Inode>> get_inode(InodeIdentifier) const;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
|
||||
#include <Kernel/Devices/DeviceManagement.h>
|
||||
#include <Kernel/FileSystem/DevPtsFS/Inode.h>
|
||||
#include <Kernel/FileSystem/RAMBackedFileType.h>
|
||||
|
||||
namespace Kernel {
|
||||
|
||||
|
|
@ -49,15 +50,17 @@ ErrorOr<void> DevPtsFSInode::traverse_as_directory(Function<ErrorOr<void>(FileSy
|
|||
if (identifier().index() > 1)
|
||||
return ENOTDIR;
|
||||
|
||||
TRY(callback({ "."sv, identifier(), 0 }));
|
||||
TRY(callback({ ".."sv, identifier(), 0 }));
|
||||
TRY(callback({ "."sv, identifier(), to_underlying(RAMBackedFileType::Directory) }));
|
||||
TRY(callback({ ".."sv, identifier(), to_underlying(RAMBackedFileType::Directory) }));
|
||||
|
||||
return SlavePTY::all_instances().with([&](auto& list) -> ErrorOr<void> {
|
||||
StringBuilder builder;
|
||||
for (SlavePTY& slave_pty : list) {
|
||||
builder.clear();
|
||||
TRY(builder.try_appendff("{}", slave_pty.index()));
|
||||
TRY(callback({ builder.string_view(), { fsid(), pty_index_to_inode_index(slave_pty.index()) }, 0 }));
|
||||
// NOTE: We represent directory entries with DT_CHR as all
|
||||
// inodes in this filesystem are assumed to be char devices.
|
||||
TRY(callback({ builder.string_view(), { fsid(), pty_index_to_inode_index(slave_pty.index()) }, to_underlying(RAMBackedFileType::Character) }));
|
||||
}
|
||||
return {};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -8,45 +8,46 @@
|
|||
|
||||
#include <AK/StringView.h>
|
||||
#include <AK/Types.h>
|
||||
#include <Kernel/FileSystem/RAMBackedFileType.h>
|
||||
|
||||
namespace Kernel {
|
||||
|
||||
struct segmented_global_inode_index {
|
||||
StringView name;
|
||||
u8 file_type;
|
||||
RAMBackedFileType file_type;
|
||||
u32 primary;
|
||||
u16 subdirectory;
|
||||
u32 property;
|
||||
};
|
||||
|
||||
constexpr segmented_global_inode_index global_inode_ids[] = {
|
||||
{ "."sv, DT_DIR, 0, 0, 1 }, // NOTE: This is here for the root directory
|
||||
{ "self"sv, DT_DIR, 0, 0, 2 }
|
||||
{ "."sv, RAMBackedFileType::Directory, 0, 0, 1 }, // NOTE: This is here for the root directory
|
||||
{ "self"sv, RAMBackedFileType::Directory, 0, 0, 2 }
|
||||
};
|
||||
|
||||
struct segmented_process_directory_entry {
|
||||
StringView name;
|
||||
u8 file_type;
|
||||
RAMBackedFileType file_type;
|
||||
u16 subdirectory;
|
||||
u32 property;
|
||||
};
|
||||
|
||||
constexpr segmented_process_directory_entry main_process_directory_root_entry = { "."sv, DT_DIR, 0, 0 };
|
||||
constexpr segmented_process_directory_entry process_fd_subdirectory_root_entry = { "."sv, DT_DIR, 1, 0 };
|
||||
constexpr segmented_process_directory_entry process_stacks_subdirectory_root_entry = { "."sv, DT_DIR, 2, 0 };
|
||||
constexpr segmented_process_directory_entry process_children_subdirectory_root_entry = { "."sv, DT_DIR, 3, 0 };
|
||||
constexpr segmented_process_directory_entry main_process_directory_root_entry = { "."sv, RAMBackedFileType::Directory, 0, 0 };
|
||||
constexpr segmented_process_directory_entry process_fd_subdirectory_root_entry = { "."sv, RAMBackedFileType::Directory, 1, 0 };
|
||||
constexpr segmented_process_directory_entry process_stacks_subdirectory_root_entry = { "."sv, RAMBackedFileType::Directory, 2, 0 };
|
||||
constexpr segmented_process_directory_entry process_children_subdirectory_root_entry = { "."sv, RAMBackedFileType::Directory, 3, 0 };
|
||||
|
||||
constexpr segmented_process_directory_entry process_fd_directory_entry = { "fd"sv, DT_DIR, 1, 0 };
|
||||
constexpr segmented_process_directory_entry process_stacks_directory_entry = { "stacks"sv, DT_DIR, 2, 0 };
|
||||
constexpr segmented_process_directory_entry process_children_directory_entry = { "children"sv, DT_DIR, 3, 0 };
|
||||
constexpr segmented_process_directory_entry process_unveil_list_entry = { "unveil"sv, DT_REG, 0, 1 };
|
||||
constexpr segmented_process_directory_entry process_pledge_list_entry = { "pledge"sv, DT_REG, 0, 2 };
|
||||
constexpr segmented_process_directory_entry process_fds_list_entry = { "fds"sv, DT_REG, 0, 3 };
|
||||
constexpr segmented_process_directory_entry process_exe_symlink_entry = { "exe"sv, DT_LNK, 0, 4 };
|
||||
constexpr segmented_process_directory_entry process_cwd_symlink_entry = { "cwd"sv, DT_LNK, 0, 5 };
|
||||
constexpr segmented_process_directory_entry process_perf_events_entry = { "perf_events"sv, DT_REG, 0, 6 };
|
||||
constexpr segmented_process_directory_entry process_vm_entry = { "vm"sv, DT_REG, 0, 7 };
|
||||
constexpr segmented_process_directory_entry process_cmdline_entry = { "cmdline"sv, DT_REG, 0, 8 };
|
||||
constexpr segmented_process_directory_entry process_fd_directory_entry = { "fd"sv, RAMBackedFileType::Directory, 1, 0 };
|
||||
constexpr segmented_process_directory_entry process_stacks_directory_entry = { "stacks"sv, RAMBackedFileType::Directory, 2, 0 };
|
||||
constexpr segmented_process_directory_entry process_children_directory_entry = { "children"sv, RAMBackedFileType::Directory, 3, 0 };
|
||||
constexpr segmented_process_directory_entry process_unveil_list_entry = { "unveil"sv, RAMBackedFileType::Regular, 0, 1 };
|
||||
constexpr segmented_process_directory_entry process_pledge_list_entry = { "pledge"sv, RAMBackedFileType::Regular, 0, 2 };
|
||||
constexpr segmented_process_directory_entry process_fds_list_entry = { "fds"sv, RAMBackedFileType::Regular, 0, 3 };
|
||||
constexpr segmented_process_directory_entry process_exe_symlink_entry = { "exe"sv, RAMBackedFileType::Link, 0, 4 };
|
||||
constexpr segmented_process_directory_entry process_cwd_symlink_entry = { "cwd"sv, RAMBackedFileType::Link, 0, 5 };
|
||||
constexpr segmented_process_directory_entry process_perf_events_entry = { "perf_events"sv, RAMBackedFileType::Regular, 0, 6 };
|
||||
constexpr segmented_process_directory_entry process_vm_entry = { "vm"sv, RAMBackedFileType::Regular, 0, 7 };
|
||||
constexpr segmented_process_directory_entry process_cmdline_entry = { "cmdline"sv, RAMBackedFileType::Regular, 0, 8 };
|
||||
constexpr segmented_process_directory_entry main_process_directory_entries[] = {
|
||||
process_fd_directory_entry,
|
||||
process_stacks_directory_entry,
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
|
||||
#include <Kernel/FileSystem/ProcFS/FileSystem.h>
|
||||
#include <Kernel/FileSystem/ProcFS/Inode.h>
|
||||
#include <Kernel/FileSystem/RAMBackedFileType.h>
|
||||
|
||||
namespace Kernel {
|
||||
|
||||
|
|
@ -32,6 +33,11 @@ ErrorOr<void> ProcFS::initialize()
|
|||
return {};
|
||||
}
|
||||
|
||||
u8 ProcFS::internal_file_type_to_directory_entry_type(DirectoryEntryView const& entry) const
|
||||
{
|
||||
return ram_backed_file_type_to_directory_entry_type(entry);
|
||||
}
|
||||
|
||||
Inode& ProcFS::root_inode()
|
||||
{
|
||||
return *m_root_inode;
|
||||
|
|
|
|||
|
|
@ -28,6 +28,8 @@ public:
|
|||
virtual Inode& root_inode() override;
|
||||
|
||||
private:
|
||||
virtual u8 internal_file_type_to_directory_entry_type(DirectoryEntryView const& entry) const override;
|
||||
|
||||
ProcFS();
|
||||
|
||||
ErrorOr<NonnullRefPtr<Inode>> get_inode(InodeIdentifier) const;
|
||||
|
|
|
|||
|
|
@ -1,12 +1,13 @@
|
|||
/*
|
||||
* Copyright (c) 2018-2021, Andreas Kling <kling@serenityos.org>
|
||||
* Copyright (c) 2021, Spencer Dixon <spencercdixon@gmail.com>
|
||||
* Copyright (c) 2021-2023, Liav A. <liavalb@hotmail.co.il>
|
||||
* Copyright (c) 2021-2024, Liav A. <liavalb@hotmail.co.il>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <Kernel/FileSystem/ProcFS/Inode.h>
|
||||
#include <Kernel/FileSystem/RAMBackedFileType.h>
|
||||
#include <Kernel/Tasks/Process.h>
|
||||
#include <Kernel/Time/TimeManagement.h>
|
||||
|
||||
|
|
@ -108,16 +109,16 @@ ProcFSInode::ProcFSInode(ProcFS const& procfs_instance, InodeIndex inode_index)
|
|||
|
||||
ErrorOr<void> ProcFSInode::traverse_as_root_directory(Function<ErrorOr<void>(FileSystem::DirectoryEntryView const&)> callback) const
|
||||
{
|
||||
TRY(callback({ "."sv, { fsid(), 1 }, 0 }));
|
||||
TRY(callback({ ".."sv, { fsid(), 0 }, 0 }));
|
||||
TRY(callback({ "self"sv, { fsid(), 2 }, 0 }));
|
||||
TRY(callback({ "."sv, { fsid(), to_underlying(RAMBackedFileType::Directory) }, 0 }));
|
||||
TRY(callback({ ".."sv, { fsid(), to_underlying(RAMBackedFileType::Directory) }, 0 }));
|
||||
TRY(callback({ "self"sv, { fsid(), 2 }, to_underlying(RAMBackedFileType::Link) }));
|
||||
|
||||
return Process::for_each_in_same_jail([&](Process& process) -> ErrorOr<void> {
|
||||
VERIFY(!(process.pid() < 0));
|
||||
u64 process_id = (u64)process.pid().value();
|
||||
InodeIdentifier identifier = { fsid(), static_cast<InodeIndex>(process_id << 36) };
|
||||
auto process_id_string = TRY(KString::formatted("{:d}", process_id));
|
||||
TRY(callback({ process_id_string->view(), identifier, 0 }));
|
||||
TRY(callback({ process_id_string->view(), identifier, to_underlying(RAMBackedFileType::Directory) }));
|
||||
return {};
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2021-2023, Liav A. <liavalb@hotmail.co.il>
|
||||
* Copyright (c) 2021-2024, Liav A. <liavalb@hotmail.co.il>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
|
@ -9,6 +9,7 @@
|
|||
#include <Kernel/Devices/TTY/TTY.h>
|
||||
#include <Kernel/FileSystem/Custody.h>
|
||||
#include <Kernel/FileSystem/ProcFS/Inode.h>
|
||||
#include <Kernel/FileSystem/RAMBackedFileType.h>
|
||||
#include <Kernel/Interrupts/InterruptDisabler.h>
|
||||
#include <Kernel/Library/KBufferBuilder.h>
|
||||
#include <Kernel/Memory/AnonymousVMObject.h>
|
||||
|
|
@ -19,11 +20,11 @@ namespace Kernel {
|
|||
|
||||
ErrorOr<void> Process::traverse_as_directory(FileSystemID fsid, Function<ErrorOr<void>(FileSystem::DirectoryEntryView const&)> callback) const
|
||||
{
|
||||
TRY(callback({ main_process_directory_root_entry.name, { fsid, ProcFSInode::create_index_from_process_directory_entry(pid(), main_process_directory_root_entry) }, main_process_directory_root_entry.file_type }));
|
||||
TRY(callback({ ".."sv, { fsid, ProcFSInode::create_index_from_global_directory_entry(global_inode_ids[0]) }, global_inode_ids[0].file_type }));
|
||||
TRY(callback({ main_process_directory_root_entry.name, { fsid, ProcFSInode::create_index_from_process_directory_entry(pid(), main_process_directory_root_entry) }, to_underlying(main_process_directory_root_entry.file_type) }));
|
||||
TRY(callback({ ".."sv, { fsid, ProcFSInode::create_index_from_global_directory_entry(global_inode_ids[0]) }, to_underlying(global_inode_ids[0].file_type) }));
|
||||
|
||||
for (auto& entry : main_process_directory_entries) {
|
||||
TRY(callback({ entry.name, { fsid, ProcFSInode::create_index_from_process_directory_entry(pid(), entry) }, entry.file_type }));
|
||||
TRY(callback({ entry.name, { fsid, ProcFSInode::create_index_from_process_directory_entry(pid(), entry) }, to_underlying(entry.file_type) }));
|
||||
}
|
||||
return {};
|
||||
}
|
||||
|
|
@ -62,16 +63,16 @@ ErrorOr<void> Process::procfs_get_thread_stack(ThreadID thread_id, KBufferBuilde
|
|||
|
||||
ErrorOr<void> Process::traverse_stacks_directory(FileSystemID fsid, Function<ErrorOr<void>(FileSystem::DirectoryEntryView const&)> callback) const
|
||||
{
|
||||
TRY(callback({ "."sv, { fsid, ProcFSInode::create_index_from_process_directory_entry(pid(), process_stacks_subdirectory_root_entry) }, DT_DIR }));
|
||||
TRY(callback({ ".."sv, { fsid, ProcFSInode::create_index_from_process_directory_entry(pid(), main_process_directory_root_entry) }, main_process_directory_root_entry.file_type }));
|
||||
TRY(callback({ "."sv, { fsid, ProcFSInode::create_index_from_process_directory_entry(pid(), process_stacks_subdirectory_root_entry) }, to_underlying(RAMBackedFileType::Directory) }));
|
||||
TRY(callback({ ".."sv, { fsid, ProcFSInode::create_index_from_process_directory_entry(pid(), main_process_directory_root_entry) }, to_underlying(main_process_directory_root_entry.file_type) }));
|
||||
|
||||
return thread_list().with([&](auto& list) -> ErrorOr<void> {
|
||||
for (auto const& thread : list) {
|
||||
// NOTE: All property numbers should start from 1 as 0 is reserved for the directory itself.
|
||||
auto entry = segmented_process_directory_entry { {}, DT_REG, process_stacks_subdirectory_root_entry.subdirectory, static_cast<u32>(thread.tid().value() + 1) };
|
||||
auto entry = segmented_process_directory_entry { {}, RAMBackedFileType::Regular, process_stacks_subdirectory_root_entry.subdirectory, static_cast<u32>(thread.tid().value() + 1) };
|
||||
InodeIdentifier identifier = { fsid, ProcFSInode::create_index_from_process_directory_entry(pid(), entry) };
|
||||
auto name = TRY(KString::number(thread.tid().value()));
|
||||
TRY(callback({ name->view(), identifier, 0 }));
|
||||
TRY(callback({ name->view(), identifier, to_underlying(RAMBackedFileType::Regular) }));
|
||||
}
|
||||
return {};
|
||||
});
|
||||
|
|
@ -90,7 +91,7 @@ ErrorOr<NonnullRefPtr<Inode>> Process::lookup_stacks_directory(ProcFS& procfs, S
|
|||
VERIFY(!(tid < 0));
|
||||
if (needle == (unsigned)tid) {
|
||||
// NOTE: All property numbers should start from 1 as 0 is reserved for the directory itself.
|
||||
auto entry = segmented_process_directory_entry { {}, DT_REG, process_stacks_subdirectory_root_entry.subdirectory, static_cast<u32>(thread.tid().value() + 1) };
|
||||
auto entry = segmented_process_directory_entry { {}, RAMBackedFileType::Regular, process_stacks_subdirectory_root_entry.subdirectory, static_cast<u32>(thread.tid().value() + 1) };
|
||||
thread_stack_inode = procfs.get_inode({ procfs.fsid(), ProcFSInode::create_index_from_process_directory_entry(pid(), entry) });
|
||||
return IterationDecision::Break;
|
||||
}
|
||||
|
|
@ -104,15 +105,15 @@ ErrorOr<NonnullRefPtr<Inode>> Process::lookup_stacks_directory(ProcFS& procfs, S
|
|||
|
||||
ErrorOr<void> Process::traverse_children_directory(FileSystemID fsid, Function<ErrorOr<void>(FileSystem::DirectoryEntryView const&)> callback) const
|
||||
{
|
||||
TRY(callback({ "."sv, { fsid, ProcFSInode::create_index_from_process_directory_entry(pid(), process_children_subdirectory_root_entry) }, DT_DIR }));
|
||||
TRY(callback({ ".."sv, { fsid, ProcFSInode::create_index_from_process_directory_entry(pid(), main_process_directory_root_entry) }, main_process_directory_root_entry.file_type }));
|
||||
TRY(callback({ "."sv, { fsid, ProcFSInode::create_index_from_process_directory_entry(pid(), process_children_subdirectory_root_entry) }, to_underlying(RAMBackedFileType::Directory) }));
|
||||
TRY(callback({ ".."sv, { fsid, ProcFSInode::create_index_from_process_directory_entry(pid(), main_process_directory_root_entry) }, to_underlying(main_process_directory_root_entry.file_type) }));
|
||||
return Process::for_each_in_same_jail([&](Process& process) -> ErrorOr<void> {
|
||||
if (process.ppid() == pid()) {
|
||||
auto name = TRY(KString::number(process.pid().value()));
|
||||
// NOTE: All property numbers should start from 1 as 0 is reserved for the directory itself.
|
||||
auto entry = segmented_process_directory_entry { {}, DT_LNK, process_children_subdirectory_root_entry.subdirectory, static_cast<u32>(process.pid().value() + 1) };
|
||||
auto entry = segmented_process_directory_entry { {}, RAMBackedFileType::Link, process_children_subdirectory_root_entry.subdirectory, static_cast<u32>(process.pid().value() + 1) };
|
||||
InodeIdentifier identifier = { fsid, ProcFSInode::create_index_from_process_directory_entry(pid(), entry) };
|
||||
TRY(callback({ name->view(), identifier, DT_LNK }));
|
||||
TRY(callback({ name->view(), identifier, to_underlying(RAMBackedFileType::Link) }));
|
||||
}
|
||||
return {};
|
||||
});
|
||||
|
|
@ -129,7 +130,7 @@ ErrorOr<NonnullRefPtr<Inode>> Process::lookup_children_directory(ProcFS& procfs,
|
|||
return ENOENT;
|
||||
|
||||
// NOTE: All property numbers should start from 1 as 0 is reserved for the directory itself.
|
||||
auto entry = segmented_process_directory_entry { {}, DT_LNK, process_children_subdirectory_root_entry.subdirectory, (maybe_pid.value() + 1) };
|
||||
auto entry = segmented_process_directory_entry { {}, RAMBackedFileType::Link, process_children_subdirectory_root_entry.subdirectory, (maybe_pid.value() + 1) };
|
||||
return procfs.get_inode({ procfs.fsid(), ProcFSInode::create_index_from_process_directory_entry(pid(), entry) });
|
||||
}
|
||||
|
||||
|
|
@ -150,8 +151,8 @@ ErrorOr<size_t> Process::procfs_get_file_description_link(unsigned fd, KBufferBu
|
|||
|
||||
ErrorOr<void> Process::traverse_file_descriptions_directory(FileSystemID fsid, Function<ErrorOr<void>(FileSystem::DirectoryEntryView const&)> callback) const
|
||||
{
|
||||
TRY(callback({ "."sv, { fsid, ProcFSInode::create_index_from_process_directory_entry(pid(), process_fd_subdirectory_root_entry) }, DT_DIR }));
|
||||
TRY(callback({ ".."sv, { fsid, ProcFSInode::create_index_from_process_directory_entry(pid(), main_process_directory_root_entry) }, main_process_directory_root_entry.file_type }));
|
||||
TRY(callback({ "."sv, { fsid, ProcFSInode::create_index_from_process_directory_entry(pid(), process_fd_subdirectory_root_entry) }, to_underlying(RAMBackedFileType::Directory) }));
|
||||
TRY(callback({ ".."sv, { fsid, ProcFSInode::create_index_from_process_directory_entry(pid(), main_process_directory_root_entry) }, to_underlying(main_process_directory_root_entry.file_type) }));
|
||||
u32 count = 0;
|
||||
TRY(fds().with_shared([&](auto& fds) -> ErrorOr<void> {
|
||||
return fds.try_enumerate([&](auto& file_description_metadata) -> ErrorOr<void> {
|
||||
|
|
@ -161,9 +162,9 @@ ErrorOr<void> Process::traverse_file_descriptions_directory(FileSystemID fsid, F
|
|||
}
|
||||
auto name = TRY(KString::number(count));
|
||||
// NOTE: All property numbers should start from 1 as 0 is reserved for the directory itself.
|
||||
auto entry = segmented_process_directory_entry { {}, DT_LNK, process_fd_subdirectory_root_entry.subdirectory, count + 1 };
|
||||
auto entry = segmented_process_directory_entry { {}, RAMBackedFileType::Link, process_fd_subdirectory_root_entry.subdirectory, count + 1 };
|
||||
InodeIdentifier identifier = { fsid, ProcFSInode::create_index_from_process_directory_entry(pid(), entry) };
|
||||
TRY(callback({ name->view(), identifier, DT_LNK }));
|
||||
TRY(callback({ name->view(), identifier, to_underlying(RAMBackedFileType::Link) }));
|
||||
count++;
|
||||
return {};
|
||||
});
|
||||
|
|
@ -181,7 +182,7 @@ ErrorOr<NonnullRefPtr<Inode>> Process::lookup_file_descriptions_directory(ProcFS
|
|||
return ENOENT;
|
||||
|
||||
// NOTE: All property numbers should start from 1 as 0 is reserved for the directory itself.
|
||||
auto entry = segmented_process_directory_entry { {}, DT_LNK, process_fd_subdirectory_root_entry.subdirectory, (maybe_index.value() + 1) };
|
||||
auto entry = segmented_process_directory_entry { {}, RAMBackedFileType::Link, process_fd_subdirectory_root_entry.subdirectory, (maybe_index.value() + 1) };
|
||||
return procfs.get_inode({ procfs.fsid(), ProcFSInode::create_index_from_process_directory_entry(pid(), entry) });
|
||||
}
|
||||
|
||||
|
|
|
|||
71
Kernel/FileSystem/RAMBackedFileType.h
Normal file
71
Kernel/FileSystem/RAMBackedFileType.h
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
/*
|
||||
* Copyright (c) 2024, Liav A. <liavalb@hotmail.co.il>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <AK/Types.h>
|
||||
#include <Kernel/API/POSIX/sys/stat.h>
|
||||
#include <Kernel/FileSystem/FileSystem.h>
|
||||
|
||||
namespace Kernel {
|
||||
|
||||
enum class RAMBackedFileType : u8 {
|
||||
Directory,
|
||||
Character,
|
||||
Block,
|
||||
Regular,
|
||||
FIFO,
|
||||
Link,
|
||||
Socket,
|
||||
Unknown,
|
||||
};
|
||||
|
||||
inline RAMBackedFileType ram_backed_file_type_from_mode(mode_t mode)
|
||||
{
|
||||
switch (mode & S_IFMT) {
|
||||
case S_IFDIR:
|
||||
return RAMBackedFileType::Directory;
|
||||
case S_IFCHR:
|
||||
return RAMBackedFileType::Character;
|
||||
case S_IFBLK:
|
||||
return RAMBackedFileType::Block;
|
||||
case S_IFREG:
|
||||
return RAMBackedFileType::Regular;
|
||||
case S_IFIFO:
|
||||
return RAMBackedFileType::FIFO;
|
||||
case S_IFLNK:
|
||||
return RAMBackedFileType::Link;
|
||||
case S_IFSOCK:
|
||||
return RAMBackedFileType::Socket;
|
||||
default:
|
||||
return RAMBackedFileType::Unknown;
|
||||
}
|
||||
}
|
||||
|
||||
inline u8 ram_backed_file_type_to_directory_entry_type(FileSystem::DirectoryEntryView const& entry)
|
||||
{
|
||||
switch (static_cast<RAMBackedFileType>(entry.file_type)) {
|
||||
case RAMBackedFileType::Directory:
|
||||
return DT_DIR;
|
||||
case RAMBackedFileType::Character:
|
||||
return DT_CHR;
|
||||
case RAMBackedFileType::Block:
|
||||
return DT_BLK;
|
||||
case RAMBackedFileType::Regular:
|
||||
return DT_REG;
|
||||
case RAMBackedFileType::FIFO:
|
||||
return DT_FIFO;
|
||||
case RAMBackedFileType::Link:
|
||||
return DT_LNK;
|
||||
case RAMBackedFileType::Socket:
|
||||
return DT_SOCK;
|
||||
case RAMBackedFileType::Unknown:
|
||||
default:
|
||||
return DT_UNKNOWN;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,10 +1,11 @@
|
|||
/*
|
||||
* Copyright (c) 2019-2020, Sergey Bugaev <bugaevc@serenityos.org>
|
||||
* Copyright (c) 2022-2023, Liav A. <liavalb@hotmail.co.il>
|
||||
* Copyright (c) 2022-2024, Liav A. <liavalb@hotmail.co.il>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <Kernel/FileSystem/RAMBackedFileType.h>
|
||||
#include <Kernel/FileSystem/RAMFS/FileSystem.h>
|
||||
#include <Kernel/FileSystem/RAMFS/Inode.h>
|
||||
|
||||
|
|
@ -39,25 +40,7 @@ unsigned RAMFS::next_inode_index()
|
|||
|
||||
u8 RAMFS::internal_file_type_to_directory_entry_type(DirectoryEntryView const& entry) const
|
||||
{
|
||||
switch (static_cast<FileType>(entry.file_type)) {
|
||||
case FileType::Directory:
|
||||
return DT_DIR;
|
||||
case FileType::Character:
|
||||
return DT_CHR;
|
||||
case FileType::Block:
|
||||
return DT_BLK;
|
||||
case FileType::Regular:
|
||||
return DT_REG;
|
||||
case FileType::FIFO:
|
||||
return DT_FIFO;
|
||||
case FileType::Link:
|
||||
return DT_LNK;
|
||||
case FileType::Socket:
|
||||
return DT_SOCK;
|
||||
case FileType::Unknown:
|
||||
default:
|
||||
return DT_UNKNOWN;
|
||||
}
|
||||
return ram_backed_file_type_to_directory_entry_type(entry);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
* Copyright (c) 2019-2020, Sergey Bugaev <bugaevc@serenityos.org>
|
||||
* Copyright (c) 2022-2023, Liav A. <liavalb@hotmail.co.il>
|
||||
* Copyright (c) 2022-2024, Liav A. <liavalb@hotmail.co.il>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
|
@ -29,17 +29,6 @@ public:
|
|||
|
||||
virtual u8 internal_file_type_to_directory_entry_type(DirectoryEntryView const& entry) const override;
|
||||
|
||||
enum class FileType : u8 {
|
||||
Directory,
|
||||
Character,
|
||||
Block,
|
||||
Regular,
|
||||
FIFO,
|
||||
Link,
|
||||
Socket,
|
||||
Unknown,
|
||||
};
|
||||
|
||||
private:
|
||||
RAMFS();
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
/*
|
||||
* Copyright (c) 2019-2020, Sergey Bugaev <bugaevc@serenityos.org>
|
||||
* Copyright (c) 2022-2023, Liav A. <liavalb@hotmail.co.il>
|
||||
* Copyright (c) 2022-2024, Liav A. <liavalb@hotmail.co.il>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <Kernel/FileSystem/RAMBackedFileType.h>
|
||||
#include <Kernel/FileSystem/RAMFS/FileSystem.h>
|
||||
#include <Kernel/FileSystem/RAMFS/Inode.h>
|
||||
#include <Kernel/Tasks/Process.h>
|
||||
|
|
@ -50,28 +51,6 @@ InodeMetadata RAMFSInode::metadata() const
|
|||
return m_metadata;
|
||||
}
|
||||
|
||||
static RAMFS::FileType file_type_from_mode(mode_t mode)
|
||||
{
|
||||
switch (mode & S_IFMT) {
|
||||
case S_IFDIR:
|
||||
return RAMFS::FileType::Directory;
|
||||
case S_IFCHR:
|
||||
return RAMFS::FileType::Character;
|
||||
case S_IFBLK:
|
||||
return RAMFS::FileType::Block;
|
||||
case S_IFREG:
|
||||
return RAMFS::FileType::Regular;
|
||||
case S_IFIFO:
|
||||
return RAMFS::FileType::FIFO;
|
||||
case S_IFLNK:
|
||||
return RAMFS::FileType::Link;
|
||||
case S_IFSOCK:
|
||||
return RAMFS::FileType::Socket;
|
||||
default:
|
||||
return RAMFS::FileType::Unknown;
|
||||
}
|
||||
}
|
||||
|
||||
ErrorOr<void> RAMFSInode::traverse_as_directory(Function<ErrorOr<void>(FileSystem::DirectoryEntryView const&)> callback) const
|
||||
{
|
||||
MutexLocker locker(m_inode_lock, Mutex::Mode::Shared);
|
||||
|
|
@ -79,15 +58,15 @@ ErrorOr<void> RAMFSInode::traverse_as_directory(Function<ErrorOr<void>(FileSyste
|
|||
if (!is_directory())
|
||||
return ENOTDIR;
|
||||
|
||||
TRY(callback({ "."sv, identifier(), to_underlying(RAMFS::FileType::Directory) }));
|
||||
TRY(callback({ "."sv, identifier(), to_underlying(RAMBackedFileType::Directory) }));
|
||||
if (m_root_directory_inode) {
|
||||
TRY(callback({ ".."sv, identifier(), to_underlying(RAMFS::FileType::Directory) }));
|
||||
TRY(callback({ ".."sv, identifier(), to_underlying(RAMBackedFileType::Directory) }));
|
||||
} else if (auto parent = m_parent.strong_ref()) {
|
||||
TRY(callback({ ".."sv, parent->identifier(), to_underlying(RAMFS::FileType::Directory) }));
|
||||
TRY(callback({ ".."sv, parent->identifier(), to_underlying(RAMBackedFileType::Directory) }));
|
||||
}
|
||||
|
||||
for (auto& child : m_children) {
|
||||
TRY(callback({ child.name->view(), child.inode->identifier(), to_underlying(file_type_from_mode(child.inode->metadata().mode)) }));
|
||||
TRY(callback({ child.name->view(), child.inode->identifier(), to_underlying(ram_backed_file_type_from_mode(child.inode->metadata().mode)) }));
|
||||
}
|
||||
return {};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2021, Liav A. <liavalb@hotmail.co.il>
|
||||
* Copyright (c) 2021-2024, Liav A. <liavalb@hotmail.co.il>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
|
@ -107,18 +107,18 @@ SysFSSymbolicLink::SysFSSymbolicLink(SysFSDirectory const& parent_directory, Sys
|
|||
|
||||
ErrorOr<void> SysFSDirectory::traverse_as_directory(FileSystemID fsid, Function<ErrorOr<void>(FileSystem::DirectoryEntryView const&)> callback) const
|
||||
{
|
||||
TRY(callback({ "."sv, { fsid, component_index() }, 0 }));
|
||||
TRY(callback({ "."sv, { fsid, component_index() }, to_underlying(RAMBackedFileType::Directory) }));
|
||||
if (is_root_directory()) {
|
||||
TRY(callback({ ".."sv, { fsid, component_index() }, 0 }));
|
||||
TRY(callback({ ".."sv, { fsid, component_index() }, to_underlying(RAMBackedFileType::Directory) }));
|
||||
} else {
|
||||
VERIFY(m_parent_directory);
|
||||
TRY(callback({ ".."sv, { fsid, m_parent_directory->component_index() }, 0 }));
|
||||
TRY(callback({ ".."sv, { fsid, m_parent_directory->component_index() }, to_underlying(RAMBackedFileType::Directory) }));
|
||||
}
|
||||
|
||||
return m_child_components.with([&](auto& list) -> ErrorOr<void> {
|
||||
for (auto& child_component : list) {
|
||||
InodeIdentifier identifier = { fsid, child_component.component_index() };
|
||||
TRY(callback({ child_component.name(), identifier, 0 }));
|
||||
TRY(callback({ child_component.name(), identifier, to_underlying(child_component.type()) }));
|
||||
}
|
||||
return {};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2021, Liav A. <liavalb@hotmail.co.il>
|
||||
* Copyright (c) 2021-2024, Liav A. <liavalb@hotmail.co.il>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
|
@ -15,6 +15,7 @@
|
|||
#include <Kernel/FileSystem/File.h>
|
||||
#include <Kernel/FileSystem/FileSystem.h>
|
||||
#include <Kernel/FileSystem/OpenFileDescription.h>
|
||||
#include <Kernel/FileSystem/RAMBackedFileType.h>
|
||||
#include <Kernel/Forward.h>
|
||||
|
||||
namespace Kernel {
|
||||
|
|
@ -28,6 +29,10 @@ class SysFSComponent : public AtomicRefCounted<SysFSComponent> {
|
|||
friend class SysFSDirectory;
|
||||
|
||||
public:
|
||||
// NOTE: It is safe to assume that the regular file type is largely
|
||||
// the most used file type in the SysFS filesystem.
|
||||
virtual RAMBackedFileType type() const { return RAMBackedFileType::Regular; }
|
||||
|
||||
virtual StringView name() const = 0;
|
||||
virtual ErrorOr<size_t> read_bytes(off_t, size_t, UserOrKernelBuffer&, OpenFileDescription*) const { return Error::from_errno(ENOTIMPL); }
|
||||
virtual ErrorOr<void> traverse_as_directory(FileSystemID, Function<ErrorOr<void>(FileSystem::DirectoryEntryView const&)>) const { VERIFY_NOT_REACHED(); }
|
||||
|
|
@ -61,6 +66,7 @@ private:
|
|||
|
||||
class SysFSSymbolicLink : public SysFSComponent {
|
||||
public:
|
||||
virtual RAMBackedFileType type() const override final { return RAMBackedFileType::Link; }
|
||||
virtual ErrorOr<size_t> read_bytes(off_t, size_t, UserOrKernelBuffer&, OpenFileDescription*) const override final;
|
||||
virtual ErrorOr<NonnullRefPtr<SysFSInode>> to_inode(SysFS const& sysfs_instance) const override final;
|
||||
|
||||
|
|
@ -75,6 +81,7 @@ protected:
|
|||
|
||||
class SysFSDirectory : public SysFSComponent {
|
||||
public:
|
||||
virtual RAMBackedFileType type() const override final { return RAMBackedFileType::Directory; }
|
||||
virtual ErrorOr<void> traverse_as_directory(FileSystemID, Function<ErrorOr<void>(FileSystem::DirectoryEntryView const&)>) const override final;
|
||||
virtual RefPtr<SysFSComponent> lookup(StringView name) override final;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
*/
|
||||
|
||||
#include <AK/StringView.h>
|
||||
#include <Kernel/FileSystem/RAMBackedFileType.h>
|
||||
#include <Kernel/FileSystem/SysFS/FileSystem.h>
|
||||
#include <Kernel/FileSystem/SysFS/Inode.h>
|
||||
#include <Kernel/FileSystem/SysFS/Registry.h>
|
||||
|
|
@ -25,6 +26,11 @@ ErrorOr<void> SysFS::initialize()
|
|||
return {};
|
||||
}
|
||||
|
||||
u8 SysFS::internal_file_type_to_directory_entry_type(DirectoryEntryView const& entry) const
|
||||
{
|
||||
return ram_backed_file_type_to_directory_entry_type(entry);
|
||||
}
|
||||
|
||||
Inode& SysFS::root_inode()
|
||||
{
|
||||
return *m_root_inode;
|
||||
|
|
|
|||
|
|
@ -28,6 +28,8 @@ public:
|
|||
virtual Inode& root_inode() override;
|
||||
|
||||
private:
|
||||
virtual u8 internal_file_type_to_directory_entry_type(DirectoryEntryView const& entry) const override;
|
||||
|
||||
SysFS();
|
||||
|
||||
RefPtr<SysFSInode> m_root_inode;
|
||||
|
|
|
|||
Loading…
Reference in a new issue