Master with old VM subsystem

.gdbinit

@@ -1,14 +1,3 @@
-# some generic settings
-set output-radix 0x10
-set pagination off
-set confirm off
-set verbose off
-
-# make extra commands available
-python import os, sys
-python sys.path.append(os.path.join(os.getcwd(), 'sys'))
-python import debug
-
 # favorite set of breakpoints
 break kernel_init
 break halt

.gdbinit-common

@@ -0,0 +1,10 @@
+# some generic settings
+set output-radix 0x10
+set pagination off
+set confirm off
+set verbose off
+
+# make extra commands available
+python import os, sys
+python sys.path.append(os.path.join(os.getcwd(), 'sys'))
+python import debug

.gdbinit-kftrace

@@ -0,0 +1,29 @@
+# Command to easily append KFT events to specified file
+define dump-kft
+  printf "Appending %d entries to file `dump.kft`\n", kft_used
+  append memory dump.kft kft_event_list kft_event_list+kft_used
+end
+
+set $kft_flush_count = 0
+
+break kft_flush
+commands
+  silent
+  printf "kft_flush(%d): ", $kft_flush_count++
+  dump-kft
+  continue
+end
+
+break ktest_success
+commands
+  printf "ktest_success: "
+  dump-kft
+end
+
+break halt
+commands
+  printf "halt: "
+  dump-kft
+end
+
+continue

.gdbinit-test

@@ -1,15 +1,3 @@
-# some generic settings
-set output-radix 0x10
-set pagination off
-set confirm off
-set verbose off
-handle SIGINT stop
-
-# make extra commands available
-python import os, sys
-python sys.path.append(os.path.join(os.getcwd(), 'sys'))
-python import debug
-
 define post-mortem
   add-symbol-file bin/utest/utest.uelf 0x400000
   echo \n*** REGISTERS ***\n\n

.github/workflows/default.yml

@@ -29,104 +29,53 @@ jobs:
       - uses: actions/checkout@v3
       - run: ./verify-pycodestyle.sh
 
-  build_mips:
-    name: Build MIPS
+  build:
+    name: Build Mimiker
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [mips, aarch64, riscv32, riscv64]
+        build: [kasan, kcsan]
+        exclude:
+          - arch: riscv32
+            build: kcsan
+          - arch: riscv64
+            build: kcsan
     runs-on: self-hosted
     needs: [verify_c_style, verify_py_style]
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
-      - run: make BOARD=malta KASAN=1 LOCKDEP=1
+      - run: ./action.sh build ${{ matrix.arch }} ${{ matrix.build }}
       - uses: actions/upload-artifact@v3
         with:
-          name: "mips kernel+ramdisk"
+          name: "${{ matrix.arch }} ${{ matrix.build }} build"
           path: |
-            sys/mimiker.elf
-            sys/mimiker.elf.map
             bin/*/*.uelf
-            usr.bin/*/*.uelf
             initrd.cpio
-
-  build_aarch64:
-    name: Build AArch64
-    runs-on: self-hosted
-    needs: [verify_c_style, verify_py_style]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - run: make BOARD=rpi3 KASAN=1 LOCKDEP=1
-      - uses: actions/upload-artifact@v3
-        with:
-          name: "aarch64 kernel+ramdisk"
-          path: |
-            sys/mimiker.elf
-            sys/mimiker.img.gz
-            sys/mimiker.elf.map
-            bin/*/*.uelf
-            usr.bin/*/*.uelf
             sys/dts/*.dtb
-            initrd.cpio
-
-  build_riscv32:
-    name: Build RISC-V 32-bit
-    runs-on: self-hosted
-    needs: [verify_c_style, verify_py_style]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - run: make BOARD=litex-riscv KASAN=1 LOCKDEP=1
-
-  build_riscv64:
-    name: Build RISC-V 64-bit
-    runs-on: self-hosted
-    needs: [verify_c_style, verify_py_style]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - run: make BOARD=sifive_u KASAN=1 LOCKDEP=1
-      - uses: actions/upload-artifact@v3
-        with:
-          name: "riscv64 kernel+ramdisk"
-          path: |
             sys/mimiker.elf
             sys/mimiker.elf.map
-            bin/*/*.uelf
+            sys/mimiker.img.gz
             usr.bin/*/*.uelf
-            initrd.cpio
-
-  kernel_tests_mips:
-    name: Tests MIPS
-    runs-on: self-hosted
-    needs: build_mips
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v3
-        with:
-          name: "mips kernel+ramdisk"
-      - run: ./run_tests.py --board malta --timeout=100 --times=50
-
-  kernel_tests_aarch64:
-    name: Tests AArch64
-    runs-on: self-hosted
-    needs: build_aarch64
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v3
-        with:
-          name: "aarch64 kernel+ramdisk"
-      - run: ./run_tests.py --board rpi3 --timeout=60 --times=50
 
-  kernel_tests_riscv64:
-    name: Tests RISC-V 64-bit
+  tests:
+    name: Run Tests
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [mips, aarch64, riscv64]
+        build: [kasan, kcsan]
+        suite: [kernel, user]
+        exclude:
+          - arch: riscv64
+            build: kcsan
     runs-on: self-hosted
-    needs: build_riscv64
+    needs: build
     steps:
       - uses: actions/checkout@v3
       - uses: actions/download-artifact@v3
         with:
-          name: "riscv64 kernel+ramdisk"
-      - run: ./run_tests.py --board sifive_u --timeout=100 --times=50
+          name: "${{ matrix.arch }} ${{ matrix.build }} build"
+      - run: ./action.sh tests ${{ matrix.arch }} ${{ matrix.build }} ${{ matrix.suite }}

.gitignore

@@ -83,3 +83,6 @@ mimiker-env/
 
 #
 contrib/*/build/
