From fb790b07aeba8e22e4190cf3e1834d11ecde6c96 Mon Sep 17 00:00:00 2001 From: Amlal Date: Fri, 25 Apr 2025 13:08:33 +0200 Subject: dev: better .clang-format, ran format command. Signed-off-by: Amlal --- dev/kernel/src/DriveMgr.cc | 318 +++++++++++++++++++++------------------------ 1 file changed, 148 insertions(+), 170 deletions(-) (limited to 'dev/kernel/src/DriveMgr.cc') diff --git a/dev/kernel/src/DriveMgr.cc b/dev/kernel/src/DriveMgr.cc index b5a8e9e4..763096b3 100644 --- a/dev/kernel/src/DriveMgr.cc +++ b/dev/kernel/src/DriveMgr.cc @@ -1,16 +1,16 @@ /* ------------------------------------------- - Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved. + Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved. ------------------------------------------- */ +#include +#include #include #include #include -#include -#include -#include #include +#include #include /***********************************************************************************/ @@ -18,233 +18,211 @@ /// @brief Drive Manager of kernel. /***********************************************************************************/ -namespace Kernel -{ +namespace Kernel { #if defined(__ATA_PIO__) || defined(__ATA_DMA__) - STATIC UInt16 kATAIO = 0U; - STATIC UInt8 kATAMaster = 0U; +STATIC UInt16 kATAIO = 0U; +STATIC UInt8 kATAMaster = 0U; #endif #if defined(__AHCI__) - STATIC UInt16 kAHCIPortsImplemented = 0UL; +STATIC UInt16 kAHCIPortsImplemented = 0UL; #endif - /// @brief reads from an ATA drive. - /// @param pckt Packet structure (fPacketContent must be non null) - /// @return - Void io_drv_input(DriveTrait::DrivePacket pckt) - { +/// @brief reads from an ATA drive. +/// @param pckt Packet structure (fPacketContent must be non null) +/// @return +Void io_drv_input(DriveTrait::DrivePacket pckt) { #ifdef __AHCI__ - drv_std_read(pckt.fPacketLba, (Char*)pckt.fPacketContent, kAHCISectorSize, pckt.fPacketSize); + drv_std_read(pckt.fPacketLba, (Char*) pckt.fPacketContent, kAHCISectorSize, pckt.fPacketSize); #elif defined(__ATA_PIO__) || defined(__ATA_DMA__) - drv_std_read(pckt.fPacketLba, kATAIO, kATAMaster, (Char*)pckt.fPacketContent, kATASectorSize, pckt.fPacketSize); + drv_std_read(pckt.fPacketLba, kATAIO, kATAMaster, (Char*) pckt.fPacketContent, kATASectorSize, + pckt.fPacketSize); #endif - } - - /// @brief Writes to an ATA drive. - /// @param pckt the packet to write. - /// @return - Void io_drv_output(DriveTrait::DrivePacket pckt) - { - if (pckt.fPacketReadOnly) - { - pckt.fPacketGood = NO; - return; - } +} + +/// @brief Writes to an ATA drive. +/// @param pckt the packet to write. +/// @return +Void io_drv_output(DriveTrait::DrivePacket pckt) { + if (pckt.fPacketReadOnly) { + pckt.fPacketGood = NO; + return; + } #ifdef __AHCI__ - drv_std_write(pckt.fPacketLba, (Char*)pckt.fPacketContent, kAHCISectorSize, pckt.fPacketSize); + drv_std_write(pckt.fPacketLba, (Char*) pckt.fPacketContent, kAHCISectorSize, pckt.fPacketSize); #elif defined(__ATA_PIO__) || defined(__ATA_DMA__) - drv_std_write(pckt.fPacketLba, kATAIO, kATAMaster, (Char*)pckt.fPacketContent, kATASectorSize, pckt.fPacketSize); + drv_std_write(pckt.fPacketLba, kATAIO, kATAMaster, (Char*) pckt.fPacketContent, kATASectorSize, + pckt.fPacketSize); #endif - } +} - /// @brief Executes a disk check on the ATA drive. - /// @param pckt the packet to read. - /// @return - Void io_drv_init(DriveTrait::DrivePacket pckt) - { - NE_UNUSED(pckt); +/// @brief Executes a disk check on the ATA drive. +/// @param pckt the packet to read. +/// @return +Void io_drv_init(DriveTrait::DrivePacket pckt) { + NE_UNUSED(pckt); #if defined(__ATA_PIO__) || defined(__ATA_DMA__) - kATAMaster = 0; - kATAIO = 0; + kATAMaster = 0; + kATAIO = 0; - kATAMaster = YES; - kATAIO = ATA_PRIMARY_IO; + kATAMaster = YES; + kATAIO = ATA_PRIMARY_IO; - if (drv_std_init(kATAIO, kATAMaster, kATAIO, kATAMaster)) - { - pckt.fPacketGood = YES; - return; - } + if (drv_std_init(kATAIO, kATAMaster, kATAIO, kATAMaster)) { + pckt.fPacketGood = YES; + return; + } - kATAMaster = NO; - kATAIO = ATA_SECONDARY_IO; + kATAMaster = NO; + kATAIO = ATA_SECONDARY_IO; - if (!drv_std_init(kATAIO, kATAMaster, kATAIO, kATAMaster)) - { - pckt.fPacketGood = YES; - return; - } + if (!drv_std_init(kATAIO, kATAMaster, kATAIO, kATAMaster)) { + pckt.fPacketGood = YES; + return; + } - pckt.fPacketGood = YES; + pckt.fPacketGood = YES; #elif defined(__AHCI__) - kAHCIPortsImplemented = 0; + kAHCIPortsImplemented = 0; - if (drv_std_init(kAHCIPortsImplemented)) - { - pckt.fPacketGood = YES; - } -#endif // if defined(__ATA_PIO__) || defined (__ATA_DMA__) - } + if (drv_std_init(kAHCIPortsImplemented)) { + pckt.fPacketGood = YES; + } +#endif // if defined(__ATA_PIO__) || defined (__ATA_DMA__) +} /// @brief Gets the drive kind (ATA, SCSI, AHCI...) /// @param void no arguments. /// @return no arguments. #ifdef __ATA_PIO__ - const Char* io_drv_kind(Void) - { - return "ATA-PIO"; - } +const Char* io_drv_kind(Void) { + return "ATA-PIO"; +} #elif defined(__ATA_DMA__) - const Char* io_drv_kind(Void) - { - return "ATA-DMA"; - } +const Char* io_drv_kind(Void) { + return "ATA-DMA"; +} #elif defined(__AHCI__) - const Char* io_drv_kind(Void) - { - return "AHCI"; - } +const Char* io_drv_kind(Void) { + return "AHCI"; +} #else - const Char* io_drv_kind(Void) - { - return "null"; - } +const Char* io_drv_kind(Void) { + return "null"; +} #endif - /// @brief Unimplemented drive function. - /// @param pckt the packet to read. - Void io_drv_unimplemented(DriveTrait::DrivePacket pckt) noexcept - { - NE_UNUSED(pckt); - } +/// @brief Unimplemented drive function. +/// @param pckt the packet to read. +Void io_drv_unimplemented(DriveTrait::DrivePacket pckt) noexcept { + NE_UNUSED(pckt); +} - /// @brief Makes a new drive. - /// @return the new blank drive. - DriveTrait io_construct_blank_drive() noexcept - { - DriveTrait trait; +/// @brief Makes a new drive. +/// @return the new blank drive. +DriveTrait io_construct_blank_drive() noexcept { + DriveTrait trait; - constexpr auto kBlankDrive = "/media/blank/"; + constexpr auto kBlankDrive = "/media/blank/"; - rt_copy_memory((VoidPtr)kBlankDrive, trait.fName, rt_string_len(kBlankDrive)); - trait.fKind = kInvalidDrive; + rt_copy_memory((VoidPtr) kBlankDrive, trait.fName, rt_string_len(kBlankDrive)); + trait.fKind = kInvalidDrive; - trait.fInput = io_drv_unimplemented; - trait.fOutput = io_drv_unimplemented; - trait.fVerify = io_drv_unimplemented; - trait.fInit = io_drv_unimplemented; - trait.fProtocol = io_drv_kind; + trait.fInput = io_drv_unimplemented; + trait.fOutput = io_drv_unimplemented; + trait.fVerify = io_drv_unimplemented; + trait.fInit = io_drv_unimplemented; + trait.fProtocol = io_drv_kind; - kout << "Construct: " << trait.fName << "\r"; + kout << "Construct: " << trait.fName << "\r"; - return trait; - } + return trait; +} - namespace Detail - { - Void io_detect_drive(DriveTrait& trait) - { - trait.fInit(trait.fPacket); +namespace Detail { + Void io_detect_drive(DriveTrait& trait) { + trait.fInit(trait.fPacket); - EPM_PART_BLOCK block_struct; + EPM_PART_BLOCK block_struct; - trait.fPacket.fPacketLba = kEPMBootBlockLba; - trait.fPacket.fPacketSize = sizeof(EPM_PART_BLOCK); - trait.fPacket.fPacketContent = &block_struct; + trait.fPacket.fPacketLba = kEPMBootBlockLba; + trait.fPacket.fPacketSize = sizeof(EPM_PART_BLOCK); + trait.fPacket.fPacketContent = &block_struct; - rt_copy_memory((VoidPtr) "fs/detect-packet", trait.fPacket.fPacketMime, - rt_string_len("fs/detect-packet")); + rt_copy_memory((VoidPtr) "fs/detect-packet", trait.fPacket.fPacketMime, + rt_string_len("fs/detect-packet")); - trait.fInput(trait.fPacket); + trait.fInput(trait.fPacket); - if (rt_string_cmp(block_struct.Magic, kEPMMagic, kEPMMagicLength) == 0) - { - trait.fPacket.fPacketReadOnly = NO; - trait.fKind = kMassStorageDrive | kEPMDrive; + if (rt_string_cmp(block_struct.Magic, kEPMMagic, kEPMMagicLength) == 0) { + trait.fPacket.fPacketReadOnly = NO; + trait.fKind = kMassStorageDrive | kEPMDrive; - kout << "Disk is EPM formatted.\r"; + kout << "Disk is EPM formatted.\r"; - trait.fSectorSz = block_struct.SectorSz; - trait.fLbaEnd = block_struct.LbaEnd; - trait.fLbaStart = block_struct.LbaStart; - } - else - { - GPT_PARTITION_TABLE gpt_struct; + trait.fSectorSz = block_struct.SectorSz; + trait.fLbaEnd = block_struct.LbaEnd; + trait.fLbaStart = block_struct.LbaStart; + } else { + GPT_PARTITION_TABLE gpt_struct; - trait.fPacket.fPacketLba = kEPMBootBlockLba; - trait.fPacket.fPacketSize = sizeof(GPT_PARTITION_TABLE); - trait.fPacket.fPacketContent = &gpt_struct; + trait.fPacket.fPacketLba = kEPMBootBlockLba; + trait.fPacket.fPacketSize = sizeof(GPT_PARTITION_TABLE); + trait.fPacket.fPacketContent = &gpt_struct; - rt_copy_memory((VoidPtr) "fs/detect-packet", trait.fPacket.fPacketMime, - rt_string_len("fs/detect-packet")); + rt_copy_memory((VoidPtr) "fs/detect-packet", trait.fPacket.fPacketMime, + rt_string_len("fs/detect-packet")); - trait.fInput(trait.fPacket); + trait.fInput(trait.fPacket); - if (rt_string_cmp(gpt_struct.Signature, kMagicGPT, kMagicLenGPT) == 0) - { - trait.fPacket.fPacketReadOnly = NO; - trait.fKind = kMassStorageDrive | kGPTDrive; + if (rt_string_cmp(gpt_struct.Signature, kMagicGPT, kMagicLenGPT) == 0) { + trait.fPacket.fPacketReadOnly = NO; + trait.fKind = kMassStorageDrive | kGPTDrive; - kout << "Disk is GPT formatted.\r"; + kout << "Disk is GPT formatted.\r"; - trait.fSectorSz = gpt_struct.SizeOfEntries; - trait.fLbaEnd = gpt_struct.LastGPTEntry; - trait.fLbaStart = gpt_struct.FirstGPTEntry; - } - else - { - kout << "Disk is unformatted.\r"; + trait.fSectorSz = gpt_struct.SizeOfEntries; + trait.fLbaEnd = gpt_struct.LastGPTEntry; + trait.fLbaStart = gpt_struct.FirstGPTEntry; + } else { + kout << "Disk is unformatted.\r"; - trait.fPacket.fPacketReadOnly = YES; - trait.fKind = kMassStorageDrive | kUnformattedDrive | kReadOnlyDrive; - } - } + trait.fPacket.fPacketReadOnly = YES; + trait.fKind = kMassStorageDrive | kUnformattedDrive | kReadOnlyDrive; + } + } - rt_copy_memory((VoidPtr) "*/*", trait.fPacket.fPacketMime, - rt_string_len("*/*")); + rt_copy_memory((VoidPtr) "*/*", trait.fPacket.fPacketMime, rt_string_len("*/*")); - trait.fPacket.fPacketLba = 0; - trait.fPacket.fPacketSize = 0UL; - trait.fPacket.fPacketContent = nullptr; - } - } // namespace Detail + trait.fPacket.fPacketLba = 0; + trait.fPacket.fPacketSize = 0UL; + trait.fPacket.fPacketContent = nullptr; + } +} // namespace Detail - /// @brief Fetches the main drive. - /// @return the new drive. (returns kEPMDrive if EPM formatted) - DriveTrait io_construct_main_drive() noexcept - { - DriveTrait trait; +/// @brief Fetches the main drive. +/// @return the new drive. (returns kEPMDrive if EPM formatted) +DriveTrait io_construct_main_drive() noexcept { + DriveTrait trait; - constexpr auto kMainDrive = "/media/main/"; + constexpr auto kMainDrive = "/media/main/"; - rt_copy_memory((VoidPtr)kMainDrive, trait.fName, rt_string_len(kMainDrive)); + rt_copy_memory((VoidPtr) kMainDrive, trait.fName, rt_string_len(kMainDrive)); - MUST_PASS(trait.fName[0] != 0); + MUST_PASS(trait.fName[0] != 0); - trait.fVerify = io_drv_unimplemented; - trait.fOutput = io_drv_output; - trait.fInput = io_drv_input; - trait.fInit = io_drv_init; - trait.fProtocol = io_drv_kind; + trait.fVerify = io_drv_unimplemented; + trait.fOutput = io_drv_output; + trait.fInput = io_drv_input; + trait.fInit = io_drv_init; + trait.fProtocol = io_drv_kind; - kout << "Detecting partition scheme of: " << trait.fName << ".\r"; + kout << "Detecting partition scheme of: " << trait.fName << ".\r"; - Detail::io_detect_drive(trait); + Detail::io_detect_drive(trait); - return trait; - } -} // namespace Kernel + return trait; +} +} // namespace Kernel -- cgit v1.2.3 From cddf1926591707121a3c1302a5ef7f5abd030d7e Mon Sep 17 00:00:00 2001 From: Amlal Date: Sat, 26 Apr 2025 11:12:44 +0200 Subject: dev, kernel: add kernel on when the traversal hits 0 (it should never happen) Signed-off-by: Amlal --- dev/boot/BootKit/BootKit.h | 2 +- dev/kernel/KernelKit/DriveMgr.h | 4 +++ dev/kernel/src/DriveMgr.cc | 4 +++ dev/kernel/src/FS/HeFS.cc | 65 ++++++++++++++++++++++++++++++++++++----- 4 files changed, 66 insertions(+), 9 deletions(-) (limited to 'dev/kernel/src/DriveMgr.cc') diff --git a/dev/boot/BootKit/BootKit.h b/dev/boot/BootKit/BootKit.h index 2bf95696..03902363 100644 --- a/dev/boot/BootKit/BootKit.h +++ b/dev/boot/BootKit/BootKit.h @@ -297,7 +297,7 @@ inline Boolean BDiskFormatFactory::Format(const Char* part_name) { epm_boot.FsVersion = kNeFSVersionInteger; epm_boot.LbaStart = kNeFSRootCatalogStartAddress; - epm_boot.LbaEnd = fDiskDev.GetDiskSize(); + epm_boot.LbaEnd = fDiskDev.GetDiskSize() - 1; epm_boot.SectorSz = BootDev::kSectorSize; epm_boot.Kind = kEPMNeKernel; epm_boot.NumBlocks = 1; diff --git a/dev/kernel/KernelKit/DriveMgr.h b/dev/kernel/KernelKit/DriveMgr.h index 263b728e..b40cf0ad 100644 --- a/dev/kernel/KernelKit/DriveMgr.h +++ b/dev/kernel/KernelKit/DriveMgr.h @@ -71,6 +71,10 @@ struct DriveTrait final { const Char* (*fProtocol)(Void); }; +namespace Detail { + Void io_detect_drive(DriveTrait& trait); +} + ///! drive as a device. typedef DriveTrait* DriveTraitPtr; diff --git a/dev/kernel/src/DriveMgr.cc b/dev/kernel/src/DriveMgr.cc index 763096b3..17c6c8cc 100644 --- a/dev/kernel/src/DriveMgr.cc +++ b/dev/kernel/src/DriveMgr.cc @@ -191,6 +191,10 @@ namespace Detail { trait.fPacket.fPacketReadOnly = YES; trait.fKind = kMassStorageDrive | kUnformattedDrive | kReadOnlyDrive; + + trait.fSectorSz = 512; + trait.fLbaEnd = drv_get_sector_count() - 1; + trait.fLbaStart = 0x400; } } diff --git a/dev/kernel/src/FS/HeFS.cc b/dev/kernel/src/FS/HeFS.cc index 71d1d1d4..9333e53c 100644 --- a/dev/kernel/src/FS/HeFS.cc +++ b/dev/kernel/src/FS/HeFS.cc @@ -90,6 +90,14 @@ namespace Detail { else start = dir->fParent; } + + if (start == 0) { + kout << "Errror: Something went terribly wrong when traversing the RB-Tree.\r"; + + ke_panic(RUNTIME_CHECK_FILESYSTEM, "RB-Tree traversal failed, critical filesystem error!"); + + return; + } } /***********************************************************************************/ @@ -782,7 +790,7 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input root->fStartIND = drive->fLbaStart + sizeof(HEFS_BOOT_NODE); root->fEndIND = drive->fLbaEnd; - root->fINDCount = root->fEndIND - root->fStartIND; + root->fINDCount = 0; root->fDiskSize = drv_get_size(); root->fDiskStatus = kHeFSStatusUnlocked; @@ -811,8 +819,40 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input drive->fOutput(drive->fPacket); + if (!drive->fPacket.fPacketGood) { + delete root; + root = nullptr; + + err_global_get() = kErrorDiskIsCorrupted; + + return NO; + } + + HEFS_INDEX_NODE_DIRECTORY* root_dir = new HEFS_INDEX_NODE_DIRECTORY(); + rt_set_memory(root_dir, 0, sizeof(HEFS_INDEX_NODE_DIRECTORY)); + + wrt_copy_memory((VoidPtr) u"/", root_dir->fName, wrt_string_len(u"/")); + + root_dir->fKind = kHeFSFileKindDirectory; + root_dir->fColor = kHeFSBlack; + root_dir->fParent = 0; // No parent (it's the real root) + root_dir->fChild = 0; // No children yet + root_dir->fNext = 0; // No next + root_dir->fPrev = 0; // No previous + + root_dir->fEntryCount = 0; + + drive->fPacket.fPacketLba = root->fStartIND; + drive->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); + drive->fPacket.fPacketContent = root_dir; + + drive->fOutput(drive->fPacket); + + delete root_dir; delete root; - root = nullptr; + + root = nullptr; + root_dir = nullptr; if (drive->fPacket.fPacketGood) return YES; @@ -827,7 +867,7 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input /// @param dir The directory to create the file in. /// @return If it was sucessful, see err_local_get(). _Output Bool HeFileSystemParser::CreateDirectory(_Input DriveTrait* drive, _Input const Int32 flags, - const Utf16Char* dir) { + const Utf16Char* dir) { NE_UNUSED(drive); NE_UNUSED(flags); NE_UNUSED(dir); @@ -881,9 +921,15 @@ _Output Bool HeFileSystemParser::CreateDirectory(_Input DriveTrait* drive, _Inpu dirent->fDeleted = 0; dirent->fModified = 0; dirent->fEntryCount = 0; - dirent->fKind = kHeFSFileKindDirectory; - dirent->fFlags = flags; - dirent->fChecksum = 0; + + dirent->fParent = 0; // No parent (it's the real root) + dirent->fChild = 0; // No children yet + dirent->fNext = 0; // No next + dirent->fPrev = 0; // No previous + + dirent->fKind = kHeFSFileKindDirectory; + dirent->fFlags = flags; + dirent->fChecksum = 0; if (Detail::hefs_allocate_index_directory_node(root, drive, dirent)) { delete dirent; @@ -994,10 +1040,13 @@ Boolean fs_init_hefs(Void) noexcept { ke_panic(RUNTIME_CHECK_FILESYSTEM, "Main filesystem cannot be mounted."); HeFileSystemParser parser; + parser.Format(&drv, kHeFSEncodingUTF16, kHeFSDefaultVoluneName); - parser.CreateDirectory(&drv, kHeFSEncodingUTF16, u"/"); - parser.CreateFile(&drv, kHeFSEncodingUTF16, u"/", u"boot.log"); + Kernel::Detail::io_detect_drive(drv); + + parser.CreateDirectory(&drv, kHeFSEncodingUTF16, u"boot"); + parser.CreateFile(&drv, kHeFSEncodingUTF16, u"boot", u".hefs"); return YES; } -- cgit v1.2.3 From 9c33e844d76f9db6d7110de4f05cbe2084cdbca1 Mon Sep 17 00:00:00 2001 From: Amlal Date: Sat, 26 Apr 2025 13:44:35 +0200 Subject: dev, kernel and user: codebase additions and work in progress 'tactical pause' why? - HeFS's Formating needs some thought before being layed out, that's the kind of thing that bites hard in the ass. - Alongside those changes I improved parts of the kernel too. Signed-off-by: Amlal --- dev/kernel/FSKit/HeFS.h | 10 ++++++ dev/kernel/KernelKit/DeviceMgr.h | 4 +-- dev/kernel/src/DriveMgr.cc | 2 +- dev/kernel/src/FS/HeFS.cc | 51 +++++++++++++++++++++++---- dev/kernel/src/Gfx/FBDeviceInterface.cc | 10 ++---- dev/kernel/src/Storage/AHCIDeviceInterface.cc | 2 +- dev/kernel/src/Storage/ATADeviceInterface.cc | 2 +- dev/kernel/src/Storage/NVMEDeviceInterface.cc | 2 +- dev/user/SystemCalls.h | 10 ++++++ 9 files changed, 73 insertions(+), 20 deletions(-) (limited to 'dev/kernel/src/DriveMgr.cc') diff --git a/dev/kernel/FSKit/HeFS.h b/dev/kernel/FSKit/HeFS.h index 895422a6..693ec2d3 100644 --- a/dev/kernel/FSKit/HeFS.h +++ b/dev/kernel/FSKit/HeFS.h @@ -28,6 +28,9 @@ #define kHeFSDefaultVoluneName u"HeFS Volume" +#define kHeFSDIMBootDir u"boot-x/dir" +#define kHeFSDIMBootFile u"boot-x/file" + #define kHeFSSearchAllStr u"*" struct HEFS_BOOT_NODE; @@ -63,6 +66,7 @@ enum { kHeFSEncodingUTF32LE, kHeFSEncodingUTF8BE, kHeFSEncodingUTF8LE, + kHeFSEncodingBinary, kHeFSEncodingCount, }; @@ -135,6 +139,10 @@ struct PACKED ALIGN(8) HEFS_INDEX_NODE final { fLinkChecksum; /// @brief Checksum of the file, recovery checksum, block checksum, link /// checksum. + Kernel::Utf16Char fMime[kHeFSFileNameLen]; /// @brief File mime type. + + Kernel::Boolean fSymLink; /// @brief Is this a symbolic link? (if yes, the fName is the path to the file and blocklinkstart and end contains it's inodes.) + Kernel::ATime fCreated, fAccessed, fModified, fDeleted; /// @brief File timestamps. Kernel::UInt32 fUID, fGID; /// @brief User ID and Group ID of the file. Kernel::UInt32 fMode; /// @brief File mode. (read, write, execute, etc). @@ -168,6 +176,8 @@ struct PACKED ALIGN(8) HEFS_INDEX_NODE_DIRECTORY final { Kernel::UInt32 fChecksum, fIndexNodeChecksum; /// @brief Checksum of the file, index node checksum. + Kernel::Utf16Char fDim[kHeFSFileNameLen]; /// @brief Directiory Immatriculation magic. + Kernel::ATime fCreated, fAccessed, fModified, fDeleted; /// @brief File timestamps and allocation status. Kernel::UInt32 fUID, fGID; /// @brief User ID and Group ID of the file. Kernel::UInt32 fMode; /// @brief File mode. (read, write, execute, etc). diff --git a/dev/kernel/KernelKit/DeviceMgr.h b/dev/kernel/KernelKit/DeviceMgr.h index 8da52699..210cef2a 100644 --- a/dev/kernel/KernelKit/DeviceMgr.h +++ b/dev/kernel/KernelKit/DeviceMgr.h @@ -22,7 +22,7 @@ #include #include -#define kDeviceMgrRootDirPath "/dev/" +#define kDeviceMgrRootDirPath "/devices/" #define NE_DEVICE : public ::Kernel::IDeviceObject @@ -58,7 +58,7 @@ class IDeviceObject { return *this; } - virtual const char* Name() const { return "/dev/null"; } + virtual const char* Name() const { return "/devices/null"; } operator bool() { return fOut && fIn; } diff --git a/dev/kernel/src/DriveMgr.cc b/dev/kernel/src/DriveMgr.cc index 17c6c8cc..46a5c588 100644 --- a/dev/kernel/src/DriveMgr.cc +++ b/dev/kernel/src/DriveMgr.cc @@ -25,7 +25,7 @@ STATIC UInt8 kATAMaster = 0U; #endif #if defined(__AHCI__) -STATIC UInt16 kAHCIPortsImplemented = 0UL; +STATIC UInt16 kAHCIPortsImplemented [[maybe_unused]] = 0UL; #endif /// @brief reads from an ATA drive. diff --git a/dev/kernel/src/FS/HeFS.cc b/dev/kernel/src/FS/HeFS.cc index 1da886c4..81316ba5 100644 --- a/dev/kernel/src/FS/HeFS.cc +++ b/dev/kernel/src/FS/HeFS.cc @@ -756,7 +756,7 @@ namespace Kernel::HeFS { /// @param drive The drive to write on. /// @return If it was sucessful, see err_local_get(). _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input const Int32 flags, - const Utf16Char* part_name) { + _Input const Utf16Char* part_name) { NE_UNUSED(drive); NE_UNUSED(flags); NE_UNUSED(part_name); @@ -779,6 +779,34 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input rt_set_memory(root, 0, sizeof(HEFS_BOOT_NODE)); + drive->fPacket.fPacketLba = drive->fLbaStart; + drive->fPacket.fPacketSize = sizeof(HEFS_BOOT_NODE); + drive->fPacket.fPacketContent = root; + + drive->fInput(drive->fPacket); + + if (!drive->fPacket.fPacketGood) { + delete root; + root = nullptr; + + err_global_get() = kErrorDiskIsCorrupted; + + return NO; + } + + // Check if the disk is already formatted. + + if (KStringBuilder::Equals(root->fMagic, kHeFSMagic)) { + delete root; + root = nullptr; + + err_global_get() = kErrorSuccess; + + return YES; + } + + rt_set_memory(root, 0, sizeof(HEFS_BOOT_NODE)); + rt_copy_memory((VoidPtr) "fs/hefs-packet", drive->fPacket.fPacketMime, rt_string_len("fs/hefs-packet")); @@ -836,9 +864,10 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input rt_set_memory(root_dir, 0, sizeof(HEFS_INDEX_NODE_DIRECTORY)); wrt_copy_memory((VoidPtr) u"/", root_dir->fName, wrt_string_len(u"/")); + wrt_copy_memory((VoidPtr) kHeFSDIMBootDir, root_dir->fDim, wrt_string_len(kHeFSDIMBootDir)); root_dir->fKind = kHeFSFileKindDirectory; - root_dir->fColor = kHeFSBlack; + root_dir->fColor = kHeFSBlack; // Every RB-Tree root starts black. (a condition of the algorithm) root_dir->fParent = 0; // No parent (it's the real root) root_dir->fChild = 0; // No children yet root_dir->fNext = 0; // No next @@ -858,6 +887,19 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input root = nullptr; root_dir = nullptr; + // Create the directories, something UNIX inspired but more explicit and forward looking. + + this->CreateDirectory(drive, kHeFSEncodingUTF16, u"/boot"); + this->CreateDirectory(drive, kHeFSEncodingUTF16, u"/netdevices"); + this->CreateDirectory(drive, kHeFSEncodingUTF16, u"/binaries"); + this->CreateDirectory(drive, kHeFSEncodingUTF16, u"/users"); + this->CreateDirectory(drive, kHeFSEncodingUTF16, u"/config"); + this->CreateDirectory(drive, kHeFSEncodingUTF16, u"/config/xml"); + this->CreateDirectory(drive, kHeFSEncodingUTF16, u"/config/json"); + this->CreateDirectory(drive, kHeFSEncodingUTF16, u"/devices"); + this->CreateDirectory(drive, kHeFSEncodingUTF16, u"/media"); + this->CreateFile(drive, kHeFSEncodingBinary, u"/", u"mk.hefs"); + if (drive->fPacket.fPacketGood) return YES; err_global_get() = kErrorDiskIsCorrupted; @@ -1036,7 +1078,7 @@ _Output Bool HeFileSystemParser::CreateFile(_Input DriveTrait* drive, _Input con } Boolean fs_init_hefs(Void) noexcept { - kout << "Creating main disk...\r"; + kout << "Creating main disk with HeFS in it...\r"; auto drv = io_construct_main_drive(); @@ -1047,9 +1089,6 @@ Boolean fs_init_hefs(Void) noexcept { parser.Format(&drv, kHeFSEncodingUTF16, kHeFSDefaultVoluneName); - parser.CreateDirectory(&drv, kHeFSEncodingUTF16, u"boot"); - parser.CreateFile(&drv, kHeFSEncodingUTF16, u"boot", u".hefs"); - return YES; } } // namespace Kernel::HeFS diff --git a/dev/kernel/src/Gfx/FBDeviceInterface.cc b/dev/kernel/src/Gfx/FBDeviceInterface.cc index 185b22b0..be52655d 100644 --- a/dev/kernel/src/Gfx/FBDeviceInterface.cc +++ b/dev/kernel/src/Gfx/FBDeviceInterface.cc @@ -27,9 +27,6 @@ FBDeviceInterface& FBDeviceInterface::operator<<(FBDevicePacket* pckt) { if (pckt->fHeight == 0 || pckt->fWidth == 0) return *this; - if (pckt->fX > kHandoverHeader->f_GOP.f_Width || pckt->fY > kHandoverHeader->f_GOP.f_Height) - return *this; - this->fOut(this, pckt); return *this; @@ -40,10 +37,7 @@ FBDeviceInterface& FBDeviceInterface::operator<<(FBDevicePacket* pckt) { /// @return the class itself after operation. FBDeviceInterface& FBDeviceInterface::operator>>(FBDevicePacket* pckt) { if (!pckt) return *this; - - if (pckt->fX > kHandoverHeader->f_GOP.f_Width || pckt->fY > kHandoverHeader->f_GOP.f_Height) - return *this; - + this->fIn(this, pckt); return *this; @@ -52,5 +46,5 @@ FBDeviceInterface& FBDeviceInterface::operator>>(FBDevicePacket* pckt) { /// @brief Returns the name of the device interface. /// @return it's name as a string. const Char* FBDeviceInterface::Name() const { - return "/dev/fb{}"; + return "/devices/fb{}"; } \ No newline at end of file diff --git a/dev/kernel/src/Storage/AHCIDeviceInterface.cc b/dev/kernel/src/Storage/AHCIDeviceInterface.cc index d5c1e5c6..2d97eee7 100644 --- a/dev/kernel/src/Storage/AHCIDeviceInterface.cc +++ b/dev/kernel/src/Storage/AHCIDeviceInterface.cc @@ -24,7 +24,7 @@ AHCIDeviceInterface::~AHCIDeviceInterface() = default; /// @brief Returns the name of the device interface. /// @return it's name as a string. const Char* AHCIDeviceInterface::Name() const { - return "/dev/sda{}"; + return "/devices/sda{}"; } /// @brief Output operator. diff --git a/dev/kernel/src/Storage/ATADeviceInterface.cc b/dev/kernel/src/Storage/ATADeviceInterface.cc index f38d5359..a66d812b 100644 --- a/dev/kernel/src/Storage/ATADeviceInterface.cc +++ b/dev/kernel/src/Storage/ATADeviceInterface.cc @@ -22,7 +22,7 @@ ATADeviceInterface::~ATADeviceInterface() = default; /// @brief Returns the name of the device interface. /// @return it's name as a string. const Char* ATADeviceInterface::Name() const { - return "/dev/hda{}"; + return "/devices/hda{}"; } /// @brief Output operator. diff --git a/dev/kernel/src/Storage/NVMEDeviceInterface.cc b/dev/kernel/src/Storage/NVMEDeviceInterface.cc index edec6d6d..cff776c9 100644 --- a/dev/kernel/src/Storage/NVMEDeviceInterface.cc +++ b/dev/kernel/src/Storage/NVMEDeviceInterface.cc @@ -18,6 +18,6 @@ NVMEDeviceInterface::~NVMEDeviceInterface() { } const Char* NVMEDeviceInterface::Name() const { - return ("/dev/nvme{}"); + return ("/devices/nvme{}"); } } // namespace Kernel diff --git a/dev/user/SystemCalls.h b/dev/user/SystemCalls.h index 1e391d8a..4ff7de11 100644 --- a/dev/user/SystemCalls.h +++ b/dev/user/SystemCalls.h @@ -60,6 +60,16 @@ IMPORT_C Ref IoOpenFile(const Char* fs_path, const Char* drive_letter); /// @return Function doesn't return a type. IMPORT_C Void IoCloseFile(_Input Ref file_desc); +/// @brief I/O control (ioctl) on a file. +/// @param file_desc the file descriptor. +/// @param ioctl_code the ioctl code. +/// @param in_data the input data. +/// @param out_data the output data. +/// @return the number of bytes written. +/// @note This function is used to control the file descriptor, introduced for HeFS. +IMPORT_C SInt32 IoCTLFile(_Input Ref file_desc, _Input UInt32 ioctl_code, _Input VoidPtr in_data, + _Output VoidPtr out_data); + /// @brief Gets the file mime (if any) /// @param file_desc the file descriptor. IMPORT_C const Char* IoMimeFile(_Input Ref file_desc); -- cgit v1.2.3 From 2ead335ccc7afd8e1b2a6533e966c10f49fbdfe9 Mon Sep 17 00:00:00 2001 From: Amlal Date: Mon, 28 Apr 2025 09:06:35 +0200 Subject: dev, kernel: HeFS, Tooling: reworked the mkfs.hefs tool for the new filesystem. other/related: - Add new KPC codes. - Final refactors for HeFS's Format method. - Dma pool improvements. - Better standard disk I/O names. - Add mm_memory_fence function inside HalPagingMgrAMD64.cc Signed-off-by: Amlal --- dev/boot/BootKit/HW/SATA.h | 2 +- dev/kernel/FSKit/HeFS.h | 36 ++++++------- dev/kernel/HALKit/AMD64/HalKernelMain.cc | 2 +- dev/kernel/HALKit/AMD64/HalPagingMgrAMD64.cc | 16 ++++-- dev/kernel/HALKit/AMD64/Processor.h | 2 + dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc | 14 +++--- dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc | 6 +-- dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc | 4 +- dev/kernel/KernelKit/FileMgr.h | 2 +- dev/kernel/KernelKit/KPC.h | 6 ++- dev/kernel/NewKit/KString.h | 2 +- dev/kernel/StorageKit/DmaPool.h | 21 ++++++-- dev/kernel/src/DriveMgr.cc | 2 +- dev/kernel/src/FS/HeFS+FileMgr.cc | 4 +- dev/kernel/src/FS/HeFS.cc | 67 ++++++++++++++----------- dev/kernel/src/FS/NeFS.cc | 8 +-- dev/kernel/src/Utils.cc | 1 - dev/modules/AHCI/AHCI.h | 4 +- dev/modules/ATA/ATA.h | 4 +- dev/user/ProcessCodes.h | 1 + docs/tex/hefs.tex | 2 +- tooling/hefs.h | 67 +++++++++++-------------- tooling/mkfs.hefs.cc | 24 ++++----- 23 files changed, 161 insertions(+), 136 deletions(-) (limited to 'dev/kernel/src/DriveMgr.cc') diff --git a/dev/boot/BootKit/HW/SATA.h b/dev/boot/BootKit/HW/SATA.h index 5c70c18c..8cf48ec7 100644 --- a/dev/boot/BootKit/HW/SATA.h +++ b/dev/boot/BootKit/HW/SATA.h @@ -28,7 +28,7 @@ class BootDeviceSATA final { operator bool() { return this->Leak().mDetected; } - SizeT GetDiskSize() { return drv_get_size(); } + SizeT GetDiskSize() { return drv_std_get_size(); } constexpr static auto kSectorSize = kAHCISectorSize; diff --git a/dev/kernel/FSKit/HeFS.h b/dev/kernel/FSKit/HeFS.h index 90a2e274..515034fc 100644 --- a/dev/kernel/FSKit/HeFS.h +++ b/dev/kernel/FSKit/HeFS.h @@ -28,12 +28,6 @@ #define kHeFSDefaultVoluneName u8"HeFS Volume" -#define kHeFSDIMBootDir u8"boot-x/dir" -#define kHeFSMIMEBootFile u8"boot-x/file" - -#define kHeFSDIMSystemDir u8"system-x/dir" -#define kHeFSMIMESystemFile u8"system-x/file" - #define kHeFSSearchAllStr u8"*" struct HEFS_BOOT_NODE; @@ -101,19 +95,19 @@ typedef UInt64 ATime; /// @details Acts like a superblock, it contains the information about the filesystem. /// @note The boot node is the first block of the filesystem. struct PACKED HEFS_BOOT_NODE final { - Kernel::Char fMagic[kHeFSMagicLen]; /// @brief Magic number of the filesystem. + Kernel::Char fMagic[kHeFSMagicLen]; /// @brief Magic number of the filesystem. Kernel::Utf8Char fVolName[kHeFSPartNameLen]; /// @brief Volume name. - Kernel::UInt32 fVersion; /// @brief Version of the filesystem. - Kernel::UInt64 fBadSectors; /// @brief Number of bad sectors in the filesystem. - Kernel::UInt64 fSectorCount; /// @brief Number of sectors in the filesystem. - Kernel::UInt64 fSectorSize; /// @brief Size of the sector. - Kernel::UInt32 fChecksum; /// @brief Checksum of the boot node. - Kernel::UInt8 fDiskKind; /// @brief Kind of the drive. (Hard Drive, Solid State Drive, Optical - /// Drive, etc). - Kernel::UInt8 fEncoding; /// @brief Encoding of the filesystem. (UTF-8, UTF-16, etc). - Kernel::UInt64 fStartIND; /// @brief Start of the INode tree. - Kernel::UInt64 fEndIND; /// @brief End of the INode tree. - Kernel::UInt64 fINDCount; /// @brief Number of leafs in the INode tree. + Kernel::UInt32 fVersion; /// @brief Version of the filesystem. + Kernel::UInt64 fBadSectors; /// @brief Number of bad sectors in the filesystem. + Kernel::UInt64 fSectorCount; /// @brief Number of sectors in the filesystem. + Kernel::UInt64 fSectorSize; /// @brief Size of the sector. + Kernel::UInt32 fChecksum; /// @brief Checksum of the boot node. + Kernel::UInt8 fDiskKind; /// @brief Kind of the drive. (Hard Drive, Solid State Drive, Optical + /// Drive, etc). + Kernel::UInt8 fEncoding; /// @brief Encoding of the filesystem. (UTF-8, UTF-16, etc). + Kernel::UInt64 fStartIND; /// @brief Start of the INode tree. + Kernel::UInt64 fEndIND; /// @brief End of the INode tree. + Kernel::UInt64 fINDCount; /// @brief Number of leafs in the INode tree. Kernel::UInt64 fDiskSize; /// @brief Size of the disk. (Could be a virtual size, that is not the /// real size of the disk.) Kernel::UInt16 fDiskStatus; /// @brief Status of the disk. (locked, unlocked, error, invalid). @@ -124,7 +118,7 @@ struct PACKED HEFS_BOOT_NODE final { Kernel::UInt64 fReserved2; /// @brief Reserved for future use. Kernel::UInt64 fReserved3; /// @brief Reserved for future use. Kernel::UInt64 fReserved4; /// @brief Reserved for future use. - Kernel::Char fPad[272]; + Kernel::Char fPad[272]; }; inline constexpr Kernel::ATime kHeFSTimeInvalid = 0x0000000000000000; @@ -136,11 +130,11 @@ inline constexpr Kernel::ATime kHeFSTimeMax = 0xFFFFFFFFFFFFFFFF - 1; /// @note The index node is used to store the file information of a file. struct PACKED ALIGN(8) HEFS_INDEX_NODE final { Kernel::Utf8Char fName[kHeFSFileNameLen]; /// @brief File name. - Kernel::UInt32 fFlags; /// @brief File flags. + Kernel::UInt32 fFlags; /// @brief File flags. Kernel::UInt16 fKind; /// @brief File kind. (Regular, Directory, Block, Character, FIFO, Socket, /// Symbolic Link, Unknown). Kernel::UInt32 fSize; /// @brief File size. - Kernel::UInt32 fChecksum; /// @brief Checksum. + Kernel::UInt32 fChecksum; /// @brief Checksum. Kernel::Boolean fSymLink; /// @brief Is this a symbolic link? (if yes, the fName is the path to /// the file and blocklinkstart and end contains it's inodes.) diff --git a/dev/kernel/HALKit/AMD64/HalKernelMain.cc b/dev/kernel/HALKit/AMD64/HalKernelMain.cc index 66793aa6..a6bf09c7 100644 --- a/dev/kernel/HALKit/AMD64/HalKernelMain.cc +++ b/dev/kernel/HALKit/AMD64/HalKernelMain.cc @@ -142,4 +142,4 @@ EXTERN_C Kernel::Void hal_real_init(Kernel::Void) noexcept { ++team_index; } } -#endif // ifndef __NE_MODULAR_KERNEL_COMPONENTS__ \ No newline at end of file +#endif // ifndef __NE_MODULAR_KERNEL_COMPONENTS__ \ No newline at end of file diff --git a/dev/kernel/HALKit/AMD64/HalPagingMgrAMD64.cc b/dev/kernel/HALKit/AMD64/HalPagingMgrAMD64.cc index d7a8baf6..b6176e39 100644 --- a/dev/kernel/HALKit/AMD64/HalPagingMgrAMD64.cc +++ b/dev/kernel/HALKit/AMD64/HalPagingMgrAMD64.cc @@ -93,6 +93,18 @@ UIntPtr hal_get_phys_address(VoidPtr virt) { return (pte->PhysicalAddress << 12) | (kVMAddr & 0xFFF); } +/***********************************************************************************/ +/// @brief clflush+mfence helper function. +/***********************************************************************************/ +EXTERN_C Int32 mm_memory_fence(VoidPtr virtual_address) { + if (!virtual_address || !hal_get_phys_address(virtual_address)) return kErrorInvalidData; + + asm volatile("clflush (%0)" : : "r"(virtual_address) : "memory"); + asm volatile("mfence" ::: "memory"); + + return kErrorSuccess; +} + /***********************************************************************************/ /// @brief Maps or allocates a page from virtual_address. /// @param virtual_address a valid virtual address. @@ -136,9 +148,7 @@ EXTERN_C Int32 mm_map_page(VoidPtr virtual_address, VoidPtr physical_address, UI hal_invl_tlb(virtual_address); - asm volatile("clflush (%0)" : : "r"(virtual_address) : "memory"); - - asm volatile("mfence" ::: "memory"); + mm_memory_fence(virtual_address); mmi_page_status(pte); diff --git a/dev/kernel/HALKit/AMD64/Processor.h b/dev/kernel/HALKit/AMD64/Processor.h index 1319277f..b57e9abf 100644 --- a/dev/kernel/HALKit/AMD64/Processor.h +++ b/dev/kernel/HALKit/AMD64/Processor.h @@ -272,6 +272,8 @@ EXTERN_C Void rt_cli(); EXTERN_C Void rt_sti(); EXTERN_C Void rt_cld(); EXTERN_C Void rt_std(); + +EXTERN_C Int32 mm_memory_fence(VoidPtr virtual_address); } // namespace Kernel::HAL EXTERN_C Kernel::Void idt_handle_generic(Kernel::UIntPtr rsp); diff --git a/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc index 06c7781c..050826e3 100644 --- a/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc +++ b/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc @@ -257,7 +257,7 @@ SizeT drv_get_sector_count_ahci() { /// @brief Get the drive size. /// @return Disk size in bytes. SizeT drv_get_size_ahci() { - return drv_get_sector_count() * kAHCISectorSize; + return drv_std_get_sector_count() * kAHCISectorSize; } /// @brief Enable Host and probe using the IDENTIFY command. @@ -426,16 +426,16 @@ Bool drv_std_detected_ahci() { /// //////////////////////////////////////////////////// Void drv_std_write(UInt64 lba, Char* buffer, SizeT sector_sz, SizeT size_buffer) { - drv_std_input_output_ahci(lba / sector_sz, reinterpret_cast(buffer), sector_sz, - size_buffer); + drv_std_input_output_ahci(lba / sector_sz, reinterpret_cast(buffer), + sector_sz, size_buffer); } //////////////////////////////////////////////////// /// //////////////////////////////////////////////////// Void drv_std_read(UInt64 lba, Char* buffer, SizeT sector_sz, SizeT size_buffer) { - drv_std_input_output_ahci(lba / sector_sz, reinterpret_cast(buffer), sector_sz, - size_buffer); + drv_std_input_output_ahci(lba / sector_sz, reinterpret_cast(buffer), + sector_sz, size_buffer); } //////////////////////////////////////////////////// @@ -459,7 +459,7 @@ Bool drv_std_detected(Void) { @return Sector size in bytes. */ //////////////////////////////////////////////////// -SizeT drv_get_sector_count() { +SizeT drv_std_get_sector_count() { return drv_get_sector_count_ahci(); } @@ -467,7 +467,7 @@ SizeT drv_get_sector_count() { /// @brief Get the drive size. /// @return Disk size in bytes. //////////////////////////////////////////////////// -SizeT drv_get_size() { +SizeT drv_std_get_size() { return drv_get_size_ahci(); } diff --git a/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc index ca3e9ee4..4688203f 100644 --- a/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc +++ b/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc @@ -183,15 +183,15 @@ Boolean drv_std_detected(Void) { @return Number of sectors, or zero. */ /***********************************************************************************/ -Kernel::SizeT drv_get_sector_count() { +Kernel::SizeT drv_std_get_sector_count() { return (kATAIdentifyData[61] << 16) | kATAIdentifyData[60]; } /***********************************************************************************/ /// @brief Get the size of the current drive. /***********************************************************************************/ -Kernel::SizeT drv_get_size() { - return (drv_get_sector_count()) * kATASectorSize; +Kernel::SizeT drv_std_get_size() { + return (drv_std_get_sector_count()) * kATASectorSize; } #endif /* ifdef __ATA_DMA__ */ diff --git a/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc index a024d2fe..e57494a7 100644 --- a/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc +++ b/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc @@ -245,11 +245,11 @@ Void drv_std_write(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, SizeT SectorS drv_pio_std_write(Lba, IO, Master, Buf, SectorSz, Size); } -SizeT drv_get_size() { +SizeT drv_std_get_size() { return drv_pio_get_size(); } -SizeT drv_get_sector_count() { +SizeT drv_std_get_sector_count() { return drv_pio_get_sector_count(); } diff --git a/dev/kernel/KernelKit/FileMgr.h b/dev/kernel/KernelKit/FileMgr.h index 3dff61b0..2c4b2055 100644 --- a/dev/kernel/KernelKit/FileMgr.h +++ b/dev/kernel/KernelKit/FileMgr.h @@ -59,7 +59,7 @@ namespace Kernel { enum { - kFileIOInvalid = 0, + kFileIOInvalid = 0, kFileWriteAll = 100, kFileReadAll = 101, kFileReadChunk = 102, diff --git a/dev/kernel/KernelKit/KPC.h b/dev/kernel/KernelKit/KPC.h index e195d5ad..9de1f70f 100644 --- a/dev/kernel/KernelKit/KPC.h +++ b/dev/kernel/KernelKit/KPC.h @@ -61,7 +61,11 @@ inline constexpr KPCError kErrorInvalidCreds = 61; inline constexpr KPCError kErrorCDTrayBroken = 62; inline constexpr KPCError kErrorUnrecoverableDisk = 63; inline constexpr KPCError kErrorFileLocked = 64; -inline constexpr KPCError kErrorUnimplemented = -1; +inline constexpr KPCError kErrorDiskIsTooTiny = 65; +/// Kernel errors. +inline constexpr KPCError kErrorDmaExhausted = 101; +/// Generic errors. +inline constexpr KPCError kErrorUnimplemented = -1; /// @brief Does a system wide bug check. /// @param void no params are needed. diff --git a/dev/kernel/NewKit/KString.h b/dev/kernel/NewKit/KString.h index a9a58b7e..08f783c0 100644 --- a/dev/kernel/NewKit/KString.h +++ b/dev/kernel/NewKit/KString.h @@ -71,7 +71,7 @@ class KString final { }; class KStringBuilder final { -public: + public: static ErrorOr Construct(const Char* data); static const Char* FromBool(const Char* fmt, bool n); static const Char* Format(const Char* fmt, const Char* from); diff --git a/dev/kernel/StorageKit/DmaPool.h b/dev/kernel/StorageKit/DmaPool.h index 9e59910a..09851a0c 100644 --- a/dev/kernel/StorageKit/DmaPool.h +++ b/dev/kernel/StorageKit/DmaPool.h @@ -23,6 +23,7 @@ #pragma once #include +#include "NewKit/Defines.h" #ifdef __NE_AMD64__ #define NE_DMA_POOL_START (0x1000000) @@ -30,11 +31,14 @@ namespace Kernel { /// @brief DMA pool base pointer, here we're sure that AHCI or whatever tricky standard sees it. -inline UInt8* kDmaPoolPtr = (UInt8*) NE_DMA_POOL_START; +inline UInt8* kDmaPoolPtr = (UInt8*) NE_DMA_POOL_START; +inline const UInt8* kDmaPoolEnd = (UInt8*) (NE_DMA_POOL_START + NE_DMA_POOL_SIZE); +/***********************************************************************************/ /// @brief allocate from the rtl_dma_alloc system. /// @param size the size of the chunk to allocate. /// @param align alignement of pointer. +/***********************************************************************************/ inline VoidPtr rtl_dma_alloc(SizeT size, SizeT align) { if (!size) { return nullptr; @@ -42,11 +46,14 @@ inline VoidPtr rtl_dma_alloc(SizeT size, SizeT align) { UIntPtr addr = (UIntPtr) kDmaPoolPtr; - /// here we just align the address according to a `align` variable, i'd rather be a power of two really. + /// here we just align the address according to a `align` variable, i'd rather be a power of two + /// really. addr = (addr + (align - 1)) & ~(align - 1); - if ((addr + size) >= (NE_DMA_POOL_START + NE_DMA_POOL_SIZE)) { - kout << "DMA Pool exhausted!\r"; + if ((addr + size) >= reinterpret_cast(kDmaPoolEnd)) { + kout << "DMA Pool is exhausted!\r"; + + err_global_get() = kErrorDmaExhausted; return nullptr; } @@ -55,12 +62,18 @@ inline VoidPtr rtl_dma_alloc(SizeT size, SizeT align) { return (VoidPtr) addr; } +/***********************************************************************************/ +/// @brief Free DMA pointer. +/***********************************************************************************/ inline Void rtl_dma_free(SizeT size) { if (!size) return; kDmaPoolPtr = (UInt8*) (kDmaPoolPtr - size); } +/***********************************************************************************/ +/// @brief Flush DMA pointer. +/***********************************************************************************/ inline Void rtl_dma_flush(VoidPtr ptr, SizeT size_buffer) { if (ptr > (Void*) (NE_DMA_POOL_START + NE_DMA_POOL_SIZE)) { return; diff --git a/dev/kernel/src/DriveMgr.cc b/dev/kernel/src/DriveMgr.cc index 46a5c588..b0f78ae4 100644 --- a/dev/kernel/src/DriveMgr.cc +++ b/dev/kernel/src/DriveMgr.cc @@ -193,7 +193,7 @@ namespace Detail { trait.fKind = kMassStorageDrive | kUnformattedDrive | kReadOnlyDrive; trait.fSectorSz = 512; - trait.fLbaEnd = drv_get_sector_count() - 1; + trait.fLbaEnd = drv_std_get_sector_count() - 1; trait.fLbaStart = 0x400; } } diff --git a/dev/kernel/src/FS/HeFS+FileMgr.cc b/dev/kernel/src/FS/HeFS+FileMgr.cc index d7530d8f..e0b92a8d 100644 --- a/dev/kernel/src/FS/HeFS+FileMgr.cc +++ b/dev/kernel/src/FS/HeFS+FileMgr.cc @@ -10,5 +10,5 @@ #include #include -#endif // ifdef __FSKIT_INCLUDES_HEFS__ -#endif // ifndef __NE_MINIMAL_OS__ +#endif // ifdef __FSKIT_INCLUDES_HEFS__ +#endif // ifndef __NE_MINIMAL_OS__ diff --git a/dev/kernel/src/FS/HeFS.cc b/dev/kernel/src/FS/HeFS.cc index 37c2f8fb..f4776686 100644 --- a/dev/kernel/src/FS/HeFS.cc +++ b/dev/kernel/src/FS/HeFS.cc @@ -756,7 +756,7 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input NE_UNUSED(flags); NE_UNUSED(part_name); - // verify disk. + // Verify Disk. drive->fVerify(drive->fPacket); // if disk isn't good, then error out. @@ -765,6 +765,12 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input return false; } + if (drv_std_get_size() < kHeFSMinimumDiskSize) { + err_global_get() = kErrorDiskIsTooTiny; + kout << "Error: Failed to allocate memory for boot node.\r"; + return NO; + } + HEFS_BOOT_NODE* root = new HEFS_BOOT_NODE(); if (!root) { @@ -806,11 +812,11 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input rt_string_len("fs/hefs-packet")); urt_copy_memory((VoidPtr) part_name, root->fVolName, urt_string_len(part_name)); - rt_copy_memory((VoidPtr) kHeFSMagic, root->fMagic, sizeof(kHeFSMagic)); + rt_copy_memory((VoidPtr) kHeFSMagic, root->fMagic, kHeFSMagicLen - 1); root->fBadSectors = 0; - root->fSectorCount = drv_get_sector_count(); + root->fSectorCount = drv_std_get_sector_count(); root->fSectorSize = drive->fSectorSz; @@ -821,7 +827,7 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input root->fINDCount = 0; - root->fDiskSize = drv_get_size(); + root->fDiskSize = drv_std_get_size(); root->fDiskStatus = kHeFSStatusUnlocked; root->fDiskFlags = flags; @@ -844,6 +850,8 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input root->fVID = kHeFSInvalidVID; + root->fChecksum = ke_calculate_crc32((Char*) root, sizeof(HEFS_BOOT_NODE)); + drive->fPacket.fPacketLba = start; drive->fPacket.fPacketSize = sizeof(HEFS_BOOT_NODE); drive->fPacket.fPacketContent = root; @@ -861,52 +869,55 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input start = root->fStartIND; - constexpr SizeT kHeFSPreallocateCount = 16UL; + constexpr SizeT kHeFSPreallocateCount = 0x10UL; - HEFS_INDEX_NODE_DIRECTORY* index_node = new HEFS_INDEX_NODE_DIRECTORY(); + HEFS_INDEX_NODE_DIRECTORY* dir = new HEFS_INDEX_NODE_DIRECTORY(); // Pre-allocate index node directory tree for (SizeT i = 0; i < kHeFSPreallocateCount; ++i) { - rt_set_memory(index_node, 0, sizeof(HEFS_INDEX_NODE_DIRECTORY)); - urt_copy_memory((VoidPtr) u8"?", index_node->fName, urt_string_len(u8"?")); + rt_set_memory(dir, 0, sizeof(HEFS_INDEX_NODE_DIRECTORY)); + urt_copy_memory((VoidPtr) u8".deleted", dir->fName, urt_string_len(u8".deleted")); + + dir->fFlags = flags; + dir->fKind = kHeFSFileKindDirectory; - index_node->fFlags = flags; - index_node->fKind = kHeFSFileKindDirectory; + dir->fDeleted = kHeFSTimeMax; /// TODO: Add current time. - index_node->fDeleted = kHeFSTimeMax; + dir->fEntryCount = 0; - index_node->fEntryCount = 1; + dir->fIndexNodeChecksum = 0; - index_node->fChecksum = 0; - index_node->fIndexNodeChecksum = 0; + dir->fUID = 0; + dir->fGID = 0; + dir->fMode = 0; - index_node->fUID = 0; - index_node->fGID = 0; - index_node->fMode = 0; + dir->fColor = kHeFSBlack; + dir->fChild = 0; + dir->fParent = 0; + dir->fNext = 0; + dir->fPrev = 0; - index_node->fColor = kHeFSBlack; - index_node->fChild = 0; - index_node->fParent = 0; - index_node->fNext = 0; - index_node->fPrev = 0; + dir->fChecksum = ke_calculate_crc32((Char*) dir, sizeof(HEFS_INDEX_NODE_DIRECTORY)); drive->fPacket.fPacketLba = start; drive->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); - drive->fPacket.fPacketContent = index_node; + drive->fPacket.fPacketContent = dir; start += sizeof(HEFS_INDEX_NODE_DIRECTORY); drive->fOutput(drive->fPacket); } - delete index_node; - index_node = nullptr; + delete dir; + dir = nullptr; delete root; root = nullptr; Detail::hefsi_balance_filesystem(root, drive); + err_global_get() = kErrorSuccess; + if (drive->fPacket.fPacketGood) return YES; err_global_get() = kErrorDiskIsCorrupted; @@ -953,7 +964,7 @@ _Output Bool HeFileSystemParser::CreateDirectory(_Input DriveTrait* drive, _Inpu Detail::hefsi_balance_filesystem(root, drive); - auto dirent = new HEFS_INDEX_NODE_DIRECTORY(); + HEFS_INDEX_NODE_DIRECTORY* dirent = new HEFS_INDEX_NODE_DIRECTORY(); rt_set_memory(dirent, 0, sizeof(HEFS_INDEX_NODE_DIRECTORY)); @@ -969,7 +980,7 @@ _Output Bool HeFileSystemParser::CreateDirectory(_Input DriveTrait* drive, _Inpu dirent->fFlags = flags; dirent->fChecksum = 0; - dirent->fEntryCount = 1; + dirent->fEntryCount = 0; if (Detail::hefs_allocate_index_directory_node(root, drive, dirent)) { delete dirent; @@ -1093,7 +1104,7 @@ Boolean fs_init_hefs(Void) noexcept { HeFileSystemParser parser; - parser.Format(&drv, kHeFSEncodingUTF16, kHeFSDefaultVoluneName); + parser.Format(&drv, kHeFSEncodingUTF8, kHeFSDefaultVoluneName); return YES; } diff --git a/dev/kernel/src/FS/NeFS.cc b/dev/kernel/src/FS/NeFS.cc index e68a4035..d572bffc 100644 --- a/dev/kernel/src/FS/NeFS.cc +++ b/dev/kernel/src/FS/NeFS.cc @@ -32,12 +32,12 @@ using namespace Kernel; /***********************************************************************************/ /// @brief get sector count. /***********************************************************************************/ -Kernel::SizeT drv_get_sector_count(); +Kernel::SizeT drv_std_get_sector_count(); /***********************************************************************************/ /// @brief get device size. /***********************************************************************************/ -Kernel::SizeT drv_get_size(); +Kernel::SizeT drv_std_get_size(); #endif @@ -455,8 +455,8 @@ bool NeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input const I rt_copy_memory((VoidPtr) kNeFSUntitledHD, (VoidPtr) part_block->PartitionName, rt_string_len(kNeFSUntitledHD)); - SizeT sectorCount = drv_get_sector_count(); - SizeT diskSize = drv_get_size(); + SizeT sectorCount = drv_std_get_sector_count(); + SizeT diskSize = drv_std_get_size(); part_block->Version = kNeFSVersionInteger; diff --git a/dev/kernel/src/Utils.cc b/dev/kernel/src/Utils.cc index ea0ff7a7..4f47849b 100644 --- a/dev/kernel/src/Utils.cc +++ b/dev/kernel/src/Utils.cc @@ -193,4 +193,3 @@ EXTERN_C void* memcpy(void* dst, const void* src, long long unsigned int len) { EXTERN_C Kernel::Int32 strcmp(const char* dst, const char* src) { return Kernel::rt_string_cmp(dst, src, Kernel::rt_string_len(dst)); } - diff --git a/dev/modules/AHCI/AHCI.h b/dev/modules/AHCI/AHCI.h index 98fb3d60..7303e8c5 100644 --- a/dev/modules/AHCI/AHCI.h +++ b/dev/modules/AHCI/AHCI.h @@ -349,10 +349,10 @@ Kernel::Void drv_std_write(Kernel::UInt64 lba, Kernel::Char* buf, Kernel::SizeT Kernel::SizeT buf_sz); /// @brief Gets the sector count from AHCI disk. -Kernel::SizeT drv_get_sector_count(); +Kernel::SizeT drv_std_get_sector_count(); /// @brief Gets the AHCI disk size. -Kernel::SizeT drv_get_size(); +Kernel::SizeT drv_std_get_size(); /// @brief Checks if the drive has completed the command. Kernel::Bool drv_is_ready(void); diff --git a/dev/modules/ATA/ATA.h b/dev/modules/ATA/ATA.h index bd21d106..e7cf200f 100644 --- a/dev/modules/ATA/ATA.h +++ b/dev/modules/ATA/ATA.h @@ -149,9 +149,9 @@ Kernel::Void drv_std_write(Kernel::UInt64 lba, Kernel::UInt16 io, Kernel::UInt8 Kernel::Char* buf, Kernel::SizeT sec_sz, Kernel::SizeT buf_sz); /// @brief get sector count. -Kernel::SizeT drv_get_sector_count(); +Kernel::SizeT drv_std_get_sector_count(); /// @brief get device size. -Kernel::SizeT drv_get_size(); +Kernel::SizeT drv_std_get_size(); #endif // ifdef __NEOSKRNL__ \ No newline at end of file diff --git a/dev/user/ProcessCodes.h b/dev/user/ProcessCodes.h index 74b50c68..90457944 100644 --- a/dev/user/ProcessCodes.h +++ b/dev/user/ProcessCodes.h @@ -51,6 +51,7 @@ inline constexpr ErrRef kErrorInvalidCreds = 61; inline constexpr ErrRef kErrorCDTrayBroken = 62; inline constexpr ErrRef kErrorUnrecoverableDisk = 63; inline constexpr ErrRef kErrorFileLocked = 64; +inline constexpr ErrRef kErrorDiskIsTooTiny = 65; inline constexpr ErrRef kErrorUnimplemented = -1; /// @brief The last error reported by the system to the process. diff --git a/docs/tex/hefs.tex b/docs/tex/hefs.tex index 75f98bcc..f3c2d6bf 100644 --- a/docs/tex/hefs.tex +++ b/docs/tex/hefs.tex @@ -26,7 +26,7 @@ \title{HeFS (High-Throughput Extended File System) Specification} \author{Amlal El Mahrouss} -\date{2024--2025} +\date{2024-2025} \begin{document} diff --git a/tooling/hefs.h b/tooling/hefs.h index d0ad823b..2a04a1c3 100644 --- a/tooling/hefs.h +++ b/tooling/hefs.h @@ -1,6 +1,6 @@ /* ------------------------------------------- - Copyright (C) 2025, Amlal El Mahrouss, all rights reserved. + Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved. ------------------------------------------- */ @@ -16,17 +16,11 @@ #define kHeFSFileNameLen (256U) #define kHeFSPartNameLen (128U) -#define kHeFSMinimumDiskSize (gib_cast(4)) - -#define kHeFSDefaultVoluneName u"HeFS Volume" - -#define kHeFSDIMBootDir u"boot-x/dir" -#define kHeFSMIMEBootFile u"boot-x/file" - -#define kHeFSDIMSystemDir u"system-x/dir" -#define kHeFSMIMESystemFile u"system-x/file" +#define kHeFSDefaultVoluneName u8"HeFS Volume" namespace mkfs::hefs { + +// Drive kinds enum { kHeFSHardDrive = 0xC0, // Hard Drive kHeFSSolidStateDrive = 0xC1, // Solid State Drive @@ -38,6 +32,7 @@ enum { kHeFSDriveCount = 7, }; +// Disk status enum { kHeFSStatusUnlocked = 0x18, kHeFSStatusLocked, @@ -46,6 +41,7 @@ enum { kHeFSStatusCount, }; +// Encodings enum { kHeFSEncodingUTF8 = 0x00, kHeFSEncodingUTF16, @@ -60,18 +56,13 @@ enum { kHeFSEncodingCount, }; -// Constants +// Block constants constexpr std::size_t kHeFSBlockCount = 16; -// Types +// Time type using ATime = std::uint64_t; -enum { - kHeFSRed = 100, - kHeFSBlack, - kHeFSColorCount, -}; - +// File kinds inline constexpr uint16_t kHeFSFileKindRegular = 0x00; inline constexpr uint16_t kHeFSFileKindDirectory = 0x01; inline constexpr uint16_t kHeFSFileKindBlock = 0x02; @@ -82,14 +73,22 @@ inline constexpr uint16_t kHeFSFileKindSymbolicLink = 0x06; inline constexpr uint16_t kHeFSFileKindUnknown = 0x07; inline constexpr uint16_t kHeFSFileKindCount = 0x08; -// Basic Time Constants +// Red-black tree colors +enum { + kHeFSInvalidColor = 0, + kHeFSRed = 100, + kHeFSBlack, + kHeFSColorCount, +}; + +// Time constants inline constexpr ATime kHeFSTimeInvalid = 0x0000000000000000; inline constexpr ATime kHeFSTimeMax = 0xFFFFFFFFFFFFFFFF - 1; -// Boot Node (Superblock Equivalent) +// Boot Node struct alignas(8) BootNode { char magic[kHeFSMagicLen]{}; - char16_t volumeName[kHeFSPartNameLen]{}; + char8_t volumeName[kHeFSPartNameLen]{}; std::uint32_t version{}; std::uint64_t badSectors{}; std::uint64_t sectorCount{}; @@ -108,19 +107,16 @@ struct alignas(8) BootNode { std::uint64_t reserved2{}; std::uint64_t reserved3{}; std::uint64_t reserved4{}; + char pad[272]{}; }; -// File Node (Index Node) +// Index Node struct alignas(8) IndexNode { - char16_t name[kHeFSFileNameLen]{}; + char8_t name[kHeFSFileNameLen]{}; std::uint32_t flags{}; std::uint16_t kind{}; std::uint32_t size{}; std::uint32_t checksum{}; - std::uint32_t recoverChecksum{}; - std::uint32_t blockChecksum{}; - std::uint32_t linkChecksum{}; - char16_t mime[kHeFSFileNameLen]{}; bool symbolicLink{false}; ATime created{}; ATime accessed{}; @@ -129,23 +125,18 @@ struct alignas(8) IndexNode { std::uint32_t uid{}; std::uint32_t gid{}; std::uint32_t mode{}; - std::uint64_t blockLinkStart[kHeFSBlockCount]{}; - std::uint64_t blockLinkEnd[kHeFSBlockCount]{}; - std::uint64_t blockStart[kHeFSBlockCount]{}; - std::uint64_t blockEnd[kHeFSBlockCount]{}; - std::uint64_t blockRecoveryStart[kHeFSBlockCount]{}; - std::uint64_t blockRecoveryEnd[kHeFSBlockCount]{}; + std::uint64_t block[kHeFSBlockCount]{}; + char pad[62]{}; }; -// Directory Node (Red-Black Tree Node) +// Index Node Directory (Red-Black Tree Node) struct alignas(8) IndexNodeDirectory { - char16_t name[kHeFSFileNameLen]{}; + char8_t name[kHeFSFileNameLen]{}; std::uint32_t flags{}; std::uint16_t kind{}; std::uint32_t entryCount{}; std::uint32_t checksum{}; std::uint32_t indexNodeChecksum{}; - char16_t dim[kHeFSFileNameLen]{}; ATime created{}; ATime accessed{}; ATime modified{}; @@ -153,13 +144,13 @@ struct alignas(8) IndexNodeDirectory { std::uint32_t uid{}; std::uint32_t gid{}; std::uint32_t mode{}; - std::uint64_t indexNodeStart[kHeFSBlockCount]{}; - std::uint64_t indexNodeEnd[kHeFSBlockCount]{}; + std::uint64_t indexNode[kHeFSBlockCount]{}; std::uint8_t color{}; std::uint64_t next{}; std::uint64_t prev{}; std::uint64_t child{}; std::uint64_t parent{}; + char pad[32]{}; }; } // namespace mkfs::hefs diff --git a/tooling/mkfs.hefs.cc b/tooling/mkfs.hefs.cc index 542ae175..3147a6e6 100644 --- a/tooling/mkfs.hefs.cc +++ b/tooling/mkfs.hefs.cc @@ -28,10 +28,10 @@ static std::basic_string get_option(const std::basic_string& } } // namespace mkfs::detail -static size_t kDiskSize = 1024 * 1024 * 1024 * 4UL; -static uint16_t kVersion = kHeFSVersion; -static std::u16string kLabel = kHeFSDefaultVoluneName; -static size_t kSectorSize = 512; +static size_t kDiskSize = 1024 * 1024 * 1024 * 4UL; +static uint16_t kVersion = kHeFSVersion; +static std::u8string kLabel = kHeFSDefaultVoluneName; +static size_t kSectorSize = 512; int main(int argc, char** argv) { if (argc < 2) { @@ -42,8 +42,8 @@ int main(int argc, char** argv) { return EXIT_FAILURE; } - std::string args; - std::u16string args_wide; + std::string args; + std::u8string args_wide; for (int i = 1; i < argc; ++i) { args += argv[i]; @@ -55,13 +55,13 @@ int main(int argc, char** argv) { args_wide.push_back(ch); } - args_wide += u" "; + args_wide += u8" "; } auto output_device = mkfs::detail::get_option(args, "-o"); kSectorSize = std::strtol(mkfs::detail::get_option(args, "-s").data(), nullptr, 10); - kLabel = mkfs::detail::get_option(args_wide, u"-L"); + kLabel = mkfs::detail::get_option(args_wide, u8"-L"); if (kLabel.empty()) kLabel = kHeFSDefaultVoluneName; @@ -91,14 +91,14 @@ int main(int argc, char** argv) { bootNode.version = kVersion; bootNode.diskKind = mkfs::hefs::kHeFSHardDrive; - bootNode.encoding = mkfs::hefs::kHeFSEncodingUTF16; + bootNode.encoding = mkfs::hefs::kHeFSEncodingUTF8; bootNode.diskSize = kDiskSize; bootNode.sectorSize = kSectorSize; bootNode.startIND = start_ind; bootNode.endIND = end_ind; bootNode.diskStatus = mkfs::hefs::kHeFSStatusUnlocked; - std::memcpy(bootNode.magic, kHeFSMagic, kHeFSMagicLen); + std::memcpy(bootNode.magic, kHeFSMagic, kHeFSMagicLen - 1); std::memcpy(bootNode.volumeName, kLabel.data(), kLabel.size() * sizeof(char16_t)); filesystem.seekp(std::strtol(mkfs::detail::get_option(args, "-p").data(), nullptr, 10)); @@ -121,9 +121,9 @@ int main(int argc, char** argv) { for (size_t i = 0; i < cnt; ++i) { mkfs::hefs::IndexNodeDirectory indexNode{}; - std::memcpy(indexNode.name, u"/", std::u16string(u"/").size() * sizeof(char16_t)); + std::memcpy(indexNode.name, u8"/", std::u8string(u8"/").size() * sizeof(char16_t)); - indexNode.flags = mkfs::hefs::kHeFSEncodingUTF16; + indexNode.flags = mkfs::hefs::kHeFSEncodingUTF8; indexNode.kind = mkfs::hefs::kHeFSFileKindDirectory; indexNode.deleted = mkfs::hefs::kHeFSTimeMax; -- cgit v1.2.3 From bbdc9527d81cbafa74375ed108009f30e340d1b0 Mon Sep 17 00:00:00 2001 From: Amlal Date: Tue, 29 Apr 2025 16:52:05 +0200 Subject: dev(kernel, HeFS): reworking filesystem to find an hybrid solution regarding memory footprint (unstable changes) Signed-off-by: Amlal --- dev/kernel/HALKit/AMD64/HalDebugOutput.cc | 6 +- dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc | 10 +- dev/kernel/KernelKit/DriveMgr.h | 8 +- dev/kernel/src/DriveMgr.cc | 12 +- dev/kernel/src/FS/HeFS.cc | 512 ++++++++++++------------ tooling/fsck.hefs.cc | 6 +- 6 files changed, 285 insertions(+), 269 deletions(-) (limited to 'dev/kernel/src/DriveMgr.cc') diff --git a/dev/kernel/HALKit/AMD64/HalDebugOutput.cc b/dev/kernel/HALKit/AMD64/HalDebugOutput.cc index 5d09f8b4..34b99ffe 100644 --- a/dev/kernel/HALKit/AMD64/HalDebugOutput.cc +++ b/dev/kernel/HALKit/AMD64/HalDebugOutput.cc @@ -13,15 +13,15 @@ namespace Kernel { enum CommStatus : UInt16 { - kStateInvalid = 0x64, + kStateInvalid = 0x64, kStateReady = 0xCF, kStateTransmit = 0xFC, kStateCnt = 3 }; namespace Detail { - constexpr ATTRIBUTE(unused) const UInt16 kPort = 0x3F8; - STATIC ATTRIBUTE(unused) UInt16 kState = kStateInvalid; + constexpr ATTRIBUTE(unused) const UInt16 kPort = 0x3F8; + STATIC ATTRIBUTE(unused) UInt16 kState = kStateInvalid; /// @brief Init COM1. /// @return diff --git a/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc index b767e79c..d09fd71a 100644 --- a/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc +++ b/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc @@ -130,6 +130,11 @@ STATIC Void drv_std_input_output_ahci(UInt64 lba, UInt8* buffer, SizeT sector_sz lba /= sector_sz; + if (lba > kSATASectorCount) { + err_global_get() = kErrorDisk; + return; + } + if (!buffer || size_buffer == 0) { kout << "Invalid buffer for AHCI I/O.\r"; err_global_get() = kErrorDisk; @@ -146,7 +151,7 @@ STATIC Void drv_std_input_output_ahci(UInt64 lba, UInt8* buffer, SizeT sector_sz volatile HbaCmdHeader* command_header = (volatile HbaCmdHeader*) ((UInt64) kSATAHba->Ports[kSATAIndex].Clb); - + command_header += slot; MUST_PASS(command_header); @@ -196,7 +201,7 @@ STATIC Void drv_std_input_output_ahci(UInt64 lba, UInt8* buffer, SizeT sector_sz return; } - command_header->Prdtl = prdt_index; + command_header->Prdtl = prdt_index; command_header->HbaFlags.Struct.Cfl = sizeof(FisRegH2D) / sizeof(UInt32); command_header->HbaFlags.Struct.Write = Write; @@ -241,6 +246,7 @@ STATIC Void drv_std_input_output_ahci(UInt64 lba, UInt8* buffer, SizeT sector_sz rtl_dma_free(size_buffer); err_global_get() = kErrorDiskIsCorrupted; + return; } else { if (!Write) { diff --git a/dev/kernel/KernelKit/DriveMgr.h b/dev/kernel/KernelKit/DriveMgr.h index d287a345..7972ac74 100644 --- a/dev/kernel/KernelKit/DriveMgr.h +++ b/dev/kernel/KernelKit/DriveMgr.h @@ -64,10 +64,10 @@ struct DriveTrait final { Lba fLbaStart{0}, fLbaEnd{0}; SizeT fSectorSz{kDriveSectorSz}; - Void (*fInput)(DrivePacket packet); - Void (*fOutput)(DrivePacket packet); - Void (*fVerify)(DrivePacket packet); - Void (*fInit)(DrivePacket packet); + Void (*fInput)(DrivePacket& packet); + Void (*fOutput)(DrivePacket& packet); + Void (*fVerify)(DrivePacket& packet); + Void (*fInit)(DrivePacket& packet); const Char* (*fProtocol)(Void); }; diff --git a/dev/kernel/src/DriveMgr.cc b/dev/kernel/src/DriveMgr.cc index b0f78ae4..37c8b439 100644 --- a/dev/kernel/src/DriveMgr.cc +++ b/dev/kernel/src/DriveMgr.cc @@ -31,9 +31,11 @@ STATIC UInt16 kAHCIPortsImplemented [[maybe_unused]] = 0UL; /// @brief reads from an ATA drive. /// @param pckt Packet structure (fPacketContent must be non null) /// @return -Void io_drv_input(DriveTrait::DrivePacket pckt) { +Void io_drv_input(DriveTrait::DrivePacket& pckt) { #ifdef __AHCI__ drv_std_read(pckt.fPacketLba, (Char*) pckt.fPacketContent, kAHCISectorSize, pckt.fPacketSize); + + if (err_global_get() != kErrorSuccess) pckt.fPacketGood = NO; #elif defined(__ATA_PIO__) || defined(__ATA_DMA__) drv_std_read(pckt.fPacketLba, kATAIO, kATAMaster, (Char*) pckt.fPacketContent, kATASectorSize, pckt.fPacketSize); @@ -43,7 +45,7 @@ Void io_drv_input(DriveTrait::DrivePacket pckt) { /// @brief Writes to an ATA drive. /// @param pckt the packet to write. /// @return -Void io_drv_output(DriveTrait::DrivePacket pckt) { +Void io_drv_output(DriveTrait::DrivePacket& pckt) { if (pckt.fPacketReadOnly) { pckt.fPacketGood = NO; return; @@ -51,6 +53,8 @@ Void io_drv_output(DriveTrait::DrivePacket pckt) { #ifdef __AHCI__ drv_std_write(pckt.fPacketLba, (Char*) pckt.fPacketContent, kAHCISectorSize, pckt.fPacketSize); + + if (err_global_get() != kErrorSuccess) pckt.fPacketGood = NO; #elif defined(__ATA_PIO__) || defined(__ATA_DMA__) drv_std_write(pckt.fPacketLba, kATAIO, kATAMaster, (Char*) pckt.fPacketContent, kATASectorSize, pckt.fPacketSize); @@ -60,7 +64,7 @@ Void io_drv_output(DriveTrait::DrivePacket pckt) { /// @brief Executes a disk check on the ATA drive. /// @param pckt the packet to read. /// @return -Void io_drv_init(DriveTrait::DrivePacket pckt) { +Void io_drv_init(DriveTrait::DrivePacket& pckt) { NE_UNUSED(pckt); #if defined(__ATA_PIO__) || defined(__ATA_DMA__) @@ -116,7 +120,7 @@ const Char* io_drv_kind(Void) { /// @brief Unimplemented drive function. /// @param pckt the packet to read. -Void io_drv_unimplemented(DriveTrait::DrivePacket pckt) noexcept { +Void io_drv_unimplemented(DriveTrait::DrivePacket& pckt) noexcept { NE_UNUSED(pckt); } diff --git a/dev/kernel/src/FS/HeFS.cc b/dev/kernel/src/FS/HeFS.cc index 47248d4c..6809f4b4 100644 --- a/dev/kernel/src/FS/HeFS.cc +++ b/dev/kernel/src/FS/HeFS.cc @@ -4,6 +4,7 @@ ------------------------------------------- */ +#include "NewKit/Macros.h" #ifdef __FSKIT_INCLUDES_HEFS__ #include @@ -29,7 +30,7 @@ namespace Detail { /// @note This function is used to traverse the RB-Tree of the filesystem. /// @internal Internal filesystem use only. STATIC ATTRIBUTE(unused) _Output Void - hefsi_traverse_tree(HEFS_INDEX_NODE_DIRECTORY dir, Lba& start); + hefsi_traverse_tree(HEFS_INDEX_NODE_DIRECTORY* dir, Lba& start, Bool hop_watch = NO); /// @brief Get the index node of a file or directory. /// @param root The root node of the filesystem. @@ -39,7 +40,7 @@ namespace Detail { /// @param kind The kind of the file (regular, directory, block, character, FIFO, socket, symbolic /// link, unknown). STATIC ATTRIBUTE(unused) _Output HEFS_INDEX_NODE* hefsi_fetch_index_node( - HEFS_BOOT_NODE root, DriveTrait* mnt, const Utf8Char* dir_name, const Utf8Char* file_name, + HEFS_BOOT_NODE* root, DriveTrait* mnt, const Utf8Char* dir_name, const Utf8Char* file_name, UInt8 kind, SizeT* cnt) noexcept; /// @brief Get the index node size. @@ -50,24 +51,24 @@ namespace Detail { /// @param kind The kind of the file (regular, directory, block, character, FIFO, socket, symbolic /// link, unknown). STATIC ATTRIBUTE(unused) _Output SizeT - hefsi_fetch_index_node_size(HEFS_BOOT_NODE root, DriveTrait* mnt, const Utf8Char* dir_name, + hefsi_fetch_index_node_size(HEFS_BOOT_NODE* root, DriveTrait* mnt, const Utf8Char* dir_name, const Utf8Char* file_name, UInt8 kind) noexcept; - /// @brief Allocate a new index node. + /// @brief Allocate a new index node-> /// @param root The root node of the filesystem. /// @param mnt The drive to read/write from. /// @param parent_dir_name The name of the parent directory. /// @return Status, see err_global_get(). STATIC ATTRIBUTE(unused) _Output BOOL - hefsi_allocate_index_node(HEFS_BOOT_NODE root, DriveTrait* mnt, - const Utf8Char* parent_dir_name, HEFS_INDEX_NODE node) noexcept; + hefsi_allocate_index_node(HEFS_BOOT_NODE* root, DriveTrait* mnt, + const Utf8Char* parent_dir_name, HEFS_INDEX_NODE* node) noexcept; /// @brief Balance RB-Tree of the filesystem. /// @param root The root node of the filesystem. /// @param mnt The drive to read/write from. /// @return Status, see err_global_get(). STATIC ATTRIBUTE(unused) _Output BOOL - hefsi_balance_filesystem(HEFS_BOOT_NODE root, DriveTrait* mnt); + hefsi_balance_filesystem(HEFS_BOOT_NODE* root, DriveTrait* mnt); /// @brief Traverse the RB-Tree of the filesystem. /// @param dir The directory to traverse. @@ -75,16 +76,20 @@ namespace Detail { /// @note This function is used to traverse the RB-Tree of the filesystem. /// @internal Internal filesystem use only. STATIC ATTRIBUTE(unused) _Output Void - hefsi_traverse_tree(HEFS_INDEX_NODE_DIRECTORY dir, Lba& start) { - if (dir.fChild != 0) { - start = dir.fChild; - } else if (dir.fNext != 0) { - start = dir.fNext; - } else if (dir.fParent != 0) { - start = dir.fParent; - } else if (dir.fPrev != 0) { - start = dir.fPrev; + hefsi_traverse_tree(HEFS_INDEX_NODE_DIRECTORY* dir, Lba& start, Bool hop_watch) { + if (dir->fChild != 0) { + start = dir->fChild; + } else if (dir->fNext != 0) { + start = dir->fNext; + } else if (dir->fParent != 0) { + start = dir->fParent; + } else if (dir->fPrev != 0) { + start = dir->fPrev; } else { + if (hop_watch) { + err_global_get() = kErrorDisk; + } + start += kHeFSINDStartOffset; } @@ -96,37 +101,41 @@ namespace Detail { /// @internal /***********************************************************************************/ STATIC ATTRIBUTE(unused) _Output Void - hefsi_rotate_left(HEFS_INDEX_NODE_DIRECTORY dir, Lba& start, DriveTrait* mnt) { - HEFS_INDEX_NODE_DIRECTORY parent; + hefsi_rotate_left(HEFS_INDEX_NODE_DIRECTORY* dir, Lba& start, DriveTrait* mnt) { + HEFS_INDEX_NODE_DIRECTORY* parent = + (HEFS_INDEX_NODE_DIRECTORY*) RTL_ALLOCA(sizeof(HEFS_INDEX_NODE_DIRECTORY)); - mnt->fPacket.fPacketLba = dir.fParent; + mnt->fPacket.fPacketLba = dir->fParent; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); - mnt->fPacket.fPacketContent = &parent; + mnt->fPacket.fPacketContent = parent; mnt->fInput(mnt->fPacket); - HEFS_INDEX_NODE_DIRECTORY grand_parent; + HEFS_INDEX_NODE_DIRECTORY* grand_parent = + (HEFS_INDEX_NODE_DIRECTORY*) RTL_ALLOCA(sizeof(HEFS_INDEX_NODE_DIRECTORY)); - mnt->fPacket.fPacketLba = parent.fParent; + mnt->fPacket.fPacketLba = parent->fParent; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); - mnt->fPacket.fPacketContent = &grand_parent; + mnt->fPacket.fPacketContent = grand_parent; mnt->fInput(mnt->fPacket); - dir.fParent = parent.fParent; - parent.fParent = start; - parent.fNext = dir.fChild; - dir.fChild = dir.fParent; + dir->fParent = parent->fParent; + parent->fParent = start; + parent->fNext = dir->fChild; + dir->fChild = dir->fParent; - mnt->fPacket.fPacketLba = parent.fParent; + if (parent->fParent == 0 || dir->fParent == 0) return; + + mnt->fPacket.fPacketLba = parent->fParent; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); - mnt->fPacket.fPacketContent = &grand_parent; + mnt->fPacket.fPacketContent = grand_parent; mnt->fOutput(mnt->fPacket); - mnt->fPacket.fPacketLba = dir.fParent; + mnt->fPacket.fPacketLba = dir->fParent; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); - mnt->fPacket.fPacketContent = &parent; + mnt->fPacket.fPacketContent = parent; mnt->fOutput(mnt->fPacket); @@ -138,31 +147,32 @@ namespace Detail { /// @internal /***********************************************************************************/ STATIC ATTRIBUTE(unused) _Output Void - hefsi_rotate_right(HEFS_INDEX_NODE_DIRECTORY dir, Lba& start, DriveTrait* mnt) { - HEFS_INDEX_NODE_DIRECTORY parent; + hefsi_rotate_right(HEFS_INDEX_NODE_DIRECTORY* dir, Lba& start, DriveTrait* mnt) { + HEFS_INDEX_NODE_DIRECTORY* parent = + (HEFS_INDEX_NODE_DIRECTORY*) RTL_ALLOCA(sizeof(HEFS_INDEX_NODE_DIRECTORY)); - mnt->fPacket.fPacketLba = dir.fParent; + mnt->fPacket.fPacketLba = dir->fParent; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); - mnt->fPacket.fPacketContent = &parent; + mnt->fPacket.fPacketContent = parent; mnt->fInput(mnt->fPacket); - parent.fParent = dir.fParent; - dir.fParent = parent.fParent; - dir.fNext = parent.fChild; - parent.fChild = start; + parent->fParent = dir->fParent; + dir->fParent = parent->fParent; + dir->fNext = parent->fChild; + parent->fChild = start; - mnt->fPacket.fPacketLba = dir.fParent; + mnt->fPacket.fPacketLba = dir->fParent; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); - mnt->fPacket.fPacketContent = &parent; + mnt->fPacket.fPacketContent = parent; mnt->fOutput(mnt->fPacket); - dir.fColor = kHeFSBlack; + dir->fColor = kHeFSBlack; mnt->fPacket.fPacketLba = start; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); - mnt->fPacket.fPacketContent = &dir; + mnt->fPacket.fPacketContent = dir; mnt->fOutput(mnt->fPacket); @@ -177,20 +187,21 @@ namespace Detail { /// @param kind The kind of the file (regular, directory, block, character, FIFO, socket, symbolic /// link, unknown). STATIC ATTRIBUTE(unused) _Output SizeT - hefsi_fetch_index_node_size(HEFS_BOOT_NODE root, DriveTrait* mnt, const Utf8Char* dir_name, + hefsi_fetch_index_node_size(HEFS_BOOT_NODE* root, DriveTrait* mnt, const Utf8Char* dir_name, const Utf8Char* file_name, UInt8 kind) noexcept { if (mnt) { - HEFS_INDEX_NODE node; - HEFS_INDEX_NODE_DIRECTORY dir; + HEFS_INDEX_NODE* node = (HEFS_INDEX_NODE*) RTL_ALLOCA(sizeof(HEFS_INDEX_NODE)); + HEFS_INDEX_NODE_DIRECTORY* dir = + (HEFS_INDEX_NODE_DIRECTORY*) RTL_ALLOCA(sizeof(HEFS_INDEX_NODE_DIRECTORY)); SizeT sz = 0UL; - auto start = root.fStartIND; + auto start = root->fStartIND; while (YES) { mnt->fPacket.fPacketLba = start; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); - mnt->fPacket.fPacketContent = &dir; + mnt->fPacket.fPacketContent = dir; mnt->fInput(mnt->fPacket); @@ -200,20 +211,20 @@ namespace Detail { return 0; } - if (dir.fKind == kHeFSFileKindDirectory) { - if (KStringBuilder::Equals(dir_name, dir.fName) || + if (dir->fKind == kHeFSFileKindDirectory) { + if (KStringBuilder::Equals(dir_name, dir->fName) || KStringBuilder::Equals(dir_name, kHeFSSearchAllStr)) { for (SizeT inode_index = 0UL; inode_index < kHeFSBlockCount; inode_index += 2) { - mnt->fPacket.fPacketLba = dir.fIndexNode[inode_index]; + mnt->fPacket.fPacketLba = dir->fIndexNode[inode_index]; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE); - mnt->fPacket.fPacketContent = &node; + mnt->fPacket.fPacketContent = node; mnt->fInput(mnt->fPacket); - if (KStringBuilder::Equals(file_name, node.fName) && node.fKind == kind) { - if (node.fKind == kHeFSFileKindDirectory) { + if (KStringBuilder::Equals(file_name, node->fName) && node->fKind == kind) { + if (node->fKind == kHeFSFileKindDirectory) { sz += hefsi_fetch_index_node_size(root, mnt, dir_name, file_name, kind); } else { - sz = node.fSize; + sz = node->fSize; } return sz; @@ -231,18 +242,27 @@ namespace Detail { return 0; } - STATIC _Output BOOL hefsi_allocate_index_directory_node(HEFS_BOOT_NODE root, DriveTrait* mnt, + /// @brief Alllocate IND for boot node-> + STATIC _Output BOOL hefsi_allocate_index_directory_node(HEFS_BOOT_NODE* root, DriveTrait* mnt, const Utf8Char* dir_name, UInt16 flags) noexcept { + if (urt_string_len(dir_name) >= kHeFSFileNameLen) { + err_global_get() = kErrorDisk; + return NO; + } + if (mnt) { - HEFS_INDEX_NODE_DIRECTORY tmpdir; + HEFS_INDEX_NODE_DIRECTORY* tmpdir = + (HEFS_INDEX_NODE_DIRECTORY*) RTL_ALLOCA(sizeof(HEFS_INDEX_NODE_DIRECTORY)); - auto start = root.fStartIND; + auto start = root->fStartIND; while (YES) { + if (start == 0) break; + mnt->fPacket.fPacketLba = start; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); - mnt->fPacket.fPacketContent = &tmpdir; + mnt->fPacket.fPacketContent = tmpdir; mnt->fInput(mnt->fPacket); @@ -250,91 +270,95 @@ namespace Detail { break; } - if ((!tmpdir.fCreated && tmpdir.fDeleted) || *tmpdir.fName == 0) { - HEFS_INDEX_NODE_DIRECTORY dirent; + if ((!tmpdir->fCreated && tmpdir->fDeleted) || *tmpdir->fName == 0) { + HEFS_INDEX_NODE_DIRECTORY* dirent = + (HEFS_INDEX_NODE_DIRECTORY*) mm_new_heap(sizeof(HEFS_INDEX_NODE_DIRECTORY), Yes, No); - urt_copy_memory((VoidPtr) dir_name, dirent.fName, urt_string_len(dir_name)); + urt_copy_memory((VoidPtr) dir_name, dirent->fName, urt_string_len(dir_name) + 1); - dirent.fAccessed = 0; - dirent.fCreated = 1UL; - dirent.fDeleted = 0; - dirent.fModified = 0; - dirent.fEntryCount = 0; + dirent->fAccessed = 0; + dirent->fCreated = 1UL; + dirent->fDeleted = 0; + dirent->fModified = 0; + dirent->fEntryCount = 0; - dirent.fKind = kHeFSFileKindDirectory; - dirent.fFlags = flags; - dirent.fChecksum = 0; + dirent->fKind = kHeFSFileKindDirectory; + dirent->fFlags = flags; + dirent->fChecksum = 0; - dirent.fChecksum = ke_calculate_crc32((Char*) &dirent, sizeof(HEFS_INDEX_NODE_DIRECTORY)); + dirent->fChecksum = ke_calculate_crc32((Char*) dirent, sizeof(HEFS_INDEX_NODE_DIRECTORY)); - dirent.fEntryCount = 0; + dirent->fEntryCount = 0; - dirent.fNext = tmpdir.fNext; - dirent.fPrev = tmpdir.fPrev; + dirent->fNext = tmpdir->fNext; + dirent->fPrev = tmpdir->fPrev; - if (dirent.fPrev == 0) { - dirent.fPrev = root.fStartIND; + if (dirent->fPrev == 0) { + dirent->fPrev = root->fStartIND; } - if (dirent.fNext == 0) { - if (start < root.fEndIND) { - dirent.fNext = start + sizeof(HEFS_INDEX_NODE_DIRECTORY); + if (dirent->fNext == 0) { + if (start < root->fEndIND) { + dirent->fNext = start + sizeof(HEFS_INDEX_NODE_DIRECTORY); } else { - dirent.fNext = 0; + dirent->fNext = 0; } } - if (tmpdir.fParent == 0) { - tmpdir.fParent = root.fStartIND; + if (tmpdir->fParent == 0) { + tmpdir->fParent = root->fStartIND; } - if (tmpdir.fChild == 0) { - auto child = root.fEndIND; + if (tmpdir->fChild == 0) { + auto child = root->fEndIND; - HEFS_INDEX_NODE_DIRECTORY tmpend; + HEFS_INDEX_NODE_DIRECTORY* tmpend = + (HEFS_INDEX_NODE_DIRECTORY*) RTL_ALLOCA(sizeof(HEFS_INDEX_NODE_DIRECTORY)); while (YES) { mnt->fPacket.fPacketLba = child; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); - mnt->fPacket.fPacketContent = &tmpend; + mnt->fPacket.fPacketContent = tmpend; mnt->fInput(mnt->fPacket); - if ((!tmpend.fCreated && tmpend.fDeleted) || *tmpend.fName == 0) { + if ((!tmpend->fCreated && tmpend->fDeleted) || *tmpend->fName == 0) { break; } child -= sizeof(HEFS_INDEX_NODE_DIRECTORY); - if (child < root.fStartIND || child > root.fEndIND) break; + if (child < root->fStartIND || child > root->fEndIND) break; } - dirent.fColor = kHeFSRed; - dirent.fChild = child; + dirent->fColor = kHeFSRed; + dirent->fChild = child; - if (child > root.fEndIND) dirent.fChild = root.fEndIND; + if (child > root->fEndIND) dirent->fChild = root->fEndIND; } else { - dirent.fColor = tmpdir.fColor; - dirent.fChild = tmpdir.fChild; + dirent->fColor = tmpdir->fColor; + dirent->fChild = tmpdir->fChild; } for (SizeT index = 0UL; index < (kHeFSBlockCount * 2); index += 2) { - dirent.fIndexNode[index] = root.fStartIN; - dirent.fIndexNode[index + 1] = 0UL; + dirent->fIndexNode[index] = root->fStartIN; + dirent->fIndexNode[index + 1] = 0UL; } mnt->fPacket.fPacketLba = start; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); - mnt->fPacket.fPacketContent = &dirent; + mnt->fPacket.fPacketContent = dirent; mnt->fOutput(mnt->fPacket); err_global_get() = kErrorSuccess; + mm_delete_heap(dirent); + return YES; } hefsi_traverse_tree(tmpdir, start); - if (start > root.fEndIND) break; + if (start > root->fEndIND || start == 0) break; } err_global_get() = kErrorDisk; @@ -346,17 +370,18 @@ namespace Detail { return NO; } - STATIC _Output HEFS_INDEX_NODE_DIRECTORY - hefsi_fetch_index_node_directory(HEFS_BOOT_NODE root, DriveTrait* mnt, const Utf8Char* dir_name) { + STATIC _Output HEFS_INDEX_NODE_DIRECTORY* hefsi_fetch_index_node_directory( + HEFS_BOOT_NODE* root, DriveTrait* mnt, const Utf8Char* dir_name) { if (mnt) { - HEFS_INDEX_NODE_DIRECTORY dir; + HEFS_INDEX_NODE_DIRECTORY* dir = + (HEFS_INDEX_NODE_DIRECTORY*) RTL_ALLOCA(sizeof(HEFS_INDEX_NODE_DIRECTORY)); - auto start = root.fStartIND; + auto start = root->fStartIND; while (YES) { mnt->fPacket.fPacketLba = start; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); - mnt->fPacket.fPacketContent = &dir; + mnt->fPacket.fPacketContent = dir; mnt->fInput(mnt->fPacket); @@ -366,10 +391,10 @@ namespace Detail { return {}; } - if (dir.fKind == kHeFSFileKindDirectory) { - if (KStringBuilder::Equals(dir_name, dir.fName)) { + if (dir->fKind == kHeFSFileKindDirectory) { + if (KStringBuilder::Equals(dir_name, dir->fName)) { if (ke_calculate_crc32((Char*) &dir, sizeof(HEFS_INDEX_NODE_DIRECTORY)) != - dir.fChecksum) + dir->fChecksum) ke_panic(RUNTIME_CHECK_FILESYSTEM, "CRC32 failure on HeFS IND!"); err_global_get() = kErrorSuccess; @@ -378,7 +403,7 @@ namespace Detail { } hefsi_traverse_tree(dir, start); - if (start > root.fEndIND) break; + if (start > root->fEndIND || start == 0) break; } } @@ -394,7 +419,7 @@ namespace Detail { /// @param kind The kind of the file (regular, directory, block, character, FIFO, socket, symbolic /// link, unknown). STATIC ATTRIBUTE(unused) _Output HEFS_INDEX_NODE* hefsi_fetch_index_node( - HEFS_BOOT_NODE root, DriveTrait* mnt, const Utf8Char* dir_name, const Utf8Char* file_name, + HEFS_BOOT_NODE* root, DriveTrait* mnt, const Utf8Char* dir_name, const Utf8Char* file_name, UInt8 kind, SizeT* cnt) noexcept { if (mnt) { HEFS_INDEX_NODE* node_arr = new HEFS_INDEX_NODE[*cnt]; @@ -403,17 +428,18 @@ namespace Detail { return nullptr; } - HEFS_INDEX_NODE node; - HEFS_INDEX_NODE_DIRECTORY dir; + HEFS_INDEX_NODE* node = (HEFS_INDEX_NODE*) RTL_ALLOCA(sizeof(HEFS_INDEX_NODE)); + HEFS_INDEX_NODE_DIRECTORY* dir = + (HEFS_INDEX_NODE_DIRECTORY*) RTL_ALLOCA(sizeof(HEFS_INDEX_NODE_DIRECTORY)); - auto start = root.fStartIND; + auto start = root->fStartIND; auto start_cnt = 0UL; while (YES) { mnt->fPacket.fPacketLba = start; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); - mnt->fPacket.fPacketContent = &dir; + mnt->fPacket.fPacketContent = dir; mnt->fInput(mnt->fPacket); @@ -424,27 +450,27 @@ namespace Detail { return nullptr; } - if (dir.fKind == kHeFSFileKindDirectory) { - if (KStringBuilder::Equals(dir_name, dir.fName) || + if (dir->fKind == kHeFSFileKindDirectory) { + if (KStringBuilder::Equals(dir_name, dir->fName) || KStringBuilder::Equals(dir_name, kHeFSSearchAllStr)) { if (ke_calculate_crc32((Char*) &dir, sizeof(HEFS_INDEX_NODE_DIRECTORY)) != - dir.fChecksum) + dir->fChecksum) ke_panic(RUNTIME_CHECK_FILESYSTEM, "CRC32 failure on HeFS IND!"); for (SizeT inode_index = 0UL; inode_index < (kHeFSBlockCount * 2); inode_index += 2) { - if (dir.fIndexNode[inode_index] != 0) { - mnt->fPacket.fPacketLba = dir.fIndexNode[inode_index]; + if (dir->fIndexNode[inode_index] != 0) { + mnt->fPacket.fPacketLba = dir->fIndexNode[inode_index]; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE); - mnt->fPacket.fPacketContent = &node; + mnt->fPacket.fPacketContent = node; mnt->fInput(mnt->fPacket); if (mnt->fPacket.fPacketGood) { - if (ke_calculate_crc32((Char*) &node, sizeof(HEFS_INDEX_NODE)) != node.fChecksum) + if (ke_calculate_crc32((Char*) &node, sizeof(HEFS_INDEX_NODE)) != node->fChecksum) ke_panic(RUNTIME_CHECK_FILESYSTEM, "CRC32 failure on HeFS IND!"); - if (KStringBuilder::Equals(file_name, node.fName) && node.fKind == kind) { - node_arr[start_cnt] = node; + if (KStringBuilder::Equals(file_name, node->fName) && node->fKind == kind) { + node_arr[start_cnt] = *node; ++start_cnt; if (start_cnt > *cnt) { @@ -466,45 +492,46 @@ namespace Detail { } hefsi_traverse_tree(dir, start); - if (start > root.fEndIND) break; + if (start > root->fEndIND || start == 0) break; } } - kout << "Error: Failed to find index node.\r"; + kout << "Error: Failed to find index node->\r"; err_global_get() = kErrorFileNotFound; return nullptr; } - /// @brief Allocate a new index node. + /// @brief Allocate a new index node-> /// @param root The root node of the filesystem. /// @param mnt The drive to read from. /// @param parent_dir_name The name of the parent directory. /// @return Status, see err_global_get(). STATIC ATTRIBUTE(unused) _Output BOOL - hefsi_allocate_index_node(HEFS_BOOT_NODE root, DriveTrait* mnt, - const Utf8Char* parent_dir_name, HEFS_INDEX_NODE node) noexcept { + hefsi_allocate_index_node(HEFS_BOOT_NODE* root, DriveTrait* mnt, + const Utf8Char* parent_dir_name, HEFS_INDEX_NODE* node) noexcept { if (mnt) { - HEFS_INDEX_NODE_DIRECTORY dir; + HEFS_INDEX_NODE_DIRECTORY* dir = + (HEFS_INDEX_NODE_DIRECTORY*) RTL_ALLOCA(sizeof(HEFS_INDEX_NODE_DIRECTORY)); - auto start = root.fStartIND; + auto start = root->fStartIND; while (YES) { mnt->fPacket.fPacketLba = start; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); - mnt->fPacket.fPacketContent = &dir; + mnt->fPacket.fPacketContent = dir; mnt->fInput(mnt->fPacket); - if (KStringBuilder::Equals(dir.fName, parent_dir_name)) { + if (KStringBuilder::Equals(dir->fName, parent_dir_name)) { for (SizeT inode_index = 0UL; inode_index < (kHeFSBlockCount * 2); inode_index += 2) { - if (dir.fIndexNode[inode_index] != 0) { - auto lba = dir.fIndexNode[inode_index]; + if (dir->fIndexNode[inode_index] != 0) { + auto lba = dir->fIndexNode[inode_index]; mnt->fPacket.fPacketLba = lba; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE); - mnt->fPacket.fPacketContent = &node; + mnt->fPacket.fPacketContent = node; mnt->fOutput(mnt->fPacket); @@ -516,7 +543,7 @@ namespace Detail { } hefsi_traverse_tree(dir, start); - if (start > root.fEndIND) break; + if (start > root->fEndIND || start == 0) break; } return YES; @@ -530,17 +557,21 @@ namespace Detail { /// @param mnt The drive to read/write from. /// @return Status, see err_global_get(). STATIC ATTRIBUTE(unused) _Output BOOL - hefsi_balance_filesystem(HEFS_BOOT_NODE root, DriveTrait* mnt) { + hefsi_balance_filesystem(HEFS_BOOT_NODE* root, DriveTrait* mnt) { if (mnt) { - HEFS_INDEX_NODE_DIRECTORY dir; - HEFS_INDEX_NODE_DIRECTORY dir_parent; + HEFS_INDEX_NODE_DIRECTORY* dir = + (HEFS_INDEX_NODE_DIRECTORY*) RTL_ALLOCA(sizeof(HEFS_INDEX_NODE_DIRECTORY)); + HEFS_INDEX_NODE_DIRECTORY* dir_parent = + (HEFS_INDEX_NODE_DIRECTORY*) RTL_ALLOCA(sizeof(HEFS_INDEX_NODE_DIRECTORY)); - auto start = root.fStartIND; + auto start = root->fStartIND; while (YES) { + if (start == 0) break; + mnt->fPacket.fPacketLba = start; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); - mnt->fPacket.fPacketContent = &dir; + mnt->fPacket.fPacketContent = dir; mnt->fInput(mnt->fPacket); @@ -550,19 +581,19 @@ namespace Detail { return NO; } - if (start == root.fStartIND) { - dir.fColor = kHeFSBlack; + if (start == root->fStartIND) { + dir->fColor = kHeFSBlack; mnt->fPacket.fPacketLba = start; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); - mnt->fPacket.fPacketContent = &dir; + mnt->fPacket.fPacketContent = dir; mnt->fOutput(mnt->fPacket); } - mnt->fPacket.fPacketLba = dir.fParent; + mnt->fPacket.fPacketLba = dir->fParent; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); - mnt->fPacket.fPacketContent = &dir_parent; + mnt->fPacket.fPacketContent = dir_parent; mnt->fInput(mnt->fPacket); @@ -572,11 +603,12 @@ namespace Detail { return NO; } - HEFS_INDEX_NODE_DIRECTORY dir_uncle; + HEFS_INDEX_NODE_DIRECTORY* dir_uncle = + (HEFS_INDEX_NODE_DIRECTORY*) RTL_ALLOCA(sizeof(HEFS_INDEX_NODE_DIRECTORY)); - mnt->fPacket.fPacketLba = dir_parent.fNext; + mnt->fPacket.fPacketLba = dir_parent->fNext; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); - mnt->fPacket.fPacketContent = &dir_uncle; + mnt->fPacket.fPacketContent = dir_uncle; mnt->fInput(mnt->fPacket); @@ -586,19 +618,19 @@ namespace Detail { return NO; } - if (dir_uncle.fColor == kHeFSRed) { - dir_parent.fColor = kHeFSBlack; - dir_uncle.fColor = kHeFSBlack; + if (dir_uncle->fColor == kHeFSRed) { + dir_parent->fColor = kHeFSBlack; + dir_uncle->fColor = kHeFSBlack; - mnt->fPacket.fPacketLba = dir.fParent; + mnt->fPacket.fPacketLba = dir->fParent; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); - mnt->fPacket.fPacketContent = &dir_parent; + mnt->fPacket.fPacketContent = dir_parent; mnt->fOutput(mnt->fPacket); - mnt->fPacket.fPacketLba = dir_uncle.fParent; + mnt->fPacket.fPacketLba = dir_uncle->fParent; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); - mnt->fPacket.fPacketContent = &dir_uncle; + mnt->fPacket.fPacketContent = dir_uncle; mnt->fOutput(mnt->fPacket); @@ -608,26 +640,26 @@ namespace Detail { return NO; } - hefsi_traverse_tree(dir, start); + hefsi_traverse_tree(dir, start, YES); - if (start > root.fEndIND) break; + if (start > root->fEndIND || start == 0) break; continue; } else { - if (dir_parent.fNext == start) { + if (dir_parent->fNext == start) { hefsi_rotate_left(dir_parent, start, mnt); - hefsi_traverse_tree(dir_parent, start); + hefsi_traverse_tree(dir_parent, start, YES); - if (start > root.fEndIND) break; + if (start > root->fEndIND || start == 0) break; continue; } - dir_parent.fColor = kHeFSBlack; + dir_parent->fColor = kHeFSBlack; - mnt->fPacket.fPacketLba = dir.fParent; + mnt->fPacket.fPacketLba = dir->fParent; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); - mnt->fPacket.fPacketContent = &dir_parent; + mnt->fPacket.fPacketContent = dir_parent; mnt->fOutput(mnt->fPacket); @@ -640,8 +672,8 @@ namespace Detail { hefsi_rotate_right(dir, start, mnt); } - hefsi_traverse_tree(dir, start); - if (start > root.fEndIND) break; + hefsi_traverse_tree(dir, start, YES); + if (start > root->fEndIND || start == 0) break; } return YES; @@ -677,15 +709,15 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input if (drv_std_get_size() < kHeFSMinimumDiskSize) { err_global_get() = kErrorDiskIsTooTiny; - kout << "Error: Failed to allocate memory for boot node.\r"; + kout << "Error: Failed to allocate memory for boot node->\r"; return NO; } - HEFS_BOOT_NODE root; + HEFS_BOOT_NODE* root = (HEFS_BOOT_NODE*) RTL_ALLOCA(sizeof(HEFS_BOOT_NODE)); drive->fPacket.fPacketLba = drive->fLbaStart; drive->fPacket.fPacketSize = sizeof(HEFS_BOOT_NODE); - drive->fPacket.fPacketContent = &root; + drive->fPacket.fPacketContent = root; drive->fInput(drive->fPacket); @@ -697,7 +729,7 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input // Check if the disk is already formatted. - if (KStringBuilder::Equals(root.fMagic, kHeFSMagic) && root.fVersion == kHeFSVersion) { + if (KStringBuilder::Equals(root->fMagic, kHeFSMagic) && root->fVersion == kHeFSVersion) { err_global_get() = kErrorSuccess; return YES; @@ -706,8 +738,8 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input rt_copy_memory((VoidPtr) "fs/hefs-packet", drive->fPacket.fPacketMime, rt_string_len("fs/hefs-packet")); - urt_copy_memory((VoidPtr) part_name, root.fVolName, urt_string_len(part_name)); - rt_copy_memory((VoidPtr) kHeFSMagic, root.fMagic, kHeFSMagicLen - 1); + urt_copy_memory((VoidPtr) part_name, root->fVolName, urt_string_len(part_name) + 1); + rt_copy_memory((VoidPtr) kHeFSMagic, root->fMagic, kHeFSMagicLen - 1); if (drive->fLbaStart > drive->fLbaEnd) { err_global_get() = kErrorDiskIsCorrupted; @@ -715,58 +747,58 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input return NO; } - root.fBadSectors = 0; + root->fBadSectors = 0; - root.fSectorCount = drv_std_get_sector_count(); - root.fSectorSize = drive->fSectorSz; + root->fSectorCount = drv_std_get_sector_count(); + root->fSectorSize = drive->fSectorSz; - SizeT disk_sectors = drv_std_get_size() / root.fSectorSize; // Get total sectors + const SizeT max_lba = drive->fLbaEnd / root->fSectorSize; - SizeT dir_sectors = disk_sectors / 20; // 5% for directory metadata - SizeT inode_sectors = disk_sectors / 10; // 10% for inodes + const SizeT dir_max = max_lba / 20; // 5% for directory metadata + const SizeT inode_max = max_lba / 10; // 10% for inodes - root.fStartIND = drive->fLbaStart + kHeFSINDStartOffset; - root.fEndIND = root.fStartIND + dir_sectors; + root->fStartIND = drive->fLbaStart + kHeFSINDStartOffset; + root->fEndIND = root->fStartIND + dir_max; - root.fStartIN = root.fEndIND - kHeFSINDStartOffset; - root.fEndIN = root.fStartIN + inode_sectors; + root->fStartIN = root->fEndIND - kHeFSINDStartOffset; + root->fEndIN = root->fStartIN + inode_max; - constexpr SizeT kHeFSPreallocateCount = 0x7UL; + constexpr SizeT kHeFSPreallocateCount = 0x2UL; - root.fINDCount = kHeFSPreallocateCount; + root->fINDCount = kHeFSPreallocateCount; - root.fDiskSize = drv_std_get_size(); - root.fDiskStatus = kHeFSStatusUnlocked; + root->fDiskSize = drv_std_get_size(); + root->fDiskStatus = kHeFSStatusUnlocked; - root.fDiskFlags = flags; + root->fDiskFlags = flags; if (drive->fKind & kMassStorageDrive) { } else if (drive->fKind & kHeFSOpticalDrive) { - root.fDiskKind = kHeFSOpticalDrive; + root->fDiskKind = kHeFSOpticalDrive; } else { - root.fDiskKind = kHeFSUnknown; + root->fDiskKind = kHeFSUnknown; } - root.fReserved = 0; - root.fReserved1 = 0; + root->fReserved = 0; + root->fReserved1 = 0; - root.fVersion = kHeFSVersion; + root->fVersion = kHeFSVersion; - root.fVID = kHeFSInvalidVID; + root->fVID = kHeFSInvalidVID; - root.fChecksum = ke_calculate_crc32((Char*) &root, sizeof(HEFS_BOOT_NODE)); + root->fChecksum = ke_calculate_crc32((Char*) &root, sizeof(HEFS_BOOT_NODE)); drive->fPacket.fPacketLba = drive->fLbaStart; drive->fPacket.fPacketSize = sizeof(HEFS_BOOT_NODE); - drive->fPacket.fPacketContent = &root; + drive->fPacket.fPacketContent = root; drive->fOutput(drive->fPacket); (Void)(kout << "Drive kind: " << drive->fProtocol() << kendl); - (Void)(kout8 << u8"Partition name: " << root.fVolName << kendl8); - (Void)(kout << "Start IND: " << hex_number(root.fStartIND) << kendl); - (Void)(kout << "Number of catalogs: " << hex_number(root.fINDCount) << kendl); - (Void)(kout << "Sector size: " << hex_number(root.fSectorSize) << kendl); + (Void)(kout8 << u8"Partition name: " << root->fVolName << kendl8); + (Void)(kout << "Start IND: " << hex_number(root->fStartIND) << kendl); + (Void)(kout << "Number of IND: " << hex_number(root->fINDCount) << kendl); + (Void)(kout << "Sector size: " << hex_number(root->fSectorSize) << kendl); if (!drive->fPacket.fPacketGood) { err_global_get() = kErrorDiskIsCorrupted; @@ -774,40 +806,9 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input return NO; } - HEFS_INDEX_NODE_DIRECTORY dir; - - urt_copy_memory((VoidPtr) u8".deleted", dir.fName, urt_string_len(u8".deleted")); - - dir.fFlags = flags; - dir.fKind = kHeFSFileKindDirectory; - - dir.fCreated = 0; - dir.fDeleted = 1; /// TODO: Add current time. - - dir.fEntryCount = 0; - - dir.fIndexNodeChecksum = 0; - - dir.fUID = 0; - dir.fGID = 0; - dir.fMode = 0; - - dir.fColor = kHeFSBlack; - dir.fChild = 0; - dir.fParent = 0; - dir.fNext = 0; - dir.fPrev = 0; - - dir.fChecksum = ke_calculate_crc32((Char*) &dir, sizeof(HEFS_INDEX_NODE_DIRECTORY)); - - drive->fPacket.fPacketLba = root.fStartIND; - drive->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); - drive->fPacket.fPacketContent = &dir; - - drive->fOutput(drive->fPacket); - const Utf8Char* kFileMap[kHeFSPreallocateCount] = { - u8"/", u8"/boot", u8"/system", u8"/devices", u8"/network", u8"/users", u8"/home", + u8"/", + u8"/boot", }; for (SizeT i = 0; i < kHeFSPreallocateCount; ++i) { @@ -832,7 +833,7 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input /// @return If it was sucessful, see err_local_get(). _Output Bool HeFileSystemParser::CreateDirectory(_Input DriveTrait* drive, _Input const Int32 flags, const Utf8Char* dir) { - HEFS_BOOT_NODE root; + HEFS_BOOT_NODE* root = (HEFS_BOOT_NODE*) mm_new_heap(sizeof(HEFS_BOOT_NODE), Yes, No); kout << "CreateDirectory...\r"; @@ -841,11 +842,11 @@ _Output Bool HeFileSystemParser::CreateDirectory(_Input DriveTrait* drive, _Inpu drive->fPacket.fPacketLba = drive->fLbaStart; drive->fPacket.fPacketSize = sizeof(HEFS_BOOT_NODE); - drive->fPacket.fPacketContent = &root; + drive->fPacket.fPacketContent = root; drive->fInput(drive->fPacket); - if (!KStringBuilder::Equals(root.fMagic, kHeFSMagic) || root.fVersion != kHeFSVersion) { + if (!KStringBuilder::Equals(root->fMagic, kHeFSMagic) || root->fVersion != kHeFSVersion) { err_global_get() = kErrorDiskIsCorrupted; kout << "Invalid Boot Node, this can't continue!\r"; @@ -853,11 +854,20 @@ _Output Bool HeFileSystemParser::CreateDirectory(_Input DriveTrait* drive, _Inpu return NO; } - if (Detail::hefsi_allocate_index_directory_node(root, drive, dir, flags)) { - Detail::hefsi_balance_filesystem(root, drive); + auto name = new Utf8Char[urt_string_len(dir) + 1]; + + urt_copy_memory((VoidPtr) dir, name, urt_string_len(dir) + 1); + + if (Detail::hefsi_allocate_index_directory_node(root, drive, name, flags)) { + mm_delete_heap((VoidPtr) root); + delete[] name; return YES; } + mm_delete_heap((VoidPtr) root); + + delete[] name; + return NO; } @@ -874,8 +884,8 @@ _Output Bool HeFileSystemParser::CreateFile(_Input DriveTrait* drive, _Input con NE_UNUSED(dir); NE_UNUSED(name); - HEFS_BOOT_NODE root; - HEFS_INDEX_NODE node; + HEFS_INDEX_NODE* node = (HEFS_INDEX_NODE*) RTL_ALLOCA(sizeof(HEFS_INDEX_NODE)); + HEFS_BOOT_NODE* root = (HEFS_BOOT_NODE*) RTL_ALLOCA(sizeof(HEFS_BOOT_NODE)); kout << "CreateFile...\r"; @@ -884,7 +894,7 @@ _Output Bool HeFileSystemParser::CreateFile(_Input DriveTrait* drive, _Input con drive->fPacket.fPacketLba = drive->fLbaStart; drive->fPacket.fPacketSize = sizeof(HEFS_BOOT_NODE); - drive->fPacket.fPacketContent = &root; + drive->fPacket.fPacketContent = root; drive->fInput(drive->fPacket); @@ -896,23 +906,21 @@ _Output Bool HeFileSystemParser::CreateFile(_Input DriveTrait* drive, _Input con return NO; } - node.fAccessed = 0; - node.fCreated = 1UL; - node.fDeleted = 0; - node.fModified = 0; - node.fSize = 0; - node.fKind = kHeFSFileKindRegular; - node.fFlags = flags; - node.fChecksum = 0; - node.fChecksum = ke_calculate_crc32((Char*) &node, sizeof(HEFS_INDEX_NODE)); - node.fGID = 0; - node.fUID = 0; + node->fAccessed = 0; + node->fCreated = 1UL; + node->fDeleted = 0; + node->fModified = 0; + node->fSize = 0; + node->fKind = kHeFSFileKindRegular; + node->fFlags = flags; + node->fChecksum = 0; + node->fChecksum = ke_calculate_crc32((Char*) &node, sizeof(HEFS_INDEX_NODE)); + node->fGID = 0; + node->fUID = 0; - urt_copy_memory((VoidPtr) name, node.fName, urt_string_len(name)); + urt_copy_memory((VoidPtr) name, node->fName, urt_string_len(name) + 1); if (Detail::hefsi_allocate_index_node(root, drive, dir, node)) { - Detail::hefsi_balance_filesystem(root, drive); - return YES; } @@ -935,8 +943,6 @@ Boolean fs_init_hefs(Void) noexcept { parser.Format(&kMountPoint, kHeFSEncodingUTF8, kHeFSDefaultVoluneName); - parser.CreateFile(&kMountPoint, kHeFSEncodingUTF8, u8"/", u8"bootnet.efi"); - return YES; } } // namespace Kernel::HeFS diff --git a/tooling/fsck.hefs.cc b/tooling/fsck.hefs.cc index d566e2a6..05cf0660 100644 --- a/tooling/fsck.hefs.cc +++ b/tooling/fsck.hefs.cc @@ -8,8 +8,8 @@ #include int main(int argc, char** argv) { - (void)(argc); - (void)(argv); + (void) (argc); + (void) (argv); - return EXIT_FAILURE; + return EXIT_FAILURE; } \ No newline at end of file -- cgit v1.2.3 From b3b4b1ebdcd6adeac914869017c86d892b7a8ced Mon Sep 17 00:00:00 2001 From: Amlal Date: Fri, 2 May 2025 18:49:49 +0200 Subject: kernel: HeFS: disk security improvements and new CreateFile and DeleteFile method on FSParser class. Signed-off-by: Amlal --- dev/boot/BootKit/BootKit.h | 2 +- dev/kernel/FSKit/HeFS.h | 11 +- dev/kernel/src/DriveMgr.cc | 6 ++ dev/kernel/src/FS/HeFS.cc | 253 +++++++++++++++++++++++++++++---------------- dev/kernel/src/UtfUtils.cc | 2 - 5 files changed, 182 insertions(+), 92 deletions(-) (limited to 'dev/kernel/src/DriveMgr.cc') diff --git a/dev/boot/BootKit/BootKit.h b/dev/boot/BootKit/BootKit.h index 3f871b9a..181be973 100644 --- a/dev/boot/BootKit/BootKit.h +++ b/dev/boot/BootKit/BootKit.h @@ -259,7 +259,7 @@ inline Boolean BDiskFormatFactory::Format(const Char* part_name) { #if defined(BOOTZ_EPM_SUPPORT) EPM_PART_BLOCK* epm_boot = (EPM_PART_BLOCK*) RTL_ALLOCA(sizeof(EPM_PART_BLOCK)); - const auto kFsName = "HeFS"; + const auto kFsName = "NeKernel"; const auto kBlockName = "OS (EPM)"; epm_boot->FsVersion = 0; diff --git a/dev/kernel/FSKit/HeFS.h b/dev/kernel/FSKit/HeFS.h index 8723cd86..c9a48f71 100644 --- a/dev/kernel/FSKit/HeFS.h +++ b/dev/kernel/FSKit/HeFS.h @@ -28,7 +28,7 @@ #define kHeFSDefaultVoluneName u8"HeFS Volume" -#define kHeFSINDStartOffset (sizeof(HEFS_INDEX_NODE_DIRECTORY)) +#define kHeFSINDStartOffset (sizeof(HEFS_INDEX_NODE_DIRECTORY) + sizeof(HEFS_BOOT_NODE)) #define kHeFSSearchAllStr u8"*" @@ -366,9 +366,16 @@ class HeFileSystemParser final { const Utf8Char* dir, const Utf8Char* parent_dir); _Output Bool CreateFile(_Input DriveTrait* drive, _Input const Int32 flags, const Utf8Char* dir, - const Utf8Char* namespase, const Utf8Char* name); + const Utf8Char* parent_dir_fmt, const Utf8Char* name); + + _Output Bool DeleteFile(_Input DriveTrait* drive, _Input const Int32 flags, const Utf8Char* dir, + const Utf8Char* parent_dir_fmt, const Utf8Char* name); private: + _Output Bool FileCtl_(_Input DriveTrait* drive, _Input const Int32 flags, const Utf8Char* dir, + const Utf8Char* parent_dir_fmt, const Utf8Char* name, + const BOOL delete_or_create); + _Output Bool DirectoryCtl_(_Input DriveTrait* drive, _Input const Int32 flags, const Utf8Char* dir, const Utf8Char* parent, const BOOL delete_or_create); diff --git a/dev/kernel/src/DriveMgr.cc b/dev/kernel/src/DriveMgr.cc index 37c8b439..f26890b5 100644 --- a/dev/kernel/src/DriveMgr.cc +++ b/dev/kernel/src/DriveMgr.cc @@ -51,6 +51,12 @@ Void io_drv_output(DriveTrait::DrivePacket& pckt) { return; } + // nothing starts before 512 anyways, even an EPM partition. + if (!pckt.fPacketReadOnly && pckt.fPacketLba == 0) { + pckt.fPacketGood = NO; + return; + } + #ifdef __AHCI__ drv_std_write(pckt.fPacketLba, (Char*) pckt.fPacketContent, kAHCISectorSize, pckt.fPacketSize); diff --git a/dev/kernel/src/FS/HeFS.cc b/dev/kernel/src/FS/HeFS.cc index 2ae41331..ca655b8b 100644 --- a/dev/kernel/src/FS/HeFS.cc +++ b/dev/kernel/src/FS/HeFS.cc @@ -30,7 +30,7 @@ namespace Detail { /// @internal Internal filesystem use only. STATIC ATTRIBUTE(unused) _Output Void hefsi_traverse_tree(HEFS_INDEX_NODE_DIRECTORY* dir, DriveTrait* mnt, const Lba& start_ind, - Lba& start, const BOOL alloc_in_mind = NO); + Lba& start, const BOOL try_new = NO); /// @brief Get the index node of a file or directory. /// @param root The root node of the filesystem. @@ -60,8 +60,8 @@ namespace Detail { /// @param parent_dir_name The name of the parent directory. /// @return Status, see err_global_get(). STATIC ATTRIBUTE(unused) _Output BOOL - hefsi_allocate_index_node(HEFS_BOOT_NODE* root, DriveTrait* mnt, - const Utf8Char* parent_dir_name, HEFS_INDEX_NODE* node) noexcept; + hefsi_update_in_status(HEFS_BOOT_NODE* root, DriveTrait* mnt, const Utf8Char* parent_dir_name, + HEFS_INDEX_NODE* node, const BOOL create_or_delete) noexcept; /// @brief Balance RB-Tree of the filesystem. /// @param root The root node of the filesystem. @@ -76,7 +76,7 @@ namespace Detail { /// @internal Internal filesystem use only. STATIC ATTRIBUTE(unused) Void hefsi_traverse_tree(HEFS_INDEX_NODE_DIRECTORY* dir, DriveTrait* mnt, const Lba& ind_start, - Lba& start, const BOOL alloc_in_mind) { + Lba& start, const BOOL try_new) { if (!mnt || !dir) return; BOOL check_is_good = NO; @@ -89,7 +89,7 @@ namespace Detail { if (!mnt->fPacket.fPacketGood) break; - if (*dir->fName != 0 && alloc_in_mind) break; + if (*dir->fName != 0 && try_new) break; if (dir->fNext != 0) { if (check_is_good) break; @@ -118,7 +118,7 @@ namespace Detail { check_is_good = YES; continue; } else { - if (!alloc_in_mind) break; + if (!try_new) break; if (start == 0) { start = ind_start; @@ -131,7 +131,8 @@ namespace Detail { } } - if (*dir->fName != 0 && alloc_in_mind) start += sizeof(HEFS_INDEX_NODE_DIRECTORY); + if (*dir->fName != 0 && try_new) start += sizeof(HEFS_INDEX_NODE_DIRECTORY); + if (start == 0) start = ind_start; (Void)(kout << "LBA_" << number(start) << kendl); } @@ -447,9 +448,8 @@ namespace Detail { if (child > root->fEndIND) dirent->fChild = root->fStartIND; } - for (SizeT index = 0UL; index < (kHeFSSliceCount * 2); index += 2) { - dirent->fIndexNode[index] = root->fStartIN; - dirent->fIndexNode[index + 1] = 0UL; + for (SizeT index = 0UL; index < kHeFSSliceCount; ++index) { + dirent->fIndexNode[index] = 0; } dirent->fChecksum = ke_calculate_crc32((Char*) dirent, sizeof(HEFS_INDEX_NODE_DIRECTORY)); @@ -495,51 +495,6 @@ namespace Detail { return NO; } - /// @brief Fetch IND from boot node. - /// @param root The root node of the filesystem. - /// @param mnt The drive to read from. - /// @param dir_name The name of the directory. - STATIC _Output HEFS_INDEX_NODE_DIRECTORY* hefsi_fetch_ind(HEFS_BOOT_NODE* root, DriveTrait* mnt, - const Utf8Char* dir_name) { - if (mnt) { - HEFS_INDEX_NODE_DIRECTORY* dir = - (HEFS_INDEX_NODE_DIRECTORY*) RTL_ALLOCA(sizeof(HEFS_INDEX_NODE_DIRECTORY)); - - auto start = root->fStartIND; - - while (YES) { - mnt->fPacket.fPacketLba = start; - mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); - mnt->fPacket.fPacketContent = dir; - - mnt->fInput(mnt->fPacket); - - if (!mnt->fPacket.fPacketGood) { - err_global_get() = kErrorFileNotFound; - - return {}; - } - - if (dir->fKind == kHeFSFileKindDirectory) { - if (KStringBuilder::Equals(dir_name, dir->fName)) { - if (ke_calculate_crc32((Char*) dir, sizeof(HEFS_INDEX_NODE_DIRECTORY)) != - dir->fChecksum) - ke_panic(RUNTIME_CHECK_FILESYSTEM, "CRC32 failure on HeFS IND!"); - - err_global_get() = kErrorSuccess; - return dir; - } - } - - hefsi_traverse_tree(dir, mnt, root->fStartIND, start); - if (start > root->fEndIND || start == 0) break; - } - } - - err_global_get() = kErrorFileNotFound; - return {}; - } - /// @brief Get the index node of a file or directory. /// @param root The root node of the filesystem. /// @param mnt The drive to read from. @@ -586,14 +541,8 @@ namespace Detail { dir->fChecksum) ke_panic(RUNTIME_CHECK_FILESYSTEM, "CRC32 failure on HeFS IND!"); - for (SizeT inode_index = 0UL; inode_index < (kHeFSSliceCount * 2); inode_index += 2) { + for (SizeT inode_index = 0UL; inode_index < kHeFSSliceCount; ++inode_index) { if (dir->fIndexNode[inode_index] != 0) { - mnt->fPacket.fPacketLba = dir->fIndexNode[inode_index]; - mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE); - mnt->fPacket.fPacketContent = node; - - mnt->fInput(mnt->fPacket); - if (mnt->fPacket.fPacketGood) { if (ke_calculate_crc32((Char*) node, sizeof(HEFS_INDEX_NODE)) != node->fChecksum) ke_panic(RUNTIME_CHECK_FILESYSTEM, "CRC32 failure on HeFS IND!"); @@ -620,7 +569,7 @@ namespace Detail { } } - hefsi_traverse_tree(dir, mnt, root->fStartIND, start); + hefsi_traverse_tree(dir, mnt, root->fStartIND, start, YES); if (start > root->fEndIND || start == 0) break; } } @@ -632,19 +581,28 @@ namespace Detail { return nullptr; } - /// @brief Allocate a new index node-> + /// @brief Allocate a new index node. /// @param root The root node of the filesystem. /// @param mnt The drive to read from. /// @param parent_dir_name The name of the parent directory. /// @return Status, see err_global_get(). STATIC ATTRIBUTE(unused) _Output BOOL - hefsi_allocate_index_node(HEFS_BOOT_NODE* root, DriveTrait* mnt, - const Utf8Char* parent_dir_name, HEFS_INDEX_NODE* node) noexcept { + hefsi_update_in_status(HEFS_BOOT_NODE* root, DriveTrait* mnt, const Utf8Char* parent_dir_name, + HEFS_INDEX_NODE* node, BOOL delete_or_create) noexcept { + if (!root) return NO; + + auto start = root->fStartIND; + + if (start >= root->fEndIND) return NO; + if (root->fStartIN > root->fEndIN) return NO; + if (mnt) { HEFS_INDEX_NODE_DIRECTORY* dir = - (HEFS_INDEX_NODE_DIRECTORY*) RTL_ALLOCA(sizeof(HEFS_INDEX_NODE_DIRECTORY)); + (HEFS_INDEX_NODE_DIRECTORY*) mm_new_heap(sizeof(HEFS_INDEX_NODE_DIRECTORY), Yes, No); - auto start = root->fStartIND; + Utf8Char file_name[kHeFSFileNameLen] = {0}; + + urt_copy_memory(node->fName, file_name, urt_string_len(node->fName) + 1); while (YES) { mnt->fPacket.fPacketLba = start; @@ -654,30 +612,105 @@ namespace Detail { mnt->fInput(mnt->fPacket); if (KStringBuilder::Equals(dir->fName, parent_dir_name)) { - for (SizeT inode_index = 0UL; inode_index < (kHeFSSliceCount * 2); inode_index += 2) { - if (dir->fIndexNode[inode_index] != 0) { + for (SizeT inode_index = 0UL; inode_index < kHeFSSliceCount; ++inode_index) { + if (dir->fIndexNode[inode_index] == 0 && !delete_or_create) { + dir->fIndexNode[inode_index] = root->fStartIN; + + ++dir->fEntryCount; + + root->fStartIN += sizeof(HEFS_INDEX_NODE); + + mnt->fPacket.fPacketLba = mnt->fLbaStart; + mnt->fPacket.fPacketSize = sizeof(HEFS_BOOT_NODE); + mnt->fPacket.fPacketContent = root; + + mnt->fOutput(mnt->fPacket); + + dir->fChecksum = ke_calculate_crc32((Char*) dir, sizeof(HEFS_INDEX_NODE_DIRECTORY)); + + mnt->fPacket.fPacketLba = start; + mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); + mnt->fPacket.fPacketContent = dir; + + mnt->fOutput(mnt->fPacket); + + auto lba = dir->fIndexNode[inode_index]; + + mnt->fPacket.fPacketLba = lba; + mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE); + mnt->fPacket.fPacketContent = node; + + mnt->fOutput(mnt->fPacket); + + mm_delete_heap(dir); + + if (mnt->fPacket.fPacketGood) { + return YES; + } + + return NO; + } else if (dir->fIndexNode[inode_index] != 0 && delete_or_create) { auto lba = dir->fIndexNode[inode_index]; + HEFS_INDEX_NODE tmp_node{}; + + mnt->fPacket.fPacketLba = lba; + mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE); + mnt->fPacket.fPacketContent = &tmp_node; + + mnt->fInput(mnt->fPacket); + + if (!KStringBuilder::Equals(tmp_node.fName, file_name)) { + continue; + } + + root->fStartIN -= sizeof(HEFS_INDEX_NODE); + + mnt->fPacket.fPacketLba = mnt->fLbaStart; + mnt->fPacket.fPacketSize = sizeof(HEFS_BOOT_NODE); + mnt->fPacket.fPacketContent = root; + + mnt->fOutput(mnt->fPacket); + mnt->fPacket.fPacketLba = lba; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE); mnt->fPacket.fPacketContent = node; mnt->fOutput(mnt->fPacket); + dir->fIndexNode[inode_index] = 0; + + if (dir->fEntryCount) --dir->fEntryCount; + + dir->fChecksum = ke_calculate_crc32((Char*) dir, sizeof(HEFS_INDEX_NODE_DIRECTORY)); + + mnt->fPacket.fPacketLba = start; + mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); + mnt->fPacket.fPacketContent = dir; + + mnt->fOutput(mnt->fPacket); + + mm_delete_heap(dir); + if (mnt->fPacket.fPacketGood) { return YES; } + + return NO; } } } - hefsi_traverse_tree(dir, mnt, root->fStartIND, start); + hefsi_traverse_tree(dir, mnt, root->fStartIND, start, YES); if (start > root->fEndIND || start == 0) break; } - return YES; + mm_delete_heap(dir); + err_global_get() = kErrorFileNotFound; + return NO; } + err_global_get() = kErrorDiskIsFull; return NO; } @@ -770,6 +803,11 @@ namespace Detail { parent_dir_fmt->fChecksum = ke_calculate_crc32((Char*) parent_dir_fmt, sizeof(HEFS_INDEX_NODE_DIRECTORY)); + if (dir->fParent == 0) { + hefsi_traverse_tree(dir, mnt, root->fStartIND, start, YES); + continue; + } + mnt->fPacket.fPacketLba = dir->fParent; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); mnt->fPacket.fPacketContent = parent_dir_fmt; @@ -784,7 +822,7 @@ namespace Detail { hefsi_rotate_tree(start, mnt, NO); - hefsi_traverse_tree(dir, mnt, root->fStartIND, start); + hefsi_traverse_tree(dir, mnt, root->fStartIND, start, YES); if (start > root->fEndIND || start == 0) break; } @@ -874,12 +912,12 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input const SizeT max_lba = drive->fLbaEnd / root->fSectorSize; const SizeT dir_max = max_lba / 20; // 20% for directory metadata - const SizeT inode_max = max_lba / 10; // 10% for inodes + const SizeT inode_max = max_lba / 20; // 10% for inodes - root->fStartIND = drive->fLbaStart + kHeFSINDStartOffset + sizeof(HEFS_BOOT_NODE); + root->fStartIND = drive->fLbaStart + kHeFSINDStartOffset; root->fEndIND = root->fStartIND + dir_max; - root->fStartIN = root->fEndIND + kHeFSINDStartOffset; + root->fStartIN = root->fEndIND + sizeof(HEFS_INDEX_NODE_DIRECTORY); root->fEndIN = root->fStartIN + inode_max; constexpr SizeT kHeFSPreallocateCount = 0x7UL; @@ -970,6 +1008,15 @@ _Output Bool HeFileSystemParser::DirectoryCtl_(_Input DriveTrait* drive, _Input return NO; } + if (KStringBuilder::Equals(dir, kHeFSSearchAllStr) || + KStringBuilder::Equals(parent_dir, kHeFSSearchAllStr)) { + kout << "Error: Invalid directory name.\r"; + + err_global_get() = kErrorInvalidData; + + return NO; + } + if (Detail::hefsi_update_ind_status(root, drive, dir, parent_dir, flags, delete_or_create)) { // todo: make it smarter for high-throughput. Detail::hefsi_balance_ind(root, drive); @@ -994,19 +1041,36 @@ _Output Bool HeFileSystemParser::CreateDirectory(_Input DriveTrait* drive, _Inpu return this->DirectoryCtl_(drive, flags, dir, parent_dir_fmt, NO); } +_Output Bool HeFileSystemParser::DeleteFile(_Input DriveTrait* drive, _Input const Int32 flags, + const Utf8Char* dir, const Utf8Char* parent_dir_fmt, + const Utf8Char* name) { + return this->FileCtl_(drive, flags, dir, parent_dir_fmt, name, YES); +} + +_Output Bool HeFileSystemParser::CreateFile(_Input DriveTrait* drive, _Input const Int32 flags, + const Utf8Char* dir, const Utf8Char* parent_dir_fmt, + const Utf8Char* name) { + return this->FileCtl_(drive, flags, dir, parent_dir_fmt, name, NO); +} + /// @brief Create a new file on the disk. /// @param drive The drive to write on. /// @param flags The flags to use. /// @param dir The directory to create the file in. /// @param name The name of the file. /// @return If it was sucessful, see err_local_get(). -_Output Bool HeFileSystemParser::CreateFile(_Input DriveTrait* drive, _Input const Int32 flags, - const Utf8Char* dir, const Utf8Char* parent_dir_fmt, - const Utf8Char* name) { +_Output Bool HeFileSystemParser::FileCtl_(_Input DriveTrait* drive, _Input const Int32 flags, + const Utf8Char* dir, const Utf8Char* parent_dir_fmt, + const Utf8Char* name, const BOOL delete_or_create) { NE_UNUSED(parent_dir_fmt); - HEFS_INDEX_NODE* node = (HEFS_INDEX_NODE*) RTL_ALLOCA(sizeof(HEFS_INDEX_NODE)); - HEFS_BOOT_NODE* root = (HEFS_BOOT_NODE*) RTL_ALLOCA(sizeof(HEFS_BOOT_NODE)); + HEFS_INDEX_NODE* node = (HEFS_INDEX_NODE*) mm_new_heap(sizeof(HEFS_INDEX_NODE), Yes, No); + + rt_set_memory(node, 0, sizeof(HEFS_INDEX_NODE)); + + HEFS_BOOT_NODE* root = (HEFS_BOOT_NODE*) RTL_ALLOCA(sizeof(HEFS_BOOT_NODE)); + + MUST_PASS(root && node); rt_copy_memory((VoidPtr) "fs/hefs-packet", drive->fPacket.fPacketMime, rt_string_len("fs/hefs-packet")); @@ -1017,17 +1081,24 @@ _Output Bool HeFileSystemParser::CreateFile(_Input DriveTrait* drive, _Input con drive->fInput(drive->fPacket); - if (!Detail::hefsi_fetch_ind(root, drive, dir)->fCreated) return NO; - if (KStringBuilder::Equals(name, kHeFSSearchAllStr)) { kout << "Error: Invalid file name.\r"; + err_global_get() = kErrorInvalidData; + return NO; + } + + if (KStringBuilder::Equals(dir, kHeFSSearchAllStr) || + KStringBuilder::Equals(parent_dir_fmt, kHeFSSearchAllStr)) { + kout << "Error: Invalid directory name.\r"; + + err_global_get() = kErrorInvalidData; return NO; } node->fAccessed = 0; - node->fCreated = 1UL; - node->fDeleted = 0; + node->fCreated = delete_or_create ? 0UL : 1UL; + node->fDeleted = delete_or_create ? 1UL : 0UL; node->fModified = 0; node->fSize = 0; node->fKind = kHeFSFileKindRegular; @@ -1039,10 +1110,16 @@ _Output Bool HeFileSystemParser::CreateFile(_Input DriveTrait* drive, _Input con urt_copy_memory((VoidPtr) name, node->fName, urt_string_len(name) + 1); - if (Detail::hefsi_allocate_index_node(root, drive, dir, node)) { + if (Detail::hefsi_update_in_status(root, drive, dir, node, delete_or_create)) { + mm_delete_heap((VoidPtr) node); + + Detail::hefsi_balance_ind(root, drive); + err_global_get() = kErrorSuccess; return YES; } + mm_delete_heap((VoidPtr) node); + err_global_get() = kErrorDirectoryNotFound; return NO; } @@ -1061,7 +1138,9 @@ Boolean fs_init_hefs(Void) noexcept { HeFileSystemParser parser; parser.Format(&kMountPoint, kHeFSEncodingUTF8, kHeFSDefaultVoluneName); - + + parser.CreateFile(&kMountPoint, kHeFSEncodingBinary, u8"vm", u8"/", u8"pagefile.sys"); + return YES; } } // namespace Kernel::HeFS diff --git a/dev/kernel/src/UtfUtils.cc b/dev/kernel/src/UtfUtils.cc index db1dfaf4..8486f59d 100644 --- a/dev/kernel/src/UtfUtils.cc +++ b/dev/kernel/src/UtfUtils.cc @@ -26,8 +26,6 @@ Int urt_copy_memory(const voidPtr src, voidPtr dst, Size len) { ++index; } - dstChar[index] = 0; - return index; } } // namespace Kernel \ No newline at end of file -- cgit v1.2.3