Merge pull request #107 from KaiNorberg/develop

Develop

Author: KaiNorberg

Make.defaults

@@ -2,12 +2,17 @@ MKCWD = @mkdir -p $(@D)
 
 CC = gcc
 AS = gcc
-LD = ld
-AR = ar
+LD = gcc
+AR = gcc-ar
 OBJCOPY = objcopy
 
 CFLAGS := \
 	-std=gnu11 \
+	-ffreestanding \
+	-fno-builtin \
+	-fno-pie \
+	-mno-red-zone \
+	-nostdinc \
 	-Wall \
 	-Wextra \
 	-Werror \
@@ -20,14 +25,8 @@ CFLAGS := \
 	-Wno-deprecated-non-prototype \
 	-Wno-unused-but-set-parameter \
 	-Wno-unused-command-line-argument \
-	-nostdlib \
-	-nostdinc \
-	-ffreestanding \
-	-fno-builtin \
 	-isystem include \
 	-isystem include/libstd \
-	-Lbin/libstd \
-	-Lbin/libpatchwork \
 	-Iinclude \
 	-Ilib \
 	-I$(SRCDIR) \
@@ -40,7 +39,6 @@ CFLAGS_DISABLE_SIMD := \
 	-mno-ssse3 -mno-sse4
 
 ASFLAGS := \
-	-nostdlib \
 	-nostdinc \
 	-ffreestanding \
 	-fno-builtin \
@@ -52,7 +50,8 @@ ASFLAGS := \
 LDFLAGS := \
 	-nostdlib \
 	-Lbin/libstd \
-	-Lbin/libpatchwork
+	-Lbin/libpatchwork \
+	-no-pie
 
 ifeq ($(TESTING),1)
 	CFLAGS += -D_TESTING_
@@ -85,13 +84,11 @@ CFLAGS_MODULE := \
 	-D__STDC_WANT_LIB_EXT1__=1
 
 ASFLAGS_MODULE := \
-	$(ASFLAGS) \
 	-fPIC \
 	-D_KERNEL_MODULE_ \
 	-D__STDC_WANT_LIB_EXT1__=1
 
 LDFLAGS_MODULE := \
-	$(LDFLAGS) \
 	-shared \
 	-fPIC \
 	-Tinclude/modules/linker.lds
@@ -106,4 +103,4 @@ OBJ = $(patsubst src/%, $(BUILDDIR)/%.o, $(SRC))
 
 DEP = $(OBJ:.o=.d)
 
--include $(DEP)
+-include $(DEP)

Makefile

@@ -97,22 +97,22 @@ lib/gnu-efi/.built: | lib/gnu-efi
 
 $(BOOT_TARGET): setup | bin/boot
 	@echo "BUILD   boot"
-	@$(MAKE) -s --no-print-directory -f src/boot/boot.mk SRCDIR=src/boot BUILDDIR=build/boot BINDIR=bin/boot
+	@$(MAKE) -s --no-print-directory -f src/boot/boot.mk SRCDIR=src/boot BUILDDIR=build/boot BINDIR=bin/boot all
 	@touch $@
 
 $(KERNEL_TARGET): setup | bin/kernel
 	@echo "BUILD   kernel"
-	@$(MAKE) -s --no-print-directory -f src/kernel/kernel.mk SRCDIR=src/kernel BUILDDIR=build/kernel BINDIR=bin/kernel
+	@$(MAKE) -s --no-print-directory -f src/kernel/kernel.mk SRCDIR=src/kernel BUILDDIR=build/kernel BINDIR=bin/kernel all
 	@touch $@
 
 $(LIBSTD_TARGET): setup | bin/libstd
 	@echo "BUILD   libstd"
-	@$(MAKE) -s --no-print-directory -f src/libstd/libstd.mk SRCDIR=src/libstd BUILDDIR=build/libstd BINDIR=bin/libstd
+	@$(MAKE) -s --no-print-directory -f src/libstd/libstd.mk SRCDIR=src/libstd BUILDDIR=build/libstd BINDIR=bin/libstd all
 	@touch $@
 
 $(LIBPATCHWORK_TARGET): setup | bin/libpatchwork
 	@echo "BUILD   libpatchwork"
