extfs driver fixes

.gitignore

@@ -8,9 +8,9 @@
 /dependencies/uACPI
 /dependencies/uHDA
 /dependencies/flanterm/
-/dependencies/freebsd-e1000/
-/dependencies/include/
 /dependencies/freebsd-e1000
+/dependencies/limine
+/dependencies/include/
 /dependencies/needs_download.cmake
 /qemu_log.txt
 /tar

CMakeLists.txt

@@ -19,6 +19,7 @@ option (OBOS_LAZY_IRQL "Enables lazy IRQL. Recommended if the main target of the
 option (OBOS_USE_OBOS_GCC "Uses arch-obos-gcc instead of obos-elf-gcc. Ignored if OBOS_USE_CLANG is true.")
 option (OBOS_COMPILE_USER_UTILS "Compiles user examples" ${OBOS_USE_OBOS_GCC})
 option (OBOS_ONLY_COMPILE_USER_UTILS "Only compile user utilities" OFF)
+option (OBOS_USE_LIMINE "Use Limine instead of Hyper on supported architectures" OFF)
 option (OBOS_ENABLE_UHDA "Whether to include uHDA" ON)
 
 set (OBOS_LAZY_IRQL OFF)
@@ -87,6 +88,10 @@ if (OBOS_REFRESH_DEPENDENCIES)
 		message("Fetching Hyper.")
 		include("dependencies/hyper.cmake")
 	endif()
+	if (OBOS_USE_LIMINE)
+		message("Fetching Limine.")
+		include("dependencies/limine.cmake")
+	endif()
 	message("Fetching uACPI.")
 	include ("dependencies/uacpi.cmake")
 	message("Fetching flanterm.")
@@ -105,6 +110,9 @@ else()
 	if (NOT EXISTS hyper_install AND OBOS_ARCHITECTURE STREQUAL "x86_64")
 		include("dependencies/hyper.cmake")
 	endif()
+	if (OBOS_USE_LIMINE AND NOT EXISTS limine_exe)
+		include("dependencies/limine.cmake")
+	endif()
 	if (NOT EXISTS uacpi_cmake_file)
         include("dependencies/uacpi.cmake")
 	endif()
@@ -129,7 +137,14 @@ if (OBOS_LAZY_IRQL)
 else()
 	set (OBOS_LAZY_IRQL "0")
 endif()
+
 add_compile_definitions(OBOS_LAZY_IRQL=${OBOS_LAZY_IRQL})
+if (OBOS_USE_LIMINE)
+	set (OBOS_USE_LIMINE "1")
+else()
+	set (OBOS_USE_LIMINE "0")
+endif()
+add_compile_definitions(OBOS_USE_LIMINE=${OBOS_USE_LIMINE})
 
 if (OBOS_ENABLE_LOCK_PROFILING)
 	set (OBOS_ENABLE_LOCK_PROFILING "1")

README.md

@@ -1,8 +1,7 @@
 # OBOS
 OBOS uses ***✨ state of the art technology ✨*** to do ***✨  almost nothing ✨***
 ## Downloads
-- ISO Downloads can currently be found at http://obos-dev.ddns.net/images/
-- An XBPS binary package repository exists at http://obos-dev.ddns.net/current for x86_64-obos **only**.
+- The obos file server can be found at http://obos-dev.ddns.net/
 ## Building
 ### Prerequisites
 - (For an x86-64 build) NASM
@@ -63,9 +62,6 @@ call launch_qemu.bat
 - x86_64-obos: Working, not all ported programs work
 - m68k-obos: Userspace is unstable, but the port works otherwise
 - For information on ported programs, go to the obos-pkgs repository
-## Credits
-- My friend [@LemurLord16](https://github.com/LemurLord16) (@sigsbeedrive on discord) for listening to me yap about new features.
-- My cousin Ali because why not.
 ## License Notice
 Most code in this repository is licensed under the MIT license.<br>
 Any code from other projects that require a license notice will be put below.

config/hyper.cfg

@@ -28,3 +28,7 @@ module:
 	type="memory"
 	name="FLANTERM_BUFF"
 	size=16777216
+module:
+	type="memory"
+	name="BUMP_REGION"
+	size=16777216

config/limine.conf

@@ -0,0 +1,32 @@
+timeout: 5
+
+/OBOS
+    protocol: limine
+    comment: OBOS
+
+    paging_mode: 4level
+    module_path: boot():/obos/initrd.tar
+    module_string: initrd
+    module_path: boot():/obos/initrd
+    module_string: initrd_driver
+    module_path: boot():/obos/flanterm_buff
+    module_string: FLANTERM_BUFF
+    module_path: boot():/obos/flanterm_buff
+    module_string: BUMP_REGION
+    path: boot():/obos/oboskrnl
+    cmdline: initrd-module=initrd initrd-driver-module=initrd_driver root-fs-partid initrd load-modules=/libps2,/extfs initial-swap-size=67108864 log-level=1 init-args /usr/bin/bash --login
+/OBOS (Login)
+    protocol: limine
+    comment: OBOS (Login Prompt)
+
+    paging_mode: 4level
+    module_path: boot():/obos/initrd.tar
+    module_string: initrd
+    module_path: boot():/obos/initrd
+    module_string: initrd_driver
+    module_path: boot():/obos/flanterm_buff
+    module_string: FLANTERM_BUFF
+    module_path: boot():/obos/flanterm_buff
+    module_string: BUMP_REGION
+    path: boot():/obos/oboskrnl
+    cmdline: initrd-module=initrd initrd-driver-module=initrd_driver root-fs-partid initrd load-modules=/libps2,/extfs initial-swap-size=67108864 log-level=1 init-args /usr/bin/bash --login -c login

dependencies/limine.cmake

@@ -0,0 +1,26 @@
+# dependencies/limine.cmake
+
+# Copyright (c) 2025 Omar Berrow
+
+include(FetchContent)
+
+if (OBOS_REFRESH_DEPENDENCIES)
+    FetchContent_Declare(Limine
+	    GIT_REPOSITORY https://github.com/limine-bootloader/limine.git
+    	GIT_TAG v10.3.0-binary
+	    SOURCE_DIR ${CMAKE_SOURCE_DIR}/dependencies/limine
+    )
+    FetchContent_MakeAvailable(Limine)
+    file (COPY_FILE "${CMAKE_SOURCE_DIR}/dependencies/limine/limine.h" "${CMAKE_SOURCE_DIR}/dependencies/include/limine.h")
+endif()
+if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
+    execute_process(
+        COMMAND "make"
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/dependencies/limine
+        )
+        set (limine_exe ${CMAKE_SOURCE_DIR}/dependencies/limine/limine CACHE INTERNAL "x")
+    # elseif (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_HOST_SYSTEM_NAME STREQUAL "MSYS")
+    #     set (limine_exe ${CMAKE_SOURCE_DIR}/dependencies/limine/limine.exe CACHE INTERNAL "x")
+else()
+	message(FATAL_ERROR "You must be on to compile OBOS with Limine.")
+endif()

dependencies/uacpi.cmake

@@ -9,7 +9,7 @@ if (OBOS_REFRESH_DEPENDENCIES)
 		# In honor of the old uACPI link
 		#GIT_REPOSITORY https://github.com/UltraOS/uACPI.git
 		GIT_REPOSITORY https://github.com/uACPI/uACPI.git
-		GIT_TAG 3.0.0
+		GIT_TAG 3.2.0
 		SOURCE_DIR ${CMAKE_SOURCE_DIR}/dependencies/uACPI
 	)
 	FetchContent_MakeAvailable(uACPI)

scripts/launch_qemu.sh

@@ -13,7 +13,6 @@ qemu-system-x86_64 \
 -debugcon file:/dev/stdout \
 -monitor stdio \
 -serial tcp:0.0.0.0:1534,server,nowait \
--smp cores=1,threads=1,sockets=1 \
 -d int \
 -D qemu_log.txt "$@"
 

scripts/launch_qemu.tcg.sh

@@ -0,0 +1,26 @@
+cd ../
+
+rm qemu_log.txt
+
+echo $@
+qemu-system-x86_64 \
+-drive format=raw,file=out/obos.iso,media=disk,index=0 \
+-m 2G \
+-gdb tcp:0.0.0.0:1234 -S \
+-M q35 \
+-cpu Haswell \
+-accel tcg \
+-debugcon file:/dev/stdout \
+-monitor stdio \
+-serial tcp:0.0.0.0:1534,server,nowait \
+-d int \
+-D qemu_log.txt "$@"
+
+# -nographic
+# -enable-kvm \
+# -M smm=off \
+# -no-reboot
+# -enable-kvm \
+# -no-shutdown
+
+cd scripts

src/drivers/generic/ahci/command.c

@@ -14,7 +14,8 @@
 
 #include <irq/timer.h>
 
-#include "locks/wait.h"
+#include <locks/wait.h>
+
 #include "structs.h"
 #include "command.h"
 
@@ -159,6 +160,9 @@ void WaitForTranscations()
         Port* port = Ports + i;
         for (size_t j = 0; j < 32; j++)
             if (port->CommandBitmask & BIT(j) && port->PendingCommands[j])
-                Core_WaitOnObject(WAITABLE_OBJECT(port->PendingCommands[j]->completionEvent));
+            {
+                obos_status status = Core_WaitOnObject(WAITABLE_OBJECT(port->PendingCommands[j]->completionEvent));
+                OBOS_UNUSED(status);
+            }
     }
 }

