CI cleanups

.circleci/config.yml

@@ -91,28 +91,13 @@ do_steps: &do_steps
 
 ## Customize the test machine
 jobs:
-  x86_64:
-   docker:
-     - image: lkldocker/circleci-x86_64:v1.4
-   environment:
-     CROSS_COMPILE: ""
-     MKARG: "dpdk=no"
-   <<: *do_steps
-
   i386:
    docker:
      - image: lkldocker/circleci-i386:v1.4
    environment:
      CROSS_COMPILE: ""
    <<: *do_steps
 
-  mingw32:
-   docker:
-     - image: lkldocker/circleci-mingw:v1.4
-   environment:
-     CROSS_COMPILE: "i686-w64-mingw32-"
-   <<: *do_steps
-
   android-arm32:
    docker:
      - image: lkldocker/circleci-android-arm32:v1.4
@@ -147,22 +132,10 @@ jobs:
      VALGRIND: 1
    <<: *do_steps
 
-  x86_64_qemu:
-   docker:
-     - image: lkldocker/circleci-qemu-x86_64:v1.4
-   environment:
-     CROSS_COMPILE: ""
-     MKARG: "dpdk=no"
-     LKL_QEMU_TEST: 1
-   <<: *do_steps
-
 workflows:
   version: 2
   build:
     jobs:
-     - x86_64
-     - x86_64_qemu
-     - mingw32
      - android-aarch64
      - freebsd11_x86_64
      - i386

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - displayTargetName: ubuntu-22.04
+          - displayTargetName: linux
             os: unix
             runs_on: ubuntu-22.04
             shell: bash
@@ -109,12 +109,7 @@ jobs:
         if: runner.os == 'Linux'
         run: |
           sudo apt update -y
-          sudo apt install -y ccache libjsmn-dev libfuse3-dev
-      - name: Install clang toolchain
-        if: runner.os == 'Linux'
-        run: |
-          sudo apt update -y
-          sudo apt install -y clang lld llvm
+          sudo apt install -y ccache libjsmn-dev libfuse3-dev clang lld llvm qemu-system-x86 qemu-utils sshpass cloud-image-utils
       - name: Install patched binutils for Windows
         if: runner.os == 'Windows'
         run: |
@@ -145,6 +140,16 @@ jobs:
           sudo sh -c "echo 0 > /proc/sys/vm/mmap_min_addr"
           echo "setting env variable (debug)"
           echo "ZPOLINE_DEBUG=0" >> "$GITHUB_ENV"
+      - name: Start QEMU
+        if: matrix.displayTargetName == 'linux'
+        run: |
+          ./tools/lkl/scripts/qemu-x86_64-make-images.sh
+          sudo chmod a+rw /dev/kvm
+          . tools/lkl/scripts/qemu-x86_64-start-and-set-env.sh
+          echo MYHOST="$HOST" >> $GITHUB_ENV
+          echo MYSSH="$MYSSH" >> $GITHUB_ENV
+          echo MYSCP="$MYSCP" >> $GITHUB_ENV
+          echo LKL_QEMU_TEST=1 >> $GITHUB_ENV
       - name: Build
         run: |
           make -j4 -C tools/lkl ${{ matrix.build_options }}

arch/lkl/Kconfig

@@ -124,7 +124,7 @@ config PCI
 	select NO_GENERIC_PCI_IOPORT_MAP
 	select GENERIC_PCI_IOMAP
 	select HAS_DMA
-	select DMA_OPS
+	select ARCH_HAS_DMA_OPS
 	default y
 
 config RAID6_PQ_BENCHMARK

arch/lkl/include/asm/string.h

@@ -51,9 +51,16 @@ static inline void *__memmove(void *dest, const void *src, size_t count)
 
 #else /* __SANITIZE_ADDRESS__ */
 
-#undef memcpy
+void *__asan_memset(void *addr, int c, ssize_t len);
+void *__asan_memmove(void *dest, const void *src, ssize_t len);
+void *__asan_memcpy(void *dest, const void *src, ssize_t len);
+
 #undef memset
+#define memset(s, c, n) __asan_memset(s, c, n)
 #undef memmove
+#define memmove(dst, src, len) __asan_memmove(dst, src, len)
+#undef memcpy
+#define memcpy(dst, src, len) __asan_memcpy(dst, src, len)
 
 #endif /* __SANITIZE_ADDRESS__ */
 

tools/lkl/scripts/qemu-x86_64-make-images.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+
+wget -q https://cloud-images.ubuntu.com/releases/noble/release-20260321/ubuntu-24.04-server-cloudimg-amd64.img
+wget -q https://cloud-images.ubuntu.com/releases/noble/release-20260321/unpacked/ubuntu-24.04-server-cloudimg-amd64-vmlinuz-generic
+wget -q https://cloud-images.ubuntu.com/releases/noble/release-20260321/unpacked/ubuntu-24.04-server-cloudimg-amd64-initrd-generic
+
+dd if=/dev/zero of=nvme.img bs=1024 count=102400
+cat > cloud.txt <<EOF
+#cloud-config
+user: lkl
+password: lkl
+sudo: ['ALL=(ALL) NOPASSWD:ALL']
+chpasswd: { expire: False }
+groups: sudo
+ssh_pwauth: True
+shell: /bin/bash
+EOF
+cloud-localds cloud.img cloud.txt
+rm cloud.txt