-	@$(MAKE) -s --no-print-directory -f src/libpatchwork/libpatchwork.mk SRCDIR=src/libpatchwork BUILDDIR=build/libpatchwork BINDIR=bin/libpatchwork
+	@$(MAKE) -s --no-print-directory -f src/libpatchwork/libpatchwork.mk SRCDIR=src/libpatchwork BUILDDIR=build/libpatchwork BINDIR=bin/libpatchwork all
 	@touch $@
 
 lib/argon2/.built: $(MODULES_TARGETS)
@@ -129,7 +129,7 @@ lib/argon2/.built: $(MODULES_TARGETS)
 define MODULE_RULE
 bin/modules/.$(1).built: $(filter %/$(1).mk,$(MODULES_MK)) $(BOOT_TARGET) $(KERNEL_TARGET) $(LIBSTD_TARGET) $(LIBPATCHWORK_TARGET) | bin/modules
 	@echo "BUILD   module $(1)"
-	@$(MAKE) -s --no-print-directory -f $(filter %/$(1).mk,$(MODULES_MK)) SRCDIR=$(dir $(filter %/$(1).mk,$(MODULES_MK))) BUILDDIR=build/modules/$(1) BINDIR=bin/modules MODULE=$(1)
+	@$$(MAKE) -s --no-print-directory -f $$(filter %/$(1).mk,$$(MODULES_MK)) SRCDIR=$$(dir $$(filter %/$(1).mk,$$(MODULES_MK))) BUILDDIR=build/modules/$(1) BINDIR=bin/modules MODULE=$(1) all
 	@touch $$@
 endef
 
@@ -138,7 +138,7 @@ $(foreach mod,$(MODULES_NAMES),$(eval $(call MODULE_RULE,$(mod))))
 define BOX_RULE
 bin/boxes/.$(1).built: $(filter %/$(1).mk,$(BOXES_MK)) $(MODULES_TARGETS) lib/argon2/.built | bin/boxes
 	@echo "BUILD   box $(1)"
-	@$(MAKE) -s --no-print-directory -f $(filter %/$(1).mk,$(BOXES_MK)) SRCDIR=$(dir $(filter %/$(1).mk,$(BOXES_MK))) BUILDDIR=build/boxes/$(1) BINDIR=bin/boxes BOX=$(1)
+	@$$(MAKE) -s --no-print-directory -f $$(filter %/$(1).mk,$$(BOXES_MK)) SRCDIR=$$(dir $$(filter %/$(1).mk,$$(BOXES_MK))) BUILDDIR=build/boxes/$(1) BINDIR=bin/boxes BOX=$(1) all
 	@touch $$@
 endef
 
@@ -147,7 +147,7 @@ $(foreach box,$(BOXES_NAMES),$(eval $(call BOX_RULE,$(box))))
 define PROGRAM_RULE
 bin/programs/.$(1).built: $(filter %/$(1).mk,$(PROGRAMS_MK)) $(BOXES_TARGETS) | bin/programs
 	@echo "BUILD   program $(1)"
-	@$(MAKE) -s --no-print-directory -f $(filter %/$(1).mk,$(PROGRAMS_MK)) SRCDIR=$(dir $(filter %/$(1).mk,$(PROGRAMS_MK))) BUILDDIR=build/programs/$(1) BINDIR=bin/programs PROGRAM=$(1)
+	@$$(MAKE) -s --no-print-directory -f $$(filter %/$(1).mk,$$(PROGRAMS_MK)) SRCDIR=$$(dir $$(filter %/$(1).mk,$$(PROGRAMS_MK))) BUILDDIR=build/programs/$(1) BINDIR=bin/programs PROGRAM=$(1) all
 	@touch $$@
 endef
 
