Kernel: Fix ByteRingBuffer->back()

No need to swap bytes of every 16 bit word in the packet, we can just do
one swap at the return

BAN/include/BAN/HashMap.h

@@ -98,8 +98,7 @@ namespace BAN
 
 		struct EntryHash
 		{
-			template<detail::HashMapFindable<Key, HASH, COMP> U>
+			constexpr bool operator()(const Key& a)
-			constexpr bool operator()(const U& a)
 			{
 				return HASH()(a);
 			}
@@ -111,8 +110,7 @@ namespace BAN
 
 		struct EntryComp
 		{
-			template<detail::HashMapFindable<Key, HASH, COMP> U>
+			constexpr bool operator()(const Entry& a, const Key& b)
-			constexpr bool operator()(const Entry& a, const U& b)
 			{
 				return COMP()(a.key, b);
 			}

BAN/include/BAN/Sort.h

@@ -21,66 +21,36 @@ namespace BAN::sort
 	namespace detail
 	{
 
-		template<typename It>
-		struct partition_pair
-		{
-			It lt;
-			It gt;
-		};
-
 		template<typename It, typename Comp>
-		partition_pair<It> partition(It begin, It end, Comp comp)
+		It partition(It begin, It end, Comp comp)
 		{
-			It pivot = next(begin, distance(begin, end) / 2);
+			It pivot = prev(end, 1);
 
-			It lt = begin;
+			It it1 = begin;
-			It eq = begin;
+			for (It it2 = begin; it2 != pivot; ++it2)
-			It gt = end;
-
-			while (eq != gt)
 			{
-				if (comp(*eq, *pivot))
+				if (comp(*it2, *pivot))
 				{
-					swap(*eq, *lt);
+					swap(*it1, *it2);
-					if (pivot == lt)
+					++it1;
-						pivot = eq;
-					++lt;
-					++eq;
-				}
-				else if (comp(*pivot, *eq))
-				{
-					--gt;
-					swap(*eq, *gt);
-					if (pivot == gt)
-						pivot = eq;
-				}
-				else
-				{
-					++eq;
 				}
 			}
 
-			return { lt, gt };
+			swap(*it1, *pivot);
+
+			return it1;
 		}
+
 	}
 
 	template<typename It, typename Comp = less<it_value_type_t<It>>>
 	void quick_sort(It begin, It end, Comp comp = {})
 	{
-		while (distance(begin, end) > 1)
+		if (distance(begin, end) <= 1)
-		{
+			return;
-			const auto [lt, gt] = detail::partition(begin, end, comp);
+		It mid = detail::partition(begin, end, comp);
-			if (distance(begin, lt) < distance(gt, end))
+		quick_sort(begin, mid, comp);
-			{
+		quick_sort(++mid, end, comp);
-				quick_sort(begin, lt);
-				begin = gt;
-			}
-			else
-			{
-				quick_sort(gt, end);
-				end = lt;
-			}
-		}
 	}
 
 	template<typename It, typename Comp = less<it_value_type_t<It>>>
@@ -111,28 +81,13 @@ namespace BAN::sort
 		template<typename It, typename Comp>
 		void intro_sort_impl(It begin, It end, size_t max_depth, Comp comp)
 		{
-			for (size_t i = 0; i < max_depth; i++)
+			if (distance(begin, end) <= 16)
-			{
+				return insertion_sort(begin, end, comp);
-				const size_t len = distance(begin, end);
+			if (max_depth == 0)
-				if (len <= 1)
+				return heap_sort(begin, end, comp);
-					return;
+			It mid = detail::partition(begin, end, comp);
-				if (len <= 16)
+			intro_sort_impl(begin, mid, max_depth - 1, comp);
-					return insertion_sort(begin, end, comp);
+			intro_sort_impl(++mid, end, max_depth - 1, comp);
-
-				const auto [lt, gt] = detail::partition(begin, end, comp);
-				if (distance(begin, lt) < distance(gt, end))
-				{
-					intro_sort_impl(begin, lt, max_depth - 1, comp);
-					begin = gt;
-				}
-				else
-				{
-					intro_sort_impl(gt, end, max_depth - 1, comp);
-					end = lt;
-				}
-			}
-
-			heap_sort(begin, end, comp);
 		}
 
 	}
@@ -161,20 +116,27 @@ namespace BAN::sort
 
 	template<typename It, size_t radix = 256>
 	requires is_unsigned_v<it_value_type_t<It>> && (radix > 0 && (radix & (radix - 1)) == 0)
-	void radix_sort(It begin, It end, BAN::Span<it_value_type_t<It>> storage)
+	BAN::ErrorOr<void> radix_sort(It begin, It end)
 	{
+		using value_type = it_value_type_t<It>;
+
 		const size_t len = distance(begin, end);
 		if (len <= 1)
-			return;
+			return {};
 
-		ASSERT(storage.size() >= len);
+		Vector<value_type> temp;
+		TRY(temp.resize(len));
+
+		Vector<size_t> counts;
+		TRY(counts.resize(radix));
 
 		constexpr size_t mask  = radix - 1;
 		constexpr size_t shift = detail::lsb_index(radix);
 
-		for (size_t s = 0; s < sizeof(it_value_type_t<It>) * 8; s += shift)
+		for (size_t s = 0; s < sizeof(value_type) * 8; s += shift)
 		{
-			size_t counts[radix] {};
+			for (auto& cnt : counts)
+				cnt = 0;
 			for (It it = begin; it != end; ++it)
 				counts[(*it >> s) & mask]++;
 
@@ -184,27 +146,12 @@ namespace BAN::sort
 			for (It it = end; it != begin;)
 			{
 				--it;
-				storage[--counts[(*it >> s) & mask]] = *it;
+				temp[--counts[(*it >> s) & mask]] = *it;
 			}
 
-			It it = begin;
+			for (size_t j = 0; j < temp.size(); j++)
-			for (size_t j = 0; j < storage.size(); j++, ++it)
+				*next(begin, j) = temp[j];
-				*it = storage[j];
 		}
-	}
-
-	template<typename It, size_t radix = 256>
-	requires is_unsigned_v<it_value_type_t<It>> && (radix > 0 && (radix & (radix - 1)) == 0)
-	BAN::ErrorOr<void> radix_sort(It begin, It end)
-	{
-		const size_t len = distance(begin, end);
-		if (len <= 1)
-			return {};
-
-		Vector<it_value_type_t<It>> temp;
-		TRY(temp.resize(len));
-
-		radix_sort(begin, end, temp.span());
 
 		return {};
 	}

BAN/include/BAN/Span.h

@@ -100,22 +100,3 @@ namespace BAN
 	};
 
 }
-
-#include <BAN/Formatter.h>
-
-namespace BAN::Formatter
-{
-
-	template<typename F, typename T>
-	void print_argument(F putc, const Span<T>& span, const ValueFormat& format)
-	{
-		putc('[');
-		for (typename Span<T>::size_type i = 0; i < span.size(); i++)
-		{
-			if (i != 0) putc(',');
-			print_argument(putc, span[i], format);
-		}
-		putc(']');
-	}
-
-}

README.md

@@ -118,7 +118,7 @@ To change the bootloader you can set environment variable BANAN\_BOOTLOADER; sup
 
 To run with UEFI set environment variable BANAN\_UEFI\_BOOT=1. You will also have to set OVMF\_PATH to the correct OVMF (default */usr/share/ovmf/x64/OVMF.fd*).
 