src/drivers/generic/ahci/interface.c

@@ -13,6 +13,7 @@
 #include <mm/alloc.h>
 #include <mm/page.h>
 #include <mm/context.h>
+#include <mm/handler.h>
 #include <mm/bare_map.h>
 
 #include <locks/event.h>
@@ -63,7 +64,7 @@ static obos_status populate_physical_regions(uintptr_t base, size_t size, struct
     base &= ~1;
     const size_t MAX_PRDT_COUNT = sizeof(((HBA_CMD_TBL*)nullptr))->prdt_entry/sizeof(HBA_PRDT_ENTRY);
 /*
-    data->phys_regions = Mm_Allocator->Reallocate(Mm_Allocator, data->phys_regions, ++data->physRegionCount*sizeof(struct ahci_phys_region), nullptr);
+    data->phys_regions = Reallocate(Mm_Allocator, data->phys_regions, ++data->physRegionCount*sizeof(struct ahci_phys_region), nullptr);
     struct ahci_phys_region* reg = &data->phys_regions[data->physRegionCount - 1];
 */
     long bytesLeft = size;
@@ -83,17 +84,25 @@ static obos_status populate_physical_regions(uintptr_t base, size_t size, struct
     {
         if (data->physRegionCount >= MAX_PRDT_COUNT)
             return OBOS_STATUS_INTERNAL_ERROR;
+
+        Mm_HandlePageFault(ctx, addr, (data->direction == COMMAND_DIRECTION_WRITE ? 0 : PF_EC_RW) | (ctx == &Mm_KernelContext ? 0 : PF_EC_UM));
+
         page_info info = {};
         MmS_QueryPageInfo(ctx->pt, addr, &info, nullptr);
+
         page key = {.phys=info.phys};
         page* pg = RB_FIND(phys_page_tree, &Mm_PhysicalPages, &key);
+        OBOS_ENSURE(pg != Mm_AnonPage);
+        OBOS_ENSURE(pg != Mm_UserAnonPage);
+
         MmH_RefPage(pg);
+
         if ((lastPhys + pgSize) != info.phys)
         {
             if (addr != base)
             {
                 size_t old_sz = data->physRegionCount*sizeof(struct ahci_phys_region);
-                data->phys_regions = Mm_Allocator->Reallocate(Mm_Allocator, data->phys_regions, ++data->physRegionCount*sizeof(struct ahci_phys_region), old_sz, nullptr);
+                data->phys_regions = Reallocate(Mm_Allocator, data->phys_regions, ++data->physRegionCount*sizeof(struct ahci_phys_region), old_sz, nullptr);
                 struct ahci_phys_region* reg = &data->phys_regions[data->physRegionCount - 1];
                 *reg = curr;
                 wroteback = true;
@@ -116,7 +125,7 @@ static obos_status populate_physical_regions(uintptr_t base, size_t size, struct
     if (!wroteback && curr.phys)
     {
         size_t old_sz = data->physRegionCount*sizeof(struct ahci_phys_region);
-        data->phys_regions = Mm_Allocator->Reallocate(Mm_Allocator, data->phys_regions, ++data->physRegionCount*sizeof(struct ahci_phys_region), old_sz, nullptr);
+        data->phys_regions = Reallocate(Mm_Allocator, data->phys_regions, ++data->physRegionCount*sizeof(struct ahci_phys_region), old_sz, nullptr);
         struct ahci_phys_region* reg = &data->phys_regions[data->physRegionCount - 1];
         *reg = curr;
     }
@@ -145,7 +154,7 @@ static obos_status unpopulate_physical_regions(uintptr_t base, size_t size, stru
         MmH_DerefPage(pg);
         pgSize = info.prot.huge_page ? OBOS_HUGE_PAGE_SIZE : OBOS_PAGE_SIZE;
     }
-    Mm_Allocator->Free(Mm_Allocator, data->phys_regions, data->physRegionCount*sizeof(struct ahci_phys_region));
+    Free(Mm_Allocator, data->phys_regions, data->physRegionCount*sizeof(struct ahci_phys_region));
     return OBOS_STATUS_SUCCESS;
 }
 // #pragma GCC pop_options
@@ -215,7 +224,12 @@ obos_status read_sync(dev_desc desc, void* buf, size_t blkCount, size_t blkOffse
         // irql oldIrql = Core_RaiseIrql(IRQL_AHCI);
         SendCommand(port, &data, blkOffset, 0x40, blkCount == 0x10000 ? 0 : blkCount);
         // Core_LowerIrql(oldIrql);
-        Core_WaitOnObject(WAITABLE_OBJECT(data.completionEvent));
+        if (obos_is_error(status = Core_WaitOnObject(WAITABLE_OBJECT(data.completionEvent))))
+        {
+            Core_SemaphoreRelease(&port->lock);
+            unpopulate_physical_regions((uintptr_t)buf, blkCount*port->sectorSize, &data);
+            break;
+        }
         Core_EventClear(&data.completionEvent);
         if (!port->works)
         {
@@ -275,7 +289,12 @@ obos_status write_sync(dev_desc desc, const void* buf, size_t blkCount, size_t b
     {
         SendCommand(port, &data, blkOffset, 0x40, blkCount == 0x10000 ? 0 : blkCount);
         HBA->ghc |= BIT(1) /* GhcIE */;
-        Core_WaitOnObject(WAITABLE_OBJECT(data.completionEvent));
+        if (obos_is_error(status = Core_WaitOnObject(WAITABLE_OBJECT(data.completionEvent))))
+        {
+            Core_SemaphoreRelease(&port->lock);
+            unpopulate_physical_regions((uintptr_t)buf, blkCount*port->sectorSize, &data);
+            break;
+        }
         Core_EventClear(&data.completionEvent);
         if (!port->works)
         {

src/drivers/generic/ahci/main.c

@@ -158,6 +158,7 @@ static void* map_registers(uintptr_t phys, size_t size, bool uc)
         page.phys = phys+offset;
         MmS_SetPageMapping(Mm_KernelContext.pt, &page, phys + offset, false);
     }
+    Drv_TLBShootdown(Mm_KernelContext.pt, (uintptr_t)virt, size);
     return virt+phys_page_offset;
 }