@@ -252,7 +252,7 @@ nuke: clean
 	@rm -rf lib/doomgeneric-patchworkos lib/lua-5.4.7 lib/acpica lib/acpica_tests lib/argon2 include/argon2 meta/docs
 	@rm -rf lib/gnu-efi/.built lib/argon2/.built lib/acpica_tests/.built
 
-QEMU_MEMORY ?= 1G
+QEMU_MEMORY ?= 2G
 QEMU_CPUS ?= $(shell nproc 2>/dev/null || echo 8)
 QEMU_MACHINE ?= q35
 QEMU_ARGS ?=

README.md

@@ -58,12 +58,12 @@ Will this project ever reach its goals? Probably not, but that's not the point.
 - Physical and virtual memory management is `O(1)` per page and `O(n)` where `n` is the number of pages per allocation/mapping operation, see [benchmarks](#benchmarks) for more info.
 - File based IPC including [pipes](https://kainorberg.github.io/PatchworkOS/html/d7/d64/group__modules__ipc__pipe.html), [shared memory](https://kainorberg.github.io/PatchworkOS/html/df/d3f/group__modules__ipc__shmem.html), [sockets](https://kainorberg.github.io/PatchworkOS/html/d4/db0/group__kernel__fs__netfs.html) and Plan9 inspired "signals" called [notes](https://kainorberg.github.io/PatchworkOS/html/d8/db1/group__kernel__ipc__note.html).
 - File based device API [abstractions](https://kainorberg.github.io/PatchworkOS/html/de/d7b/group__kernel__drivers__abstract.html), including framebuffers, input devices, etc.
-- [Synchronization primitives](https://kainorberg.github.io/PatchworkOS/html/dd/d6b/group__kernel__sync.html) including mutexes, read-write locks, sequential locks, futexes and others.
+- [Synchronization primitives](https://kainorberg.github.io/PatchworkOS/html/dd/d6b/group__kernel__sync.html) including Read-Copy-Update, mutexes, R/W locks, sequential locks, futexes and others.
 - Highly [Modular design](#modules), even [SMP Bootstrapping](https://kainorberg.github.io/PatchworkOS/html/d3/d0a/group__modules__smp.html) is done in a module.
 
 ### File System
 
-- UNIX-style VFS with mountpoints, hardlinks, symlinks, per-process namespaces, etc.
+- Inode and dentry based VFS with RCU traversal, hardlinks, symlinks, per-process namespaces, etc.
 - Custom [Framebuffer BitMaP](https://github.com/KaiNorberg/fbmp) (.fbmp) image format, allows for faster loading by removing the need for parsing.
 - Custom [Grayscale Raster Font](https://github.com/KaiNorberg/grf) (.grf) font format, allows for antialiasing and kerning without complex vector graphics.
 
@@ -84,7 +84,6 @@ Will this project ever reach its goals? Probably not, but that's not the point.
 
 ## Notable Future Plans
 
-- Fix filesystem mounting vulnerability.
 - File servers (FUSE, 9P?).
 - Implement user system in user-space using namespaces.
 - Improve `share()` and `claim()` security by specifying a target PID when sharing.
@@ -440,7 +439,7 @@ It would even be possible to implement a multi-user-like system entirely in user
 
 ### Hiding Dentries
 
-For complex use cases, relying on just mountpoints becomes exponentially complex. As such, the Virtual File System allows a filesystem to dynamically hide directories and files using the `revalidate()` dentry operation. 
+For complex use cases, relying on just mountpoints becomes exponentially complex. As such, the Virtual File System allows a filesystem to dynamically hide directories and files using the `revalidate()` dentry operation.
 
 For example, in "procfs", a process can see all the `/proc/[pid]/` files of processes in its namespace and in child namespaces but for processes in parent namespaces certain files will appear to not exist in the filesystem hierarchy. The "netfs" filesystem works similarly making sure that only processes in the namespace that created a socket can see its directory.
 

include/kernel/config.h

@@ -95,7 +95,7 @@
  * The `CONFIG_TIME_SLICE` constant defines the default time slice given to threads when they are scheduled.
  *
  */
-#define CONFIG_TIME_SLICE ((CLOCKS_PER_SEC / 1000) * 10)
+#define CONFIG_TIME_SLICE ((CLOCKS_PER_MS) * 10)
 
 /**
  * @brief Cache hot threshold configuration.
@@ -106,7 +106,7 @@
  * hot", meaning that the data is likely still in the CPU cache.
  *
  */
-#define CONFIG_CACHE_HOT_THRESHOLD ((CLOCKS_PER_SEC / 1000) * 5)
+#define CONFIG_CACHE_HOT_THRESHOLD ((CLOCKS_PER_MS) * 5)
 
 /**
  * @brief Maximum mutex slow spin configuration.
@@ -169,4 +169,25 @@
  * The `CONFIG_LOG_KLOG_BUFFER_SIZE` constant defines the size of the buffer used for the `/dev/klog` file.
  *
  */
-#define CONFIG_KLOG_SIZE 0x4000
+#define CONFIG_KLOG_SIZE 0x4000
+
+/**
+ * @brief Per-CPU data size configuration.
+ * @ingroup kernel
+ * @def CONFIG_PERCPU_SIZE
+ *
+ * The `CONFIG_PERCPU_SIZE` constant defines the size allocated for per-CPU data.
+ *
+ */
+#define CONFIG_PERCPU_SIZE 0x10000
+
+/**
+ * @brief Maximum wait queues configuration.
+ * @ingroup kernel
+ * @def CONFIG_MAX_WAIT_QUEUES
+ *
+ * The `CONFIG_MAX_WAIT_QUEUES` constant defines the maximum amount of wait queues that a thread can wait on
+ * simultaneously.
+ *
+ */
+#define CONFIG_MAX_WAIT_QUEUES 64

include/kernel/cpu/cli.h

@@ -0,0 +1,65 @@
+#pragma once
+
+#include <assert.h>
+#include <kernel/cpu/cpu.h>
+#include <kernel/cpu/percpu.h>
+#include <kernel/cpu/regs.h>
+#include <stdbool.h>
+#include <stdint.h>
+
+/**
+ * @brief Clear Interrupt Flag (CLI) Handling
+ * @defgroup kernel_cpu_cli CLI
+ * @ingroup kernel_cpu
+ *
+ * Manages nested CLI (Clear Interrupt Flag) calls.
+ * @{
+ */
+
+/**
+ * @brief Increments the CLI depth, disabling interrupts if depth was zero.
+ *
+ * @warning Must have a matching `cli_pop()` call to re-enable interrupts when depth reaches zero.
+ */
+static inline void cli_push(void)
+{
+    uint64_t rflags = rflags_read();
+    asm volatile("cli" ::: "memory");
+
+    if (SELF->cli == 0)
+    {
+        SELF->oldRflags = rflags;
+    }
+    SELF->cli++;
+}
+
+/**
+ * @brief Decrements the CLI depth, re-enabling interrupts if depth reaches zero and interrupts were enabled prior to
+ * the first `cli_push()` call.
+ *
+ * @warning This function should only be called after a `cli_push()` call.
+ */
+static inline void cli_pop(void)
+{
+    assert(!(rflags_read() & RFLAGS_INTERRUPT_ENABLE));
+    assert(SELF->cli != 0);
+    SELF->cli--;
+    if (SELF->cli == 0 && (SELF->oldRflags & RFLAGS_INTERRUPT_ENABLE))
+    {
+        asm volatile("sti" ::: "memory");
+    }
+}
+
+/**
+ * @brief Macro to increment CLI depth for the duration of the current scope.
+ */
+#define CLI_SCOPE() \
+    cli_push(); \
+    __attribute__((cleanup(cli_scope_cleanup))) int CONCAT(i, __COUNTER__) = 1;
+
+static inline void cli_scope_cleanup(int* _)
+{
+    cli_pop();
+}
+
+/** @} */