+
+# kft dump
+dump.kft

.gitmodules

@@ -8,6 +8,9 @@
 [submodule "contrib/atto/incurses"]
 	path = contrib/atto/incurses
 	url = https://github.com/infinnovation-dev/incurses.git
+[submodule "contrib/ubase/ubase"]
+	path = contrib/ubase/ubase
+	url = git://git.suckless.org/ubase
 [submodule "contrib/sbase/sbase"]
 	path = contrib/sbase/sbase
 	url = git://git.suckless.org/sbase

action.sh

@@ -0,0 +1,41 @@
+#!/bin/sh
+
+cmd=$1
+arch=$2
+build=$3
+
+shift 3
+
+case $arch in
+  mips) board=malta ;;
+  aarch64) board=rpi3 ;;
+  riscv32) board=litex-riscv ;;
+  riscv64) board=sifive_u ;;
+  *) exit 1 ;;
+esac
+
+case $build in
+  kasan) ksan=KASAN ;;
+  kcsan) ksan=KCSAN ;;
+  *) exit 1 ;;
+esac
+
+case $cmd in
+  build)
+    make BOARD=$board $ksan=1 LOCKDEP=1 ;;
+  tests)
+    case $build in
+      kasan)
+        ./run_tests.py --board $board --timeout=100 --times=50 --suite=$1 ;;
+      kcsan)
+        ./run_tests.py --board $board --timeout=100 --times=50 --suite=$1 \
+          --parallel=5
+        # do not report it as failed because we have no people working on
+        # fixing concurrency issues
+        exit 0 ;;
+      *)
+        exit 1 ;;
+    esac ;;
+  *)
+    exit 1 ;;
+esac

bin/ksh/Makefile

@@ -14,6 +14,10 @@ clean-here:
 	$(RM) siglist.out siglist.out.tmp
 	$(RM) emacs.out emacs.out.tmp
 
+install-here:
+	@echo "[SYMLINK] sh -> $(PROGRAM)"
+	ln -sf $(PROGRAM) $(SYSROOT)/$(BINDIR)/sh
+
 # two steps to prevent the creation of a bogus siglist.out
 siglist.out: config.h sh.h siglist.in siglist.sh
 	./siglist.sh "$(CC) -E $(CPPFLAGS) $(DEFS) -I. -I$(CURDIR)" \

bin/utest/Makefile

@@ -31,15 +31,19 @@ SOURCES = \
 	vfs.c \
 	wait.c \
 	vm_map.c \
-	vm_map_prot.c
+	vm_map_prot.c \
 
 PROGRAM = utest
 
+CPPFLAGS += -I.
 EXTRAFILES = $(shell find extra -type f)
 INSTALL-FILES = $(EXTRAFILES:extra/%=$(SYSROOT)/%)
 
 include $(TOPDIR)/build/build.prog.mk
 
+# Force a user not to use following symbols
+LDFLAGS += --wrap=sprintf --wrap=printf --wrap=wait
+
 $(SYSROOT)/%: extra/%
 	@echo "[INSTALL] $(DIR)$< -> /$*"
 	$(INSTALL) -m 644 $< $@

bin/utest/access.c

@@ -5,11 +5,11 @@
 #include <fcntl.h>
 #include <errno.h>
 
-TEST_ADD(access_basic) {
+TEST_ADD(access_basic, 0) {
   /* After implementing credentials test should be extended. */
-  syscall_ok(access("/bin/mandelbrot", R_OK));
-  syscall_ok(access("/bin/mandelbrot", 0));
-  syscall_ok(access("/bin/mandelbrot", R_OK | W_OK | X_OK));
+  xaccess("/bin/mandelbrot", R_OK);
+  xaccess("/bin/mandelbrot", 0);
+  xaccess("/bin/mandelbrot", R_OK | W_OK | X_OK);
   syscall_fail(access("/tests/ascii", X_OK), EACCES);
   syscall_fail(access("/bin/mandelbrot", (R_OK | W_OK | X_OK) + 1), EINVAL);
   syscall_fail(access("/dont/exist", X_OK), ENOENT);