From 498186e0d9b0b3ee8a532edc831605cbc42abbcb Mon Sep 17 00:00:00 2001 From: Dmitry Osipenko Date: Tue, 20 Sep 2022 03:16:23 +0300 Subject: [PATCH] ci: Bump crosvm version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Recent crosvm contains a fix for the unmapping memory on a wrong thread that crashes crosvm. Bump the crosvm version. Reviewed-by: Yiwei Zhang Reviewed-by: Corentin Noël Link: https://gitlab.freedesktop.org/virgl/virglrenderer/-/issues/282 Signed-off-by: Dmitry Osipenko Part-of: --- .gitlab-ci/container/build-crosvm.sh | 8 +--- .../container/build-crosvm_no-syslog.patch | 43 ------------------- .gitlab-ci/container/debian/x86_test-base.sh | 4 ++ .gitlab-ci/container/lava_build.sh | 1 + .gitlab-ci/crosvm-runner.sh | 4 +- .gitlab-ci/image-tags.yml | 4 +- 6 files changed, 11 insertions(+), 53 deletions(-) delete mode 100644 .gitlab-ci/container/build-crosvm_no-syslog.patch diff --git a/.gitlab-ci/container/build-crosvm.sh b/.gitlab-ci/container/build-crosvm.sh index 4fe3518204f..243c384355a 100644 --- a/.gitlab-ci/container/build-crosvm.sh +++ b/.gitlab-ci/container/build-crosvm.sh @@ -3,18 +3,14 @@ set -ex -SCRIPT_DIR="$(pwd)" - git config --global user.email "mesa@example.com" git config --global user.name "Mesa CI" -CROSVM_VERSION=c7cd0e0114c8363b884ba56d8e12adee718dcc93 -git clone --single-branch -b main --no-checkout https://chromium.googlesource.com/chromiumos/platform/crosvm /platform/crosvm +CROSVM_VERSION=acd262cb42111c53b580a67355e795775545cced +git clone --single-branch -b main --no-checkout https://chromium.googlesource.com/crosvm/crosvm /platform/crosvm pushd /platform/crosvm git checkout "$CROSVM_VERSION" git submodule update --init -# Apply all crosvm patches for Mesa CI -git am "$SCRIPT_DIR"/.gitlab-ci/container/build-crosvm_*.patch VIRGLRENDERER_VERSION=3c5a9bbb7464e0e91e446991055300f4f989f6a9 rm -rf third_party/virglrenderer diff --git a/.gitlab-ci/container/build-crosvm_no-syslog.patch b/.gitlab-ci/container/build-crosvm_no-syslog.patch deleted file mode 100644 index 804e90bb7f1..00000000000 --- a/.gitlab-ci/container/build-crosvm_no-syslog.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 3c57ec558bccc67fd53363c23deea20646be5c47 Mon Sep 17 00:00:00 2001 -From: Tomeu Vizoso -Date: Wed, 17 Nov 2021 10:18:04 +0100 -Subject: [PATCH] Hack syslog out - -It's causing stability problems when running several Crosvm instances in -parallel. - -Signed-off-by: Tomeu Vizoso ---- - base/src/unix/linux/syslog.rs | 2 +- - common/sys_util/src/linux/syslog.rs | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/base/src/unix/linux/syslog.rs b/base/src/unix/linux/syslog.rs -index 05972a3a..f0db3781 100644 ---- a/base/src/unix/linux/syslog.rs -+++ b/base/src/unix/linux/syslog.rs -@@ -35,7 +35,7 @@ pub struct PlatformSyslog { - impl Syslog for PlatformSyslog { - fn new() -> Result { - Ok(Self { -- socket: Some(openlog_and_get_socket()?), -+ socket: None, - }) - } - -diff --git a/common/sys_util/src/linux/syslog.rs b/common/sys_util/src/linux/syslog.rs -index 05972a3a..f0db3781 100644 ---- a/common/sys_util/src/linux/syslog.rs -+++ b/common/sys_util/src/linux/syslog.rs -@@ -35,7 +35,7 @@ pub struct PlatformSyslog { - impl Syslog for PlatformSyslog { - fn new() -> Result { - Ok(Self { -- socket: Some(openlog_and_get_socket()?), -+ socket: None, - }) - } - --- -2.25.1 - diff --git a/.gitlab-ci/container/debian/x86_test-base.sh b/.gitlab-ci/container/debian/x86_test-base.sh index 55e3d980a37..cb5ba61d114 100644 --- a/.gitlab-ci/container/debian/x86_test-base.sh +++ b/.gitlab-ci/container/debian/x86_test-base.sh @@ -42,6 +42,7 @@ STABLE_EPHEMERAL=" \ meson \ patch \ pkg-config \ + protobuf-compiler \ python3-dev \ python3-pip \ python3-setuptools \ @@ -122,6 +123,9 @@ pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@34f4ade9 # Needed for manipulation with traces yaml files. pip3 install yq +# Needed for crosvm compilation. +update-alternatives --install /usr/bin/clang clang /usr/bin/clang-11 100 + ############### Build LLVM-SPIRV translator . .gitlab-ci/container/build-llvm-spirv.sh diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index 426a11bbc76..d5a355716e6 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -110,6 +110,7 @@ apt-get install -y --no-remove \ libxkbcommon-dev \ ninja-build \ patch \ + protobuf-compiler \ python-is-python3 \ python3-distutils \ python3-mako \ diff --git a/.gitlab-ci/crosvm-runner.sh b/.gitlab-ci/crosvm-runner.sh index 0edc72226a4..5b49e2873cd 100755 --- a/.gitlab-ci/crosvm-runner.sh +++ b/.gitlab-ci/crosvm-runner.sh @@ -95,10 +95,10 @@ NIR_DEBUG="novalidate" \ LIBGL_ALWAYS_SOFTWARE=${CROSVM_LIBGL_ALWAYS_SOFTWARE} \ GALLIUM_DRIVER=${CROSVM_GALLIUM_DRIVER} \ VK_ICD_FILENAMES=$CI_PROJECT_DIR/install/share/vulkan/icd.d/${CROSVM_VK_DRIVER}_icd.x86_64.json \ -crosvm run \ +crosvm --no-syslog run \ --gpu "${CROSVM_GPU_ARGS}" -m "${CROSVM_MEMORY:-4096}" -c 2 --disable-sandbox \ --shared-dir /:my_root:type=fs:writeback=true:timeout=60:cache=always \ - --host_ip "192.168.30.1" --netmask "255.255.255.0" --mac "AA:BB:CC:00:00:12" \ + --host-ip "192.168.30.1" --netmask "255.255.255.0" --mac "AA:BB:CC:00:00:12" \ -s $VM_SOCKET \ --cid ${VSOCK_CID} -p "${CROSVM_KERN_ARGS}" \ /lava-files/${KERNEL_IMAGE_NAME:-bzImage} > ${VM_TEMP_DIR}/crosvm 2>&1 diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 98ee528654a..934831ae6e1 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -1,6 +1,6 @@ variables: DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base" - DEBIAN_BASE_TAG: "2022-09-26-clc" + DEBIAN_BASE_TAG: "2022-09-28-crosvm" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" DEBIAN_BUILD_TAG: "2022-09-26-clc" @@ -15,7 +15,7 @@ variables: DEBIAN_X86_TEST_VK_TAG: "2022-09-27-clc" FEDORA_X86_BUILD_TAG: "2022-09-22-python3-ply-2" - KERNEL_ROOTFS_TAG: "2022-09-20-wine-lava" + KERNEL_ROOTFS_TAG: "2022-09-28-crosvm" WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_TAG: "2022-08-17-bump"