From patchwork Thu Feb 1 06:53:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vignesh Raman X-Patchwork-Id: 195188 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:106:209c:c626 with SMTP id mn5csp267475dyc; Wed, 31 Jan 2024 23:22:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IFvZRrZvvRGZrNLfiN6dbwyjzyI1fkkfLefk9KxRKg+0depyBASbcrALOF+LNx1o/sIg+JG X-Received: by 2002:a05:6a20:1787:b0:19c:841a:99e4 with SMTP id bl7-20020a056a20178700b0019c841a99e4mr3483164pzb.6.1706772151070; Wed, 31 Jan 2024 23:22:31 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706772151; cv=pass; d=google.com; s=arc-20160816; b=l4WkVBFy/DecfLs33umytnOhNoeu2POLWy/2CGv9jt79lonKtwKN8Fz3qlUOXjhDu+ f0dVqZGhAcS3l7b0LQDrplJ6lT8MNtjN/L8+hAuZa7TdinZ62xZlMGAtnC7l4j1QIwBp oTYkXKQf42YfAUGZ5sg85JYrohMEVJGCN2LgjoHV/GgjC6+Qn5XUD2keZbxXbB8A6hyj F026tSnYijMfEusWDVZ6xlq8VWAocl7OBalntoXiXFEfDO6b2d5PpFNfi33+Y1LGROHV zUzWMszF4Kcl8n4qbh/cNlkWQlldflj05VYcY6D9i3eyteu8ZnjMukNRpPlF4GGPcORP fAtg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=6bWNJ2lSs+w2nrg8uqej9ClKoKNAQRuFe7REVNos+qQ=; fh=4zd4hcQ5M7wtaFCspZ/4DJUsrIiZvYz1zUNRTqzz7j0=; b=LjbYIKHy9sloSjQz1l1LfoQx9dHBATTIWM8jqM+gQihDY1AiLIbYDH75GOBJjkBx9z M0ePfmT9xzxQu9GvyIxQ7L32zkjm5hboje1Uufg3tcBb1/yijxTdMMfk8lyXnsbAYctg u58tZtdc2kxuJSq4sttvquhEAL48znPYTvQWt1LFmTkqhWA7NqCLz98PHukupbAz1kru LkTGU3Cg3vFkyXHrGIutvOk7mJtxr4HdMv0HFM1QXdYsluKvf2SwYByigYvyqyw5i2Wk nHL6IvTBnYJ6X/kSJbgbHW4Kb3aIKYtd+ze6rGrzJQjm/fwKhiRYn8F+sOYiybhVCKAq SCpw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=1rDWMe1O; arc=pass (i=1 spf=pass spfdomain=collabora.com dkim=pass dkdomain=collabora.com dmarc=pass fromdomain=collabora.com); spf=pass (google.com: domain of linux-kernel+bounces-47715-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-47715-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com X-Forwarded-Encrypted: i=1; AJvYcCUkVMiMGmnruoiOcA/QHshOz3/IH2zFmxMFiLkBxmxAlrTta0gMt3EYDJ0gFWUgt7QCtvbym/n6VCnDTvwDKpAw1szEMQ== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id a65-20020a639044000000b005d8b48044d3si9908526pge.723.2024.01.31.23.22.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jan 2024 23:22:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-47715-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=1rDWMe1O; arc=pass (i=1 spf=pass spfdomain=collabora.com dkim=pass dkdomain=collabora.com dmarc=pass fromdomain=collabora.com); spf=pass (google.com: domain of linux-kernel+bounces-47715-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-47715-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 984DCB23A5B for ; Thu, 1 Feb 2024 06:55:20 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E86E0157E89; Thu, 1 Feb 2024 06:55:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="1rDWMe1O" Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E39C4141998 for ; Thu, 1 Feb 2024 06:54:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706770499; cv=none; b=rI2xkduq6Ce7uK2irWJ23f0mLi/cSEnFU0QsTQJRZ9TJPAfWDAvszUJIk7J1b9pC0ywcGlbKbWtrgYOpCH4XwFCumCE1/0RqSXxHKF8Gqw1bhv8bzI1uXHZXBibSdkEk+YGfruTs6Q5tHVElxtYM5RmCWY5NvYxfYSUVo4b710Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706770499; c=relaxed/simple; bh=YfW1LfkXACdoQYA1nIBVdX6vp/rgsVNBCafSdk+OqQs=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=JLpwVhIwcwGetwCIxXejwpZki6GD0JmlItF3gdfy+Ck+vwBQCLF7jC0OomZ4RWct5UNsStHAkLe0MFwZ19o54jIQzMt9rACsl5jvCYPMMnIICpHhvoUZ6GI5g1dVb1FuK746f0f18SCF38YywyBJNn4yE5CkhbCuxz0RWMzP+Lg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=1rDWMe1O; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1706770496; bh=YfW1LfkXACdoQYA1nIBVdX6vp/rgsVNBCafSdk+OqQs=; h=From:To:Cc:Subject:Date:From; b=1rDWMe1OS37RZKpC/mPK3reJUsLW+dgW8T9t3yKUn/nKDn+LEWo2W3aAT/HRi8JyS o2mCACHtv8vrbTpr/hTjLrNmQ5T+iMchCwbJoJ9+3H2jreMOYnlxY/N5SLDBSqVCr2 Fs3hPaWHE4ZMZ7vhqXyju8Voo6uPFS854LBNC+dc3WNsmuX/9MfNUMQLFlURQeqxfY EZqFERJFecckrmfyWdjgNXpLkK9i00FdjuQqoPg9Y75XLqKMhHzZYLXkvhB7U4qima jxEvqF6OGZmu2fSuRXEsqeix7RHGzIOnhF8725FK2HEAtud734V0iLf8WwWoYCYTVV h6Y5SOl5yHLnw== Received: from localhost.localdomain (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: vignesh) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 090BC37803EE; Thu, 1 Feb 2024 06:54:50 +0000 (UTC) From: Vignesh Raman To: dri-devel@lists.freedesktop.org Cc: airlied@gmail.com, daniel@ffwll.ch, rodrigosiqueiramelo@gmail.com, melissa.srw@gmail.com, mairacanal@riseup.net, hamohammed.sa@gmail.com, robdclark@gmail.com, daniels@collabora.com, helen.koike@collabora.com, david.heidelberg@collabora.com, guilherme.gallo@collabora.com, sergi.blanch.torne@collabora.com, linux-kernel@vger.kernel.org Subject: [PATCH v4] drm/ci: add tests on vkms Date: Thu, 1 Feb 2024 12:23:46 +0530 Message-Id: <20240201065346.801038-1-vignesh.raman@collabora.com> X-Mailer: git-send-email 2.40.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789680315208667266 X-GMAIL-MSGID: 1789680315208667266 Add job that runs igt on top of vkms. Signed-off-by: Vignesh Raman Acked-by: Jessica Zhang Tested-by: Jessica Zhang Acked-by: Maxime Ripard Signed-off-by: Helen Koike --- v2: - do not mv modules to /lib/modules in the job definition, leave it to crosvm-runner.sh v3: - Enable CONFIG_DRM_VKMS in x86_64.config and update xfails v3: - Build vkms as module and test with latest IGT. This patch depends on https://lore.kernel.org/dri-devel/20240130150340.687871-1-vignesh.raman@collabora.com/ --- MAINTAINERS | 1 + drivers/gpu/drm/ci/build.sh | 1 - drivers/gpu/drm/ci/gitlab-ci.yml | 2 +- drivers/gpu/drm/ci/igt_runner.sh | 6 ++-- drivers/gpu/drm/ci/image-tags.yml | 2 +- drivers/gpu/drm/ci/test.yml | 24 +++++++++++++- drivers/gpu/drm/ci/x86_64.config | 1 + .../drm/ci/xfails/virtio_gpu-none-fails.txt | 1 - drivers/gpu/drm/ci/xfails/vkms-none-fails.txt | 32 +++++++++++++++++++ .../gpu/drm/ci/xfails/vkms-none-flakes.txt | 19 +++++++++++ drivers/gpu/drm/ci/xfails/vkms-none-skips.txt | 16 ++++++++++ 11 files changed, 97 insertions(+), 8 deletions(-) create mode 100644 drivers/gpu/drm/ci/xfails/vkms-none-fails.txt create mode 100644 drivers/gpu/drm/ci/xfails/vkms-none-flakes.txt create mode 100644 drivers/gpu/drm/ci/xfails/vkms-none-skips.txt diff --git a/MAINTAINERS b/MAINTAINERS index bcdc17d1aa26..09310a6f4b5f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6923,6 +6923,7 @@ L: dri-devel@lists.freedesktop.org S: Maintained T: git git://anongit.freedesktop.org/drm/drm-misc F: Documentation/gpu/vkms.rst +F: drivers/gpu/drm/ci/xfails/vkms* F: drivers/gpu/drm/vkms/ DRM DRIVER FOR VIRTUALBOX VIRTUAL GPU diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh index 331a61e0d25a..2e089e03f061 100644 --- a/drivers/gpu/drm/ci/build.sh +++ b/drivers/gpu/drm/ci/build.sh @@ -152,7 +152,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/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml index e2b021616a8e..c69fb6af4cf8 100644 --- a/drivers/gpu/drm/ci/gitlab-ci.yml +++ b/drivers/gpu/drm/ci/gitlab-ci.yml @@ -107,7 +107,7 @@ stages: - meson - msm - rockchip - - virtio-gpu + - software-driver # YAML anchors for rule conditions # -------------------------------- diff --git a/drivers/gpu/drm/ci/igt_runner.sh b/drivers/gpu/drm/ci/igt_runner.sh index 2fd09b9b7cf6..3c7f000805e5 100755 --- a/drivers/gpu/drm/ci/igt_runner.sh +++ b/drivers/gpu/drm/ci/igt_runner.sh @@ -20,10 +20,10 @@ cat /sys/kernel/debug/dri/*/state set -e case "$DRIVER_NAME" in - amdgpu) + amdgpu|vkms) # 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 cf07c3e09b8c..bf861ab8b9c2 100644 --- a/drivers/gpu/drm/ci/image-tags.yml +++ b/drivers/gpu/drm/ci/image-tags.yml @@ -4,7 +4,7 @@ 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-01-29-vkms" KERNEL_ROOTFS_TAG: "2023-10-06-amd" PKG_REPO_REV: "67f2c46b" diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml index 8ab8a8f56d6a..58c3cf4b18e0 100644 --- a/drivers/gpu/drm/ci/test.yml +++ b/drivers/gpu/drm/ci/test.yml @@ -399,7 +399,7 @@ meson:g12b-display: DRIVER_NAME: meson virtio_gpu:none: - stage: virtio-gpu + stage: software-driver variables: CROSVM_GALLIUM_DRIVER: llvmpipe DRIVER_NAME: virtio_gpu @@ -419,3 +419,25 @@ virtio_gpu:none: - debian/x86_64_test-gl - testing:x86_64 - igt:x86_64 + +vkms:none: + stage: software-driver + variables: + DRIVER_NAME: vkms + GPU_VERSION: vkms-none + extends: + - .test-gl + - .test-rules + tags: + - kvm + 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 + needs: + - debian/x86_64_test-gl + - testing:x86_64 + - igt:x86_64 diff --git a/drivers/gpu/drm/ci/x86_64.config b/drivers/gpu/drm/ci/x86_64.config index 1cbd49a5b23a..8eaba388b141 100644 --- a/drivers/gpu/drm/ci/x86_64.config +++ b/drivers/gpu/drm/ci/x86_64.config @@ -24,6 +24,7 @@ CONFIG_DRM=y CONFIG_DRM_PANEL_SIMPLE=y CONFIG_PWM_CROS_EC=y CONFIG_BACKLIGHT_PWM=y +CONFIG_DRM_VKMS=m # Strip out some stuff we don't need for graphics testing, to reduce # the build. 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..f82d437909b5 100644 --- a/drivers/gpu/drm/ci/xfails/virtio_gpu-none-fails.txt +++ b/drivers/gpu/drm/ci/xfails/virtio_gpu-none-fails.txt @@ -41,7 +41,6 @@ kms_flip@flip-vs-absolute-wf_vblank,Fail kms_flip@flip-vs-absolute-wf_vblank-interruptible,Fail kms_flip@flip-vs-blocking-wf-vblank,Fail kms_flip@flip-vs-expired-vblank,Fail -kms_flip@flip-vs-expired-vblank-interruptible,Fail kms_flip@flip-vs-modeset-vs-hang,Fail kms_flip@flip-vs-panning-vs-hang,Fail kms_flip@flip-vs-wf_vblank-interruptible,Fail diff --git a/drivers/gpu/drm/ci/xfails/vkms-none-fails.txt b/drivers/gpu/drm/ci/xfails/vkms-none-fails.txt new file mode 100644 index 000000000000..a8b9d79d9a16 --- /dev/null +++ b/drivers/gpu/drm/ci/xfails/vkms-none-fails.txt @@ -0,0 +1,32 @@ +kms_cursor_crc@cursor-rapid-movement-128x128,Fail +kms_cursor_crc@cursor-rapid-movement-128x42,Fail +kms_cursor_crc@cursor-rapid-movement-256x256,Fail +kms_cursor_crc@cursor-rapid-movement-256x85,Fail +kms_cursor_crc@cursor-rapid-movement-32x10,Fail +kms_cursor_crc@cursor-rapid-movement-32x32,Fail +kms_cursor_crc@cursor-rapid-movement-512x170,Fail +kms_cursor_crc@cursor-rapid-movement-512x512,Fail +kms_cursor_crc@cursor-rapid-movement-64x21,Fail +kms_cursor_crc@cursor-rapid-movement-64x64,Fail +kms_cursor_legacy@basic-flip-before-cursor-atomic,Fail +kms_cursor_legacy@basic-flip-before-cursor-legacy,Fail +kms_cursor_legacy@cursor-vs-flip-atomic,Fail +kms_cursor_legacy@cursor-vs-flip-legacy,Fail +kms_cursor_legacy@cursor-vs-flip-toggle,Fail +kms_cursor_legacy@cursor-vs-flip-varying-size,Fail +kms_cursor_legacy@flip-vs-cursor-atomic,Fail +kms_cursor_legacy@flip-vs-cursor-crc-atomic,Fail +kms_cursor_legacy@flip-vs-cursor-crc-legacy,Fail +kms_cursor_legacy@flip-vs-cursor-legacy,Fail +kms_flip@flip-vs-modeset-vs-hang,Fail +kms_flip@flip-vs-panning-vs-hang,Fail +kms_pipe_crc_basic@nonblocking-crc,Fail +kms_pipe_crc_basic@nonblocking-crc-frame-sequence,Fail +kms_pipe_crc_basic@suspend-read-crc,Fail +kms_plane@plane-panning-bottom-right-suspend,Fail +kms_universal_plane@universal-plane-pipe-A-sanity,Fail +kms_vblank@pipe-A-ts-continuation-dpms-suspend,Fail +kms_writeback@writeback-check-output,Fail +kms_writeback@writeback-fb-id,Fail +kms_writeback@writeback-invalid-parameters,Fail +kms_writeback@writeback-pixel-formats,Fail diff --git a/drivers/gpu/drm/ci/xfails/vkms-none-flakes.txt b/drivers/gpu/drm/ci/xfails/vkms-none-flakes.txt new file mode 100644 index 000000000000..18afbfcc1c52 --- /dev/null +++ b/drivers/gpu/drm/ci/xfails/vkms-none-flakes.txt @@ -0,0 +1,19 @@ +# Board Name: vkms +# Bug Report: https://lore.kernel.org/dri-devel/005da8f1-8050-bffd-653c-2a87ae6376f7@collabora.com/T/#u +# IGT Version: 1.28-gb0cc8160e +# Linux Version: 6.7.0-rc3 +# Failure Rate: 50 + +# Reported by deqp-runner +kms_cursor_legacy@cursorA-vs-flipA-legacy +kms_cursor_legacy@cursorA-vs-flipA-varying-size +kms_flip@flip-vs-expired-vblank-interruptible +kms_flip@flip-vs-expired-vblank +kms_flip@plain-flip-fb-recreate +kms_flip@plain-flip-fb-recreate-interruptible +kms_flip@plain-flip-ts-check-interruptible + +# The below test shows inconsistency across multiple runs, +# giving results of Pass and Fail alternately. +kms_cursor_legacy@cursorA-vs-flipA-toggle +kms_pipe_crc_basic@nonblocking-crc diff --git a/drivers/gpu/drm/ci/xfails/vkms-none-skips.txt b/drivers/gpu/drm/ci/xfails/vkms-none-skips.txt new file mode 100644 index 000000000000..524e7972c75a --- /dev/null +++ b/drivers/gpu/drm/ci/xfails/vkms-none-skips.txt @@ -0,0 +1,16 @@ +# Hits: +# rcu: INFO: rcu_preempt detected stalls on CPUs/tasks: +# rcu: Tasks blocked on level-0 rcu_node (CPUs 0-1): P749/1:b..l +kms_prop_blob@invalid-get-prop + +# keeps printing vkms_vblank_simulate: vblank timer overrun and never ends +kms_invalid_mode@int-max-clock + +# Suspend seems to be broken +.*suspend.* + +# Hangs machine and timeout occurs +kms_flip@flip-vs-absolute-wf_vblank-interruptible +kms_invalid_mode@zero-hdisplay +kms_invalid_mode@bad-vtotal +kms_cursor_crc.*