-To build an image with no physical root filesystem, but an initrd set environment variable BANAN\_INITRD=1. This can be used when testing on hardware with unsupported USB controller. If BANAN\_INITRD is set to a value larger than 1, initrd will be gzip compressed.
+To build an image with no physical root filesystem, but an initrd set environment variable BANAN\_INITRD=1. This can be used when testing on hardware with unsupported USB controller.
 
 If you have corrupted your disk image or want to create new one, you can either manually delete *build/banan-os.img* and build system will automatically create you a new one or you can run the following command.
 ```sh

kernel/CMakeLists.txt

@@ -11,7 +11,6 @@ set(KERNEL_SOURCES
 	kernel/Audio/Controller.cpp
 	kernel/Audio/HDAudio/AudioFunctionGroup.cpp
 	kernel/Audio/HDAudio/Controller.cpp
-	kernel/Banos.cpp
 	kernel/BootInfo.cpp
 	kernel/CPUID.cpp
 	kernel/Credentials.cpp
@@ -122,7 +121,6 @@ set(KERNEL_SOURCES
 	kernel/USB/USBManager.cpp
 	kernel/USB/XHCI/Controller.cpp
 	kernel/USB/XHCI/Device.cpp
-	kernel/UserCopy.cpp
 	icxxabi.cpp
 )
 

kernel/arch/i686/PageTable.cpp

@@ -1,7 +1,7 @@
 #include <kernel/BootInfo.h>
 #include <kernel/CPUID.h>
 #include <kernel/Lock/SpinLock.h>
-#include <kernel/Memory/Heap.h>
+#include <kernel/Memory/kmalloc.h>
 #include <kernel/Memory/PageTable.h>
 
 extern uint8_t g_kernel_start[];
@@ -26,6 +26,8 @@ namespace Kernel
 	constexpr uint64_t s_page_flag_mask = 0x8000000000000FFF;
 	constexpr uint64_t s_page_addr_mask = ~s_page_flag_mask;
 
+	static bool s_is_initialized = false;
+
 	static PageTable* s_kernel = nullptr;
 	static bool s_has_nxe = false;
 	static bool s_has_pge = false;
@@ -35,42 +37,24 @@ namespace Kernel
 
 	static uint64_t* s_fast_page_pt { nullptr };
 
-	alignas(PAGE_SIZE) static uint64_t s_fast_page_pt_storage[512] {};
+	static uint64_t* allocate_zeroed_page_aligned_page()
-
-	static paddr_t allocate_zeroed_page_aligned_page()
 	{
-		const paddr_t paddr = Heap::get().take_free_page();
+		void* page = kmalloc(PAGE_SIZE, PAGE_SIZE, true);
-		ASSERT(paddr);
+		ASSERT(page);
-
+		memset(page, 0, PAGE_SIZE);
-		PageTable::with_fast_page(paddr, [] {
+		return (uint64_t*)page;
-			memset(PageTable::fast_page_as_ptr(), 0, PAGE_SIZE);
-		});
-
-		return paddr;
 	}
 
-	static void unallocate_page(paddr_t paddr)
+	template<typename T>
+	static paddr_t V2P(const T vaddr)
 	{
-		Heap::get().release_page(paddr);
+		return (vaddr_t)vaddr - KERNEL_OFFSET + g_boot_info.kernel_paddr;
 	}
 
-	static uint64_t read_entry_from_table(paddr_t paddr, uint16_t entry)
+	template<typename T>
+	static uint64_t* P2V(const T paddr)
 	{
-		uint64_t result;
+		return reinterpret_cast<uint64_t*>(reinterpret_cast<paddr_t>(paddr) - g_boot_info.kernel_paddr + KERNEL_OFFSET);
-		PageTable::with_fast_page(paddr & s_page_addr_mask, [&result, entry] {
-			result = PageTable::fast_page_as_sized<uint64_t>(entry);
-		});
-		return result;
-	}
-
-	static uint64_t write_entry_to_table(paddr_t paddr, uint16_t entry, uint64_t value)
-	{
-		uint64_t old_value;
-		PageTable::with_fast_page(paddr & s_page_addr_mask, [&old_value, entry, value] {
-			old_value = PageTable::fast_page_as_sized<uint64_t>(entry);
-			PageTable::fast_page_as_sized<uint64_t>(entry) = value;
-		});
-		return old_value;
 	}
 
 	static inline PageTable::flags_t parse_flags(uint64_t entry)
@@ -158,10 +142,15 @@ namespace Kernel
 		s_kernel = new PageTable();
 		ASSERT(s_kernel);
 
-		s_kernel->m_highest_paging_struct = allocate_zeroed_page_aligned_page();
+		auto* pdpt = allocate_zeroed_page_aligned_page();
+		ASSERT(pdpt);
+
+		s_kernel->m_highest_paging_struct = V2P(pdpt);
 		s_kernel->map_kernel_memory();
 
-		s_global_pdpte = read_entry_from_table(s_kernel->m_highest_paging_struct, 3);
+		PageTable::with_fast_page(s_kernel->m_highest_paging_struct, [] {
+			s_global_pdpte = PageTable::fast_page_as_sized<paddr_t>(3);
+		});
 
 		// update fast page pt
 		{
@@ -172,21 +161,23 @@ namespace Kernel
 			const auto get_or_allocate_entry =
 				[](paddr_t table_paddr, uint16_t entry, uint64_t flags)
 				{
-					const uint64_t value = read_entry_from_table(table_paddr, entry);
+					uint64_t* table = P2V(table_paddr);
-					if (value & Flags::Present)
-						return value & s_page_addr_mask;
 
-					const paddr_t paddr = allocate_zeroed_page_aligned_page();
+					if (!(table[entry] & Flags::Present))
-					write_entry_to_table(table_paddr, entry, paddr | flags);
+					{
-					return paddr;
+						auto* vaddr = allocate_zeroed_page_aligned_page();
+						ASSERT(vaddr);
+						table[entry] = V2P(vaddr);
+					}
+
+					table[entry] |= flags;
+
+					return table[entry] & s_page_addr_mask;
 				};
 
 			const paddr_t pdpt = s_kernel->m_highest_paging_struct;
 			const paddr_t pd = get_or_allocate_entry(pdpt, pdpte, Flags::Present);
-
+			s_fast_page_pt = P2V(get_or_allocate_entry(pd, pde, Flags::ReadWrite | Flags::Present));
-			const paddr_t entry_paddr = reinterpret_cast<uintptr_t>(&s_fast_page_pt_storage) - KERNEL_OFFSET + g_boot_info.kernel_paddr;
-			write_entry_to_table(pd, pde, entry_paddr | PageTable::Flags::ReadWrite | PageTable::Flags::Present);
-			s_fast_page_pt = s_fast_page_pt_storage;
 		}
 
 		s_kernel->load();
@@ -206,37 +197,33 @@ namespace Kernel
 	void PageTable::map_kernel_memory()
 	{
 		// Map (phys_kernel_start -> phys_kernel_end) to (virt_kernel_start -> virt_kernel_end)
-		const vaddr_t kernel_start = reinterpret_cast<vaddr_t>(g_kernel_start);
 		map_range_at(
-			kernel_start - KERNEL_OFFSET + g_boot_info.kernel_paddr,
+			V2P(g_kernel_start),
-			kernel_start,
+			reinterpret_cast<vaddr_t>(g_kernel_start),
 			g_kernel_end - g_kernel_start,
 			Flags::Present
 		);
 
 		// Map executable kernel memory as executable
-		const vaddr_t kernel_execute_start = reinterpret_cast<vaddr_t>(g_kernel_execute_start);
 		map_range_at(
-			kernel_execute_start - KERNEL_OFFSET + g_boot_info.kernel_paddr,
+			V2P(g_kernel_execute_start),
-			kernel_execute_start,
+			reinterpret_cast<vaddr_t>(g_kernel_execute_start),
 			g_kernel_execute_end - g_kernel_execute_start,
 			Flags::Execute | Flags::Present
 		);
 
 		// Map writable kernel memory as writable
-		const vaddr_t kernel_writable_start = reinterpret_cast<vaddr_t>(g_kernel_writable_start);
 		map_range_at(
-			kernel_writable_start - KERNEL_OFFSET + g_boot_info.kernel_paddr,
+			V2P(g_kernel_writable_start),
-			kernel_writable_start,
+			reinterpret_cast<vaddr_t>(g_kernel_writable_start),
 			g_kernel_writable_end - g_kernel_writable_start,
 			Flags::ReadWrite | Flags::Present
 		);
 
 		// Map userspace memory
-		const vaddr_t kernel_userspace_start = reinterpret_cast<vaddr_t>(g_userspace_start);
 		map_range_at(
-			kernel_userspace_start - KERNEL_OFFSET + g_boot_info.kernel_paddr,
+			V2P(g_userspace_start),
-			kernel_userspace_start,
+			reinterpret_cast<vaddr_t>(g_userspace_start),
 			g_userspace_end - g_userspace_start,
 			Flags::Execute | Flags::UserSupervisor | Flags::Present
 		);
@@ -244,48 +231,26 @@ namespace Kernel
 
 	void PageTable::map_fast_page(paddr_t paddr)
 	{
-		map_fast_page(0, paddr);
+		ASSERT(paddr && paddr % PAGE_SIZE == 0);
+
+		ASSERT(s_fast_page_pt);
+		ASSERT(s_fast_page_lock.current_processor_has_lock());
+
+		ASSERT(!(*s_fast_page_pt & Flags::Present));
+		s_fast_page_pt[0] = paddr | Flags::ReadWrite | Flags::Present;
+
+		asm volatile("invlpg (%0)" :: "r"(fast_page()));
 	}
 
 	void PageTable::unmap_fast_page()
 	{
-		unmap_fast_page(0);
-	}
-
-	void* PageTable::map_fast_page(size_t index, paddr_t paddr)
-	{
-		ASSERT(paddr && paddr % PAGE_SIZE == 0);
-
-		ASSERT(index < 512);
 		ASSERT(s_fast_page_pt);
+		ASSERT(s_fast_page_lock.current_processor_has_lock());
 
-		if (index < reserved_fast_pages)
+		ASSERT((*s_fast_page_pt & Flags::Present));
-			ASSERT(s_fast_page_lock.current_processor_has_lock());
+		s_fast_page_pt[0] = 0;
-		else
-			ASSERT(Processor::get_interrupt_state() == InterruptState::Disabled);
 
-		ASSERT(!(s_fast_page_pt[index] & Flags::Present));
+		asm volatile("invlpg (%0)" :: "r"(fast_page()));
-		s_fast_page_pt[index] = paddr | Flags::ReadWrite | Flags::Present;
-
-		void* address = reinterpret_cast<void*>(fast_page() + index * PAGE_SIZE);
-		asm volatile("invlpg (%0)" :: "r"(address));
-		return address;
-	}
-
-	void PageTable::unmap_fast_page(size_t index)
-	{
-		ASSERT(index < 512);
-		ASSERT(s_fast_page_pt);
-
-		if (index < reserved_fast_pages)
-			ASSERT(s_fast_page_lock.current_processor_has_lock());
-		else
-			ASSERT(Processor::get_interrupt_state() == InterruptState::Disabled);
-
-		ASSERT((s_fast_page_pt[index] & Flags::Present));
-		s_fast_page_pt[index] = 0;
-
-		asm volatile("invlpg (%0)" :: "r"(fast_page() + index * PAGE_SIZE));
 	}
 
 	BAN::ErrorOr<PageTable*> PageTable::create_userspace()
@@ -295,16 +260,20 @@ namespace Kernel
 		if (page_table == nullptr)
 			return BAN::Error::from_errno(ENOMEM);
 
-		page_table->m_highest_paging_struct = allocate_zeroed_page_aligned_page();
+		uint64_t* pdpt = allocate_zeroed_page_aligned_page();
+		if (pdpt == nullptr)
+		{
+			delete page_table;
+			return BAN::Error::from_errno(ENOMEM);
+		}
 
-		PageTable::with_fast_page(page_table->m_highest_paging_struct, [] {
+		page_table->m_highest_paging_struct = V2P(pdpt);
-			uint64_t* pdpt = &PageTable::fast_page_as<uint64_t>();
+
-			pdpt[0] = 0;
+		pdpt[0] = 0;
-			pdpt[1] = 0;
+		pdpt[1] = 0;
-			pdpt[2] = 0;
+		pdpt[2] = 0;
-			pdpt[3] = s_global_pdpte | Flags::Present;
+		pdpt[3] = s_global_pdpte | Flags::Present;
-			static_assert(KERNEL_OFFSET == 0xC0000000);
+		static_assert(KERNEL_OFFSET == 0xC0000000);
-		});
 
 		return page_table;
 	}
@@ -314,22 +283,21 @@ namespace Kernel
 		if (m_highest_paging_struct == 0)
 			return;
 
-		const uint64_t pdpt = m_highest_paging_struct;
+		uint64_t* pdpt = P2V(m_highest_paging_struct);
 		for (uint32_t pdpte = 0; pdpte < 3; pdpte++)
 		{
-			const uint64_t pd = read_entry_from_table(pdpt, pdpte);
+			if (!(pdpt[pdpte] & Flags::Present))
-			if (!(pd & Flags::Present))
 				continue;
+			uint64_t* pd = P2V(pdpt[pdpte] & s_page_addr_mask);
 			for (uint32_t pde = 0; pde < 512; pde++)
 			{
-				const uint64_t pt = read_entry_from_table(pd, pde);
+				if (!(pd[pde] & Flags::Present))
-				if (!(pt & Flags::Present))
 					continue;
-				unallocate_page(pt & s_page_addr_mask);
+				kfree(P2V(pd[pde] & s_page_addr_mask));
 			}
-			unallocate_page(pd & s_page_addr_mask);
+			kfree(pd);
 		}
-		unallocate_page(m_highest_paging_struct);
+		kfree(pdpt);
 	}
 
 	void PageTable::load()
@@ -347,10 +315,32 @@ namespace Kernel
 		const bool is_userspace = (vaddr < KERNEL_OFFSET);
 		if (is_userspace && this != &PageTable::current())
 			;
-		else if (pages >= full_tlb_flush_threshold)
+		else if (pages <= 32 || !s_is_initialized)
-			invalidate_full_address_space(!is_userspace);
+		{
-		else for (size_t i = 0; i < pages; i++)
+			for (size_t i = 0; i < pages; i++, vaddr += PAGE_SIZE)
-			asm volatile("invlpg (%0)" :: "r"(vaddr + i * PAGE_SIZE));
+				asm volatile("invlpg (%0)" :: "r"(vaddr));
+		}
+		else if (is_userspace || !s_has_pge)
+		{
+			asm volatile("movl %0, %%cr3" :: "r"(static_cast<uint32_t>(m_highest_paging_struct)));
+		}
+		else
+		{
+			asm volatile(
+				"movl %%cr4, %%eax;"
+
+				"andl $~0x80, %%eax;"
+				"movl %%eax, %%cr4;"
+
+				"movl %0, %%cr3;"
+
+				"orl $0x80, %%eax;"
+				"movl %%eax, %%cr4;"
+				:
+				: "r"(static_cast<uint32_t>(m_highest_paging_struct))
+				: "eax"
+			);
+		}
 
 		if (send_smp_message)
 		{
@@ -365,34 +355,6 @@ namespace Kernel
 		}
 	}
 
-	void PageTable::invalidate_full_address_space(bool global)
-	{
-		if (!global || !s_has_pge)
-		{
-			asm volatile(
-				"movl %%cr3, %%eax;"
-				"movl %%eax, %%cr3;"
-				::: "eax"
-			);
-		}
-		else
-		{
-			asm volatile(
-				"movl %%cr4, %%eax;"
-
-				"andl $~0x80, %%eax;"
-				"movl %%eax, %%cr4;"
-
-				"movl %%cr3, %%ecx;"
-				"movl %%ecx, %%cr3;"
-
-				"orl $0x80, %%eax;"
-				"movl %%eax, %%cr4;"
-				::: "eax", "ecx"
-			);
-		}
-	}
-
 	void PageTable::unmap_page(vaddr_t vaddr, bool invalidate)
 	{
 		ASSERT(vaddr);
@@ -412,13 +374,15 @@ namespace Kernel
 		if (is_page_free(vaddr))
 			Kernel::panic("trying to unmap unmapped page 0x{H}", vaddr);
 
-		const uint64_t pdpt = m_highest_paging_struct;
+		uint64_t* pdpt = P2V(m_highest_paging_struct);
-		const uint64_t pd = read_entry_from_table(pdpt, pdpte);
+		uint64_t* pd   = P2V(pdpt[pdpte] & s_page_addr_mask);
-		const uint64_t pt = read_entry_from_table(pd, pde);
+		uint64_t* pt   = P2V(pd[pde] & s_page_addr_mask);
 
-		const uint64_t old_entry = write_entry_to_table(pt, pte, 0);
+		const paddr_t old_paddr = pt[pte] & s_page_addr_mask;
 
-		if (invalidate && (old_entry & s_page_addr_mask))
+		pt[pte] = 0;
+
+		if (invalidate && old_paddr != 0)
 			invalidate_page(vaddr, true);
 	}
 
@@ -469,31 +433,28 @@ namespace Kernel
 
 		SpinLockGuard _(m_lock);
 
-		const uint64_t pdpt = m_highest_paging_struct;
+		uint64_t* pdpt = P2V(m_highest_paging_struct);
+		if (!(pdpt[pdpte] & Flags::Present))
+			pdpt[pdpte] = V2P(allocate_zeroed_page_aligned_page()) | Flags::Present;
 
-		uint64_t pd = read_entry_from_table(pdpt, pdpte);
+		uint64_t* pd = P2V(pdpt[pdpte] & s_page_addr_mask);
-		if (!(pd & Flags::Present))
+		if ((pd[pde] & uwr_flags) != uwr_flags)
 		{
-			pd = allocate_zeroed_page_aligned_page();
+			if (!(pd[pde] & Flags::Present))
-			pd |= Flags::Present;
+				pd[pde] = V2P(allocate_zeroed_page_aligned_page());
-			write_entry_to_table(pdpt, pdpte, pd);
+			pd[pde] |= uwr_flags;
-		}
-
-		uint64_t pt = read_entry_from_table(pd, pde);
-		if ((pt & uwr_flags) != uwr_flags)
-		{
-			if (!(pt & Flags::Present))
-				pt = allocate_zeroed_page_aligned_page();
-			pt |= uwr_flags;
-			write_entry_to_table(pd, pde, pt);
 		}
 
 		if (!(flags & Flags::Present))
 			uwr_flags &= ~Flags::Present;
 
-		const uint64_t old_entry = write_entry_to_table(pt, pte, paddr | uwr_flags | extra_flags);
+		uint64_t* pt = P2V(pd[pde] & s_page_addr_mask);
 
-		if (invalidate && (old_entry & s_page_addr_mask))
+		const paddr_t old_paddr = pt[pte] & s_page_addr_mask;
+
+		pt[pte] = paddr | uwr_flags | extra_flags;
+
+		if (invalidate && old_paddr != 0)
 			invalidate_page(vaddr, true);
 	}
 
@@ -524,36 +485,31 @@ namespace Kernel
 		const uint32_t e_pde   = ((vaddr + size - 1) >> 21) & 0x1FF;
 		const uint32_t e_pte   = ((vaddr + size - 1) >> 12) & 0x1FF;
 
-		SpinLockGuard _0(m_lock);
+		SpinLockGuard _(m_lock);
 
-		SpinLockGuard _1(s_fast_page_lock);
+		const uint64_t* pdpt = P2V(m_highest_paging_struct);
-
-		const uint64_t* pdpt = static_cast<uint64_t*>(map_fast_page(0, m_highest_paging_struct));
 		for (; pdpte <= e_pdpte; pdpte++)
 		{
 			if (!(pdpt[pdpte] & Flags::Present))
 				continue;
-			const uint64_t* pd = static_cast<uint64_t*>(map_fast_page(1, pdpt[pdpte] & s_page_addr_mask));
+			const uint64_t* pd = P2V(pdpt[pdpte] & s_page_addr_mask);
 			for (; pde < 512; pde++)
 			{
 				if (pdpte == e_pdpte && pde > e_pde)
 					break;
 				if (!(pd[pde] & Flags::ReadWrite))
 					continue;
-				uint64_t* pt = static_cast<uint64_t*>(map_fast_page(2, pd[pde] & s_page_addr_mask));
+				uint64_t* pt = P2V(pd[pde] & s_page_addr_mask);
 				for (; pte < 512; pte++)
 				{
 					if (pdpte == e_pdpte && pde == e_pde && pte > e_pte)
 						break;
 					pt[pte] &= ~static_cast<uint64_t>(Flags::ReadWrite);
 				}
-				unmap_fast_page(2);
 				pte = 0;
 			}
-			unmap_fast_page(1);
 			pde = 0;
 		}
-		unmap_fast_page(0);
 
 		invalidate_range(vaddr, size / PAGE_SIZE, true);
 	}
@@ -568,17 +524,19 @@ namespace Kernel
 
 		SpinLockGuard _(m_lock);
 
-		const uint64_t pdpt = m_highest_paging_struct;
+		const uint64_t* pdpt = P2V(m_highest_paging_struct);
-
+		if (!(pdpt[pdpte] & Flags::Present))
-		const uint64_t pd = read_entry_from_table(pdpt, pdpte);
-		if (!(pd & Flags::Present))
 			return 0;
 
-		const uint64_t pt = read_entry_from_table(pd, pde);
+		const uint64_t* pd = P2V(pdpt[pdpte] & s_page_addr_mask);
-		if (!(pt & Flags::Present))
+		if (!(pd[pde] & Flags::Present))
 			return 0;
 
-		return read_entry_from_table(pt, pte);
+		const uint64_t* pt = P2V(pd[pde] & s_page_addr_mask);
+		if (!(pt[pte] & Flags::Used))
+			return 0;
+
+		return pt[pte];
 	}
 
 	PageTable::flags_t PageTable::get_page_flags(vaddr_t vaddr) const
@@ -609,24 +567,30 @@ namespace Kernel
 		return true;
 	}
 
-	void PageTable::reserve_page(vaddr_t vaddr)
+	bool PageTable::reserve_page(vaddr_t vaddr, bool only_free, bool send_smp_message)
 	{
-		ASSERT(vaddr % PAGE_SIZE == 0);
 		SpinLockGuard _(m_lock);
-		ASSERT(is_page_free(vaddr));
+		ASSERT(vaddr % PAGE_SIZE == 0);
-		map_page_at(0, vaddr, Flags::Reserved, MemoryType::Normal, false);
+		if (only_free && !is_page_free(vaddr))
+			return false;
+		map_page_at(0, vaddr, Flags::Reserved, MemoryType::Normal, send_smp_message);
+		return true;
 	}
 
-	void PageTable::reserve_range(vaddr_t vaddr, size_t bytes)
+	bool PageTable::reserve_range(vaddr_t vaddr, size_t bytes, bool only_free)
 	{
 		if (size_t rem = bytes % PAGE_SIZE)
 			bytes += PAGE_SIZE - rem;
 		ASSERT(vaddr % PAGE_SIZE == 0);
 
 		SpinLockGuard _(m_lock);
-		ASSERT(is_range_free(vaddr, bytes));
+		if (only_free && !is_range_free(vaddr, bytes))
+			return false;
 		for (size_t offset = 0; offset < bytes; offset += PAGE_SIZE)
-			reserve_page(vaddr + offset);
+			reserve_page(vaddr + offset, true, false);
+		invalidate_range(vaddr, bytes / PAGE_SIZE, true);
+
+		return true;
 	}
 
 	vaddr_t PageTable::reserve_free_page(vaddr_t first_address, vaddr_t last_address)
@@ -648,58 +612,45 @@ namespace Kernel
 
 		SpinLockGuard _(m_lock);
 
-		auto state = s_fast_page_lock.lock();
-
 		// Try to find free page that can be mapped without
 		// allocations (page table with unused entries)
-		const uint64_t* pdpt = static_cast<uint64_t*>(map_fast_page(0, m_highest_paging_struct));
+		const uint64_t* pdpt = P2V(m_highest_paging_struct);
 		for (; pdpte <= e_pdpte; pdpte++)
 		{
 			if (!(pdpt[pdpte] & Flags::Present))
 				continue;
-			const uint64_t* pd = static_cast<uint64_t*>(map_fast_page(1, pdpt[pdpte] & s_page_addr_mask));
+			const uint64_t* pd = P2V(pdpt[pdpte] & s_page_addr_mask);
 			for (; pde < 512; pde++)
 			{
 				if (pdpte == e_pdpte && pde > e_pde)
 					break;
 				if (!(pd[pde] & Flags::Present))
 					continue;
-				const uint64_t* pt = static_cast<uint64_t*>(map_fast_page(2, pd[pde] & s_page_addr_mask));
+				const uint64_t* pt = P2V(pd[pde] & s_page_addr_mask);
 				for (; pte < 512; pte++)
 				{
 					if (pdpte == e_pdpte && pde == e_pde && pte > e_pte)
 						break;
 					if (pt[pte] & Flags::Used)
 						continue;
-
-					unmap_fast_page(2);
-					unmap_fast_page(1);
-					unmap_fast_page(0);
-					s_fast_page_lock.unlock(state);
-
 					vaddr_t vaddr = 0;
 					vaddr |= (vaddr_t)pdpte << 30;
 					vaddr |= (vaddr_t)pde   << 21;
 					vaddr |= (vaddr_t)pte   << 12;
-					reserve_page(vaddr);
+					ASSERT(reserve_page(vaddr));
 					return vaddr;
 				}
-				unmap_fast_page(2);
 				pte = 0;
 			}
-			unmap_fast_page(1);
 			pde = 0;
 		}
-		unmap_fast_page(0);
-
-		s_fast_page_lock.unlock(state);
 
 		// Find any free page
 		for (vaddr_t vaddr = first_address; vaddr < last_address; vaddr += PAGE_SIZE)
 		{
 			if (is_page_free(vaddr))
 			{
-				reserve_page(vaddr);
+				ASSERT(reserve_page(vaddr));
 				return vaddr;
 			}
 		}
@@ -732,7 +683,7 @@ namespace Kernel
 			}
 			if (valid)
 			{
-				reserve_range(vaddr, page_count * PAGE_SIZE);
+				ASSERT(reserve_range(vaddr, page_count * PAGE_SIZE));
 				return vaddr;
 			}
 		}
@@ -755,14 +706,12 @@ namespace Kernel
 
 	void PageTable::debug_dump()
 	{
-		SpinLockGuard _0(m_lock);
+		SpinLockGuard _(m_lock);
 
 		flags_t flags = 0;
 		vaddr_t start = 0;
 
-		SpinLockGuard _1(s_fast_page_lock);
+		const uint64_t* pdpt = P2V(m_highest_paging_struct);
-
-		const uint64_t* pdpt = static_cast<uint64_t*>(map_fast_page(0, m_highest_paging_struct));
 		for (uint32_t pdpte = 0; pdpte < 4; pdpte++)
 		{
 			if (!(pdpt[pdpte] & Flags::Present))
@@ -771,7 +720,7 @@ namespace Kernel
 				start = 0;
 				continue;
 			}
-			const uint64_t* pd = static_cast<uint64_t*>(map_fast_page(1, pdpt[pdpte] & s_page_addr_mask));
+			const uint64_t* pd = P2V(pdpt[pdpte] & s_page_addr_mask);
 			for (uint64_t pde = 0; pde < 512; pde++)
 			{
 				if (!(pd[pde] & Flags::Present))
@@ -780,7 +729,7 @@ namespace Kernel
 					start = 0;
 					continue;
 				}
-				const uint64_t* pt = static_cast<uint64_t*>(map_fast_page(2, pd[pde] & s_page_addr_mask));
+				const uint64_t* pt = P2V(pd[pde] & s_page_addr_mask);
 				for (uint64_t pte = 0; pte < 512; pte++)
 				{
 					if (parse_flags(pt[pte]) != flags)
@@ -798,11 +747,8 @@ namespace Kernel
 						start = (pdpte << 30) | (pde << 21) | (pte << 12);
 					}
 				}
-				unmap_fast_page(2);
 			}
-			unmap_fast_page(1);
 		}
-		unmap_fast_page(0);
 	}
 
 }

kernel/arch/i686/Signal.S

@@ -59,7 +59,7 @@ signal_trampoline:
 	addl $24, %esp
 
 	// restore sigmask
-	movl $78, %eax      // SYS_SIGPROCMASK
+	movl $83, %eax      // SYS_SIGPROCMASK
 	movl $3,  %ebx      // SIG_SETMASK
 	leal 72(%esp), %ecx // set
 	xorl %edx, %edx     // oset

kernel/arch/i686/Yield.S

@@ -12,7 +12,7 @@ asm_yield_trampoline:
 	pushl %ebp
 
 	pushl %esp
-	call scheduler_on_yield_trampoline
+	call scheduler_on_yield
 	addl $4, %esp
 
 	popl %ebp

kernel/arch/i686/interrupts.S

@@ -27,10 +27,14 @@
 
 isr_stub:
 	intr_header 12
+	movl %cr0, %eax; pushl %eax
+	movl %cr2, %eax; pushl %eax
+	movl %cr3, %eax; pushl %eax
+	movl %cr4, %eax; pushl %eax
 
-	movl 32(%esp), %edi // isr number
+	movl 48(%esp), %edi // isr number
-	movl 36(%esp), %esi // error code
+	movl 52(%esp), %esi // error code
-	leal 40(%esp), %edx // interrupt stack ptr
+	leal 56(%esp), %edx // interrupt stack ptr
 	movl %esp,     %ecx // register ptr
 
 	# stack frame for stack trace
@@ -48,7 +52,7 @@ isr_stub:
 	call cpp_isr_handler
 
 	movl %ebp, %esp
-	addl $8, %esp
+	addl $24, %esp
 
 	intr_footer 12
 	addl $8, %esp

kernel/arch/x86_64/PageTable.cpp

@@ -24,6 +24,7 @@ namespace Kernel
 	SpinLock PageTable::s_fast_page_lock;
 
 	static constexpr vaddr_t s_hhdm_offset = 0xFFFF800000000000;
+	static bool s_is_initialized = false;
 
 	constexpr uint64_t s_page_flag_mask = 0x8000000000000FFF;
 	constexpr uint64_t s_page_addr_mask = ~s_page_flag_mask;
@@ -368,48 +369,26 @@ namespace Kernel
 
 	void PageTable::map_fast_page(paddr_t paddr)
 	{
-		map_fast_page(0, paddr);
+		ASSERT(paddr && paddr % PAGE_SIZE == 0);
+
+		ASSERT(s_fast_page_pt);
+		ASSERT(s_fast_page_lock.current_processor_has_lock());
+
+		ASSERT(!(*s_fast_page_pt & Flags::Present));
+		s_fast_page_pt[0] = paddr | Flags::ReadWrite | Flags::Present;
+
+		asm volatile("invlpg (%0)" :: "r"(fast_page()));
 	}
 
 	void PageTable::unmap_fast_page()
 	{
-		unmap_fast_page(0);
-	}
-
-	void* PageTable::map_fast_page(size_t index, paddr_t paddr)
-	{
-		ASSERT(paddr && paddr % PAGE_SIZE == 0);
-
-		ASSERT(index < 512);
 		ASSERT(s_fast_page_pt);
+		ASSERT(s_fast_page_lock.current_processor_has_lock());
 
-		if (index < reserved_fast_pages)
+		ASSERT((*s_fast_page_pt & Flags::Present));
-			ASSERT(s_fast_page_lock.current_processor_has_lock());
+		s_fast_page_pt[0] = 0;
-		else
-			ASSERT(Processor::get_interrupt_state() == InterruptState::Disabled);
 
-		ASSERT(!(s_fast_page_pt[index] & Flags::Present));
+		asm volatile("invlpg (%0)" :: "r"(fast_page()));
-		s_fast_page_pt[index] = paddr | Flags::ReadWrite | Flags::Present;
-
-		void* address = reinterpret_cast<void*>(fast_page() + index * PAGE_SIZE);
-		asm volatile("invlpg (%0)" :: "r"(address));
-		return address;
-	}
-
-	void PageTable::unmap_fast_page(size_t index)
-	{
-		ASSERT(index < 512);
-		ASSERT(s_fast_page_pt);
-
-		if (index < reserved_fast_pages)
-			ASSERT(s_fast_page_lock.current_processor_has_lock());
-		else
-			ASSERT(Processor::get_interrupt_state() == InterruptState::Disabled);
-
-		ASSERT((s_fast_page_pt[index] & Flags::Present));
-		s_fast_page_pt[index] = 0;
-
-		asm volatile("invlpg (%0)" :: "r"(fast_page() + index * PAGE_SIZE));
 	}
 
 	BAN::ErrorOr<PageTable*> PageTable::create_userspace()
@@ -477,10 +456,32 @@ namespace Kernel
 		const bool is_userspace = (vaddr < KERNEL_OFFSET);
 		if (is_userspace && this != &PageTable::current())
 			;
-		else if (pages >= full_tlb_flush_threshold)
+		else if (pages <= 32 || !s_is_initialized)
-			invalidate_full_address_space(!is_userspace);
+		{
-		else for (size_t i = 0; i < pages; i++)
+			for (size_t i = 0; i < pages; i++, vaddr += PAGE_SIZE)
-			asm volatile("invlpg (%0)" :: "r"(vaddr + i * PAGE_SIZE));
+				asm volatile("invlpg (%0)" :: "r"(vaddr));
+		}
+		else if (is_userspace || !s_has_pge)
+		{
+			asm volatile("movq %0, %%cr3" :: "r"(m_highest_paging_struct));
+		}
+		else
+		{
+			asm volatile(
+				"movq %%cr4, %%rax;"
+
+				"andq $~0x80, %%rax;"
+				"movq %%rax, %%cr4;"
+
+				"movq %0, %%cr3;"
+
+				"orq $0x80, %%rax;"
+				"movq %%rax, %%cr4;"
+				:
+				: "r"(m_highest_paging_struct)
+				: "rax"
+			);
+		}
 
 		if (send_smp_message)
 		{
@@ -495,34 +496,6 @@ namespace Kernel
 		}
 	}
 
-	void PageTable::invalidate_full_address_space(bool global)
-	{
-		if (!global || !s_has_pge)
-		{
-			asm volatile(
-				"movq %%cr3, %%rax;"
-				"movq %%rax, %%cr3;"
-				::: "rax"
-			);
-		}
-		else
-		{
-			asm volatile(
-				"movq %%cr4, %%rax;"
-
-				"andq $~0x80, %%rax;"
-				"movq %%rax, %%cr4;"
-
-				"movq %%cr3, %%rcx;"
-				"movq %%rcx, %%cr3;"
-
-				"orq $0x80, %%rax;"
-				"movq %%rax, %%cr4;"
-				::: "rax", "rcx"
-			);
-		}
-	}
-
 	void PageTable::unmap_page(vaddr_t vaddr, bool invalidate)
 	{
 		ASSERT(vaddr);
@@ -564,70 +537,12 @@ namespace Kernel
 	{
 		ASSERT(vaddr % PAGE_SIZE == 0);
 
-		ASSERT(is_canonical(vaddr));
+		const size_t page_count = range_page_count(vaddr, size);
-		ASSERT(is_canonical(vaddr + size - 1));
-
-		const vaddr_t uc_vaddr_start = uncanonicalize(vaddr);
-		const vaddr_t uc_vaddr_end   = uncanonicalize(vaddr + size - 1);
-
-		uint16_t pml4e = (uc_vaddr_start >> 39) & 0x1FF;
-		uint16_t pdpte = (uc_vaddr_start >> 30) & 0x1FF;
-		uint16_t pde   = (uc_vaddr_start >> 21) & 0x1FF;
-		uint16_t pte   = (uc_vaddr_start >> 12) & 0x1FF;
-
-		const uint16_t e_pml4e = (uc_vaddr_end >> 39) & 0x1FF;
-		const uint16_t e_pdpte = (uc_vaddr_end >> 30) & 0x1FF;
-		const uint16_t e_pde   = (uc_vaddr_end >> 21) & 0x1FF;
-		const uint16_t e_pte   = (uc_vaddr_end >> 12) & 0x1FF;
 
 		SpinLockGuard _(m_lock);
-
+		for (vaddr_t page = 0; page < page_count; page++)
-		uint64_t* pml4 = P2V(m_highest_paging_struct);
+			unmap_page(vaddr + page * PAGE_SIZE, false);
-		for (; pml4e <= e_pml4e; pml4e++)
+		invalidate_range(vaddr, page_count, true);
-		{
-#define UNALLOCATE_TABLE_IF_EMPTY(outer, inner) \
-			if (old_##inner##e == 0 && inner##e == 512) { \
-				unallocate_page(outer[outer##e] & s_page_addr_mask); \
-				outer[outer##e] = 0; \
-			}
-			if (!(pml4[pml4e] & Flags::Present))
-				continue;
-			const uint16_t old_pdpte = pdpte;
-			uint64_t* pdpt = P2V(pml4[pml4e] & s_page_addr_mask);
-			for (; pdpte < 512; pdpte++)
-			{
-				if (pml4e == e_pml4e && pdpte > e_pdpte)
-					break;
-				if (!(pdpt[pdpte] & Flags::Present))
-					continue;
-				const uint16_t old_pde = pde;
-				uint64_t* pd = P2V(pdpt[pdpte] & s_page_addr_mask);
-				for (; pde < 512; pde++)
-				{
-					if (pml4e == e_pml4e && pdpte == e_pdpte && pde > e_pde)
-						break;
-					if (!(pd[pde] & Flags::Present))
-						continue;
-					const uint16_t old_pte = pte;
-					uint64_t* pt = P2V(pd[pde] & s_page_addr_mask);
-					for (; pte < 512; pte++)
-					{
-						if (pml4e == e_pml4e && pdpte == e_pdpte && pde == e_pde && pte > e_pte)
-							break;
-						pt[pte] = 0;
-					}
-					UNALLOCATE_TABLE_IF_EMPTY(pd, pt);
-					pte = 0;
-				}
-				UNALLOCATE_TABLE_IF_EMPTY(pdpt, pd);
-				pde = 0;
-			}
-			UNALLOCATE_TABLE_IF_EMPTY(pml4, pdpt);
-			pdpte = 0;
-#undef UNALLOCATE_TABLE_IF_EMPTY
-		}
-
-		invalidate_range(vaddr, range_page_count(vaddr, size), true);
 	}
 
 	void PageTable::map_page_at(paddr_t paddr, vaddr_t vaddr, flags_t flags, MemoryType memory_type, bool invalidate)
@@ -814,74 +729,33 @@ namespace Kernel
 
 	paddr_t PageTable::physical_address_of(vaddr_t addr) const
 	{
-		return get_page_data(addr) & s_page_addr_mask;
+		uint64_t page_data = get_page_data(addr);
+		return page_data & s_page_addr_mask;
 	}
 
-	void PageTable::reserve_page(vaddr_t vaddr)
+	bool PageTable::reserve_page(vaddr_t vaddr, bool only_free, bool invalidate)
 	{
-		ASSERT(vaddr % PAGE_SIZE == 0);
 		SpinLockGuard _(m_lock);
-		ASSERT(is_page_free(vaddr));
+		ASSERT(vaddr % PAGE_SIZE == 0);
-		map_page_at(0, vaddr, Flags::Reserved, MemoryType::Normal, false);
+		if (only_free && !is_page_free(vaddr))
+			return false;
+		map_page_at(0, vaddr, Flags::Reserved, MemoryType::Normal, invalidate);
+		return true;
 	}
 
-	void PageTable::reserve_range(vaddr_t vaddr, size_t bytes)
+	bool PageTable::reserve_range(vaddr_t vaddr, size_t bytes, bool only_free)
 	{
 		if (size_t rem = bytes % PAGE_SIZE)
 			bytes += PAGE_SIZE - rem;
 		ASSERT(vaddr % PAGE_SIZE == 0);
 
-		ASSERT(is_canonical(vaddr));
-		ASSERT(is_canonical(vaddr + bytes - 1));
-
-		const vaddr_t uc_vaddr_start = uncanonicalize(vaddr);
-		uint16_t pml4e = (uc_vaddr_start >> 39) & 0x1FF;
-		uint16_t pdpte = (uc_vaddr_start >> 30) & 0x1FF;
-		uint16_t pde   = (uc_vaddr_start >> 21) & 0x1FF;
-		uint16_t pte   = (uc_vaddr_start >> 12) & 0x1FF;
-
-		size_t pages_to_reserve = bytes / PAGE_SIZE;
-		ASSERT(pages_to_reserve);
-
 		SpinLockGuard _(m_lock);
-
+		if (only_free && !is_range_free(vaddr, bytes))
-		uint64_t* pml4 = P2V(m_highest_paging_struct);
+			return false;
-		for (;; pml4e++)
+		for (size_t offset = 0; offset < bytes; offset += PAGE_SIZE)
-		{
+			reserve_page(vaddr + offset, true, false);
-#define CHECK_IF_PRESENT(expr) \
+		invalidate_range(vaddr, bytes / PAGE_SIZE, true);
-			if (!((expr) & Flags::Present)) { \
+		return true;
-				const paddr_t paddr = allocate_zeroed_page_aligned_page(); \
-				ASSERT(paddr); \
-				(expr) = paddr | Flags::Present; \
-			}
-			CHECK_IF_PRESENT(pml4[pml4e]);
-			uint64_t* pdpt = P2V(pml4[pml4e] & s_page_addr_mask);
-			for (; pdpte < 512; pdpte++)
-			{
-				CHECK_IF_PRESENT(pdpt[pdpte]);
-				uint64_t* pd = P2V(pdpt[pdpte] & s_page_addr_mask);
-				for (; pde < 512; pde++)
-				{
-					CHECK_IF_PRESENT(pd[pde]);
-					uint64_t* pt = P2V(pd[pde] & s_page_addr_mask);
-					for (; pte < 512; pte++)
-					{
-						ASSERT(!(pt[pte] & Flags::Used));
-						pt[pte] = Flags::Reserved;
-
-						pages_to_reserve--;
-						if (pages_to_reserve == 0)
-							return;
-					}
-					pte = 0;
-				}
-				pde = 0;
-			}
-			pdpte = 0;
-#undef CHECK_IF_PRESENT
-		}
-
-		ASSERT_NOT_REACHED();
 	}
 
 	vaddr_t PageTable::reserve_free_page(vaddr_t first_address, vaddr_t last_address)
@@ -895,7 +769,6 @@ namespace Kernel
 
 		ASSERT(is_canonical(first_address));
 		ASSERT(is_canonical(last_address - 1));
-
 		const vaddr_t uc_vaddr_start = uncanonicalize(first_address);
 		const vaddr_t uc_vaddr_end   = uncanonicalize(last_address - 1);
 
@@ -945,7 +818,7 @@ namespace Kernel
 						vaddr |= static_cast<uint64_t>(pde)   << 21;
 						vaddr |= static_cast<uint64_t>(pte)   << 12;
 						vaddr = canonicalize(vaddr);
-						reserve_page(vaddr);
+						ASSERT(reserve_page(vaddr));
 						return vaddr;
 					}
 					pte = 0;
@@ -959,7 +832,7 @@ namespace Kernel
 		{
 			if (vaddr_t vaddr = canonicalize(uc_vaddr); is_page_free(vaddr))
 			{
-				reserve_page(vaddr);
+				ASSERT(reserve_page(vaddr));
 				return vaddr;
 			}
 		}
@@ -969,90 +842,44 @@ namespace Kernel
 
 	vaddr_t PageTable::reserve_free_contiguous_pages(size_t page_count, vaddr_t first_address, vaddr_t last_address)
 	{
-		if (first_address >= KERNEL_OFFSET && first_address < reinterpret_cast<vaddr_t>(g_kernel_start))
+		if (first_address >= KERNEL_OFFSET && first_address < (vaddr_t)g_kernel_start)
-			first_address = reinterpret_cast<vaddr_t>(g_kernel_start);
+			first_address = (vaddr_t)g_kernel_start;
-		if (const auto rem = first_address % PAGE_SIZE)
+		if (size_t rem = first_address % PAGE_SIZE)
 			first_address += PAGE_SIZE - rem;
-		if (const auto rem = last_address % PAGE_SIZE)
+		if (size_t rem = last_address % PAGE_SIZE)
 			last_address -= rem;
 
 		ASSERT(is_canonical(first_address));
 		ASSERT(is_canonical(last_address - 1));
 
-		const vaddr_t uc_vaddr_start = uncanonicalize(first_address);
-		const vaddr_t uc_vaddr_end   = uncanonicalize(last_address - 1);
-
-		uint16_t pml4e = (uc_vaddr_start >> 39) & 0x1FF;
-		uint16_t pdpte = (uc_vaddr_start >> 30) & 0x1FF;
-		uint16_t pde   = (uc_vaddr_start >> 21) & 0x1FF;
-		uint16_t pte   = (uc_vaddr_start >> 12) & 0x1FF;
-
-		const uint16_t e_pml4e = (uc_vaddr_end >> 39) & 0x1FF;
-		const uint16_t e_pdpte = (uc_vaddr_end >> 30) & 0x1FF;
-		const uint16_t e_pde   = (uc_vaddr_end >> 21) & 0x1FF;
-		const uint16_t e_pte   = (uc_vaddr_end >> 12) & 0x1FF;
-
-		vaddr_t vaddr = first_address;
-		size_t free_count = 0;
-
 		SpinLockGuard _(m_lock);
 
-		const uint64_t* pml4 = P2V(m_highest_paging_struct);
+		for (vaddr_t vaddr = first_address; vaddr < last_address;)
-		for (; pml4e <= e_pml4e; pml4e++)
 		{
-#define CHECK_IF_PRESENT(expr, advance) \
+			bool valid { true };
-			if (!((expr) & Flags::Present)) { \
+			for (size_t page = 0; page < page_count; page++)
-				if ((free_count += advance) >= page_count) \
-					goto found_free_region; \
-				continue; \
-			}
-			CHECK_IF_PRESENT(pml4[pml4e], 512 * 512 * 512);
-			const uint64_t* pdpt = P2V(pml4[pml4e] & s_page_addr_mask);
-			for (; pdpte < 512; pdpte++)
 			{
-				if (pml4e == e_pml4e && pdpte > e_pdpte)
+				if (!is_canonical(vaddr + page * PAGE_SIZE))
-					break;
-				CHECK_IF_PRESENT(pdpt[pdpte], 512 * 512);
-				const uint64_t* pd = P2V(pdpt[pdpte] & s_page_addr_mask);
-				for (; pde < 512; pde++)
 				{
-					if (pml4e == e_pml4e && pdpte == e_pdpte && pde > e_pde)
+					vaddr = canonicalize(uncanonicalize(vaddr) + page * PAGE_SIZE);
-						break;
+					valid = false;
-					CHECK_IF_PRESENT(pd[pde], 512);
+					break;
-					uint64_t* pt = P2V(pd[pde] & s_page_addr_mask);
+				}
-					for (; pte < 512; pte++)
+				if (!is_page_free(vaddr + page * PAGE_SIZE))
-					{
+				{
-						if (pml4e == e_pml4e && pdpte == e_pdpte && pde == e_pde && pte > e_pte)
+					vaddr += (page + 1) * PAGE_SIZE;
-							break;
+					valid = false;
-						if (!(pt[pte] & Flags::Used))
+					break;
-						{
-							if (++free_count >= page_count)
-								goto found_free_region;
-						}
-						else
-						{
-							vaddr = 0;
-							vaddr |= static_cast<uint64_t>(pml4e) << 39;
-							vaddr |= static_cast<uint64_t>(pdpte) << 30;
-							vaddr |= static_cast<uint64_t>(pde)   << 21;
-							vaddr |= static_cast<uint64_t>(pte)   << 12;
-							vaddr = canonicalize(vaddr + PAGE_SIZE);
-							free_count = 0;
-						}
-					}
-					pte = 0;
 				}
-				pde = 0;
 			}
-			pdpte = 0;
+			if (valid)
-#undef CHECK_IF_PRESENT
+			{
+				ASSERT(reserve_range(vaddr, page_count * PAGE_SIZE));
+				return vaddr;
+			}
 		}
 
 		return 0;
-
-	found_free_region:
-		reserve_range(vaddr, page_count * PAGE_SIZE);
-		return vaddr;
 	}
 
 	bool PageTable::is_page_free(vaddr_t page) const

kernel/arch/x86_64/Signal.S

@@ -61,7 +61,7 @@ signal_trampoline:
 	addq $40, %rsp
 
 	// restore sigmask
-	movq $78, %rdi       // SYS_SIGPROCMASK
+	movq $83, %rdi       // SYS_SIGPROCMASK
 	movq $3,  %rsi       // SIG_SETMASK
 	leaq 192(%rsp), %rdx // set
 	xorq %r10, %r10      // oset

kernel/arch/x86_64/Yield.S

@@ -15,7 +15,7 @@ asm_yield_trampoline:
 	pushq %r15
 
 	movq %rsp, %rdi
-	call scheduler_on_yield_trampoline
+	call scheduler_on_yield
 
 	popq %r15
 	popq %r14

kernel/arch/x86_64/interrupts.S

@@ -44,12 +44,17 @@
 
 isr_stub:
 	intr_header 24
+	movq %cr0, %rax; pushq %rax
+	movq %cr2, %rax; pushq %rax
+	movq %cr3, %rax; pushq %rax
+	movq %cr4, %rax; pushq %rax
 
-	movq 120(%rsp), %rdi // isr number
+	movq 152(%rsp), %rdi	// isr number
-	movq 128(%rsp), %rsi // error code
+	movq 160(%rsp), %rsi	// error code
-	leaq 136(%rsp), %rdx // interrupt stack ptr
+	leaq 168(%rsp), %rdx	// interrupt stack ptr
-	movq %rsp, %rcx      // register ptr
+	movq %rsp, %rcx			// register ptr
 	call cpp_isr_handler
+	addq $32, %rsp
 
 	intr_footer 24
 	addq $16, %rsp

kernel/arch/x86_64/linker.ld

@@ -41,18 +41,7 @@ SECTIONS
 	{
 		g_kernel_writable_start = .;
 		*(.data)
-
-		. = ALIGN(8);
-		g_drv_builtin_begin = .;
-		KEEP(*(.banos-driver))
-		g_drv_builtin_end = .;
-		. = ALIGN(8);
-		g_banos_export = .;
-		KEEP(*(.banos-export))
-		g_banos_export_end = .;
 	}
-
-
 	.bss ALIGN(4K) : AT(ADDR(.bss) - KERNEL_OFFSET)
 	{
 		g_kernel_bss_start = .;

kernel/include/banos/driver.h

@@ -1,27 +0,0 @@
-#pragma once
-// Copyright (c) 2026 Dcraftbg
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#include "version.h"
-#include "revision.h"
-
-#define BANOS_DRIVER_REVISION_CURRENT 0
-
-typedef struct Banos_Driver Banos_Driver;
-struct Banos_Driver {
-    unsigned long driver_size;
-    banos_version_t minimal_banos_version;
-    const char* name;
-    const char* license;
-    banos_version_t version;
-
-    // NOTE: checkout BANOS_DRIVER_INSTANCE_SIZE.
-    // You may use this instance data for anything you wish to store.
-    // If you need more than that just allocate it on the heap or
-    // globally if you add the proper verification of having your driver run only
-    // within a single instance
-    int (*init)(Banos_Driver* drv);
-    int (*uninit)(Banos_Driver* drv);
-};
-#define BANOS_DRIVER_API static __attribute__((section(".banos-driver"), used, aligned(8)))

kernel/include/banos/export.h

@@ -1,15 +0,0 @@
-#pragma once
-// Copyright (c) 2026 Dcraftbg
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-typedef struct Banos_Symbol {
-    const char* name;
-    void* arg;
-} Banos_Symbol;
-#define BANOS_EXPORT_SYMBOL(symname, str, ptr) \
-    static __attribute__((section(".banos-export"), used, aligned(8))) Banos_Symbol __symbol_##symname = {\
-        .name = str, \
-        .arg = ptr \
-    };
-#define BANOS_EXPORT(name) BANOS_EXPORT_SYMBOL(name, #name, (void*)&name)

kernel/include/banos/print.h

@@ -1,13 +0,0 @@
-#pragma once
-// Copyright (c) 2026 Dcraftbg
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void banos_dprintln(const char* str);
-#ifdef __cplusplus
-}
-#endif

kernel/include/banos/revision.h

@@ -1,2 +0,0 @@
-#pragma once
-typedef unsigned long banos_revision_t;

kernel/include/banos/version.h

@@ -1,28 +0,0 @@
-#pragma once
-// Copyright (c) 2026 Dcraftbg
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-// [ 8 bit major ] [ 8 minor ] [ 16 patch]
-typedef unsigned int banos_version_t;
-#define BANOS_VERSION_MAJOR_SHIFT 24
-#define BANOS_VERSION_MINOR_SHIFT 16
-#define BANOS_VERSION_PATCH_SHIFT 0
-
-#define BANOS_VERSION_MAJOR_MASK 0xFF
-#define BANOS_VERSION_MINOR_MASK 0xFF
-#define BANOS_VERSION_PATCH_MASK 0xFFFF
-
-#define BANOS_VERSION_MAKE(major, minor, patch) \
-    (banos_version_t)( \
-        (((major) & BANOS_VERSION_MAJOR_MASK) << BANOS_VERSION_MAJOR_SHIFT) | \
-        (((minor) & BANOS_VERSION_MINOR_MASK) << BANOS_VERSION_MINOR_SHIFT) | \
-        (((patch) & BANOS_VERSION_PATCH_MASK) << BANOS_VERSION_PATCH_SHIFT) \
-    )
-
-#define BANOS_VERSION_CURRENT BANOS_VERSION_MAKE(0, 0, 1)
-
-#define BANOS_VERSION_GET_MAJOR(v) (((v) >> BANOS_VERSION_MAJOR_SHIFT) & BANOS_VERSION_MAJOR_MASK)
-#define BANOS_VERSION_GET_MINOR(v) (((v) >> BANOS_VERSION_MINOR_SHIFT) & BANOS_VERSION_MINOR_MASK)
-#define BANOS_VERSION_GET_PATCH(v) (((v) >> BANOS_VERSION_PATCH_SHIFT) & BANOS_VERSION_PATCH_MASK)

kernel/include/kernel/API/SharedPage.h

@@ -8,7 +8,6 @@ namespace Kernel::API
 	enum SharedPageFeature : uint32_t
 	{
 		SPF_GETTIME = 1 << 0,
-		SPF_RDTSCP  = 1 << 1,
 	};
 
 	struct SharedPage
@@ -19,8 +18,9 @@ namespace Kernel::API
 
 		struct
 		{
-			uint64_t realtime_s;
+			uint8_t shift;
-			uint32_t realtime_ns;
+			uint64_t mult;
+			uint64_t realtime_seconds;
 		} gettime_shared;
 
 		struct
@@ -28,8 +28,6 @@ namespace Kernel::API
 			struct
 			{
 				uint32_t seq;
-				uint32_t mult;
-				int8_t shift;
 				uint64_t last_ns;
 				uint64_t last_tsc;
 			} gettime_local;

kernel/include/kernel/APIC.h

@@ -26,7 +26,6 @@ namespace Kernel
 		BAN::ErrorOr<uint8_t> reserve_gsi(uint32_t gsi);
 
 		void initialize_timer();
-		void set_timer_dealine(uint64_t ns);
 
 	private:
 		uint32_t read_from_local_apic(ptrdiff_t);

kernel/include/kernel/Audio/Controller.h

@@ -14,6 +14,7 @@ namespace Kernel
 	public:
 		static BAN::ErrorOr<void> create(PCI::Device& pci_device);
 
+		dev_t rdev() const override { return m_rdev; }
 		BAN::StringView name() const override { return m_name; }
 
 	protected:
@@ -38,7 +39,7 @@ namespace Kernel
 
 		BAN::ErrorOr<size_t> write_impl(off_t, BAN::ConstByteSpan) override;
 
-		BAN::ErrorOr<long> ioctl_impl(unsigned long request, void* arg) override;
+		BAN::ErrorOr<long> ioctl_impl(int cmd, void* arg) override;
 
 	protected:
 		ThreadBlocker m_sample_data_blocker;
@@ -50,6 +51,7 @@ namespace Kernel
 		snd_volume_info m_volume_info {};
 
 	private:
+		const dev_t m_rdev;
 		char m_name[10] {};
 	};
 

kernel/include/kernel/Audio/HDAudio/AudioFunctionGroup.h

@@ -43,7 +43,7 @@ namespace Kernel
 		BAN::ErrorOr<void> enable_output_path(uint8_t index);
 		BAN::ErrorOr<void> disable_output_path(uint8_t index);
 
-		BAN::ErrorOr<void> reset_stream();
+		void reset_stream();
 
 		BAN::ErrorOr<void> recurse_output_paths(const HDAudio::AFGWidget& widget, BAN::Vector<const HDAudio::AFGWidget*>& path);
 

kernel/include/kernel/Banos.h

@@ -1,10 +0,0 @@
-#pragma once
-#include <BAN/Vector.h>
-#include <BAN/StringView.h>
-typedef struct Banos_Symbol Banos_Symbol;
-namespace Banos {
-	void* resolve_symbol(const char* name);
-	void import_symbols(Banos_Symbol* symbols, size_t count);
-	void initialize_initial_drivers(void);
-	BAN::ErrorOr<size_t> load_driver_from_image(const char* u_image);
-}

kernel/include/kernel/CPUID.h

@@ -82,8 +82,5 @@ namespace CPUID
 	bool has_pat();
 	bool has_1gib_pages();
 	bool has_invariant_tsc();
-	bool has_rdtscp();
-	uint64_t get_tsc_frequency();
-	bool has_kvm_pvclock();
 
 }

kernel/include/kernel/Debug.h

@@ -49,8 +49,6 @@
 
 #define DEBUG_VTTY 1
 
-#define DEBUG_DEVFS 0
-
 #define DEBUG_PCI 0
 #define DEBUG_SCHEDULER 0
 #define DEBUG_PS2 1

kernel/include/kernel/Device/DebugDevice.h

@@ -8,14 +8,15 @@ namespace Kernel
 	public:
 		static BAN::ErrorOr<BAN::RefPtr<DebugDevice>> create(mode_t, uid_t, gid_t);
 
+		virtual dev_t rdev() const override { return m_rdev; }
+
 		virtual BAN::StringView name() const override { return "debug"_sv; }
 
 	protected:
 		DebugDevice(mode_t mode, uid_t uid, gid_t gid, dev_t rdev)
 			: CharacterDevice(mode, uid, gid)
-		{
+			, m_rdev(rdev)
-			m_rdev = rdev;
+		{ }
-		}
 
 		virtual BAN::ErrorOr<size_t> read_impl(off_t, BAN::ByteSpan) override { return 0; }
 		virtual BAN::ErrorOr<size_t> write_impl(off_t, BAN::ConstByteSpan buffer) override;
@@ -24,6 +25,9 @@ namespace Kernel
 		virtual bool can_write_impl() const override { return true; }
 		virtual bool has_error_impl() const override { return false; }
 		virtual bool has_hungup_impl() const override { return false; }
+
+	private:
+		const dev_t m_rdev;
 	};
 
 }

kernel/include/kernel/Device/Device.h

@@ -12,20 +12,24 @@ namespace Kernel
 		virtual ~Device() = default;
 		virtual void update() {}
 
+		virtual bool is_device() const override { return true; }
+		virtual bool is_partition() const { return false; }
+		virtual bool is_storage_device() const { return false; }
+
 		virtual BAN::ErrorOr<BAN::UniqPtr<MemoryRegion>> mmap_region(PageTable&, off_t offset, size_t len, AddressRange, MemoryRegion::Type, PageTable::flags_t, int status_flags)
 		{
 			(void)offset; (void)len; (void)status_flags;
 			return BAN::Error::from_errno(ENOTSUP);
 		}
 
+		virtual dev_t rdev() const override = 0;
+
 		virtual BAN::StringView name() const = 0;
 
 	protected:
 		Device(mode_t, uid_t, gid_t);
 
-	private:
+		virtual BAN::ErrorOr<void> fsync_impl() final override { return BAN::Error::from_errno(EINVAL); }
-		BAN::ErrorOr<void> sync_inode(SyncType) final override { return {}; }
-		BAN::ErrorOr<void> sync_data()          final override { return {}; }
 	};
 
 	class BlockDevice : public Device, public BAN::Weakable<BlockDevice>
@@ -41,7 +45,7 @@ namespace Kernel
 		BlockDevice(mode_t mode, uid_t uid, gid_t gid)
 			: Device(mode, uid, gid)
 		{
-			m_mode |= Inode::Mode::IFBLK;
+			m_inode_info.mode |= Inode::Mode::IFBLK;
 		}
 	};
 
@@ -51,7 +55,7 @@ namespace Kernel
 		CharacterDevice(mode_t mode, uid_t uid, gid_t gid)
 			: Device(mode, uid, gid)
 		{
-			m_mode |= Inode::Mode::IFCHR;
+			m_inode_info.mode |= Inode::Mode::IFCHR;
 		}
 	};
 

kernel/include/kernel/Device/FramebufferDevice.h

@@ -30,13 +30,14 @@ namespace Kernel
 
 		virtual BAN::ErrorOr<BAN::UniqPtr<MemoryRegion>> mmap_region(PageTable&, off_t offset, size_t len, AddressRange, MemoryRegion::Type, PageTable::flags_t, int status_flags) override;
 
+		virtual dev_t rdev() const override { return m_rdev; }
 		virtual BAN::StringView name() const override { return m_name.sv(); }
 
 	protected:
 		virtual BAN::ErrorOr<size_t> read_impl(off_t, BAN::ByteSpan) override;
 		virtual BAN::ErrorOr<size_t> write_impl(off_t, BAN::ConstByteSpan) override;
 
-		BAN::ErrorOr<long> ioctl_impl(unsigned long request, void* arg) override;
+		BAN::ErrorOr<long> ioctl_impl(int cmd, void* arg) override;
 
 		virtual bool can_read_impl() const override { return true; }
 		virtual bool can_write_impl() const override { return true; }
@@ -49,6 +50,7 @@ namespace Kernel
 
 	private:
 		const BAN::String m_name;
+		const dev_t m_rdev;
 
 		vaddr_t			m_video_memory_vaddr { 0 };
 		const paddr_t	m_video_memory_paddr;

kernel/include/kernel/Device/NullDevice.h

@@ -10,14 +10,15 @@ namespace Kernel
 	public:
 		static BAN::ErrorOr<BAN::RefPtr<NullDevice>> create(mode_t, uid_t, gid_t);
 
+		virtual dev_t rdev() const override { return m_rdev; }
+
 		virtual BAN::StringView name() const override { return "null"_sv; }
 
 	protected:
 		NullDevice(mode_t mode, uid_t uid, gid_t gid, dev_t rdev)
 			: CharacterDevice(mode, uid, gid)
-		{
+			, m_rdev(rdev)
-			m_rdev = rdev;
+		{ }
-		}
 
 		virtual BAN::ErrorOr<size_t> read_impl(off_t, BAN::ByteSpan) override { return 0; }
 		virtual BAN::ErrorOr<size_t> write_impl(off_t, BAN::ConstByteSpan buffer) override { return buffer.size(); };
@@ -27,6 +28,8 @@ namespace Kernel
 		virtual bool has_error_impl() const override { return false; }
 		virtual bool has_hungup_impl() const override { return false; }
 
+	private:
+		const dev_t m_rdev;
 	};
 
 }

kernel/include/kernel/Device/RandomDevice.h

@@ -8,14 +8,15 @@ namespace Kernel
 	public:
 		static BAN::ErrorOr<BAN::RefPtr<RandomDevice>> create(mode_t, uid_t, gid_t);
 
+		virtual dev_t rdev() const override { return m_rdev; }
+
 		virtual BAN::StringView name() const override { return "random"_sv; }
 
 	protected:
 		RandomDevice(mode_t mode, uid_t uid, gid_t gid, dev_t rdev)
 			: CharacterDevice(mode, uid, gid)
-		{
+			, m_rdev(rdev)
-			m_rdev = rdev;
+		{ }
-		}
 
 		virtual BAN::ErrorOr<size_t> read_impl(off_t, BAN::ByteSpan) override;
 		virtual BAN::ErrorOr<size_t> write_impl(off_t, BAN::ConstByteSpan buffer) override { return buffer.size(); };
@@ -24,6 +25,9 @@ namespace Kernel
 		virtual bool can_write_impl() const override { return false; }
 		virtual bool has_error_impl() const override { return false; }
 		virtual bool has_hungup_impl() const override { return false; }
+
+	private:
+		const dev_t m_rdev;
 	};
 
 }

kernel/include/kernel/Device/ZeroDevice.h

@@ -8,14 +8,15 @@ namespace Kernel
 	public:
 		static BAN::ErrorOr<BAN::RefPtr<ZeroDevice>> create(mode_t, uid_t, gid_t);
 
+		virtual dev_t rdev() const override { return m_rdev; }
+
 		virtual BAN::StringView name() const override { return "zero"_sv; }
 
 	protected:
 		ZeroDevice(mode_t mode, uid_t uid, gid_t gid, dev_t rdev)
 			: CharacterDevice(mode, uid, gid)
-		{
+			, m_rdev(rdev)
-			m_rdev = rdev;
+		{ }
-		}
 
 		virtual BAN::ErrorOr<size_t> read_impl(off_t, BAN::ByteSpan) override;
 		virtual BAN::ErrorOr<size_t> write_impl(off_t, BAN::ConstByteSpan buffer) override { return buffer.size(); };
@@ -24,6 +25,9 @@ namespace Kernel
 		virtual bool can_write_impl() const override { return false; }
 		virtual bool has_error_impl() const override { return false; }
 		virtual bool has_hungup_impl() const override { return false; }
+
+	private:
+		const dev_t m_rdev;
 	};
 
 }

kernel/include/kernel/ELF.h

@@ -14,8 +14,8 @@ namespace Kernel::ELF
 			size_t size;
 		};
 
+		bool open_execfd;
 		vaddr_t entry_point;
-		BAN::Optional<vaddr_t> interp_base;
 		BAN::Optional<TLS> master_tls;
 		BAN::Vector<BAN::UniqPtr<MemoryRegion>> regions;
 	};

kernel/include/kernel/Epoll.h

@@ -2,7 +2,6 @@
 
 #include <BAN/HashMap.h>
 #include <kernel/FS/Inode.h>
-#include <kernel/Lock/Mutex.h>
 
 #include <sys/epoll.h>
 
@@ -21,7 +20,24 @@ namespace Kernel
 		void notify(BAN::RefPtr<Inode> inode, uint32_t event);
 
 	private:
-		Epoll();
+		Epoll() = default;
+
+	public:
+		ino_t ino() const override         { return 0; }
+		Mode mode() const override         { return { Mode::IRUSR | Mode::IWUSR }; }
+		nlink_t nlink() const override     { return 0; }
+		uid_t uid() const override         { return 0; }
+		gid_t gid() const override         { return 0; }
+		off_t size() const override        { return 0; }
+		timespec atime() const override    { return {}; }
+		timespec mtime() const override    { return {}; }
+		timespec ctime() const override    { return {}; }
+		blksize_t blksize() const override { return PAGE_SIZE; }
+		blkcnt_t blocks() const override   { return 0; }
+		dev_t dev() const override         { return 0; }
+		dev_t rdev() const override        { return 0; }
+
+		bool is_epoll() const override { return true; }
 
 		const FileSystem* filesystem() const override { return nullptr; }
 
@@ -30,8 +46,7 @@ namespace Kernel
 		bool has_error_impl() const override { return false; }
 		bool has_hungup_impl() const override { return false; }
 
-		BAN::ErrorOr<void> sync_inode(SyncType) override { return {}; }
+		BAN::ErrorOr<void> fsync_impl() override { return {}; }
-		BAN::ErrorOr<void> sync_data() override { return {}; }
 
 	private:
 		struct ListenEventList
@@ -75,7 +90,6 @@ namespace Kernel
 		};
 
 	private:
-		Mutex m_mutex;
 		ThreadBlocker m_thread_blocker;
 		SpinLock m_ready_lock;
 		BAN::HashMap<BAN::RefPtr<Inode>, uint32_t> m_ready_events;

kernel/include/kernel/FS/EventFD.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <kernel/FS/Inode.h>
-#include <kernel/Lock/Mutex.h>
 
 namespace Kernel
 {
@@ -11,16 +10,26 @@ namespace Kernel
 	public:
 		static BAN::ErrorOr<BAN::RefPtr<Inode>> create(uint64_t initval, bool semaphore);
 
-	private:
+		ino_t ino() const override { return 0; }
-		EventFD(uint64_t initval, bool is_semaphore);
+		Mode mode() const override { return { Mode::IFCHR | Mode::IRUSR | Mode::IWUSR }; }
+		nlink_t nlink() const override { return ref_count(); }
+		uid_t uid() const override { return 0; }
+		gid_t gid() const override { return 0; }
+		off_t size() const override { return 0; }
+		timespec atime() const override { return {}; }
+		timespec mtime() const override { return {}; }
+		timespec ctime() const override { return {}; }
+		blksize_t blksize() const override { return 8; }
+		blkcnt_t blocks() const override { return 0; }
+		dev_t dev() const override { return 0; }
+		dev_t rdev() const override { return 0; }
 
 		const FileSystem* filesystem() const override { return nullptr; }
 
-		BAN::ErrorOr<void> sync_inode(SyncType) override { return {}; }
+	protected:
-		BAN::ErrorOr<void> sync_data() override { return {}; }
-
 		BAN::ErrorOr<size_t> read_impl(off_t, BAN::ByteSpan) override;
 		BAN::ErrorOr<size_t> write_impl(off_t, BAN::ConstByteSpan) override;
+		BAN::ErrorOr<void> fsync_impl() final override { return {}; }
 
 		bool can_read_impl() const override { return m_value > 0; }
 		bool can_write_impl() const override { return m_value < UINT64_MAX - 1; }
@@ -28,10 +37,15 @@ namespace Kernel
 		bool has_hungup_impl() const override { return false; }
 
 	private:
-		const bool m_is_semaphore;
+		EventFD(uint64_t initval, bool is_semaphore)
-		BAN::Atomic<uint64_t> m_value;
+			: m_is_semaphore(is_semaphore)
+			, m_value(initval)
+		{ }
+
+	private:
+		const bool m_is_semaphore;
+		uint64_t m_value;
 
-		Mutex m_mutex;
 		ThreadBlocker m_thread_blocker;
 	};
 

kernel/include/kernel/FS/Ext2/Definitions.h

@@ -79,12 +79,6 @@ namespace Kernel::Ext2
 		uint8_t __reserved[12];
 	};
 
-	struct InodeBlocks {
-		uint32_t block[15];
-	};
-	struct Osd2 {
-		uint32_t osd2[3];
-	};
 	struct Inode
 	{
 		uint16_t mode;
@@ -99,12 +93,12 @@ namespace Kernel::Ext2
 		uint32_t blocks;
 		uint32_t flags;
 		uint32_t osd1;
-		InodeBlocks block;
+		uint32_t block[15];
 		uint32_t generation;
 		uint32_t file_acl;
 		uint32_t dir_acl;
 		uint32_t faddr;
-		Osd2 osd2;
+		uint32_t osd2[3];
 	};
 
 	struct LinkedDirectoryEntry

kernel/include/kernel/FS/Ext2/FileSystem.h

@@ -99,8 +99,7 @@ namespace Kernel
 		BAN::ErrorOr<uint32_t> reserve_free_block(uint32_t primary_bgd);
 		BAN::ErrorOr<void> release_block(uint32_t block);
 
-		BAN::ErrorOr<BAN::RefPtr<Ext2Inode>> open_inode(ino_t);
+		BAN::HashMap<ino_t, BAN::RefPtr<Ext2Inode>>& inode_cache() { return m_inode_cache; }
-		void remove_from_cache(ino_t);
 
 		const Ext2::Superblock& superblock() const { return m_superblock; }
 
@@ -156,7 +155,6 @@ namespace Kernel
 		BAN::RefPtr<Inode> m_root_inode;
 		BAN::Vector<uint32_t> m_superblock_backups;
 
-		Mutex m_inode_cache_lock;
 		BAN::HashMap<ino_t, BAN::RefPtr<Ext2Inode>> m_inode_cache;
 
 		BlockBufferManager m_buffer_manager;

kernel/include/kernel/FS/Ext2/Inode.h

@@ -4,7 +4,6 @@
 #include <BAN/StringView.h>
 #include <kernel/FS/Ext2/Definitions.h>
 #include <kernel/FS/Inode.h>
-#include <kernel/Lock/RWLock.h>
 
 namespace Kernel
 {
@@ -16,12 +15,23 @@ namespace Kernel
 	public:
 		~Ext2Inode();
 
+		virtual ino_t ino() const override { return m_ino; };
+		virtual Mode mode() const override { return { m_inode.mode }; }
+		virtual nlink_t nlink() const override { return m_inode.links_count; }
+		virtual uid_t uid() const override { return m_inode.uid; }
+		virtual gid_t gid() const override { return m_inode.gid; }
+		virtual off_t size() const override { return m_inode.size; }
+		virtual timespec atime() const override { return timespec { .tv_sec = m_inode.atime, .tv_nsec = 0 }; }
+		virtual timespec mtime() const override { return timespec { .tv_sec = m_inode.mtime, .tv_nsec = 0 }; }
+		virtual timespec ctime() const override { return timespec { .tv_sec = m_inode.ctime, .tv_nsec = 0 }; }
+		virtual blksize_t blksize() const override;
+		virtual blkcnt_t blocks() const override;
+		virtual dev_t dev() const override { return 0; }
+		virtual dev_t rdev() const override { return 0; }
+
 		virtual const FileSystem* filesystem() const override;
 
-	private:
+	protected:
-		virtual BAN::ErrorOr<void> sync_inode(SyncType) override;
-		virtual BAN::ErrorOr<void> sync_data() override;
-
 		virtual BAN::ErrorOr<BAN::RefPtr<Inode>> find_inode_impl(BAN::StringView) override;
 		virtual BAN::ErrorOr<size_t> list_next_inodes_impl(off_t, struct dirent*, size_t) override;
 		virtual BAN::ErrorOr<void> create_file_impl(BAN::StringView, mode_t, uid_t, gid_t) override;
@@ -36,6 +46,10 @@ namespace Kernel
 		virtual BAN::ErrorOr<size_t> read_impl(off_t, BAN::ByteSpan) override;
 		virtual BAN::ErrorOr<size_t> write_impl(off_t, BAN::ConstByteSpan) override;
 		virtual BAN::ErrorOr<void> truncate_impl(size_t) override;
+		virtual BAN::ErrorOr<void> chmod_impl(mode_t) override;
+		virtual BAN::ErrorOr<void> chown_impl(uid_t, gid_t) override;
+		virtual BAN::ErrorOr<void> utimens_impl(const timespec[2]) override;
+		virtual BAN::ErrorOr<void> fsync_impl() override;
 
 		virtual bool can_read_impl() const override { return true; }
 		virtual bool can_write_impl() const override { return true; }
@@ -43,96 +57,58 @@ namespace Kernel
 		virtual bool has_hungup_impl() const override { return false; }
 
 	private:
-		uint32_t block_group() const;
-
 		// Returns maximum number of data blocks in use
 		// NOTE: the inode might have more blocks than what this suggests if it has been shrinked
 		uint32_t max_used_data_block_count() const { return size() / blksize(); }
 
-		BAN::ErrorOr<void> sync_inode_no_lock();
+		BAN::ErrorOr<BAN::Optional<uint32_t>> block_from_indirect_block(uint32_t& block, uint32_t index, uint32_t depth, bool allocate);
+		BAN::ErrorOr<BAN::Optional<uint32_t>> fs_block_of_data_block_index(uint32_t data_block_index, bool allocate);
 
-		BAN::ErrorOr<bool> is_directory_empty_no_lock();
+		BAN::ErrorOr<void> link_inode_to_directory(Ext2Inode&, BAN::StringView name);
-		BAN::ErrorOr<BAN::RefPtr<Inode>> find_inode_no_lock(BAN::StringView);
+		BAN::ErrorOr<void> remove_inode_from_directory(BAN::StringView name, bool cleanup_directory);
+		BAN::ErrorOr<bool> is_directory_empty();
 
-		/* needs write end of the lock when allocate is true*/
+		BAN::ErrorOr<void> cleanup_indirect_block(uint32_t block, uint32_t depth);
-		BAN::ErrorOr<BAN::Optional<uint32_t>> block_from_indirect_block_no_lock(uint32_t block, uint32_t index, uint32_t depth, bool allocate);
+		BAN::ErrorOr<void> cleanup_default_links();
-		BAN::ErrorOr<BAN::Optional<uint32_t>> fs_block_of_data_block_index_no_lock(uint32_t data_block_index, bool allocate);
+		BAN::ErrorOr<void> cleanup_data_blocks();
+		BAN::ErrorOr<void> cleanup_from_fs();
 
-		/* needs write end of the lock */
+		BAN::ErrorOr<void> sync();
-		BAN::ErrorOr<void> link_inode_to_directory_no_lock(Ext2Inode&, BAN::StringView name);
-		BAN::ErrorOr<void> remove_inode_from_directory_no_lock(BAN::StringView name, bool cleanup_directory);
 
-		/* needs write end of the lock */
+		uint32_t block_group() const;
-		BAN::ErrorOr<void> cleanup_indirect_block_no_lock(uint32_t block, uint32_t depth);
-		BAN::ErrorOr<void> cleanup_default_links_no_lock();
-		BAN::ErrorOr<void> cleanup_data_blocks_no_lock();
-		BAN::ErrorOr<void> cleanup_from_fs_no_lock();
 
 	private:
-		Ext2Inode(Ext2FS& fs, Ext2::Inode inode, uint32_t ino);
+		Ext2Inode(Ext2FS& fs, Ext2::Inode inode, uint32_t ino)
-
+			: m_fs(fs)
-		BAN::Optional<uint32_t> block_cache_find(uint32_t block, uint32_t index) const;
+			, m_inode(inode)
-		void block_cache_remove(uint32_t block, uint32_t index);
+			, m_ino(ino)
-		void block_cache_add(uint32_t block, uint32_t index, uint32_t target);
+		{}
-
+		static BAN::ErrorOr<BAN::RefPtr<Ext2Inode>> create(Ext2FS&, uint32_t);
-		BAN::RefPtr<Inode> dir_cache_find(BAN::StringView) const;
-		void dir_cache_remove(BAN::StringView);
-		void dir_cache_add(BAN::StringView, BAN::RefPtr<Inode>);
 
 	private:
 		struct ScopedSync
 		{
 			ScopedSync(Ext2Inode& inode)
 				: inode(inode)
+				, inode_info(inode.m_inode)
 			{ }
 
 			~ScopedSync()
 			{
-				// TODO: there was some memcmp smarty pants stuff here.
+				if (memcmp(&inode.m_inode, &inode_info, sizeof(Ext2::Inode)) == 0)
-				// How do we wanna approach it?
+					return;
-				if (auto ret = inode.sync_inode_no_lock(); ret.is_error())
+				if (auto ret = inode.sync(); ret.is_error())
 					dwarnln("failed to sync inode: {}", ret.error());
 			}
 
 			Ext2Inode& inode;
+			Ext2::Inode inode_info;
 		};
 
 	private:
 		Ext2FS& m_fs;
-		RWLock m_lock;
+		Ext2::Inode m_inode;
-
+		const uint32_t m_ino;
-		Ext2::InodeBlocks m_ext2_blocks;
-		// NOTE: some fields from the original disk inode
-		// that we do not use, but we keep for serialise.
-		const uint32_t m_og_dtime;
-		const uint32_t m_og_flags;
-		const uint32_t m_og_osd1;
-		const uint32_t m_og_generation;
-		const uint32_t m_og_file_acl;
-		const uint32_t m_og_dir_acl;
-		const uint32_t m_og_faddr;
-		const Ext2::Osd2 m_og_osd2;
-
-		struct BlockCacheEntry
-		{
-			mutable uint32_t freq;
-			uint32_t block;
-			uint32_t index;
-			uint32_t target;
-		};
-		mutable SpinLock m_block_cache_lock;
-		BAN::Array<BlockCacheEntry, 8> m_block_cache;
-
-		struct DirCacheEntry
-		{
-			mutable size_t freq { 0 };
-			BAN::RefPtr<Inode> inode;
-			size_t name_len { 0 };
-			char   name[256];
-		};
-		static constexpr size_t dir_cache_size = 32;
-		mutable RWLock m_dir_cache_lock;
-		BAN::Vector<DirCacheEntry> m_dir_cache;
 
 		friend class Ext2FS;
 		friend class BAN::RefPtr<Ext2Inode>;

kernel/include/kernel/FS/FAT/Inode.h

@@ -15,14 +15,25 @@ namespace Kernel
 	class FATInode final : public Inode, public BAN::Weakable<FATInode>
 	{
 	public:
+		virtual ino_t ino() const override { return m_ino; };
+		virtual Mode mode() const override { return Mode { ((m_entry.attr & FAT::FileAttr::DIRECTORY) ? Mode::IFDIR : Mode::IFREG) | 0777 }; }
+		virtual nlink_t nlink() const override { return 1; }
+		virtual uid_t uid() const override { return 0; }
+		virtual gid_t gid() const override { return 0; }
+		virtual off_t size() const override { return m_entry.file_size; }
+		virtual timespec atime() const override;
+		virtual timespec mtime() const override;
+		virtual timespec ctime() const override;
+		virtual blksize_t blksize() const override;
+		virtual blkcnt_t blocks() const override { return m_block_count; }
+		virtual dev_t dev() const override { return 0; }
+		virtual dev_t rdev() const override { return 0; }
+
 		virtual const FileSystem* filesystem() const override;
 
 		const FAT::DirectoryEntry& entry() const { return m_entry; }
 
-	private:
+	protected:
-		virtual BAN::ErrorOr<void> sync_inode(SyncType) override { return {}; }
-		virtual BAN::ErrorOr<void> sync_data() override { return {}; }
-
 		virtual BAN::ErrorOr<BAN::RefPtr<Inode>> find_inode_impl(BAN::StringView) override;
 		virtual BAN::ErrorOr<size_t> list_next_inodes_impl(off_t, struct dirent*, size_t) override;
 		//virtual BAN::ErrorOr<void> create_file_impl(BAN::StringView, mode_t, uid_t, gid_t) override;
@@ -32,6 +43,9 @@ namespace Kernel
 		virtual BAN::ErrorOr<size_t> read_impl(off_t, BAN::ByteSpan) override;
 		//virtual BAN::ErrorOr<size_t> write_impl(off_t, BAN::ConstByteSpan) override;
 		//virtual BAN::ErrorOr<void> truncate_impl(size_t) override;
+		//virtual BAN::ErrorOr<void> chmod_impl(mode_t) override;
+		//virtual BAN::ErrorOr<void> utimens_impl(const timespec[2]) override;
+		virtual BAN::ErrorOr<void> fsync_impl() override { return {}; }
 
 		virtual bool can_read_impl() const override { return true; }
 		virtual bool can_write_impl() const override { return true; }
@@ -39,8 +53,12 @@ namespace Kernel
 		virtual bool has_hungup_impl() const override { return false; }
 
 	private:
-		FATInode(FATFS& fs, const FAT::DirectoryEntry& entry, ino_t ino, uint32_t block_count);
+		FATInode(FATFS& fs, const FAT::DirectoryEntry& entry, ino_t ino, uint32_t block_count)
-
+			: m_fs(fs)
+			, m_entry(entry)
+			, m_ino(ino)
+			, m_block_count(block_count)
+		{ }
 		~FATInode()	{}
 
 		BAN::ErrorOr<void> for_each_directory_entry(BAN::ConstByteSpan, BAN::Function<BAN::Iteration(const FAT::DirectoryEntry&)>);
@@ -49,6 +67,7 @@ namespace Kernel
 	private:
 		FATFS& m_fs;
 		FAT::DirectoryEntry m_entry;
+		const ino_t m_ino;
 		uint32_t m_block_count;
 
 		friend class Ext2FS;

kernel/include/kernel/FS/Inode.h

@@ -10,6 +10,7 @@
 
 #include <kernel/Credentials.h>
 #include <kernel/Debug.h>
+#include <kernel/Lock/Mutex.h>
 
 #include <dirent.h>
 #include <sys/socket.h>
@@ -62,24 +63,6 @@ namespace Kernel
 			mode_t mode;
 		};
 
-		enum InodeKind : uint8_t
-		{
-			DEVICE    = 0x01,
-			EPOLL     = 0x02,
-			PIPE      = 0x04,
-			TTY       = 0x08,
-			PARTITION = 0x10,
-			STORAGE   = 0x20,
-		};
-
-		enum class SyncType
-		{
-			General,
-			Mode,
-			UidGid,
-			Times,
-		};
-
 	public:
 		virtual ~Inode() {}
 
@@ -87,26 +70,24 @@ namespace Kernel
 
 		bool operator==(const Inode& other) const { return dev() == other.dev() && ino() == other.ino(); }
 
-		ino_t ino() const { return m_ino; }
+		virtual ino_t ino() const = 0;
-		Mode mode() const { return Mode(m_mode); }
+		virtual Mode mode() const = 0;
-		nlink_t nlink() const { return m_nlink; }
+		virtual nlink_t nlink() const = 0;
-		uid_t uid() const { return m_uid; }
+		virtual uid_t uid() const = 0;
-		gid_t gid() const { return m_gid; }
+		virtual gid_t gid() const = 0;
-		off_t size() const { return m_size; }
+		virtual off_t size() const = 0;
-		timespec atime() const { return m_atime; }
+		virtual timespec atime() const = 0;
-		timespec mtime() const { return m_mtime; }
+		virtual timespec mtime() const = 0;
-		timespec ctime() const { return m_ctime; }
+		virtual timespec ctime() const = 0;
-		blksize_t blksize() const { return m_blksize; }
+		virtual blksize_t blksize() const = 0;
-		blkcnt_t blocks() const { return m_blocks; }
+		virtual blkcnt_t blocks() const = 0;
-		dev_t dev() const { return m_dev; }
+		virtual dev_t dev() const = 0;
-		dev_t rdev() const { return m_rdev; }
+		virtual dev_t rdev() const = 0;
 
-		bool is_device()         const { return m_kind & InodeKind::DEVICE;    }
+		virtual bool is_device() const { return false; }
-		bool is_epoll()          const { return m_kind & InodeKind::EPOLL;     }
+		virtual bool is_epoll() const { return false; }
-		bool is_pipe()           const { return m_kind & InodeKind::PIPE;      }
+		virtual bool is_pipe() const { return false; }
-		bool is_tty()            const { return m_kind & InodeKind::TTY;       }
+		virtual bool is_tty() const { return false; }
-		bool is_partition()      const { return m_kind & InodeKind::PARTITION; }
-		bool is_storage_device() const { return m_kind & InodeKind::STORAGE;   }
 
 		virtual const FileSystem* filesystem() const = 0;
 
@@ -145,12 +126,12 @@ namespace Kernel
 		BAN::ErrorOr<void> fsync();
 
 		// Select/Non blocking API
-		bool can_read() const   { return can_read_impl(); }
+		bool can_read() const;
-		bool can_write() const  { return can_write_impl(); }
+		bool can_write() const;
-		bool has_error() const  { return has_error_impl(); }
+		bool has_error() const;
-		bool has_hungup() const { return has_hungup_impl(); }
+		bool has_hungup() const;
 
-		BAN::ErrorOr<long> ioctl(unsigned long request, void* arg);
+		BAN::ErrorOr<long> ioctl(int request, void* arg);
 
 		BAN::ErrorOr<void> add_epoll(class Epoll*);
 		void del_epoll(class Epoll*);
@@ -159,9 +140,6 @@ namespace Kernel
 		virtual void on_close(int status_flags) { (void)status_flags; }
 		virtual void on_clone(int status_flags) { (void)status_flags; }
 
-		virtual BAN::ErrorOr<void> sync_inode(SyncType) = 0;
-		virtual BAN::ErrorOr<void> sync_data() = 0;
-
 	protected:
 		// Directory API
 		virtual BAN::ErrorOr<BAN::RefPtr<Inode>> find_inode_impl(BAN::StringView)							{ return BAN::Error::from_errno(ENOTSUP); }
@@ -192,6 +170,10 @@ namespace Kernel
 		virtual BAN::ErrorOr<size_t> read_impl(off_t, BAN::ByteSpan)		{ return BAN::Error::from_errno(ENOTSUP); }
 		virtual BAN::ErrorOr<size_t> write_impl(off_t, BAN::ConstByteSpan)	{ return BAN::Error::from_errno(ENOTSUP); }
 		virtual BAN::ErrorOr<void> truncate_impl(size_t)					{ return BAN::Error::from_errno(ENOTSUP); }
+		virtual BAN::ErrorOr<void> chmod_impl(mode_t)						{ return BAN::Error::from_errno(ENOTSUP); }
+		virtual BAN::ErrorOr<void> chown_impl(uid_t, gid_t)					{ return BAN::Error::from_errno(ENOTSUP); }
+		virtual BAN::ErrorOr<void> utimens_impl(const timespec[2])			{ return BAN::Error::from_errno(ENOTSUP); }
+		virtual BAN::ErrorOr<void> fsync_impl() = 0;
 
 		// Select/Non blocking API
 		virtual bool can_read_impl() const = 0;
@@ -199,36 +181,15 @@ namespace Kernel
 		virtual bool has_error_impl() const = 0;
 		virtual bool has_hungup_impl() const = 0;
 
-		virtual BAN::ErrorOr<long> ioctl_impl(unsigned long, void*) { return BAN::Error::from_errno(ENOTSUP); }
+		virtual BAN::ErrorOr<long> ioctl_impl(int, void*) { return BAN::Error::from_errno(ENOTSUP); }
 
 	protected:
-		// TODO: this is supposed to be const I guess?
+		mutable PriorityMutex m_mutex;
-		// But the thing is I would have to refactor a big chunk of the codebase
-		// to add it as a parameter to Inode() soooooo yeah no, not doing that rn.
-		uint8_t m_kind = 0;
-
-		BAN::Atomic<ino_t>     m_ino;
-		BAN::Atomic<mode_t>    m_mode;
-		BAN::Atomic<nlink_t>   m_nlink;
-		BAN::Atomic<uid_t>     m_uid;
-		BAN::Atomic<gid_t>     m_gid;
-		BAN::Atomic<off_t>     m_size;
-		// TODO: make these guys atomic :)
-		timespec m_atime;
-		timespec m_mtime;
-		timespec m_ctime;
-		BAN::Atomic<blksize_t> m_blksize;
-		BAN::Atomic<blkcnt_t>  m_blocks;
-		BAN::Atomic<dev_t>     m_dev;
-		BAN::Atomic<dev_t>     m_rdev;
 
 	private:
-		SpinLock m_shared_region_lock;
 		BAN::WeakPtr<SharedFileData> m_shared_region;
-
 		SpinLock m_epoll_lock;
 		BAN::LinkedList<class Epoll*> m_epolls;
-
 		friend class Epoll;
 		friend class FileBackedRegion;
 		friend class OpenFileDescriptorSet;

kernel/include/kernel/FS/Pipe.h

@@ -1,34 +1,43 @@
 #pragma once
 
+#include <BAN/Array.h>
 #include <kernel/FS/Inode.h>
-#include <kernel/Lock/Mutex.h>
 #include <kernel/Memory/ByteRingBuffer.h>
 #include <kernel/ThreadBlocker.h>
 
-#include <sys/stat.h>
-
 namespace Kernel
 {
 
-	class Pipe final : public Inode, public BAN::Weakable<Pipe>
+	class Pipe : public Inode
 	{
 	public:
-		static BAN::ErrorOr<BAN::RefPtr<Inode>> open(BAN::RefPtr<Inode>, int status_flags);
+		static BAN::ErrorOr<BAN::RefPtr<Inode>> create(const Credentials&);
-		static BAN::ErrorOr<BAN::RefPtr<Inode>> create(uid_t, gid_t);
+
-		~Pipe();
+		virtual bool is_pipe() const override { return true; }
 
 		void on_close(int status_flags) override;
 		void on_clone(int status_flags) override;
 
+		virtual ino_t ino() const override { return 0; } // FIXME
+		virtual Mode mode() const override { return { Mode::IFIFO | Mode::IRUSR | Mode::IWUSR }; }
+		virtual nlink_t nlink() const override { return 1; }
+		virtual uid_t uid() const override { return m_uid; }
+		virtual gid_t gid() const override { return m_gid; }
+		virtual off_t size() const override { return 0; }
+		virtual timespec atime() const override { return m_atime; }
+		virtual timespec mtime() const override { return m_mtime; }
+		virtual timespec ctime() const override { return m_ctime; }
+		virtual blksize_t blksize() const override { return 4096; }
+		virtual blkcnt_t blocks() const override { return 0; }
+		virtual dev_t dev() const override { return 0; } // FIXME
+		virtual dev_t rdev() const override { return 0; } // FIXME
+
 		virtual const FileSystem* filesystem() const override { return nullptr; }
 
-	private:
+	protected:
-		virtual BAN::ErrorOr<void> sync_inode(SyncType) override;
-		virtual BAN::ErrorOr<void> sync_data() override;
-
 		virtual BAN::ErrorOr<size_t> read_impl(off_t, BAN::ByteSpan) override;
 		virtual BAN::ErrorOr<size_t> write_impl(off_t, BAN::ConstByteSpan) override;
-		virtual BAN::ErrorOr<void> truncate_impl(size_t) override;
+		virtual BAN::ErrorOr<void> fsync_impl() final override { return {}; }
 
 		virtual bool can_read_impl() const override { return !m_buffer->empty(); }
 		virtual bool can_write_impl() const override { return true; }
@@ -36,18 +45,20 @@ namespace Kernel
 		virtual bool has_hungup_impl() const override { return m_writing_count == 0; }
 
 	private:
-		Pipe(const struct stat&);
+		Pipe(const Credentials&);
 
 	private:
-		Mutex m_mutex;
+		const uid_t m_uid;
+		const gid_t m_gid;
+		timespec m_atime {};
+		timespec m_mtime {};
+		timespec m_ctime {};
 		ThreadBlocker m_thread_blocker;
 
 		BAN::UniqPtr<ByteRingBuffer> m_buffer;
 
-		BAN::Atomic<uint32_t> m_writing_count { 0 };
+		BAN::Atomic<uint32_t> m_writing_count { 1 };
-		BAN::Atomic<uint32_t> m_reading_count { 0 };
+		BAN::Atomic<uint32_t> m_reading_count { 1 };
-
-		BAN::RefPtr<Inode> m_named_inode;
 	};
 
 }

kernel/include/kernel/FS/ProcFS/FileSystem.h

@@ -13,8 +13,6 @@ namespace Kernel
 		static void initialize();
 		static ProcFileSystem& get();
 
-		void post_scheduler_initialize();
-
 		BAN::ErrorOr<void> on_process_create(Process&);
 		void on_process_delete(Process&);
 

kernel/include/kernel/FS/ProcFS/Inode.h

@@ -9,27 +9,34 @@ namespace Kernel
 
 	class ProcPidInode final : public TmpDirectoryInode
 	{
-		// FIXME: dynamically update ruid/rgid.
-		// Possibly just have a magic uid/gid of -1 or something
-		// which means use current process ID
 	public:
 		static BAN::ErrorOr<BAN::RefPtr<ProcPidInode>> create_new(Process&, TmpFileSystem&, mode_t);
 		~ProcPidInode() = default;
 
+		virtual uid_t uid() const override { return m_process.credentials().ruid(); }
+		virtual gid_t gid() const override { return m_process.credentials().rgid(); }
+
 		void cleanup();
+
 	protected:
 		virtual BAN::ErrorOr<void> unlink_impl(BAN::StringView) override { return BAN::Error::from_errno(EPERM); }
 
 	private:
 		ProcPidInode(Process&, TmpFileSystem&, const TmpInodeInfo&);
+
+	private:
+		Process& m_process;
 	};
 
 	class ProcROProcessInode final : public TmpInode
 	{
-		//FIXME: dynamically update ruid/rgid
 	public:
 		static BAN::ErrorOr<BAN::RefPtr<ProcROProcessInode>> create_new(Process&, size_t (Process::*callback)(off_t, BAN::ByteSpan) const, TmpFileSystem&, mode_t);
 		~ProcROProcessInode() = default;
+
+		virtual uid_t uid() const override { return m_process.credentials().ruid(); }
+		virtual gid_t gid() const override { return m_process.credentials().rgid(); }
+
 	protected:
 		virtual BAN::ErrorOr<size_t> read_impl(off_t, BAN::ByteSpan) override;
 
@@ -52,11 +59,13 @@ namespace Kernel
 
 	class ProcSymlinkProcessInode final : public TmpInode
 	{
-		//FIXME: dynamically update ruid/rgid
 	public:
 		static BAN::ErrorOr<BAN::RefPtr<ProcSymlinkProcessInode>> create_new(Process& process, BAN::ErrorOr<BAN::String> (Process::*callback)() const, TmpFileSystem&, mode_t);
 		~ProcSymlinkProcessInode() = default;
 
+		virtual uid_t uid() const override { return m_process.credentials().ruid(); }
+		virtual gid_t gid() const override { return m_process.credentials().rgid(); }
+
 	protected:
 		virtual BAN::ErrorOr<BAN::String> link_target_impl() override;
 
@@ -76,7 +85,7 @@ namespace Kernel
 	class ProcROInode final : public TmpInode
 	{
 	public:
-		static BAN::ErrorOr<BAN::RefPtr<ProcROInode>> create_new(BAN::ErrorOr<size_t> (*callback)(off_t, BAN::ByteSpan, void*), TmpFileSystem&, void*, mode_t, uid_t, gid_t);
+		static BAN::ErrorOr<BAN::RefPtr<ProcROInode>> create_new(size_t (*callback)(off_t, BAN::ByteSpan), TmpFileSystem&, mode_t, uid_t, gid_t);
 		~ProcROInode() = default;
 
 	protected:
@@ -92,11 +101,10 @@ namespace Kernel
 		virtual bool has_hungup_impl() const override { return false; }
 
 	private:
-		ProcROInode(BAN::ErrorOr<size_t> (*callback)(off_t, BAN::ByteSpan, void*), TmpFileSystem&, void*, const TmpInodeInfo&);
+		ProcROInode(size_t (*callback)(off_t, BAN::ByteSpan), TmpFileSystem&, const TmpInodeInfo&);
 
 	private:
-		BAN::ErrorOr<size_t> (*m_callback)(off_t, BAN::ByteSpan, void*);
+		size_t (*m_callback)(off_t, BAN::ByteSpan);
-		void* m_argument;
 	};
 
 	class ProcSymlinkInode final : public TmpInode
@@ -124,10 +132,13 @@ namespace Kernel
 
 	class ProcFDDirectoryInode final : public TmpInode
 	{
-		//FIXME: dynamically update ruid/rgid
 	public:
 		static BAN::ErrorOr<BAN::RefPtr<ProcFDDirectoryInode>> create_new(Process&, TmpFileSystem&, mode_t);
 		~ProcFDDirectoryInode() = default;
+
+		virtual uid_t uid() const override { return m_process.credentials().ruid(); }
+		virtual gid_t gid() const override { return m_process.credentials().rgid(); }
+
 	protected:
 		virtual BAN::ErrorOr<BAN::RefPtr<Inode>> find_inode_impl(BAN::StringView) override;
 		virtual BAN::ErrorOr<size_t> list_next_inodes_impl(off_t, struct dirent*, size_t) override;

kernel/include/kernel/FS/Socket.h

@@ -30,19 +30,31 @@ namespace Kernel
 		};
 
 	public:
+		ino_t		ino()		const final override { ASSERT_NOT_REACHED(); }
+		Mode		mode()		const final override { return Mode(m_info.mode); }
+		nlink_t		nlink()		const final override { ASSERT_NOT_REACHED(); }
+		uid_t		uid()		const final override { return m_info.uid; }
+		gid_t		gid()		const final override { return m_info.gid; }
+		off_t		size()		const final override { ASSERT_NOT_REACHED(); }
+		timespec	atime()		const final override { ASSERT_NOT_REACHED(); }
+		timespec	mtime()		const final override { ASSERT_NOT_REACHED(); }
+		timespec	ctime()		const final override { ASSERT_NOT_REACHED(); }
+		blksize_t	blksize()	const final override { ASSERT_NOT_REACHED(); }
+		blkcnt_t	blocks()	const final override { ASSERT_NOT_REACHED(); }
+		dev_t		dev()		const final override { ASSERT_NOT_REACHED(); }
+		dev_t		rdev()		const final override { ASSERT_NOT_REACHED(); }
+
 		const FileSystem* filesystem() const final override { return nullptr; }
 
 	protected:
 		Socket(const Info& info)
-		{
+			: m_info(info)
-			m_mode = info.mode;
+		{}
-			m_uid = info.uid;
+
-			m_gid = info.gid;
+		BAN::ErrorOr<void> fsync_impl() final override { return {}; }
-		}
 
 	private:
-		BAN::ErrorOr<void> sync_inode(SyncType) final override { return {}; }
+		const Info m_info;
-		BAN::ErrorOr<void> sync_data() final override { return {}; }
 	};
 
 }

kernel/include/kernel/FS/TmpFS/Definitions.h

@@ -11,8 +11,18 @@
 namespace Kernel
 {
 
-	struct TmpBlocks
+	struct TmpInodeInfo
 	{
+		mode_t		mode	{ 0 };
+		uid_t		uid		{ 0 };
+		gid_t		gid		{ 0 };
+		timespec	atime	{ 0, 0 };
+		timespec	ctime	{ 0, 0 };
+		timespec	mtime	{ 0, 0 };
+		nlink_t		nlink	{ 0 };
+		size_t		size	{ 0 };
+		blkcnt_t	blocks	{ 0 };
+
 #if ARCH(x86_64)
 		// 2x direct blocks
 		// 1x singly indirect
@@ -31,23 +41,8 @@ namespace Kernel
 #else
 	#error
 #endif
-	};
-
-	struct TmpInodeInfo
-	{
-		mode_t		mode	{ 0 };
-		uid_t		uid		{ 0 };
-		gid_t		gid		{ 0 };
-		timespec	atime	{ 0, 0 };
-		timespec	ctime	{ 0, 0 };
-		timespec	mtime	{ 0, 0 };
-		nlink_t		nlink	{ 0 };
-		size_t		size	{ 0 };
-		blkcnt_t	blocks	{ 0 };
-		TmpBlocks   tmp_blocks;
-
 		static constexpr size_t max_size =
-			TmpBlocks::direct_block_count * PAGE_SIZE +
+			direct_block_count * PAGE_SIZE +
 			(PAGE_SIZE / sizeof(paddr_t)) * PAGE_SIZE +
 			(PAGE_SIZE / sizeof(paddr_t)) * (PAGE_SIZE / sizeof(paddr_t)) * PAGE_SIZE +
 			(PAGE_SIZE / sizeof(paddr_t)) * (PAGE_SIZE / sizeof(paddr_t)) * (PAGE_SIZE / sizeof(paddr_t)) * PAGE_SIZE;

kernel/include/kernel/FS/TmpFS/Inode.h

@@ -4,7 +4,6 @@
 #include <BAN/Optional.h>
 #include <kernel/FS/Inode.h>
 #include <kernel/FS/TmpFS/Definitions.h>
-#include <kernel/Lock/Mutex.h>
 
 namespace Kernel
 {
@@ -24,37 +23,51 @@ namespace Kernel
 
 	class TmpInode : public Inode
 	{
+	public:
+		virtual ino_t		ino()		const override { return m_ino; }
+		virtual Mode		mode()		const override { return Mode(m_inode_info.mode); }
+		virtual nlink_t		nlink()		const override { return m_inode_info.nlink; }
+		virtual uid_t		uid()		const override { return m_inode_info.uid; }
+		virtual gid_t		gid()		const override { return m_inode_info.gid; }
+		virtual off_t		size()		const override { return m_inode_info.size; }
+		virtual timespec	atime()		const override { return m_inode_info.atime; }
+		virtual timespec	mtime()		const override { return m_inode_info.mtime; }
+		virtual timespec	ctime()		const override { return m_inode_info.ctime; }
+		virtual blksize_t	blksize()	const override { return PAGE_SIZE; }
+		virtual blkcnt_t	blocks()	const override { return m_inode_info.blocks; }
+		virtual dev_t		dev()		const override;
+		virtual dev_t		rdev()		const override { return 0; }
+
 	public:
 		static BAN::ErrorOr<BAN::RefPtr<TmpInode>> create_from_existing(TmpFileSystem&, ino_t, const TmpInodeInfo&);
-		virtual ~TmpInode();
+		~TmpInode();
 
 		virtual const FileSystem* filesystem() const override;
 
 	protected:
 		TmpInode(TmpFileSystem&, ino_t, const TmpInodeInfo&);
 
-		void write_inode_to_fs();
+		virtual BAN::ErrorOr<void> chmod_impl(mode_t) override;
-		virtual BAN::ErrorOr<void> prepare_unlink_no_lock() { return {}; };
+		virtual BAN::ErrorOr<void> chown_impl(uid_t, gid_t) override;
+		virtual BAN::ErrorOr<void> utimens_impl(const timespec[2]) override;
+		virtual BAN::ErrorOr<void> fsync_impl() override { return {}; }
+
+		void sync();
+		virtual BAN::ErrorOr<void> prepare_unlink() { return {}; };
 
 		void free_all_blocks();
-		void free_indirect_blocks_no_lock(size_t block, uint32_t depth);
+		void free_indirect_blocks(size_t block, uint32_t depth);
 
 		BAN::Optional<size_t> block_index(size_t data_block_index);
-		BAN::Optional<size_t> block_index_from_indirect_no_lock(size_t block, size_t index, uint32_t depth);
+		BAN::Optional<size_t> block_index_from_indirect(size_t block, size_t index, uint32_t depth);
 
 		BAN::ErrorOr<size_t> block_index_with_allocation(size_t data_block_index);
-		BAN::ErrorOr<size_t> block_index_from_indirect_with_allocation_no_lock(size_t& block, size_t index, uint32_t depth);
+		BAN::ErrorOr<size_t> block_index_from_indirect_with_allocation(size_t& block, size_t index, uint32_t depth);
-
-	private:
-		BAN::ErrorOr<void> sync_inode(SyncType) override;
-		BAN::ErrorOr<void> sync_data() override;
 
 	protected:
 		TmpFileSystem& m_fs;
-		TmpBlocks m_tmp_blocks;
+		TmpInodeInfo m_inode_info;
-
+		const ino_t m_ino;
-		// TODO: try to reduce locking or replace this with rwlock(?)
-		Mutex m_lock;
 
 		// has to be able to increase link count
 		friend class TmpDirectoryInode;
@@ -66,7 +79,7 @@ namespace Kernel
 		static BAN::ErrorOr<BAN::RefPtr<TmpFileInode>> create_new(TmpFileSystem&, mode_t, uid_t, gid_t);
 		~TmpFileInode();
 
-	private:
+	protected:
 		virtual BAN::ErrorOr<size_t> read_impl(off_t, BAN::ByteSpan) override;
 		virtual BAN::ErrorOr<size_t> write_impl(off_t, BAN::ConstByteSpan) override;
 		virtual BAN::ErrorOr<void> truncate_impl(size_t) override;
@@ -82,36 +95,13 @@ namespace Kernel
 		friend class TmpInode;
 	};
 
-	// NOTE: this is just a dummy, when opening a fifo a pipe is created
-	class TmpFIFOInode : public TmpInode
-	{
-	public:
-		static BAN::ErrorOr<BAN::RefPtr<TmpFIFOInode>> create_new(TmpFileSystem&, mode_t, uid_t, gid_t);
-		~TmpFIFOInode();
-
-	private:
-		virtual BAN::ErrorOr<size_t> read_impl(off_t, BAN::ByteSpan) override { return BAN::Error::from_errno(ENODEV); }
-		virtual BAN::ErrorOr<size_t> write_impl(off_t, BAN::ConstByteSpan) override { return BAN::Error::from_errno(ENODEV); }
-		virtual BAN::ErrorOr<void> truncate_impl(size_t) override { return BAN::Error::from_errno(ENODEV); }
-
-		virtual bool can_read_impl() const override { return false; }
-		virtual bool can_write_impl() const override { return false; }
-		virtual bool has_error_impl() const override { return false; }
-		virtual bool has_hungup_impl() const override { return false; }
-
-	private:
-		TmpFIFOInode(TmpFileSystem&, ino_t, const TmpInodeInfo&);
-
-		friend class TmpInode;
-	};
-
 	class TmpSocketInode : public TmpInode
 	{
 	public:
 		static BAN::ErrorOr<BAN::RefPtr<TmpSocketInode>> create_new(TmpFileSystem&, mode_t, uid_t, gid_t);
 		~TmpSocketInode();
 
-	private:
+	protected:
 		virtual BAN::ErrorOr<size_t> read_impl(off_t, BAN::ByteSpan) override { return BAN::Error::from_errno(ENODEV); }
 		virtual BAN::ErrorOr<size_t> write_impl(off_t, BAN::ConstByteSpan) override { return BAN::Error::from_errno(ENODEV); }
 		virtual BAN::ErrorOr<void> truncate_impl(size_t) override { return BAN::Error::from_errno(ENODEV); }
@@ -133,7 +123,7 @@ namespace Kernel
 		static BAN::ErrorOr<BAN::RefPtr<TmpSymlinkInode>> create_new(TmpFileSystem&, mode_t, uid_t, gid_t, BAN::StringView target);
 		~TmpSymlinkInode();
 
-	private:
+	protected:
 		BAN::ErrorOr<BAN::String> link_target_impl() override;
 		BAN::ErrorOr<void> set_link_target_impl(BAN::StringView) override;
 
@@ -159,7 +149,7 @@ namespace Kernel
 	protected:
 		TmpDirectoryInode(TmpFileSystem&, ino_t, const TmpInodeInfo&);
 
-		virtual BAN::ErrorOr<void> prepare_unlink_no_lock() override;
+		virtual BAN::ErrorOr<void> prepare_unlink() override;
 
 	protected:
 		virtual BAN::ErrorOr<BAN::RefPtr<Inode>> find_inode_impl(BAN::StringView) override final;

kernel/include/kernel/FS/VirtualFileSystem.h

@@ -92,9 +92,8 @@ namespace Kernel
 		MountPoint* mount_from_root_inode(BAN::RefPtr<Inode>);
 
 	private:
+		Mutex					m_mutex;
 		BAN::RefPtr<FileSystem>	m_root_fs;
-
-		Mutex					m_mount_point_lock;
 		BAN::Vector<MountPoint>	m_mount_points;
 
 		friend class BAN::RefPtr<VirtualFileSystem>;

kernel/include/kernel/Input/InputDevice.h

@@ -22,6 +22,8 @@ namespace Kernel
 		InputDevice(Type type);
 
 		BAN::StringView name() const final override { return m_name; }
+		dev_t rdev() const final override { return m_rdev; }
+
 	protected:
 		void add_event(BAN::ConstByteSpan);
 
@@ -36,7 +38,8 @@ namespace Kernel
 		BAN::ErrorOr<size_t> read_non_block(BAN::ByteSpan);
 
 	private:
-		BAN::String m_name;
+		const dev_t m_rdev;
+		const BAN::String m_name;
 
 		const Type m_type;
 
@@ -61,7 +64,6 @@ namespace Kernel
 	{
 	public:
 		static BAN::ErrorOr<BAN::RefPtr<KeyboardDevice>> create(mode_t mode, uid_t uid, gid_t gid);
-		static BAN::ErrorOr<void> initialize_tty_thread();
 
 		void notify();
 
@@ -75,8 +77,10 @@ namespace Kernel
 		bool has_hungup_impl() const override { return false; }
 
 		BAN::StringView name() const final override { return m_name; }
+		dev_t rdev() const final override { return m_rdev; }
 
 	private:
+		const dev_t m_rdev;
 		const BAN::StringView m_name;
 		ThreadBlocker m_thread_blocker;
 
@@ -100,7 +104,10 @@ namespace Kernel
 		bool has_hungup_impl() const override { return false; }
 
 		BAN::StringView name() const final override { return m_name; }
+		dev_t rdev() const final override { return m_rdev; }
+
 	private:
+		const dev_t m_rdev;
 		const BAN::StringView m_name;
 		ThreadBlocker m_thread_blocker;
 

kernel/include/kernel/Lock/LockGuard.h

@@ -7,7 +7,7 @@
 namespace Kernel
 {
 
-	template<typename Lock> requires requires(Lock& lock) { lock.lock(); lock.unlock(); }
+	template<typename Lock>
 	class LockGuard
 	{
 		BAN_NON_COPYABLE(LockGuard);

kernel/include/kernel/Lock/Mutex.h

@@ -21,7 +21,7 @@ namespace Kernel
 		virtual uint32_t lock_depth() const = 0;
 	};
 
-	class Mutex final : public BaseMutex
+	class Mutex : public BaseMutex
 	{
 		BAN_NON_COPYABLE(Mutex);
 		BAN_NON_MOVABLE(Mutex);
@@ -40,7 +40,6 @@ namespace Kernel
 				pid_t expected = -1;
 				while (!m_locker.compare_exchange(expected, tid))
 				{
-					ASSERT(Processor::get_interrupt_state() == InterruptState::Enabled);
 					Processor::yield();
 					expected = -1;
 				}
@@ -85,14 +84,13 @@ namespace Kernel
 		pid_t locker() const override { return m_locker; }
 		bool is_locked() const override { return m_locker != -1; }
 		uint32_t lock_depth() const override { return m_lock_depth; }
-		bool is_locked_by_current_thread() const { return m_locker == Thread::current_tid(); }
 
 	private:
 		BAN::Atomic<pid_t>	m_locker		{ -1 };
 		uint32_t			m_lock_depth	{  0 };
 	};
 
-	class PriorityMutex final : public BaseMutex
+	class PriorityMutex : public BaseMutex
 	{
 		BAN_NON_COPYABLE(PriorityMutex);
 		BAN_NON_MOVABLE(PriorityMutex);
@@ -115,7 +113,6 @@ namespace Kernel
 				pid_t expected = -1;
 				while (!(has_priority || m_queue_length == 0) || !m_locker.compare_exchange(expected, tid))
 				{
-					ASSERT(Processor::get_interrupt_state() == InterruptState::Enabled);
 					Processor::yield();
 					expected = -1;
 				}
@@ -167,7 +164,6 @@ namespace Kernel
 		pid_t locker() const override { return m_locker; }
 		bool is_locked() const override { return m_locker != -1; }
 		uint32_t lock_depth() const override { return m_lock_depth; }
-		bool is_locked_by_current_thread() const { return m_locker == Thread::current_tid(); }
 
 	private:
 		BAN::Atomic<pid_t>		m_locker		{ -1 };

kernel/include/kernel/Lock/RWLock.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <kernel/Lock/SpinLock.h>
+#include <kernel/Lock/Mutex.h>
-#include <kernel/Lock/SpinLockAsMutex.h>
+#include <kernel/Lock/LockGuard.h>
 
 namespace Kernel
 {
@@ -15,60 +15,43 @@ namespace Kernel
 
 		void rd_lock()
 		{
-			SpinLockGuard _(m_lock);
+			LockGuard _(m_mutex);
-			while (m_writers_waiting > 0 || m_writer != -1)
+			while (m_writers_waiting > 0 || m_writer_active)
-			{
+				m_thread_blocker.block_indefinite(&m_mutex);
-				SpinLockGuardAsMutex smutex(_);
-				m_thread_blocker.block_indefinite(&smutex);
-			}
 			m_readers_active++;
 		}
 
 		void rd_unlock()
 		{
-			SpinLockGuard _(m_lock);
+			LockGuard _(m_mutex);
 			if (--m_readers_active == 0)
 				m_thread_blocker.unblock();
 		}
 
 		void wr_lock()
 		{
-			if (m_writer == Thread::current_tid())
+			LockGuard _(m_mutex);
-			{
-				m_writer_depth++;
-				return;
-			}
-
-			SpinLockGuard _(m_lock);
-
 			m_writers_waiting++;
-			while (m_readers_active > 0 || m_writer != -1)
+			while (m_readers_active > 0 || m_writer_active)
-			{
+				m_thread_blocker.block_indefinite(&m_mutex);
-				SpinLockGuardAsMutex smutex(_);
-				m_thread_blocker.block_indefinite(&smutex);
-			}
 			m_writers_waiting--;
-
+			m_writer_active = true;
-			m_writer = Thread::current_tid();
-			m_writer_depth = 1;
 		}
 
+
 		void wr_unlock()
 		{
-			if (--m_writer_depth != 0)
+			LockGuard _(m_mutex);
-				return;
+			m_writer_active = false;
-			SpinLockGuard _(m_lock);
-			m_writer = -1;
 			m_thread_blocker.unblock();
 		}
 
 	private:
-		SpinLock m_lock;
+		Mutex m_mutex;
 		ThreadBlocker m_thread_blocker;
 		uint32_t m_readers_active  { 0 };
 		uint32_t m_writers_waiting { 0 };
-		pid_t m_writer { -1 };
+		bool m_writer_active { false };
-		uint32_t m_writer_depth { 0 };
 	};
 
 	class RWLockRDGuard

kernel/include/kernel/Lock/SpinLockAsMutex.h

@@ -46,7 +46,7 @@ namespace Kernel
 		uint32_t lock_depth() const override { return m_lock_depth; }
 
 	private:
-		Lock& m_lock;
+		SpinLock& m_lock;
 		uint32_t m_lock_depth { 0 };
 		InterruptState m_state;
 		const pid_t m_locker;

kernel/include/kernel/Memory/FileBackedRegion.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <kernel/FS/Inode.h>
-#include <kernel/Lock/RWLock.h>
 #include <kernel/Memory/MemoryRegion.h>
 
 namespace Kernel
@@ -11,15 +10,15 @@ namespace Kernel
 	{
 		~SharedFileData();
 
-		void sync_no_lock(size_t page_index);
+		void sync(size_t page_index);
 
-		RWLock rw_lock;
+		Mutex mutex;
 
 		// FIXME: this should probably be ordered tree like map
 		//        for fast lookup and less memory usage
 		BAN::Vector<paddr_t> pages;
-		BAN::Vector<uint32_t> writers;
 		BAN::RefPtr<Inode> inode;
+		uint8_t page_buffer[PAGE_SIZE];
 	};
 
 	class FileBackedRegion final : public MemoryRegion

kernel/include/kernel/Memory/PageTable.h

@@ -14,12 +14,6 @@ namespace Kernel
 		requires BAN::is_same_v<decltype(func()), void>;
 	};
 
-	template<typename F>
-	concept with_per_cpu_fast_page_callback = requires(F func, void* addr)
-	{
-		requires BAN::is_same_v<decltype(func(addr)), void>;
-	};
-
 	template<typename F>
 	concept with_fast_page_callback_error = requires(F func)
 	{
@@ -51,10 +45,6 @@ namespace Kernel
 			WriteThrough,
 		};
 
-		static constexpr bool full_tlb_flush_threshold = 32;
-
-		static constexpr size_t reserved_fast_pages = 0x10;
-
 	public:
 		static void initialize_fast_page();
 		static void initialize_and_load();
@@ -82,18 +72,6 @@ namespace Kernel
 			unmap_fast_page();
 		}
 
-		template<with_per_cpu_fast_page_callback F>
-		static void with_per_cpu_fast_page(paddr_t paddr, F callback)
-		{
-			const auto state = Processor::get_interrupt_state();
-			Processor::set_interrupt_state(InterruptState::Disabled);
-			const size_t index = Processor::current_index() + reserved_fast_pages;
-			void* addr = map_fast_page(index, paddr);
-			callback(addr);
-			unmap_fast_page(index);
-			Processor::set_interrupt_state(state);
-		}
-
 		template<with_fast_page_callback_error F>
 		static BAN::ErrorOr<void> with_fast_page(paddr_t paddr, F callback)
 		{
@@ -145,8 +123,8 @@ namespace Kernel
 		bool is_page_free(vaddr_t) const;
 		bool is_range_free(vaddr_t, size_t bytes) const;
 
-		void reserve_page(vaddr_t);
+		bool reserve_page(vaddr_t, bool only_free = true, bool invalidate = true);
-		void reserve_range(vaddr_t, size_t bytes);
+		bool reserve_range(vaddr_t, size_t bytes, bool only_free = true);
 
 		vaddr_t reserve_free_page(vaddr_t first_address, vaddr_t last_address = UINTPTR_MAX);
 		vaddr_t reserve_free_contiguous_pages(size_t page_count, vaddr_t first_address, vaddr_t last_address = UINTPTR_MAX);
@@ -155,7 +133,6 @@ namespace Kernel
 
 		void invalidate_page(vaddr_t addr, bool send_smp_message) { invalidate_range(addr, 1, send_smp_message); }
 		void invalidate_range(vaddr_t addr, size_t pages, bool send_smp_message);
-		void invalidate_full_address_space(bool global);
 
 		InterruptState lock() const { return m_lock.lock(); }
 		void unlock(InterruptState state) const { m_lock.unlock(state); }
@@ -172,9 +149,6 @@ namespace Kernel
 		static void map_fast_page(paddr_t);
 		static void unmap_fast_page();
 
-		static void* map_fast_page(size_t index, paddr_t);
-		static void unmap_fast_page(size_t index);
-
 	private:
 		paddr_t						m_highest_paging_struct { 0 };
 		mutable RecursiveSpinLock	m_lock;

kernel/include/kernel/Memory/kmalloc.h

@@ -1,8 +1,15 @@
 #pragma once
 
+#include <BAN/Optional.h>
+#include <kernel/Memory/Types.h>
+
 #include <stddef.h>
 
 void kmalloc_initialize();
+void kmalloc_dump_info();
 
-void* kmalloc(size_t);
+void* kmalloc(size_t size);
+void* kmalloc(size_t size, size_t align, bool force_identity_map = false);
 void kfree(void*);
+
+BAN::Optional<Kernel::paddr_t> kmalloc_paddr_of(Kernel::vaddr_t);

kernel/include/kernel/Networking/E1000/Definitions.h

@@ -29,7 +29,6 @@ namespace Kernel
 		REG_TDLEN	= 0x3808,
 		REG_TDH		= 0x3810,
 		REG_TDT		= 0x3818,
-		REG_RXCSUM	= 0x5000,
 		REG_MTA		= 0x5200,
 	};
 
@@ -168,15 +167,6 @@ namespace Kernel
 		RCTL_BSIZE_16384	= (0b01 << 16) | RCTL_BSEX,
 	};
 
-	enum E1000_RXCSUM : uint32_t
-	{
-		RXSUM_IPOFLD  = 1 << 8,
-		RXSUM_TUOFLD  = 1 << 9,
-		RXSUM_CRCOFLD = 1 << 11,
-		RXSUM_IPPCE   = 1 << 12,
-		RXSUM_PCSD    = 1 << 13,
-	};
-
 	enum E1000_CMD : uint8_t
 	{
 		CMD_EOP		= 1 << 0,
@@ -188,26 +178,6 @@ namespace Kernel
 		CMD_IDE		= 1 << 7,
 	};
 
-	enum E1000_RX_STS : uint8_t
-	{
-		RX_STS_IPCS  = 1 << 6,
-		RX_STS_TCPCS = 1 << 5,
-		RX_STS_UDPCS = 1 << 5,
-		RX_STS_EOP   = 1 << 1,
-		RX_STS_DD    = 1 << 0,
-	};
-
-	enum E1000_RX_ERR : uint8_t
-	{
-		RX_ERR_RXE  = 1 << 7,
-		RX_ERR_IPE  = 1 << 6,
-		RX_ERR_TCPE = 1 << 5,
-		RX_ERR_CXE  = 1 << 4,
-		RX_ERR_SEQ  = 1 << 2,
-		RX_ERR_SE   = 1 << 1,
-		RX_ERR_CE   = 1 << 0,
-	};
-
 	struct e1000_rx_desc
 	{
 		uint64_t addr;

kernel/include/kernel/Networking/E1000/E1000.h

@@ -45,7 +45,7 @@ namespace Kernel
 		uint32_t read32(uint16_t reg);
 		void write32(uint16_t reg, uint32_t value);
 
-		BAN::ErrorOr<void> send_raw_bytes(BAN::Span<const BAN::ConstByteSpan> buffers) override;
+		BAN::ErrorOr<void> send_bytes(BAN::MACAddress destination, EtherType protocol, BAN::Span<const BAN::ConstByteSpan> payload) override;
 
 		bool can_read_impl() const override { return false; }
 		bool can_write_impl() const override { return false; }
@@ -73,15 +73,11 @@ namespace Kernel
 		BAN::UniqPtr<DMARegion>	m_tx_buffer_region;
 		BAN::UniqPtr<DMARegion>	m_rx_descriptor_region;
 		BAN::UniqPtr<DMARegion>	m_tx_descriptor_region;
-
+		SpinLock m_lock;
-		BAN::Atomic<uint32_t> m_tx_head   { 0 };
-		BAN::Atomic<uint32_t> m_tx_commit { 0 };
-
-		SpinLock m_rx_lock;
-		ThreadBlocker m_rx_blocker;
 
 		bool m_thread_should_die { false };
 		BAN::Atomic<bool> m_thread_is_dead { true };
+		ThreadBlocker m_thread_blocker;
 
 		BAN::MACAddress	m_mac_address {};
 		bool			m_link_up { false };

kernel/include/kernel/Networking/IPv4Layer.h

@@ -41,14 +41,14 @@ namespace Kernel
 
 		ARPTable& arp_table() { return *m_arp_table; }
 
-		BAN::ErrorOr<void> handle_ipv4_packet(NetworkInterface&, BAN::ConstByteSpan, uint32_t validated_cksums);
+		BAN::ErrorOr<void> handle_ipv4_packet(NetworkInterface&, BAN::ConstByteSpan);
 
 		virtual void unbind_socket(uint16_t port) override;
 		virtual BAN::ErrorOr<void> bind_socket_with_target(BAN::RefPtr<NetworkSocket>, const sockaddr* target_address, socklen_t target_address_len) override;
 		virtual BAN::ErrorOr<void> bind_socket_to_address(BAN::RefPtr<NetworkSocket>, const sockaddr* address, socklen_t address_len) override;
 		virtual BAN::ErrorOr<void> get_socket_address(BAN::RefPtr<NetworkSocket>, sockaddr* address, socklen_t* address_len) override;
 
-		virtual BAN::ErrorOr<void> sendto(NetworkSocket&, BAN::ConstByteSpan, const sockaddr*, socklen_t) override;
+		virtual BAN::ErrorOr<size_t> sendto(NetworkSocket&, BAN::ConstByteSpan, const sockaddr*, socklen_t) override;
 
 		virtual Socket::Domain domain() const override { return Socket::Domain::INET ;}
 		virtual size_t header_size() const override { return sizeof(IPv4Header); }

kernel/include/kernel/Networking/Loopback.h

@@ -27,7 +27,7 @@ namespace Kernel
 		{}
 		~LoopbackInterface();
 
-		BAN::ErrorOr<void> send_raw_bytes(BAN::Span<const BAN::ConstByteSpan> buffers) override;
+		BAN::ErrorOr<void> send_bytes(BAN::MACAddress destination, EtherType protocol, BAN::Span<const BAN::ConstByteSpan> payload) override;
 
 		bool can_read_impl() const override { return false; }
 		bool can_write_impl() const override { return false; }
@@ -46,7 +46,7 @@ namespace Kernel
 		};
 
 	private:
-		SpinLock m_buffer_lock;
+		Mutex m_buffer_lock;
 		BAN::UniqPtr<VirtualRange> m_buffer;
 
 		uint32_t m_buffer_tail { 0 };

kernel/include/kernel/Networking/NetworkInterface.h

@@ -23,13 +23,6 @@ namespace Kernel
 		ARP = 0x0806,
 	};
 
-	enum NetworkChecksum : uint32_t
-	{
-		CKSUM_IPV4 = 1 << 0,
-		CKSUM_TCP  = 1 << 1,
-		CKSUM_UDP  = 1 << 2,
-	};
-
 	class NetworkInterface : public CharacterDevice
 	{
 		BAN_NON_COPYABLE(NetworkInterface);
@@ -64,38 +57,19 @@ namespace Kernel
 
 		virtual size_t payload_mtu() const = 0;
 
+		virtual dev_t rdev() const override { return m_rdev; }
 		virtual BAN::StringView name() const override { return m_name; }
 
-		BAN::ErrorOr<void> send_with_ethernet_header(BAN::MACAddress dst_mac, EtherType ether_type, BAN::ConstByteSpan buffer)
+		BAN::ErrorOr<void> send_bytes(BAN::MACAddress destination, EtherType protocol, BAN::ConstByteSpan payload)
 		{
-			BAN::ConstByteSpan buffer_array[1] { buffer };
+			return send_bytes(destination, protocol, { &payload, 1 });
-			return send_with_ethernet_header(dst_mac, ether_type, buffer_array);
 		}
-
+		virtual BAN::ErrorOr<void> send_bytes(BAN::MACAddress destination, EtherType protocol, BAN::Span<const BAN::ConstByteSpan> payload) = 0;
-		template<size_t SIZE>
-		BAN::ErrorOr<void> send_with_ethernet_header(BAN::MACAddress dst_mac, EtherType ether_type, const BAN::ConstByteSpan (&buffer_array)[SIZE])
-		{
-			const auto ethernet_header = EthernetHeader {
-				.dst_mac = dst_mac,
-				.src_mac = get_mac_address(),
-				.ether_type = ether_type,
-			};
-
-			BAN::ConstByteSpan new_buffer_array[SIZE + 1];
-			new_buffer_array[0] = BAN::ConstByteSpan::from(ethernet_header);
-			for (size_t i = 0; i < SIZE; i++)
-				new_buffer_array[i + 1] = buffer_array[i];
-
-			return send_raw_bytes({ new_buffer_array, SIZE + 1 });
-		}
-
-		virtual BAN::ErrorOr<void> send_raw_bytes(BAN::Span<const BAN::ConstByteSpan> buffers) = 0;
-
-	private:
-		BAN::ErrorOr<long> ioctl_impl(unsigned long, void*) override;
 
 	private:
 		const Type m_type;
+
+		const dev_t m_rdev;
 		char m_name[10];
 
 		BAN::IPv4Address m_ipv4_address { 0 };

kernel/include/kernel/Networking/NetworkLayer.h

@@ -27,7 +27,7 @@ namespace Kernel
 		virtual BAN::ErrorOr<void> bind_socket_to_address(BAN::RefPtr<NetworkSocket>, const sockaddr* address, socklen_t address_len) = 0;
 		virtual BAN::ErrorOr<void> get_socket_address(BAN::RefPtr<NetworkSocket>, sockaddr* address, socklen_t* address_len) = 0;
 
-		virtual BAN::ErrorOr<void> sendto(NetworkSocket&, BAN::ConstByteSpan, const sockaddr*, socklen_t) = 0;
+		virtual BAN::ErrorOr<size_t> sendto(NetworkSocket&, BAN::ConstByteSpan, const sockaddr*, socklen_t) = 0;
 
 		virtual Socket::Domain domain() const = 0;
 		virtual size_t header_size() const = 0;

kernel/include/kernel/Networking/NetworkManager.h

@@ -27,7 +27,7 @@ namespace Kernel
 		BAN::ErrorOr<BAN::RefPtr<Socket>> create_socket(Socket::Domain, Socket::Type, mode_t, uid_t, gid_t);
 		BAN::ErrorOr<void> connect_sockets(Socket::Domain, BAN::RefPtr<Socket>, BAN::RefPtr<Socket>);
 
-		void on_receive(NetworkInterface&, BAN::ConstByteSpan, uint32_t validated_cksums);
+		void on_receive(NetworkInterface&, BAN::ConstByteSpan);
 
 	private:
 		NetworkManager() {}

kernel/include/kernel/Networking/NetworkSocket.h

@@ -35,7 +35,7 @@ namespace Kernel
 		virtual void get_protocol_header(BAN::ByteSpan header, BAN::ConstByteSpan payload, uint16_t dst_port, PseudoHeader) = 0;
 		virtual NetworkProtocol protocol() const = 0;
 
-		virtual void receive_packet(BAN::ConstByteSpan, const sockaddr* sender, socklen_t sender_len, uint32_t validated_cksums) = 0;
+		virtual void receive_packet(BAN::ConstByteSpan, const sockaddr* sender, socklen_t sender_len) = 0;
 
 		bool is_bound() const { return m_address_len >= static_cast<socklen_t>(sizeof(sa_family_t)) && m_address.ss_family != AF_UNSPEC; }
 		in_port_t bound_port() const
@@ -54,7 +54,7 @@ namespace Kernel
 	protected:
 		NetworkSocket(NetworkLayer&, const Socket::Info&);
 
-		virtual BAN::ErrorOr<long> ioctl_impl(unsigned long request, void* arg) override;
+		virtual BAN::ErrorOr<long> ioctl_impl(int request, void* arg) override;
 		virtual BAN::ErrorOr<void> getsockname_impl(sockaddr*, socklen_t*) override;
 		virtual BAN::ErrorOr<void> getpeername_impl(sockaddr*, socklen_t*) override = 0;
 

kernel/include/kernel/Networking/RTL8169/Definitions.h

@@ -7,25 +7,25 @@ namespace Kernel
 
 	enum RTL8169_IO_REGS : uint16_t
 	{
-		RTL8169_IO_IDR0    = 0x00,
+		RTL8169_IO_IDR0   = 0x00,
-		RTL8169_IO_IDR1    = 0x01,
+		RTL8169_IO_IDR1   = 0x01,
-		RTL8169_IO_IDR2    = 0x02,
+		RTL8169_IO_IDR2   = 0x02,
-		RTL8169_IO_IDR3    = 0x03,
+		RTL8169_IO_IDR3   = 0x03,
-		RTL8169_IO_IDR4    = 0x04,
+		RTL8169_IO_IDR4   = 0x04,
-		RTL8169_IO_IDR5    = 0x05,
+		RTL8169_IO_IDR5   = 0x05,
 
-		RTL8169_IO_TNPDS   = 0x20,
+		RTL8169_IO_TNPDS  = 0x20,
-		RTL8169_IO_CR      = 0x37,
+		RTL8169_IO_CR     = 0x37,
-		RTL8169_IO_TPPoll  = 0x38,
+		RTL8169_IO_TPPoll = 0x38,
-		RTL8169_IO_IMR     = 0x3C,
+		RTL8169_IO_IMR    = 0x3C,
-		RTL8169_IO_ISR     = 0x3E,
+		RTL8169_IO_ISR    = 0x3E,
-		RTL8169_IO_TCR     = 0x40,
+		RTL8169_IO_TCR    = 0x40,
-		RTL8169_IO_RCR     = 0x44,
+		RTL8169_IO_RCR    = 0x44,
-		RTL8169_IO_PHYSts  = 0x6C,
+		RTL8169_IO_9346CR = 0x50,
-		RTL8169_IO_RMS     = 0xDA,
+		RTL8169_IO_PHYSts = 0x6C,
-		RTL8169_IO_CPlusCR = 0xE0,
+		RTL8169_IO_RMS    = 0xDA,
-		RTL8169_IO_RDSAR   = 0xE4,
+		RTL8169_IO_RDSAR  = 0xE4,
-		RTL8169_IO_MTPS    = 0xEC,
+		RTL8169_IO_MTPS   = 0xEC,
 	};
 
 	enum RTL8169_CR : uint8_t

kernel/include/kernel/Networking/RTL8169/RTL8169.h

@@ -20,7 +20,7 @@ namespace Kernel
 		virtual bool link_up() override { return m_link_up; }
 		virtual int link_speed() override;
 
-		virtual size_t payload_mtu() const override { return 0x1FF8 - sizeof(EthernetHeader); }
+		virtual size_t payload_mtu() const override { return 7436 - sizeof(EthernetHeader); }
 
 		virtual void handle_irq() override;
 
@@ -33,7 +33,7 @@ namespace Kernel
 
 		BAN::ErrorOr<void> initialize();
 
-		virtual BAN::ErrorOr<void> send_raw_bytes(BAN::Span<const BAN::ConstByteSpan> buffers) override;
+		virtual BAN::ErrorOr<void> send_bytes(BAN::MACAddress destination, EtherType protocol, BAN::Span<const BAN::ConstByteSpan>) override;
 
 		virtual bool can_read_impl() const override { return false; }
 		virtual bool can_write_impl() const override { return false; }
@@ -64,17 +64,14 @@ namespace Kernel
 		BAN::UniqPtr<DMARegion>	m_rx_descriptor_region;
 		BAN::UniqPtr<DMARegion>	m_tx_descriptor_region;
 
-		BAN::Atomic<bool> m_rx_thread_should_die { false };
+		SpinLock m_lock;
-		BAN::Atomic<bool> m_rx_thread_is_dead { true };
 
-		uint32_t m_rx_head { 0 };
+		bool m_thread_should_die { false };
-		SpinLock m_rx_lock;
+		BAN::Atomic<bool> m_thread_is_dead { true };
-		ThreadBlocker m_rx_blocker;
+		ThreadBlocker m_thread_blocker;
 
-		BAN::Atomic<uint32_t> m_tx_head { 0 };
+		uint32_t m_rx_current { 0 };
-		BAN::Atomic<uint32_t> m_tx_commit { 0 };
+		size_t m_tx_current { 0 };
-		SpinLock m_tx_lock;
-		ThreadBlocker m_tx_blocker;
 
 		BAN::MACAddress	m_mac_address {};
 		BAN::Atomic<bool> m_link_up { false };

kernel/include/kernel/Networking/TCPSocket.h

@@ -66,9 +66,9 @@ namespace Kernel
 		BAN::ErrorOr<void> getsockopt_impl(int, int, void*, socklen_t*) override;
 		BAN::ErrorOr<void> setsockopt_impl(int, int, const void*, socklen_t) override;
 
-		BAN::ErrorOr<long> ioctl_impl(unsigned long, void*) override;
+		BAN::ErrorOr<long> ioctl_impl(int, void*) override;
 
-		void receive_packet(BAN::ConstByteSpan, const sockaddr* sender, socklen_t sender_len, uint32_t validated_cksums) override;
+		void receive_packet(BAN::ConstByteSpan, const sockaddr* sender, socklen_t sender_len) override;
 
 		bool can_read_impl() const override;
 		bool can_write_impl() const override;
@@ -181,7 +181,6 @@ namespace Kernel
 
 		uint64_t m_time_wait_start_ms { 0 };
 
-		mutable Mutex m_mutex;
 		ThreadBlocker m_thread_blocker;
 
 		RecvWindowInfo m_recv_window;

kernel/include/kernel/Networking/UDPSocket.h

@@ -31,7 +31,7 @@ namespace Kernel
 		void get_protocol_header(BAN::ByteSpan header, BAN::ConstByteSpan payload, uint16_t dst_port, PseudoHeader) override;
 
 	protected:
-		void receive_packet(BAN::ConstByteSpan, const sockaddr* sender, socklen_t sender_len, uint32_t validated_cksums) override;
+		void receive_packet(BAN::ConstByteSpan, const sockaddr* sender, socklen_t sender_len) override;
 
 		BAN::ErrorOr<void> connect_impl(const sockaddr*, socklen_t) override;
 		BAN::ErrorOr<void> bind_impl(const sockaddr* address, socklen_t address_len) override;
@@ -41,7 +41,7 @@ namespace Kernel
 		BAN::ErrorOr<void> getsockopt_impl(int, int, void*, socklen_t*) override;
 		BAN::ErrorOr<void> setsockopt_impl(int, int, const void*, socklen_t) override;
 
-		BAN::ErrorOr<long> ioctl_impl(unsigned long, void*) override;
+		BAN::ErrorOr<long> ioctl_impl(int, void*) override;
 
 		bool can_read_impl() const override { return !m_packets.empty(); }
 		bool can_write_impl() const override { return true; }
@@ -66,12 +66,9 @@ namespace Kernel
 		SpinLock							m_packet_lock;
 		ThreadBlocker						m_packet_thread_blocker;
 
-		SpinLock							m_peer_address_lock;
 		sockaddr_storage					m_peer_address {};
 		socklen_t							m_peer_address_len { 0 };
 
-		Mutex								m_bind_lock;
-
 		friend class BAN::RefPtr<UDPSocket>;
 	};
 

kernel/include/kernel/Networking/UNIX/Socket.h

@@ -30,7 +30,6 @@ namespace Kernel
 		virtual BAN::ErrorOr<void> bind_impl(const sockaddr*, socklen_t) override;
 		virtual BAN::ErrorOr<size_t> recvmsg_impl(msghdr& message, int flags) override;
 		virtual BAN::ErrorOr<size_t> sendmsg_impl(const msghdr& message, int flags) override;
-		virtual BAN::ErrorOr<void> getsockname_impl(sockaddr*, socklen_t*) override;
 		virtual BAN::ErrorOr<void> getpeername_impl(sockaddr*, socklen_t*) override;
 		virtual BAN::ErrorOr<void> getsockopt_impl(int, int, void*, socklen_t*) override;
 		virtual BAN::ErrorOr<void> setsockopt_impl(int, int, const void*, socklen_t) override;
@@ -44,16 +43,15 @@ namespace Kernel
 		UnixDomainSocket(Socket::Type, const Socket::Info&);
 		~UnixDomainSocket();
 
-		bool is_bound() const;
+		bool is_bound() const { return !m_bound_file.canonical_path.empty(); }
-		bool is_bound_to_unused() const;
+		bool is_bound_to_unused() const { return !m_bound_file.inode; }
-		BAN::ErrorOr<void> bind_to_unused_if_not_bound();
 
 		bool is_streaming() const;
 
 	private:
 		struct ConnectionInfo
 		{
-			BAN::Atomic<bool>							listening { false };
+			bool										listening { false };
 			BAN::Atomic<bool>							connection_done { false };
 			mutable BAN::Atomic<bool>					target_closed { false };
 			BAN::WeakPtr<UnixDomainSocket>				connection;
@@ -64,7 +62,6 @@ namespace Kernel
 
 		struct ConnectionlessInfo
 		{
-			SpinLock lock;
 			BAN::String peer_address;
 		};
 
@@ -79,9 +76,7 @@ namespace Kernel
 		BAN::ErrorOr<size_t> add_packet(const msghdr&, PacketInfo&&, bool dont_block);
 
 	private:
-		const Socket::Type m_socket_type;
+		const Socket::Type		m_socket_type;
-
-		mutable Mutex m_bind_mutex;
 		VirtualFileSystem::File	m_bound_file;
 
 		BAN::Variant<ConnectionInfo, ConnectionlessInfo> m_info;

kernel/include/kernel/OpenFileDescriptorSet.h

@@ -58,8 +58,6 @@ namespace Kernel
 		BAN::ErrorOr<size_t> recvmsg(int socket, msghdr& message, int flags);
 		BAN::ErrorOr<size_t> sendmsg(int socket, const msghdr& message, int flags);
 
-		int get_max_open_fd() const;
-
 		BAN::ErrorOr<VirtualFileSystem::File> file_of(int) const;
 		BAN::ErrorOr<BAN::String> path_of(int) const;
 		BAN::ErrorOr<BAN::RefPtr<Inode>> inode_of(int);

kernel/include/kernel/PCI.h

@@ -4,6 +4,7 @@
 #include <BAN/Vector.h>
 #include <kernel/ACPI/AML/Node.h>
 #include <kernel/Memory/Types.h>
+#include <kernel/Storage/StorageController.h>
 
 #include <sys/types.h>
 
@@ -65,13 +66,11 @@ namespace Kernel::PCI
 		};
 
 	public:
-		Device(uint8_t bus, uint8_t dev, uint8_t func)
+		Device() = default;
-			: m_bus(bus)
-			, m_dev(dev)
-			, m_func(func)
-		{ }
 
+		void set_location(uint8_t bus, uint8_t dev, uint8_t func);
 		void initialize(paddr_t pcie_paddr);
+		bool is_valid() const { return m_is_valid; }
 
 		uint32_t read_dword(uint8_t) const;
 		uint16_t read_word(uint8_t) const;
@@ -125,9 +124,10 @@ namespace Kernel::PCI
 		BAN::ErrorOr<uint8_t> find_intx_interrupt();
 
 	private:
-		const uint8_t m_bus	{ 0 };
+		bool m_is_valid	{ false };
-		const uint8_t m_dev	{ 0 };
+		uint8_t m_bus	{ 0 };
-		const uint8_t m_func	{ 0 };
+		uint8_t m_dev	{ 0 };
+		uint8_t m_func	{ 0 };
 
 		vaddr_t m_mmio_config { 0 };
 
@@ -161,8 +161,11 @@ namespace Kernel::PCI
 		template<typename F>
 		void for_each_device(F callback)
 		{
-			for (auto& dev : m_devices)
+			for (auto& bus : m_buses)
-				callback(dev);
+				for (auto& dev : bus)
+					for (auto& func : dev)
+						if (func.is_valid())
+							callback(func);
 		};
 
 		uint32_t read_config_dword(uint8_t bus, uint8_t dev, uint8_t func, uint8_t offset);
@@ -176,22 +179,19 @@ namespace Kernel::PCI
 		BAN::Optional<uint8_t> reserve_msi();
 
 	private:
-		struct PCIeInfo
+		PCIManager() : m_bus_pcie_paddr(0) {}
-		{
+		void check_function(uint8_t bus, uint8_t dev, uint8_t func);
-			paddr_t bus_paddr[256] {};
+		void check_device(uint8_t bus, uint8_t dev);
-		};
+		void check_bus(uint8_t bus);
-
+		void check_all_buses();
-		PCIManager() = default;
-		void check_function(const PCIeInfo&, uint8_t bus, uint8_t dev, uint8_t func);
-		void check_device(const PCIeInfo&, uint8_t bus, uint8_t dev);
-		void check_bus(const PCIeInfo&, uint8_t bus);
-		void check_all_buses(const PCIeInfo&);
 		void initialize_impl();
 
 	private:
 		static constexpr uint8_t m_msi_count = IRQ_MSI_END - IRQ_MSI_BASE;
-
+		using PCIBus = BAN::Array<BAN::Array<Device, 8>, 32>;
-		BAN::Vector<Device> m_devices;
+		BAN::Array<PCIBus, 256>  m_buses;
+		BAN::Array<paddr_t, 256> m_bus_pcie_paddr;
+		bool                     m_is_pcie { false };
 
 		SpinLock                             m_reserved_msi_lock;
 		BAN::Array<uint8_t, m_msi_count / 8> m_reserved_msi_bitmap;

kernel/include/kernel/Process.h

@@ -44,10 +44,10 @@ namespace Kernel
 		~Process();
 		void cleanup_function(Thread*);
 
-		BAN::ErrorOr<vaddr_t> setup_initial_process_stack(MemoryBackedRegion&, BAN::Span<BAN::String> argv, BAN::Span<BAN::String> envp, BAN::Span<LibELF::AuxiliaryVector> auxv);
+		void register_to_scheduler();
-
 		void exit(int status, int signal);
 
+		void add_thread(Thread*);
 		// returns true if thread was the last one
 		bool on_thread_exit(Thread&);
 
@@ -56,7 +56,6 @@ namespace Kernel
 		pid_t pid() const { return m_pid; }
 
 		bool is_session_leader() const { return pid() == sid(); }
-		bool is_pgrpg_in_this_session(pid_t) const;
 
 		const char* name() const { return m_cmdline.empty() ? "<unknown>" : m_cmdline.front().data(); }
 
@@ -64,10 +63,14 @@ namespace Kernel
 
 		BAN::ErrorOr<long> sys_exit(int status);
 
+		BAN::ErrorOr<long> sys_tcgetattr(int fildes, termios*);
+		BAN::ErrorOr<long> sys_tcsetattr(int fildes, int optional_actions, const termios*);
+
 		BAN::ErrorOr<long> sys_fork(uintptr_t rsp, uintptr_t rip);
 		BAN::ErrorOr<long> sys_exec(const char* path, const char* const* argv, const char* const* envp);
 
 		BAN::ErrorOr<long> sys_wait(pid_t pid, int* stat_loc, int options);
+		BAN::ErrorOr<long> sys_sleep(int seconds);
 		BAN::ErrorOr<long> sys_nanosleep(const timespec* rqtp, timespec* rmtp);
 		BAN::ErrorOr<long> sys_setitimer(int which, const itimerval* value, itimerval* ovalue);
 
@@ -99,14 +102,13 @@ namespace Kernel
 
 		BAN::ErrorOr<long> open_inode(VirtualFileSystem::File&&, int flags);
 
-		BAN::ErrorOr<void> create_file(int fd, const char* path, mode_t) const;
+		BAN::ErrorOr<void> create_file_or_dir(int fd, const char* path, mode_t mode) const;
-		BAN::ErrorOr<long> sys_openat(int fd, const char* path, int flags, mode_t);
+		BAN::ErrorOr<long> sys_openat(int, const char* path, int, mode_t);
 		BAN::ErrorOr<long> sys_close(int fd);
 		BAN::ErrorOr<long> sys_read(int fd, void* buffer, size_t count);
 		BAN::ErrorOr<long> sys_write(int fd, const void* buffer, size_t count);
 		BAN::ErrorOr<long> sys_access(const char* path, int amode);
-		BAN::ErrorOr<long> sys_mkdirat(int fd, const char* path, mode_t);
+		BAN::ErrorOr<long> sys_create_dir(const char*, mode_t);
-		BAN::ErrorOr<long> sys_mkfifoat(int fd, const char* path, mode_t);
 		BAN::ErrorOr<long> sys_hardlinkat(int fd1, const char* path1, int fd2, const char* path2, int flag);
 		BAN::ErrorOr<long> sys_renameat(int oldfd, const char* old, int newfd, const char* _new);
 		BAN::ErrorOr<long> sys_unlinkat(int fd, const char* path, int flag);
@@ -136,7 +138,7 @@ namespace Kernel
 		BAN::ErrorOr<long> sys_recvmsg(int socket, msghdr* message, int flags);
 		BAN::ErrorOr<long> sys_sendmsg(int socket, const msghdr* message, int flags);
 
-		BAN::ErrorOr<long> sys_ioctl(int fildes, unsigned long request, void* arg);
+		BAN::ErrorOr<long> sys_ioctl(int fildes, int request, void* arg);
 
 		BAN::ErrorOr<long> sys_pselect(sys_pselect_t* arguments);
 		BAN::ErrorOr<long> sys_ppoll(pollfd* fds, nfds_t nfds, const timespec* tmp_p, const sigset_t* sigmask);
@@ -184,6 +186,7 @@ namespace Kernel
 		BAN::ErrorOr<long> sys_smo_map(SharedMemoryObjectManager::Key);
 
 		BAN::ErrorOr<long> sys_ttyname(int fildes, char* name, size_t namesize);
+		BAN::ErrorOr<long> sys_isatty(int fildes);
 		BAN::ErrorOr<long> sys_posix_openpt(int flags);
 		BAN::ErrorOr<long> sys_ptsname(int fildes, char* buffer, size_t buffer_len);
 
@@ -209,31 +212,30 @@ namespace Kernel
 		BAN::ErrorOr<long> sys_set_gsbase(void*);
 		BAN::ErrorOr<long> sys_get_gsbase();
 
-		BAN::ErrorOr<long> sys_thread_create(void (*entry)(void*), void* arg, void* stack_base, size_t stack_size);
+		BAN::ErrorOr<long> sys_pthread_create(const pthread_attr_t* attr, void (*entry)(void*), void* arg);
-		BAN::ErrorOr<long> sys_thread_exit(void* value);
+		BAN::ErrorOr<long> sys_pthread_exit(void* value);
-		BAN::ErrorOr<long> sys_thread_join(pid_t tid, void** value);
+		BAN::ErrorOr<long> sys_pthread_join(pthread_t thread, void** value);
-		BAN::ErrorOr<long> sys_thread_getid();
+		BAN::ErrorOr<long> sys_pthread_self();
-		BAN::ErrorOr<long> sys_thread_kill(pid_t tid, int signal);
+		BAN::ErrorOr<long> sys_pthread_kill(pthread_t thread, int signal);
-		BAN::ErrorOr<long> sys_thread_detach(pid_t tid);
+
+		BAN::ErrorOr<long> sys_tcgetpgrp(int fd);
+		BAN::ErrorOr<long> sys_tcsetpgrp(int fd, pid_t pgid);
 
 		BAN::ErrorOr<long> sys_clock_gettime(clockid_t, timespec*);
 
 		BAN::ErrorOr<long> sys_load_keymap(const char* path);
 
-		BAN::ErrorOr<long> sys_banos_install(const char* object);
-
 		BAN::RefPtr<TTY> controlling_terminal() { return m_controlling_terminal; }
 
 		static Process& current() { return Thread::current().process(); }
 
 		vaddr_t shared_page_vaddr() const { return m_shared_page_vaddr; }
 
-		PageTable& page_table() { return *m_page_table; }
+		PageTable& page_table() { return m_page_table ? *m_page_table : PageTable::kernel(); }
 
 		size_t proc_meminfo(off_t offset, BAN::ByteSpan) const;
 		size_t proc_cmdline(off_t offset, BAN::ByteSpan) const;
 		size_t proc_environ(off_t offset, BAN::ByteSpan) const;
-		size_t proc_cputime(off_t offset, BAN::ByteSpan) const;
 		BAN::ErrorOr<BAN::String> proc_cwd() const;
 		BAN::ErrorOr<BAN::String> proc_exe() const;
 
@@ -280,12 +282,13 @@ namespace Kernel
 		// You must hold reader end of m_mapped_region_lock when calling this.
 		size_t find_mapped_region(vaddr_t) const;
 
-		BAN::ErrorOr<AddressRange> find_free_address_range(size_t size);
-
 		BAN::ErrorOr<VirtualFileSystem::File> find_file(int fd, const char* path, int flags) const;
 		BAN::ErrorOr<FileParent> find_parent_file(int fd, const char* path, int flags) const;
 		BAN::ErrorOr<VirtualFileSystem::File> find_relative_parent(int fd, const char* path) const;
 
+		BAN::ErrorOr<void> read_from_user(const void* user_addr, void* out, size_t size);
+		BAN::ErrorOr<void> read_string_from_user(const char* user_addr, char* out, size_t max_size);
+		BAN::ErrorOr<void> write_to_user(void* user_addr, const void* in, size_t size);
 		BAN::ErrorOr<MemoryRegion*> validate_and_pin_pointer_access(const void*, size_t, bool needs_write);
 
 		uint64_t signal_pending_mask() const
@@ -364,13 +367,13 @@ namespace Kernel
 
 		BAN::Vector<Thread*> m_threads;
 
-		struct exited_thread_info_t
+		struct pthread_info_t
 		{
-			pid_t tid;
+			pthread_t thread;
 			void* value;
 		};
-		BAN::Vector<exited_thread_info_t> m_exited_threads;
+		BAN::Vector<pthread_info_t> m_exited_pthreads;
-		ThreadBlocker m_thread_exit_blocker;
+		ThreadBlocker m_pthread_exit_blocker;
 
 		uint64_t m_alarm_interval_ns { 0 };
 		uint64_t m_alarm_wake_time_ns { 0 };

kernel/include/kernel/Processor.h

@@ -29,13 +29,6 @@ namespace Kernel
 		BAN_NON_MOVABLE(Processor);
 
 	public:
-		struct TLBEntry
-		{
-			vaddr_t vaddr;
-			size_t page_count;
-			class PageTable* page_table;
-		};
-
 		struct SMPMessage
 		{
 			enum class Type
@@ -50,19 +43,18 @@ namespace Kernel
 			Type type;
 			union
 			{
-				TLBEntry flush_tlb;
+				struct
+				{
+					uintptr_t vaddr;
+					size_t page_count;
+					void* page_table;
+				} flush_tlb;
 				SchedulerQueue::Node* new_thread;
 				SchedulerQueue::Node* unblock_thread;
 				bool dummy;
 			};
 		};
 
-		struct LoadStats
-		{
-			uint64_t ns_idle;
-			uint64_t ns_total;
-		};
-
 	public:
 		static Processor& create(ProcessorID id);
 		static Processor& initialize();
@@ -78,6 +70,9 @@ namespace Kernel
 		static void set_smp_enabled() { s_is_smp_enabled = true; }
 		static void wait_until_processors_ready();
 
+		static void toggle_should_print_cpu_load() { s_should_print_cpu_load = !s_should_print_cpu_load; }
+		static bool get_should_print_cpu_load() { return s_should_print_cpu_load; }
+
 		static ProcessorID bsp_id() { return s_bsp_id; }
 		static bool current_is_bsp() { return current_id() == bsp_id(); }
 
@@ -119,12 +114,10 @@ namespace Kernel
 		static void* get_current_page_table()					{ return read_gs_sized<void*>(offsetof(Processor, m_current_page_table)); }
 		static void set_current_page_table(void* page_table)	{ write_gs_sized<void*>(offsetof(Processor, m_current_page_table), page_table); }
 
-		static LoadStats get_load_stats(size_t index);
-
 		static void yield();
 		static Scheduler& scheduler() { return *read_gs_sized<Scheduler*>(offsetof(Processor, m_scheduler)); }
 
-		static void initialize_tsc(uint64_t realtime_seconds);
+		static void initialize_tsc(uint8_t shift, uint64_t mult, uint64_t realtime_seconds);
 		static void update_tsc();
 		static uint64_t ns_since_boot_tsc();
 
@@ -137,7 +130,7 @@ namespace Kernel
 		static void handle_ipi();
 
 		static void handle_smp_messages();
-		static bool send_smp_message(ProcessorID, const SMPMessage&, bool send_ipi = true);
+		static void send_smp_message(ProcessorID, const SMPMessage&, bool send_ipi = true);
 		static void broadcast_smp_message(const SMPMessage&);
 
 		static void load_segments();
@@ -185,13 +178,11 @@ namespace Kernel
 			asm volatile("mov %[value], %%gs:%a[offset]" :: [value]"r"(value), [offset]"ir"(offset) : "memory");
 		}
 
-		void lock_tlb_lock();
-		void unlock_tlb_lock();
-
 	private:
 		static ProcessorID s_bsp_id;
 		static BAN::Atomic<uint8_t> s_processor_count;
 		static BAN::Atomic<bool>    s_is_smp_enabled;
+		static BAN::Atomic<bool>    s_should_print_cpu_load;
 		static paddr_t              s_shared_page_paddr;
 		static vaddr_t              s_shared_page_vaddr;
 
@@ -211,19 +202,15 @@ namespace Kernel
 
 		Scheduler* m_scheduler { nullptr };
 
-		BAN::Atomic<bool> m_load_stat_lock;
+		uint64_t m_start_ns { 0 };
-		uint64_t m_load_start_ns { 0 };
+		uint64_t m_idle_ns { 0 };
-		LoadStats m_load_stats {};
+		uint64_t m_last_update_ns { 0 };
+		uint64_t m_next_update_ns { 0 };
 
 		BAN::Atomic<SMPMessage*> m_smp_pending { nullptr };
 		BAN::Atomic<SMPMessage*> m_smp_free    { nullptr };
 		SMPMessage* m_smp_message_storage { nullptr };
 
-		BAN::Atomic<bool> m_tlb_lock { false };
-		size_t m_tlb_entry_count { 0 };
-		BAN::Array<TLBEntry, 32> m_tlb_entries;
-		bool m_tlb_global { false };
-
 		void* m_current_page_table { nullptr };
 
 		friend class BAN::Array<Processor, 0xFF>;

kernel/include/kernel/Scheduler.h

@@ -23,7 +23,7 @@ namespace Kernel
 
 	public:
 		void add_thread_to_back(Node*);
-		bool add_thread_with_wake_time(Node*); // return true if node was inserted as the first element
+		void add_thread_with_wake_time(Node*);
 		template<typename F>
 		Node* remove_with_condition(F callback);
 		void remove_node(Node*);
@@ -60,8 +60,7 @@ namespace Kernel
 		void reschedule(YieldRegisters*);
 		void reschedule_if_idle();
 
-		void on_timer_interrupt();
+		void timer_interrupt();
-		void on_yield(YieldRegisters*);
 
 		static BAN::ErrorOr<void> bind_thread_to_processor(Thread*, ProcessorID);
 		// if thread is already bound, this will never fail
@@ -83,7 +82,6 @@ namespace Kernel
 		void update_most_loaded_node_queue(SchedulerQueue::Node*, SchedulerQueue* target_queue);
 		void remove_node_from_most_loaded(SchedulerQueue::Node*);
 
-		void update_wake_up_deadline();
 		void wake_up_sleeping_threads();
 
 		void do_load_balancing();

kernel/include/kernel/Storage/ATA/AHCI/Controller.h

@@ -10,14 +10,12 @@
 namespace Kernel
 {
 
-	class AHCIController final : public BAN::RefCounted<AHCIController>, public Interruptable
+	class AHCIController final : public StorageController, public Interruptable
 	{
 		BAN_NON_COPYABLE(AHCIController);
 		BAN_NON_MOVABLE(AHCIController);
 
 	public:
-		static BAN::ErrorOr<BAN::RefPtr<AHCIController>> create(PCI::Device&);
-
 		~AHCIController();
 
 		virtual void handle_irq() override;
@@ -29,7 +27,6 @@ namespace Kernel
 			: m_pci_device(pci_device)
 		{ }
 		BAN::ErrorOr<void> initialize();
-
 		BAN::Optional<AHCIPortType> check_port_type(volatile HBAPortMemorySpace&);
 
 	private:

kernel/include/kernel/Storage/ATA/ATABus.h

@@ -56,6 +56,8 @@ namespace Kernel
 
 		// Non-owning pointers
 		BAN::Vector<ATADevice*> m_devices;
+
+		friend class ATAController;
 	};
 
 }

kernel/include/kernel/Storage/ATA/ATAController.h

@@ -2,22 +2,23 @@
 
 #include <BAN/UniqPtr.h>
 #include <kernel/PCI.h>
+#include <kernel/Storage/StorageController.h>
 #include <kernel/Storage/ATA/ATABus.h>
 #include <kernel/Storage/ATA/ATADevice.h>
 
 namespace Kernel
 {
 
-	class ATAController : public BAN::RefCounted<ATAController>
+	class ATAController : public StorageController
 	{
 	public:
-		static BAN::ErrorOr<BAN::RefPtr<ATAController>> create(PCI::Device&);
+		static BAN::ErrorOr<BAN::RefPtr<StorageController>> create(PCI::Device&);
+		virtual BAN::ErrorOr<void> initialize() override;
 
 	private:
 		ATAController(PCI::Device& pci_device)
 			: m_pci_device(pci_device)
 		{ }
-		BAN::ErrorOr<void> initialize();
 
 	private:
 		PCI::Device& m_pci_device;

kernel/include/kernel/Storage/ATA/ATADevice.h

@@ -31,6 +31,8 @@ namespace Kernel
 			BAN::StringView model() const { return m_model; }
 			BAN::StringView name() const override { return m_name; }
 
+			dev_t rdev() const override { return m_rdev; }
+
 		protected:
 			ATABaseDevice();
 			BAN::ErrorOr<void> initialize(BAN::Span<const uint16_t> identify_data);
@@ -44,6 +46,8 @@ namespace Kernel
 			bool m_has_lba;
 			char m_model[41];
 			char m_name[4] {};
+
+			const dev_t m_rdev;
 		};
 
 	}

kernel/include/kernel/Storage/NVMe/Controller.h

@@ -10,16 +10,17 @@
 namespace Kernel
 {
 
-	class NVMeController final : public CharacterDevice
+	class NVMeController final : public StorageController, public CharacterDevice
 	{
 		BAN_NON_COPYABLE(NVMeController);
 		BAN_NON_MOVABLE(NVMeController);
 
 	public:
-		static BAN::ErrorOr<BAN::RefPtr<NVMeController>> create(PCI::Device&);
+		static BAN::ErrorOr<BAN::RefPtr<StorageController>> create(PCI::Device&);
 
 		NVMeQueue& io_queue() { return *m_io_queue; }
 
+		virtual dev_t rdev() const override { return m_rdev; }
 		virtual BAN::StringView name() const override { return m_name; }
 
 	protected:
@@ -30,7 +31,7 @@ namespace Kernel
 
 	private:
 		NVMeController(PCI::Device& pci_device);
-		BAN::ErrorOr<void> initialize();
+		virtual BAN::ErrorOr<void> initialize() override;
 
 		BAN::ErrorOr<void> identify_controller();
 		BAN::ErrorOr<void> identify_namespaces();
@@ -50,6 +51,7 @@ namespace Kernel
 		BAN::Vector<BAN::RefPtr<NVMeNamespace>> m_namespaces;
 
 		char m_name[20];
+		const dev_t m_rdev;
 	};
 
 }

kernel/include/kernel/Storage/NVMe/Namespace.h

@@ -16,6 +16,7 @@ namespace Kernel
 		virtual uint32_t sector_size() const override { return m_block_size; }
 		virtual uint64_t total_size() const override { return m_block_size * m_block_count; }
 
+		virtual dev_t rdev() const override { return m_rdev; }
 		virtual BAN::StringView name() const override { return m_name; }
 
 	private:
@@ -34,6 +35,7 @@ namespace Kernel
 		const uint64_t m_block_count;
 
 		char m_name[10] {};
+		const dev_t m_rdev;
 	};
 
 }

kernel/include/kernel/Storage/Partition.h

@@ -42,6 +42,11 @@ namespace Kernel
 		char m_label[36 * 4 + 1];
 		const BAN::String m_name;
 
+	public:
+		virtual bool is_partition() const override { return true; }
+
+		virtual dev_t rdev() const override { return m_rdev; }
+
 	protected:
 		virtual BAN::ErrorOr<size_t> read_impl(off_t, BAN::ByteSpan) override;
 
@@ -51,6 +56,7 @@ namespace Kernel
 		virtual bool has_hungup_impl() const override { return false; }
 
 	private:
+		const dev_t m_rdev;
 	};
 
 }

kernel/include/kernel/Storage/StorageController.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <BAN/RefPtr.h>
+
+namespace Kernel
+{
+
+	class StorageController : public BAN::RefCounted<StorageController>
+	{
+	public:
+		virtual ~StorageController() {}
+		virtual BAN::ErrorOr<void> initialize() = 0;
+	};
+
+}

kernel/include/kernel/Storage/StorageDevice.h

@@ -14,10 +14,7 @@ namespace Kernel
 	public:
 		StorageDevice()
 			: BlockDevice(0660, 0, 0)
-		{
+		{ }
-			m_kind |= InodeKind::STORAGE;
-		}
-
 		virtual ~StorageDevice();
 
 		BAN::ErrorOr<void> initialize_partitions(BAN::StringView name_prefix);
@@ -38,6 +35,7 @@ namespace Kernel
 
 		size_t drop_disk_cache();
 		BAN::ErrorOr<void> sync_disk_cache();
+		virtual bool is_storage_device() const override { return true; }
 
 	protected:
 		virtual BAN::ErrorOr<void> read_sectors_impl(uint64_t lba, uint64_t sector_count, BAN::ByteSpan) = 0;

kernel/include/kernel/Terminal/PseudoTerminal.h

@@ -13,6 +13,7 @@ namespace Kernel
 	public:
 		static BAN::ErrorOr<BAN::RefPtr<PseudoTerminalMaster>> create(mode_t, uid_t, gid_t);
 
+		dev_t rdev() const override { return m_rdev; }
 		BAN::StringView name() const override { return "<ptmx>"_sv; }
 
 		BAN::ErrorOr<BAN::RefPtr<PseudoTerminalSlave>> slave();
@@ -32,7 +33,7 @@ namespace Kernel
 
 		void on_close(int) override;
 
-		BAN::ErrorOr<long> ioctl_impl(unsigned long, void*) override;
+		BAN::ErrorOr<long> ioctl_impl(int, void*) override;
 
 	private:
 		PseudoTerminalMaster(BAN::UniqPtr<VirtualRange>, mode_t, uid_t, gid_t);
@@ -47,6 +48,8 @@ namespace Kernel
 		size_t m_buffer_tail { 0 };
 		size_t m_buffer_size { 0 };
 
+		const dev_t m_rdev;
+
 		friend class PseudoTerminalSlave;
 		friend class BAN::RefPtr<PseudoTerminalMaster>;
 	};
@@ -64,7 +67,7 @@ namespace Kernel
 		bool putchar_impl(uint8_t ch) override;
 
 		bool can_write_impl() const override;
-		bool has_hungup_impl() const override { return master_has_closed(); }
+		bool has_hungup_impl() const override { return !m_master.valid(); }
 
 	private:
 		PseudoTerminalSlave(BAN::String&& name, uint32_t number, mode_t, uid_t, gid_t);

kernel/include/kernel/Terminal/TTY.h

@@ -33,6 +33,9 @@ namespace Kernel
 	public:
 		virtual BAN::ErrorOr<void> set_font(LibFont::Font&&) { return BAN::Error::from_errno(EINVAL); }
 
+		void set_foreground_pgrp(pid_t pgrp) { m_foreground_pgrp = pgrp; }
+		pid_t foreground_pgrp() const { return m_foreground_pgrp; }
+
 		BAN::ErrorOr<void> tty_ctrl(int command, int flags);
 
 		// for kprint
@@ -43,14 +46,28 @@ namespace Kernel
 
 		static void keyboard_task(void*);
 		static void initialize_devices();
-
-		bool should_receive_input() const { return m_tty_ctrl.receive_input; }
-		void on_key_event(LibInput::RawKeyEvent);
 		void on_key_event(LibInput::KeyEvent);
 		void handle_input_byte(uint8_t);
 
+		void get_termios(termios* termios) { *termios = m_termios; }
+		// FIXME: validate termios
+		BAN::ErrorOr<void> set_termios(const termios* termios) { m_termios = *termios; return {}; }
+
+		virtual bool is_tty() const override { return true; }
+
+		virtual dev_t rdev() const final override { return m_rdev; }
+
 		virtual void clear() = 0;
 
+		virtual BAN::ErrorOr<void> chmod_impl(mode_t) override;
+		virtual BAN::ErrorOr<void> chown_impl(uid_t, gid_t) override;
+
+		virtual BAN::ErrorOr<long> ioctl_impl(int, void*) override;
+
+		virtual bool can_read_impl() const override { return m_output.flush; }
+		virtual bool has_error_impl() const override { return false; }
+		virtual bool has_hungup_impl() const override { return false; }
+
 		virtual bool master_has_closed() const { return false; }
 
 	protected:
@@ -59,50 +76,43 @@ namespace Kernel
 		virtual bool putchar_impl(uint8_t ch) = 0;
 		virtual void after_write() {}
 
-		void update_winsize(unsigned short cols, unsigned short rows);
-
 		virtual BAN::ErrorOr<size_t> read_impl(off_t, BAN::ByteSpan) final override;
 		virtual BAN::ErrorOr<size_t> write_impl(off_t, BAN::ConstByteSpan) final override;
 
-		virtual bool can_read_impl() const override { return m_output.flush; }
+		void update_winsize(unsigned short cols, unsigned short rows);
-		virtual bool has_error_impl() const override { return false; }
-		virtual bool has_hungup_impl() const override { return false; }
-
-		virtual BAN::ErrorOr<long> ioctl_impl(unsigned long, void*) override;
 
 	private:
 		bool putchar(uint8_t ch);
 		void do_backspace();
 
-		termios get_termios();
+	protected:
+		termios m_termios;
 
 	private:
-		BAN::Atomic<pid_t> m_foreground_pgrp { 0 };
+		const dev_t m_rdev;
+
+		pid_t m_foreground_pgrp { 0 };
 
 		struct tty_ctrl_t
 		{
-			BAN::Atomic<bool> draw_graphics { true };
+			bool draw_graphics { true };
-			BAN::Atomic<bool> receive_input { true };
+			bool receive_input { true };
+			ThreadBlocker thread_blocker;
 		};
 		tty_ctrl_t m_tty_ctrl;
 
 		struct Buffer
 		{
 			BAN::UniqPtr<ByteRingBuffer> buffer;
-			BAN::Atomic<bool> flush { false };
+			bool flush { false };
 			ThreadBlocker thread_blocker;
 		};
 		Buffer m_output;
 
 		winsize m_winsize {};
 
-		SpinLock m_termios_lock;
-		termios m_termios;
-
 	protected:
-		Mutex m_mutex;
+		RecursiveSpinLock m_write_lock;
-
-		Mutex m_write_lock;
 		ThreadBlocker m_write_blocker;
 	};
 

kernel/include/kernel/Thread.h

@@ -41,20 +41,22 @@ namespace Kernel
 		// TODO: userspace stack size is hard limited, maybe make this dynamic?
 #if ARCH(x86_64)
 		static constexpr size_t userspace_stack_size { 32 << 20 };
-		static constexpr vaddr_t userspace_stack_base { 0x0000700000000000 };
 #elif ARCH(i686)
 		static constexpr size_t userspace_stack_size { 4 << 20 };
-		static constexpr vaddr_t userspace_stack_base { 0xB0000000 };
 #endif
 
 	public:
 		static BAN::ErrorOr<Thread*> create_kernel(entry_t, void*);
-		static BAN::ErrorOr<Thread*> create_userspace(Process*, PageTable&, vaddr_t userspace_stack_vaddr, size_t userspace_stack_size, vaddr_t entry_point, vaddr_t stack_pointer);
+		static BAN::ErrorOr<Thread*> create_userspace(Process*, PageTable&);
 		~Thread();
 
+		BAN::ErrorOr<Thread*> pthread_create(entry_t, void*);
+
 		BAN::ErrorOr<Thread*> clone(Process*, uintptr_t sp, uintptr_t ip);
 		void setup_process_cleanup();
 
+		BAN::ErrorOr<void> initialize_userspace(vaddr_t entry, BAN::Span<BAN::String> argv, BAN::Span<BAN::String> envp, BAN::Span<LibELF::AuxiliaryVector> auxv);
+
 		// Returns true, if thread is going to trigger signal
 		bool is_interrupted_by_signal(bool skip_stop_and_cont = false) const;
 
@@ -75,21 +77,15 @@ namespace Kernel
 
 		// blocks current thread and returns either on unblock, eintr, spuriously or after timeout
 		// if mutex is not nullptr, it will be atomically freed before blocking and automatically locked on wake
-		BAN::ErrorOr<void> sleep_or_eintr_for_ns(uint64_t timeout_ns);
+		BAN::ErrorOr<void> sleep_or_eintr_ns(uint64_t ns);
-		BAN::ErrorOr<void> sleep_or_eintr_until_ns(uint64_t waketime_ns);
 		BAN::ErrorOr<void> block_or_eintr_indefinite(ThreadBlocker& thread_blocker, BaseMutex* mutex);
 		BAN::ErrorOr<void> block_or_eintr_or_timeout_ns(ThreadBlocker& thread_blocker, uint64_t timeout_ns, bool etimedout, BaseMutex* mutex);
 		BAN::ErrorOr<void> block_or_eintr_or_waketime_ns(ThreadBlocker& thread_blocker, uint64_t wake_time_ns, bool etimedout, BaseMutex* mutex);
 
-		BAN::ErrorOr<void> sleep_or_eintr_for_ms(uint64_t timeout_ms)
+		BAN::ErrorOr<void> sleep_or_eintr_ms(uint64_t ms)
 		{
-			ASSERT(!BAN::Math::will_multiplication_overflow<uint64_t>(timeout_ms, 1'000'000));
+			ASSERT(!BAN::Math::will_multiplication_overflow<uint64_t>(ms, 1'000'000));
-			return sleep_or_eintr_for_ns(timeout_ms * 1'000'000);
+			return sleep_or_eintr_ns(ms * 1'000'000);
-		}
-		BAN::ErrorOr<void> sleep_or_eintr_until_ms(uint64_t waketime_ms)
-		{
-			ASSERT(!BAN::Math::will_multiplication_overflow<uint64_t>(waketime_ms, 1'000'000));
-			return sleep_or_eintr_until_ns(waketime_ms * 1'000'000);
 		}
 		BAN::ErrorOr<void> block_or_eintr_or_timeout_ms(ThreadBlocker& thread_blocker, uint64_t timeout_ms, bool etimedout, BaseMutex* mutex)
 		{
@@ -110,6 +106,8 @@ namespace Kernel
 		vaddr_t kernel_stack_top() const	{ return m_kernel_stack->vaddr() + m_kernel_stack->size(); }
 		VirtualRange& kernel_stack() { return *m_kernel_stack; }
 
+		MemoryBackedRegion& userspace_stack() { ASSERT(is_userspace() && m_userspace_stack); return *m_userspace_stack; }
+
 		static Thread& current();
 		static pid_t current_tid();
 
@@ -119,9 +117,6 @@ namespace Kernel
 		const Process& process() const;
 		bool has_process() const { return m_process; }
 
-		void detach() { m_is_detached = true; }
-		bool is_detached() const { return m_is_detached; }
-
 		bool is_userspace() const { return m_is_userspace; }
 
 		uint64_t cpu_time_ns() const;
@@ -153,6 +148,8 @@ namespace Kernel
 	private:
 		Thread(pid_t tid, Process*);
 
+		void setup_exec(vaddr_t ip, vaddr_t sp);
+
 		static void on_exit_trampoline(Thread*);
 		void on_exit();
 
@@ -174,16 +171,13 @@ namespace Kernel
 		BAN::UniqPtr<PageTable>    m_keep_alive_page_table;
 
 		BAN::UniqPtr<VirtualRange> m_kernel_stack;
+		MemoryBackedRegion*        m_userspace_stack      { nullptr };
 		const pid_t                m_tid                  { 0 };
 		State                      m_state                { State::NotStarted };
 		Process*                   m_process              { nullptr };
 		bool                       m_is_userspace         { false };
-		BAN::Atomic<bool>          m_is_detached          { false };
 		bool                       m_delete_process       { false };
 
-		vaddr_t                    m_userspace_stack_vaddr { 0 };
-		size_t                     m_userspace_stack_size  { 0 };
-
 		vaddr_t                    m_fsbase               { 0 };
 		vaddr_t                    m_gsbase               { 0 };
 

kernel/include/kernel/Timer/HPET.h

@@ -12,7 +12,7 @@ namespace Kernel
 	class HPET final : public Timer, public Interruptable
 	{
 	public:
-		static BAN::ErrorOr<BAN::UniqPtr<HPET>> create();
+		static BAN::ErrorOr<BAN::UniqPtr<HPET>> create(bool force_pic);
 		~HPET();
 
 		virtual uint64_t ms_since_boot() const override;
@@ -26,7 +26,7 @@ namespace Kernel
 
 	private:
 		HPET() = default;
-		BAN::ErrorOr<void> initialize();
+		BAN::ErrorOr<void> initialize(bool force_pic);
 
 		volatile HPETRegisters& registers();
 		const volatile HPETRegisters& registers() const;

kernel/include/kernel/Timer/Timer.h

@@ -2,7 +2,6 @@
 
 #include <BAN/UniqPtr.h>
 #include <BAN/Vector.h>
-#include <kernel/Memory/DMARegion.h>
 #include <kernel/Timer/RTC.h>
 
 #include <time.h>
@@ -32,14 +31,7 @@ namespace Kernel
 	class SystemTimer : public Timer
 	{
 	public:
-		struct TSCInfo
+		static void initialize(bool force_pic);
-		{
-			int8_t shift;
-			uint32_t mult;
-		};
-
-	public:
-		static void initialize();
 		static SystemTimer& get();
 		static bool is_initialized();
 
@@ -52,60 +44,29 @@ namespace Kernel
 		virtual bool pre_scheduler_sleep_needs_lock() const override;
 		virtual void pre_scheduler_sleep_ns(uint64_t) override;
 
-		void sleep_for_ns(uint64_t timeout_ns) const;
+		void sleep_ms(uint64_t ms) const { ASSERT(!BAN::Math::will_multiplication_overflow<uint64_t>(ms, 1'000'000)); return sleep_ns(ms * 1'000'000); }
-		void sleep_until_ns(uint64_t waketime_ns) const;
+		void sleep_ns(uint64_t ns) const;
-
-		void sleep_for_ms(uint64_t timeout_ms) const
-		{
-			ASSERT(!BAN::Math::will_multiplication_overflow<uint64_t>(timeout_ms, 1'000'000));
-			return sleep_for_ns(timeout_ms * 1'000'000);
-		}
-		void sleep_until_ms(uint64_t waketime_ms) const
-		{
-			ASSERT(!BAN::Math::will_multiplication_overflow<uint64_t>(waketime_ms, 1'000'000));
-			return sleep_until_ns(waketime_ms * 1'000'000);
-		}
 
 		void dont_invoke_scheduler() { m_timer->m_should_invoke_scheduler = false; }
 
-		void update_tsc();
+		void update_tsc() const;
-		TSCInfo tsc_info() const;
+		uint64_t ns_since_boot_no_tsc() const;
-
-		uint64_t ns_since_boot_no_tsc() const { return m_timer->ns_since_boot(); }
 
 		timespec real_time() const;
 
 	private:
 		SystemTimer() = default;
 
-		void initialize_timers();
+		void initialize_timers(bool force_pic);
 
-		void initialize_invariant_tsc();
+		uint64_t get_tsc_frequency() const;
-		void initialize_pvclock();
 
 	private:
-		enum class TSCType
-		{
-			None,
-			Invariant,
-			PVClock,
-		};
-
 		uint64_t m_boot_time { 0 };
 		BAN::UniqPtr<RTC> m_rtc;
 		BAN::UniqPtr<Timer> m_timer;
-
+		bool m_has_invariant_tsc { false };
-		TSCType m_tsc_type = TSCType::None;
+		mutable uint32_t m_timer_ticks { 0 };
-
-		union {
-			struct {
-				int8_t shift;
-				uint32_t mult;
-			} invariant;
-		} m_tsc_info;
-
-		BAN::UniqPtr<DMARegion> m_tsc_page;
-		uint64_t m_tsc_update_ns { 0 };
 	};
 
 }

kernel/include/kernel/USB/HID/Joystick.h

@@ -34,7 +34,7 @@ namespace Kernel
 		BAN::ErrorOr<size_t> read_impl(off_t, BAN::ByteSpan) override;
 		bool can_read_impl() const override { return true; }
 
-		BAN::ErrorOr<long> ioctl_impl(unsigned long request, void* arg) override;
+		BAN::ErrorOr<long> ioctl_impl(int request, void* arg) override;
 
 	private:
 		USBJoystick(USBHIDDriver&);
@@ -62,8 +62,8 @@ namespace Kernel
 		Mutex m_command_mutex;
 
 		BAN::Atomic<bool> m_has_initialized_leds { false };
-		BAN::Atomic<uint8_t> m_led_state         { 0b0001 };
+		uint8_t m_led_state       { 0b0001 };
-		BAN::Atomic<uint8_t> m_rumble_strength   { 0x00 };
+		uint8_t m_rumble_strength { 0x00 };
 
 		friend class BAN::RefPtr<USBJoystick>;
 	};

kernel/include/kernel/USB/HID/Keyboard.h

@@ -11,8 +11,6 @@ namespace Kernel
 		BAN_NON_MOVABLE(USBKeyboard);
 
 	public:
-		BAN::ErrorOr<void> initialize() override;
-
 		void start_report() override;
 		void stop_report() override;
 
@@ -40,8 +38,6 @@ namespace Kernel
 		uint16_t m_toggle_mask { 0 };
 
 		uint16_t m_led_mask { 0 };
-		BAN::UniqPtr<DMARegion> m_led_region;
-
 		BAN::Vector<USBHID::Report> m_outputs;
 
 		BAN::Optional<uint8_t> m_repeat_scancode;

kernel/include/kernel/USB/MassStorage/SCSIDevice.h

@@ -15,6 +15,7 @@ namespace Kernel
 		uint32_t sector_size() const override { return m_block_size; }
 		uint64_t total_size() const override { return m_block_size * m_block_count; }
 
+		dev_t rdev() const override { return m_rdev; }
 		BAN::StringView name() const override { return m_name; }
 
 	private:
@@ -33,7 +34,8 @@ namespace Kernel
 		const uint64_t m_block_count;
 		const uint32_t m_block_size;
 
-		char m_name[4];
+		const dev_t m_rdev;
+		const char m_name[4];
 
 		friend class BAN::RefPtr<USBSCSIDevice>;
 	};

kernel/include/kernel/UserCopy.h

@@ -1,12 +0,0 @@
-#pragma once
-
-#include <BAN/Errors.h>
-
-namespace Kernel
-{
-
-	BAN::ErrorOr<void> read_from_user(const void* user_addr, void* out, size_t size);
-	BAN::ErrorOr<void> read_string_from_user(const char* user_addr, char* out, size_t max_size);
-	BAN::ErrorOr<void> write_to_user(void* user_addr, const void* in, size_t size);
-
-};

kernel/kernel/ACPI/ACPI.cpp

@@ -952,7 +952,7 @@ acpi_release_global_lock:
 			{
 				if (IO::inw(fadt().pm1a_cnt_blk) & PM1_CNT_SCI_EN)
 					break;
-				SystemTimer::get().sleep_for_ms(10);
+				SystemTimer::get().sleep_ms(10);
 			}
 
 			if (!(IO::inw(fadt().pm1a_cnt_blk) & PM1_CNT_SCI_EN))

kernel/kernel/ACPI/AML/Node.cpp

@@ -2146,9 +2146,9 @@ namespace Kernel::ACPI::AML
 
 		auto milliseconds = TRY(convert_node(TRY(parse_node(context)), ConvInteger, sizeof(uint64_t)));
 
-		const uint64_t waketime_ms = SystemTimer::get().ms_since_boot() + milliseconds.as.integer.value;
+		const uint64_t wakeup_ms = SystemTimer::get().ms_since_boot() + milliseconds.as.integer.value;
-		while (SystemTimer::get().ms_since_boot() < waketime_ms)
+		for (uint64_t curr_ms = SystemTimer::get().ms_since_boot(); curr_ms < wakeup_ms; curr_ms = SystemTimer::get().ms_since_boot())
-			SystemTimer::get().sleep_until_ms(waketime_ms);
+			SystemTimer::get().sleep_ms(wakeup_ms - curr_ms);
 
 		return {};
 	}
@@ -2392,7 +2392,7 @@ namespace Kernel::ACPI::AML
 		result.type = Node::Type::Integer;
 		result.as.integer.value = BAN::numeric_limits<uint64_t>::max();
 
-		const uint64_t waketime_ms = (timeout_ms >= 0xFFFF)
+		const uint64_t wake_time_ms = (timeout_ms >= 0xFFFF)
 			? BAN::numeric_limits<uint64_t>::max()
 			: SystemTimer::get().ms_since_boot() + timeout_ms;
 
@@ -2401,9 +2401,9 @@ namespace Kernel::ACPI::AML
 		{
 			if (sync_object->node.as.mutex->mutex.try_lock())
 				break;
-			if (SystemTimer::get().ms_since_boot() >= waketime_ms)
+			if (SystemTimer::get().ms_since_boot() >= wake_time_ms)
 				return result;
-			Processor::yield();
+			SystemTimer::get().sleep_ms(1);
 		}
 
 		if (sync_object->node.as.mutex->global_lock)

kernel/kernel/ACPI/BatterySystem.cpp

@@ -57,7 +57,7 @@ namespace Kernel::ACPI
 				m_last_value = target_conv.value().as.integer.value;
 			}
 
-			auto target_str = TRY(BAN::String::formatted("{}", m_last_value.load()));
+			auto target_str = TRY(BAN::String::formatted("{}", m_last_value));
 
 			if (static_cast<size_t>(offset) >= target_str.size())
 				return 0;
@@ -67,8 +67,8 @@ namespace Kernel::ACPI
 			return ncopy;
 		}
 
-		BAN::ErrorOr<size_t> write_impl(off_t, BAN::ConstByteSpan) override { return BAN::Error::from_errno(EINVAL); }
+		BAN::ErrorOr<size_t> write_impl(off_t, BAN::ConstByteSpan) override		{ return BAN::Error::from_errno(EINVAL); }
-		BAN::ErrorOr<void> truncate_impl(size_t) override { return BAN::Error::from_errno(EINVAL); }
+		BAN::ErrorOr<void> truncate_impl(size_t) override						{ return BAN::Error::from_errno(EINVAL); }
 
 		bool can_read_impl() const override { return true; }
 		bool can_write_impl() const override { return false; }
@@ -90,8 +90,8 @@ namespace Kernel::ACPI
 		AML::NameString m_method_name;
 		size_t m_result_index;
 
-		BAN::Atomic<uint64_t> m_last_read_ms = 0;
+		uint64_t m_last_read_ms = 0;
-		BAN::Atomic<uint64_t> m_last_value = 0;
+		uint64_t m_last_value = 0;
 	};
 
 	BAN::ErrorOr<void> BatterySystem::initialize(AML::Namespace& acpi_namespace)

kernel/kernel/APIC.cpp

@@ -437,27 +437,8 @@ namespace Kernel
 
 		dprintln("CPU {}: lapic timer frequency: {} Hz", Kernel::Processor::current_id(), m_lapic_timer_frequency_hz);
 
-		write_to_local_apic(LAPIC_TIMER_LVT,         TimerModeOneShot | IRQ_TIMER);
+		write_to_local_apic(LAPIC_TIMER_LVT,         TimerModePeriodic | IRQ_TIMER);
-		write_to_local_apic(LAPIC_TIMER_INITIAL_REG, 0);
+		write_to_local_apic(LAPIC_TIMER_INITIAL_REG, m_lapic_timer_frequency_hz / 2 / 100);
-	}
-
-	void APIC::set_timer_dealine(uint64_t target_ns)
-	{
-		// TODO: don't hardcode divide by 2
-		const uint64_t effective_freq = m_lapic_timer_frequency_hz / 2;
-
-		const uint64_t delta_ns = [&]() -> uint64_t {
-			const uint64_t current_ns = SystemTimer::get().ns_since_boot();
-			if (current_ns >= target_ns)
-				return 1;
-			const uint64_t delta_ns = target_ns - current_ns;
-			if (BAN::Math::will_multiplication_overflow(delta_ns, effective_freq))
-				return BAN::numeric_limits<uint64_t>::max() / effective_freq;
-			return delta_ns;
-		}();
-
-		const uint64_t ticks = BAN::Math::div_round_up<uint64_t>(delta_ns * effective_freq, 1'000'000'000);
-		write_to_local_apic(LAPIC_TIMER_INITIAL_REG, BAN::Math::min<uint64_t>(ticks, BAN::numeric_limits<uint32_t>::max()));
 	}
 
 	uint32_t APIC::read_from_local_apic(ptrdiff_t offset)

kernel/kernel/Audio/Controller.cpp

@@ -15,8 +15,8 @@ namespace Kernel
 
 	AudioController::AudioController()
 		: CharacterDevice(0644, 0, 0)
+		, m_rdev(makedev(DeviceNumber::AudioController, s_next_audio_minor++))
 	{
-		m_rdev = makedev(DeviceNumber::AudioController, s_next_audio_minor++);
 		char* ptr = m_name;
 		BAN::Formatter::print([&ptr](char c) { *ptr++ = c; }, "audio{}", minor(m_rdev));
 	}
@@ -77,9 +77,9 @@ namespace Kernel
 		return to_copy;
 	}
 
-	BAN::ErrorOr<long> AudioController::ioctl_impl(unsigned long request, void* arg)
+	BAN::ErrorOr<long> AudioController::ioctl_impl(int cmd, void* arg)
 	{
-		switch (request)
+		switch (cmd)
 		{
 			case SND_GET_CHANNELS:
 				*static_cast<uint32_t*>(arg) = get_channels();
@@ -92,7 +92,7 @@ namespace Kernel
 			{
 				SpinLockGuard _(m_spinlock);
 				*static_cast<uint32_t*>(arg) = m_sample_data->size();
-				if (request == SND_RESET_BUFFER)
+				if (cmd == SND_RESET_BUFFER)
 					m_sample_data->pop(m_sample_data->size());
 				return 0;
 			}
@@ -113,7 +113,7 @@ namespace Kernel
 				return 0;
 		}
 
-		return CharacterDevice::ioctl_impl(request, arg);
+		return CharacterDevice::ioctl_impl(cmd, arg);
 	}
 
 }

kernel/kernel/Audio/HDAudio/AudioFunctionGroup.cpp

@@ -1,7 +1,6 @@
 #include <kernel/Audio/HDAudio/AudioFunctionGroup.h>
 #include <kernel/Audio/HDAudio/Registers.h>
 #include <kernel/FS/DevFS/FileSystem.h>
-#include <kernel/Timer/Timer.h>
 
 #include <BAN/Sort.h>
 
@@ -203,12 +202,12 @@ namespace Kernel
 		ASSERT(m_stream_index == 0xFF);
 		m_stream_index = TRY(m_controller->allocate_stream(HDAudio::StreamType::Output, this));
 
-		TRY(reset_stream());
+		reset_stream();
 
 		return {};
 	}
 
-	BAN::ErrorOr<void> HDAudioFunctionGroup::reset_stream()
+	void HDAudioFunctionGroup::reset_stream()
 	{
 		using Regs = HDAudio::Regs;
 
@@ -220,23 +219,13 @@ namespace Kernel
 		// stop stream
 		bar.write8(base + Regs::SDCTL, bar.read8(base + Regs::SDCTL) & 0xFD);
 
-		const auto timeout_ms = SystemTimer::get().ms_since_boot() + 100;
-
 		// reset stream
 		bar.write8(base + Regs::SDCTL, (bar.read8(base + Regs::SDCTL) & 0xFE) | 1);
 		while (!(bar.read8(base + Regs::SDCTL) & 1))
-		{
-			if (SystemTimer::get().ms_since_boot() > timeout_ms)
-				return BAN::Error::from_errno(ETIMEDOUT);
 			Processor::pause();
-		}
 		bar.write8(base + Regs::SDCTL, (bar.read8(base + Regs::SDCTL) & 0xFE));
 		while ((bar.read8(base + Regs::SDCTL) & 1))
-		{
-			if (SystemTimer::get().ms_since_boot() > timeout_ms)
-				return BAN::Error::from_errno(ETIMEDOUT);
 			Processor::pause();
-		}
 
 		// set bdl address, total size and lvi
 		const paddr_t bdl_paddr = m_bdl_region->paddr() + bdl_offset();
@@ -255,8 +244,6 @@ namespace Kernel
 		m_bdl_head = 0;
 		m_bdl_tail = 0;
 		m_stream_running = false;
-
-		return {};
 	}
 
 	BAN::ErrorOr<void> HDAudioFunctionGroup::initialize_output()
@@ -448,7 +435,7 @@ namespace Kernel
 				continue;
 			const auto& amp = path[i]->output_amplifier.value();
 
-			const int32_t step_mdB = (amp.step_size + 1) * 250;
+			const int32_t step_mdB = amp.step_size * 250;
 			m_volume_info.step_mdB = step_mdB;
 			m_volume_info.min_mdB = -amp.offset * step_mdB;
 			m_volume_info.max_mdB = (amp.num_steps - amp.offset) * step_mdB;
@@ -634,13 +621,7 @@ namespace Kernel
 
 			m_bdl_tail = (m_bdl_tail + 1) % m_bdl_entry_count;
 			if (m_bdl_tail == m_bdl_head)
-			{
+				reset_stream();
-				if (auto ret = reset_stream(); ret.is_error())
-				{
-					dwarnln("failed to reset HDA stream: {}", ret.error());
-					return;
-				}
-			}
 
 			queue_bdl_data();
 		}

kernel/kernel/Audio/HDAudio/Controller.cpp

@@ -113,7 +113,7 @@ namespace Kernel
 		// 4.3 The software must wait at least 521 us (25 frames) after reading CRST as a 1
 		// before assuming that codecs have all made status change requests and have been
 		// registered by the controller
-		SystemTimer::get().sleep_for_ns(521'000);
+		SystemTimer::get().sleep_ms(1);
 
 		return {};
 	}

kernel/kernel/Banos.cpp

@@ -1,215 +0,0 @@
-#include <kernel/Debug.h>
-#include <kernel/Banos.h>
-#include <BAN/Assert.h>
-#include <banos/driver.h>
-#include <banos/print.h>
-#include <banos/export.h>
-#include <kernel/FS/VirtualFileSystem.h>
-#include <kernel/Memory/PageTable.h>
-#include <kernel/ELF.h>
-#include <LibELF/Types.h>
-#include <LibELF/Values.h>
-#include <kernel/Process.h>
-#include <BAN/HashMap.h>
-#include <kernel/Lock/SpinLock.h>
-#include <kernel/UserCopy.h>
-
-using namespace LibELF;
-using namespace Kernel;
-
-extern "C" {
-	void banos_dprintln(const char* str) {
-		dprintln("{}", str);
-	}
-	void* banos_lookup_symbol(const char* str) {
-		return Banos::resolve_symbol(str);
-	}
-}
-BANOS_EXPORT(banos_dprintln);
-BANOS_EXPORT(banos_lookup_symbol);
-
-BAN::HashMap<BAN::StringView, void*> g_banos_symbols;
-void* Banos::resolve_symbol(const char* name) {
-	auto it = g_banos_symbols.find(name);
-	return it == g_banos_symbols.end() ? NULL : it->value;
-}
-void Banos::import_symbols(Banos_Symbol* symbols, size_t count) {
-	for(size_t i = 0; i < count; ++i) {
-		auto sym = symbols + i;
-		MUST(g_banos_symbols.insert(sym->name, sym->arg));
-	}
-}
-// TODO: driver unloading with a reference counter
-struct Driver_Instance {
-	Banos_Driver* drv;
-};
-static BAN::Vector<Driver_Instance> s_driver_instaces;
-static SpinLock s_driver_instaces_lock;
-
-extern Banos_Symbol g_banos_export[],
-					g_banos_export_end[];
-static void load_drv(Banos_Driver* drv) {
-	ASSERT(drv->driver_size >= sizeof(Banos_Driver));
-	dprintln("Loading driver:");
-	dprintln("  name: {}", drv->name);
-	if(drv->license) dprintln("  license: {}", drv->license);
-	dprintln("  version: {}.{}.{}", BANOS_VERSION_GET_MAJOR(drv->version), BANOS_VERSION_GET_MINOR(drv->version), BANOS_VERSION_GET_PATCH(drv->version));
-	int e = drv->init(drv);
-	if(e < 0) dprintln(" Failed to init {} => {}", drv->name, -e);
-}
-BAN::ErrorOr<size_t> Banos::load_driver_from_image(const char* u_image) {
-	if(!Process::current().credentials().is_superuser()) return BAN::Error::from_errno(EPERM);
-	// TODO: permission verification. Only root should be allowed to do this
-	LibELF::ElfNativeFileHeader header;
-
-	const unsigned char elf_class =
-		#if ARCH(i686)
-			ELFCLASS32;
-		#elif ARCH(x86_64)
-			ELFCLASS64;
-		#else
-		#   error update elf class
-		#endif
-
-	// TODO: is banan-os really ever gonna be running on MSB machines?
-	const unsigned char elf_data = ELFDATA2LSB;
-	// TODO: do we need to verify e_machine? I mean we do not really care.
-	// But I'm leaving this todo:
-	//   Look up EM_X86_64 and EM_360|EM_860|EM_960
-	TRY(read_from_user(u_image, &header, sizeof header));
-	if( header.e_ident[EI_MAG0]	   != ELFMAG0        ||
-		header.e_ident[EI_MAG1]	   != ELFMAG1        ||
-		header.e_ident[EI_MAG2]	   != ELFMAG2        ||
-		header.e_ident[EI_MAG3]	   != ELFMAG3        ||
-		header.e_ident[EI_CLASS]   != elf_class	     ||
-		header.e_ident[EI_DATA]	   != elf_data       ||
-		header.e_ident[EI_VERSION] != EV_CURRENT     ||
-		header.e_type			   != ET_REL         ||
-		header.e_version		   != EV_CURRENT     ||
-		header.e_ehsize			   != sizeof(header) ||
-		header.e_shentsize		   != sizeof(ElfNativeSectionHeader))
-		return BAN::Error::from_errno(EINVAL);
-
-
-	BAN::Vector<LibELF::ElfNativeSectionHeader> secs(header.e_shnum);
-	TRY(read_from_user(u_image + header.e_shoff, secs.data(), secs.size() * sizeof(*secs.data())));
-	auto shstr = secs[header.e_shstrndx];
-
-	size_t total_size = 0;
-
-	LibELF::ElfNativeSectionHeader  *strtab = nullptr,
-									*symtab = nullptr,
-									*driver_section = nullptr;
-
-	for(auto& sec : secs) {
-		if(sec.sh_flags & LibELF::SHF_ALLOC) {
-			sec.sh_addr = total_size;
-			total_size += sec.sh_size;
-		}
-		if(sec.sh_name == 0) continue;
-		char name[256];
-		TRY(read_string_from_user(u_image + shstr.sh_offset + sec.sh_name, name, sizeof name));
-		BAN::StringView name_sv(name);
-
-		if(sec.sh_type == LibELF::SHT_SYMTAB) {
-			symtab = &sec;
-		}
-		// TODO: verify sh_type for both of these?
-		if(name_sv == ".strtab") {
-			strtab = &sec;
-		} else if(name_sv == ".banos-driver") {
-			driver_section = &sec;
-		}
-	}
-	if(!symtab || !strtab || !driver_section)
-		return BAN::Error::from_errno(EINVAL);
-	total_size += PAGE_SIZE;
-	total_size &= ~(PAGE_SIZE-1);
-	auto driver = TRY(VirtualRange::create_to_vaddr_range(PageTable::kernel(), { KERNEL_OFFSET, UINTPTR_MAX }, total_size, PageTable::Execute | PageTable::ReadWrite | PageTable::Present, true));
-
-	for(auto& sec : secs) {
-		if(sec.sh_flags & LibELF::SHF_ALLOC) {
-			sec.sh_addr += driver->vaddr();
-		}
-	}
-	Banos_Driver* banos_driver = reinterpret_cast<Banos_Driver*>(driver_section->sh_addr);
-	for(auto& sec : secs) {
-		if(sec.sh_name == 0) continue;
-		if(sec.sh_flags & LibELF::SHF_ALLOC) {
-			TRY(read_from_user(u_image + sec.sh_offset, reinterpret_cast<char*>(sec.sh_addr), sec.sh_size));
-		}
-		if(sec.sh_type == LibELF::SHT_RELA) {
-			auto& link_sec = secs[sec.sh_info];
-			size_t rela_count = sec.sh_size/sizeof(LibELF::ElfNativeRelocationA);
-			BAN::Vector<LibELF::ElfNativeRelocationA> rela_data(rela_count);
-			TRY(read_from_user(u_image + sec.sh_offset, rela_data.data(), rela_count * sizeof *rela_data.data()));
-
-			for(auto rela : rela_data) {
-				auto type   = ELF64_R_TYPE(rela.r_info);
-				auto symbol = ELF64_R_SYM(rela.r_info);
-
-				vaddr_t value = 0;
-
-				LibELF::ElfNativeSymbol sym;
-				TRY(read_from_user(u_image + symtab->sh_offset + sizeof(sym) * symbol, &sym, sizeof sym));
-
-				if(sym.st_shndx) {
-					value = secs[sym.st_shndx].sh_addr;
-				} else {
-					char name[256];
-					TRY(read_string_from_user(u_image + strtab->sh_offset + sym.st_name, name, sizeof name));
-
-					value = reinterpret_cast<vaddr_t>(Banos::resolve_symbol(name));
-					if(!value) {
-						derrorln("Failed to find symbol {}", name);
-						return BAN::Error::from_errno(ENOENT);
-					}
-				}
-				vaddr_t at = link_sec.sh_addr + rela.r_offset;
-				size_t size = 0;
-				switch(type) {
-				case LibELF::R_X86_64_PLT32:
-				case LibELF::R_X86_64_PC32:
-					value -= at;
-					// fallthrough
-				case LibELF::R_X86_64_32:
-				case LibELF::R_X86_64_32S:
-					value += rela.r_addend;
-					size = sizeof(uint32_t);
-					break;
-				case LibELF::R_X86_64_64:
-					value += rela.r_addend;
-					size = sizeof(uint64_t);
-					break;
-				default:
-					derrorln("TODO: Unsupported relocation type {}", type);
-					return BAN::Error::from_errno(ENOSYS);
-				}
-
-				switch(size) {
-				case 4: *reinterpret_cast<uint32_t*>(at) = value; break;
-				case 8: *reinterpret_cast<uint64_t*>(at) = value; break;
-				}
-			}
-		}
-	}
-	Driver_Instance instance;
-	instance.drv = banos_driver;
-	load_drv(instance.drv);
-	SpinLockGuard _(s_driver_instaces_lock);
-	TRY(s_driver_instaces.push_back(instance));
-	// TODO: import symbols and resolve redefintions :)
-	return s_driver_instaces.size() - 1;
-}
-// NOTE: should be more than plenty ;)
-extern char g_drv_builtin_begin[];
-extern char g_drv_builtin_end[];
-void Banos::initialize_initial_drivers(void) {
-	import_symbols(g_banos_export, g_banos_export_end - g_banos_export);
-	char* head = g_drv_builtin_begin;
-	while(head < g_drv_builtin_end) {
-		Banos_Driver* drv = (Banos_Driver*)head;
-		load_drv(drv);
-		head += drv->driver_size;
-	}
-}