linux-kernel - [PATCH v1 2/4] drm/ci: build virtual GPU driver as module

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives
Hash Suite for Android: free password hash cracker in your pocket
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20240423040243.448091-3-vignesh.raman@collabora.com>
Date: Tue, 23 Apr 2024 09:32:41 +0530
From: Vignesh Raman <vignesh.raman@...labora.com>
To: dri-devel@...ts.freedesktop.org
Cc: daniels@...labora.com,
	helen.koike@...labora.com,
	airlied@...il.com,
	daniel@...ll.ch,
	robdclark@...il.com,
	david.heidelberg@...labora.com,
	guilherme.gallo@...labora.com,
	sergi.blanch.torne@...labora.com,
	dmitry.baryshkov@...aro.org,
	mcanal@...lia.com,
	linux-mediatek@...ts.infradead.org,
	linux-amlogic@...ts.infradead.org,
	linux-rockchip@...ts.infradead.org,
	amd-gfx@...ts.freedesktop.org,
	linux-arm-msm@...r.kernel.org,
	intel-gfx@...ts.freedesktop.org,
	virtualization@...ts.linux-foundation.org,
	linux-kernel@...r.kernel.org
Subject: [PATCH v1 2/4] drm/ci: build virtual GPU driver as module

With latest IGT, the tests tries to load the module and it
fails. So build the virtual GPU driver for virtio as module.

Signed-off-by: Vignesh Raman <vignesh.raman@...labora.com>
---
 drivers/gpu/drm/ci/build.sh                       |  1 -
 drivers/gpu/drm/ci/igt_runner.sh                  |  6 +++---
 drivers/gpu/drm/ci/image-tags.yml                 |  4 ++--
 drivers/gpu/drm/ci/test.yml                       |  1 +
 drivers/gpu/drm/ci/x86_64.config                  |  2 +-
 .../gpu/drm/ci/xfails/virtio_gpu-none-fails.txt   | 15 +++++++++++++++
 6 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh
index 8a3baa003904..95493df9cdc2 100644
--- a/drivers/gpu/drm/ci/build.sh
+++ b/drivers/gpu/drm/ci/build.sh
@@ -156,7 +156,6 @@ fi
 
 mkdir -p artifacts/install/lib
 mv install/* artifacts/install/.
-rm -rf artifacts/install/modules
 ln -s common artifacts/install/ci-common
 cp .config artifacts/${CI_JOB_NAME}_config
 
diff --git a/drivers/gpu/drm/ci/igt_runner.sh b/drivers/gpu/drm/ci/igt_runner.sh
index f1a08b9b146f..7d2ba69294dd 100755
--- a/drivers/gpu/drm/ci/igt_runner.sh
+++ b/drivers/gpu/drm/ci/igt_runner.sh
@@ -30,10 +30,10 @@ case "$DRIVER_NAME" in
             export IGT_FORCE_DRIVER="panfrost"
         fi
         ;;
-    amdgpu)
+    amdgpu|virtio_gpu)
         # Cannot use HWCI_KERNEL_MODULES as at that point we don't have the module in /lib
-        mv /install/modules/lib/modules/* /lib/modules/.
-        modprobe amdgpu
+        mv /install/modules/lib/modules/* /lib/modules/. || true
+        modprobe --first-time $DRIVER_NAME
         ;;
 esac
 
diff --git a/drivers/gpu/drm/ci/image-tags.yml b/drivers/gpu/drm/ci/image-tags.yml
index d8f72b82c938..fd1cb6061166 100644
--- a/drivers/gpu/drm/ci/image-tags.yml
+++ b/drivers/gpu/drm/ci/image-tags.yml
@@ -4,9 +4,9 @@ variables:
    DEBIAN_BASE_TAG: "${CONTAINER_TAG}"
 
    DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
-   DEBIAN_BUILD_TAG: "2023-10-08-config"
+   DEBIAN_BUILD_TAG: "2024-04-22-virtio"
 
-   KERNEL_ROOTFS_TAG: "2023-10-06-amd"
+   KERNEL_ROOTFS_TAG: "2024-04-22-virtio"
    PKG_REPO_REV: "3cc12a2a"
 
    DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index 612c9ede3507..864ac3809d84 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -350,6 +350,7 @@ virtio_gpu:none:
   script:
     - ln -sf $CI_PROJECT_DIR/install /install
     - mv install/bzImage /lava-files/bzImage
+    - mkdir -p /lib/modules
     - mkdir -p $CI_PROJECT_DIR/results
     - ln -sf $CI_PROJECT_DIR/results /results
     - install/crosvm-runner.sh install/igt_runner.sh
diff --git a/drivers/gpu/drm/ci/x86_64.config b/drivers/gpu/drm/ci/x86_64.config
index 1cbd49a5b23a..78479f063e8e 100644
--- a/drivers/gpu/drm/ci/x86_64.config
+++ b/drivers/gpu/drm/ci/x86_64.config
@@ -91,7 +91,7 @@ CONFIG_KVM=y
 CONFIG_KVM_GUEST=y
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VIRTIO_FS=y
-CONFIG_DRM_VIRTIO_GPU=y
+CONFIG_DRM_VIRTIO_GPU=m
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_VIRTIO_NET=y
 CONFIG_VIRTIO_CONSOLE=y
diff --git a/drivers/gpu/drm/ci/xfails/virtio_gpu-none-fails.txt b/drivers/gpu/drm/ci/xfails/virtio_gpu-none-fails.txt
index 007f21e56d89..5b8cbb28b25c 100644
--- a/drivers/gpu/drm/ci/xfails/virtio_gpu-none-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/virtio_gpu-none-fails.txt
@@ -68,6 +68,7 @@ kms_plane_scaling@...cale-with-rotation-20x20,Fail
 kms_selftest@..._format,Timeout
 kms_selftest@..._format_helper,Timeout
 kms_setmode@...ic,Fail
+kms_vblank@...uracy-idle,Fail
 kms_vblank@...c-id,Fail
 kms_vblank@...alid,Fail
 kms_vblank@...e-A-accuracy-idle,Fail
@@ -82,3 +83,17 @@ kms_vblank@...e-A-wait-busy,Fail
 kms_vblank@...e-A-wait-forked,Fail
 kms_vblank@...e-A-wait-forked-busy,Fail
 kms_vblank@...e-A-wait-idle,Fail
+kms_vblank@...ry-busy,Fail
+kms_vblank@...ry-forked,Fail
+kms_vblank@...ry-forked-busy,Fail
+kms_vblank@...ry-idle,Fail
+kms_vblank@...continuation-dpms-rpm,Fail
+kms_vblank@...continuation-dpms-suspend,Fail
+kms_vblank@...continuation-idle,Fail
+kms_vblank@...continuation-modeset,Fail
+kms_vblank@...continuation-modeset-rpm,Fail
+kms_vblank@...continuation-suspend,Fail
+kms_vblank@...t-busy,Fail
+kms_vblank@...t-forked,Fail
+kms_vblank@...t-forked-busy,Fail
+kms_vblank@...t-idle,Fail
-- 
2.40.1