tools/lkl/scripts/qemu-x86_64-start-and-set-env.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+
+qemu-system-x86_64 --enable-kvm -m 512 -machine q35,kernel-irqchip=split \
+  -device intel-iommu,intremap=on \
+  -net nic,model=e1000 -net user,hostfwd=tcp::2222-:22 \
+  -drive file=nvme.img,if=none,id=D22 -device nvme,drive=D22,serial=1234 \
+  -hda ubuntu-24.04-server-cloudimg-amd64.img -hdb cloud.img \
+  -kernel ubuntu-24.04-server-cloudimg-amd64-vmlinuz-generic \
+  -initrd ubuntu-24.04-server-cloudimg-amd64-initrd-generic \
+  -append 'root=LABEL=cloudimg-rootfs ro intel_iommu=on console=tty1 console=ttyS0' \
+  -display none -serial mon:telnet::5555,server,nowait -daemonize
+
+SSH_OPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
+export MYHOST=lkl@localhost
+export MYSSH="sshpass -p lkl ssh $SSH_OPTS -p 2222 $MYHOST"
+export MYSCP="sshpass -p lkl scp -O $SSH_OPTS -P 2222"

tools/lkl/tests/disk-vfio-pci.c

@@ -1,14 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <unistd.h>
-#include <string.h>
-#include <time.h>
-#include <stdlib.h>
 #include <stdint.h>
 #include <lkl.h>
 #include <lkl_host.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <inttypes.h>
 
 #include "test.h"
 #include "cla.h"
@@ -20,81 +18,68 @@ static struct {
 } cla;
 
 struct cl_arg args[] = {
-	{ "type", 't', "filesystem type", 1, CL_ARG_STR, &cla.fstype },
 	{ "pciname", 'n', "PCI device name (as %x:%x:%x.%x format)", 1,
 	  CL_ARG_STR, &cla.pciname },
 	{ 0 },
 };
 
-static char mnt_point[32];
 static char bootparams[128];
 
-static int lkl_test_umount_dev(void)
-{
-	long ret, ret2;
-
-	ret = lkl_sys_chdir("/");
-
-	ret2 = lkl_umount_blkdev(LKL_MKDEV(259, 0), 0, 1000);
-
-	lkl_test_logf("%ld %ld", ret, ret2);
-
-	if (!ret && !ret2)
-		return TEST_SUCCESS;
-
-	return TEST_FAILURE;
-}
+#define min(a, b) (a < b ? a : b)
 
-struct lkl_dir *dir;
-
-static int lkl_test_opendir(void)
+static int lkl_test_blkdev(void)
 {
+	char dev_str[] = { "/dev/xxxxxxxx" };
+	char buffer[64*1024];
+	uint64_t size, read = 0;
 	int err;
+	int fd;
 
-	dir = lkl_opendir(mnt_point, &err);
+	snprintf(dev_str, sizeof(dev_str), "/dev/%08x", LKL_MKDEV(259, 0));
 
-	lkl_test_logf("lkl_opedir(%s) = %d %s\n", mnt_point, err,
-		      lkl_strerror(err));
+	err = lkl_sys_mknod(dev_str, LKL_S_IFBLK | 0600, LKL_MKDEV(259, 0));
+	if (err < 0) {
+		lkl_test_logf("mknod failed: %s\n", lkl_strerror(err));
+		return TEST_FAILURE;
+	}
 
-	if (err == 0)
-		return TEST_SUCCESS;
+	fd = lkl_sys_open(dev_str, LKL_O_RDONLY, 0);
+	if (fd < 0) {
+		lkl_test_logf("open failed: %s\n", lkl_strerror(fd));
+		return TEST_FAILURE;
+	}
 
-	return TEST_FAILURE;
-}
+	err = lkl_sys_ioctl(fd, LKL_BLKGETSIZE64, (unsigned long)&size);
+	if (err < 0) {
+		lkl_test_logf("BLKGETSIZE64 failed: %s\n", lkl_strerror(fd));
+		lkl_sys_close(fd);
+		return TEST_FAILURE;
+	}
 
-static int lkl_test_readdir(void)
-{
-	struct lkl_linux_dirent64 *de = lkl_readdir(dir);
-	int wr = 0;
-
-	while (de) {
-		wr += lkl_test_logf("%s ", de->d_name);
-		if (wr >= 70) {
-			lkl_test_logf("\n");
-			wr = 0;
-			break;
+	while (read < size) {
+		err = lkl_sys_read(fd, buffer,
+				   min(sizeof(buffer), size - read));
+		if (err <= 0) {
+			lkl_test_logf("read failed: %s\n", lkl_strerror(err));
+			lkl_sys_close(fd);
+			return TEST_FAILURE;
 		}
-		de = lkl_readdir(dir);
+		read += err;
 	}
 
-	if (lkl_errdir(dir) == 0)
-		return TEST_SUCCESS;
+	lkl_sys_close(fd);
+	lkl_test_logf("read %" PRIu64 " bytes\n", read);
 
-	return TEST_FAILURE;
+	return TEST_SUCCESS;
 }
 
-LKL_TEST_CALL(mount_dev, lkl_mount_blkdev, 0, LKL_MKDEV(259, 0),
-	      cla.fstype, 0, NULL, mnt_point, sizeof(mnt_point))
-LKL_TEST_CALL(closedir, lkl_closedir, 0, dir);
-LKL_TEST_CALL(chdir_mnt_point, lkl_sys_chdir, 0, mnt_point);
 LKL_TEST_CALL(start_kernel, lkl_start_kernel, 0, bootparams);
 LKL_TEST_CALL(stop_kernel, lkl_sys_halt, 0);
 
 struct lkl_test tests[] = {
-	LKL_TEST(start_kernel),	   LKL_TEST(mount_dev),
-	LKL_TEST(chdir_mnt_point), LKL_TEST(opendir),
-	LKL_TEST(readdir),	   LKL_TEST(closedir),
-	LKL_TEST(umount_dev),	   LKL_TEST(stop_kernel),
+	LKL_TEST(start_kernel),
+	LKL_TEST(blkdev),
+	LKL_TEST(stop_kernel),
 };
 
 int main(int argc, const char **argv)
@@ -115,7 +100,7 @@ int main(int argc, const char **argv)
 	}
 
 	ret = lkl_test_run(tests, sizeof(tests) / sizeof(struct lkl_test),
-			"disk-vfio-pci %s", cla.fstype);
+			"disk-vfio-pci");
 
 	lkl_cleanup();
 

tools/lkl/tests/disk-vfio-pci.sh

@@ -11,59 +11,44 @@ bin_name="disk-vfio-pci"
 function wait_guest()
 {
     for i in `seq 300`; do
-	if $MYSSH exit 2> /dev/null; then
-	    break
-	fi
-	sleep 1
+        if $MYSSH exit 2> /dev/null; then
+            break
+        fi
+        sleep 1
     done
 }
 
 function init()
 {
     # initialize
-    dd if=/dev/zero of=/home/ubuntu/nvme.img bs=1024 count=102400
-    yes | sudo mkfs.$fstype /home/ubuntu/nvme.img
     $MYSSH sudo modprobe vfio-pci
+    $MYSSH "sh -c 'echo vfio-pci |
+                      sudo tee /sys/bus/pci/devices/$pciname/driver_override'"
     $MYSSH "sh -c 'echo $nvme_id |
-    	       	       sudo tee /sys/bus/pci/drivers/vfio-pci/new_id'"
+                      sudo tee /sys/bus/pci/drivers/vfio-pci/new_id'"
     $MYSSH "sh -c 'echo $pciname |
-    	       	       sudo tee /sys/bus/pci/drivers/nvme/unbind'"
+                      sudo tee /sys/bus/pci/drivers/nvme/unbind'"
     $MYSSH "sh -c 'echo $pciname |
-    	       	       sudo tee /sys/bus/pci/drivers/vfio-pci/bind'"
+                      sudo tee /sys/bus/pci/drivers/vfio-pci/bind'"
     $MYSSH sudo chown lkl:lkl /dev/vfio/3
     $MYSCP $script_dir/$bin_name lkl@localhost:
 }
 
 function cleanup()
 {
     $MYSSH "sh -c 'echo $pciname |
-    	       	       sudo tee /sys/bus/pci/drivers/vfio-pci/unbind'"
-    $MYSSH "sh -c 'echo $pciname |
-    	       	       sudo tee /sys/bus/pci/drivers/nvme/bind'"
-}
-
-function run()
-{
-    if [ -z "$LKL_QEMU_TEST" ]; then
-	lkl_test_plan 0 "disk-vfio-pci $fstype"
-	echo "vfio not supported"
-    else
-	lkl_test_plan 1 "disk-vfio-pci $fstype"
-	lkl_test_run 1 init
-	lkl_test_exec $MYSSH ./$bin_name -n 0000:00:03.0 -t $fstype
-	lkl_test_plan 1 "disk-vfio-pci $fstype"
-	lkl_test_run 1 cleanup
-    fi
+                      sudo tee /sys/bus/pci/drivers/vfio-pci/unbind'"
 }
 
-if [ "$1" = "-t" ]; then
-    shift
-    fstype=$1
-    shift
+if [ -z "$LKL_QEMU_TEST" ]; then
+    lkl_test_plan 0 "disk-vfio-pci"
+    echo "vfio not supported"
+else
+    lkl_test_plan 1 "disk-vfio-pci"
+    lkl_test_run 1 wait_guest
+    lkl_test_plan 1 "disk-vfio-pci"
+    lkl_test_run 1 init
+    lkl_test_exec $MYSSH ./$bin_name -n $pciname
+    lkl_test_plan 1 "disk-vfio-pci"
+    lkl_test_run 1 cleanup
 fi
-
-if [ -z "$fstype" ]; then
-    fstype="ext4"
-fi
-
-"$@"