From patchwork Mon Mar 21 16:11:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 553356 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:1248:0:0:0:0 with SMTP id z8csp1645322mag; Mon, 21 Mar 2022 09:19:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFGyowT5WgGboc1HDIJRC428tYRmpvH45u1k4thRCh0z6CtIY1UtkfLiY7vJg3zIEQvJLw X-Received: by 2002:a05:6214:2608:b0:440:f018:5e1e with SMTP id gu8-20020a056214260800b00440f0185e1emr14887729qvb.40.1647879574532; Mon, 21 Mar 2022 09:19:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647879574; cv=none; d=google.com; s=arc-20160816; b=jKjC9Ru/MlDLm5z/r/Q740vrBGvgG07+56e8C3c2l7xuyH1gxjtXfQ2pg+l4L65LL8 W00pMNqbC78Kl5od+CvLpNGLWx0nDLPvNpv0lrniO+QWd1jmc/kl2eWYmskv7fdIk7/B hEzKNmlauF3NSjgKsACphasuaPG44Zgb/tIHedXCNUHga2vgVE9flkR6NT11Kwi+Yr5M BuuO3yiXmFicn6O/S7TH5/r6hUTghh92UE8+Qtq8QpWk7m38sVeqT7PglaQP779tLasu g6mlJsxADQbd9vKtGGXGus/vNwixmyqeuWnpJcl64nhj4KNY5ck/QurGkBYyFYTmLG0w Av4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature; bh=Nzc6yglUTpgqqIrg3RuRQQxPvmOmJnlNAIxXwm8xSEU=; b=ipTwBCl133nCcBmtJk9ZLNPY6nv0upMhm5HQXcjYGUYtR0cWsqj9/wlaVKHIZH2sW9 r2jrC9sfvHzlrEBprYlIYALxwHXc2dmykhS34vrFpR74no4oUIcLQ68ipsxyWwR40CTY pK3iXSDiqtbw1orTUk0l9ycHXzLw9Zm2pnL68A6IlTISyglBjhE7VTQeeKZ8IwR1gKrx LrZMLRj6jJAwbB2DDKw9++baQbdaSxkxWg5vUEm+s3yr4AKvfhWP/XKAFOJEqAKp3sM8 Oe5QnoJ0TLVrzukCB5q/yC+6i0cn3UiusxAXkCpkZju1tEBaS8A0JMrtA7VC2oAdfIFv pcuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=rIMEgCv1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k129-20020a378887000000b0067e4be23a77si2041825qkd.700.2022.03.21.09.19.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Mar 2022 09:19:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=rIMEgCv1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nWKko-0003iz-34 for patch@linaro.org; Mon, 21 Mar 2022 12:19:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nWKdS-00030c-Bn for qemu-devel@nongnu.org; Mon, 21 Mar 2022 12:11:58 -0400 Received: from [2a00:1450:4864:20::632] (port=40884 helo=mail-ej1-x632.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nWKdQ-0007lP-Lo for qemu-devel@nongnu.org; Mon, 21 Mar 2022 12:11:57 -0400 Received: by mail-ej1-x632.google.com with SMTP id p15so30853933ejc.7 for ; Mon, 21 Mar 2022 09:11:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Nzc6yglUTpgqqIrg3RuRQQxPvmOmJnlNAIxXwm8xSEU=; b=rIMEgCv1Iy98bXVNkBxrnlBkXHxyDX7/1a/MP9qwjiPnIKESAsClLqkwrwXkNB4owz RFjEEr6bUystZHMOLxTTeOZBkIjehG9N8+yTgTQi+J9ky1Kobe60D+j3cKaHDHvbSdD7 v0ZXPchrHkgMnbD3dlql97Oo+pjcKgIexRAgLVSHBk5ChB1ETSpsBU7aWBDqCa7vRVPE G9VK/ztYnLFRpW/ecSoZftEMg8jKTX6lDowyKpXbQgjNjLvdiabUfXVUgkRpD9tw3g2a nuad4xp+E3SiDY7nrggcwETivz3SfGHQr/7qDKq7ESOrvnrINRnnBTVW0sfbn/Nn5O7v bvrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Nzc6yglUTpgqqIrg3RuRQQxPvmOmJnlNAIxXwm8xSEU=; b=R/SZx4dw0MTJVniy7QSCJ0bzxATCnsZwuEsfXOd2V7MtfSI1g9k1C0Se5su0E/Jqd/ QMPc1uZQJNQee2DV8WLXfiz4YkZAHJDQ1HtKNN4VHVFdha5TgFPGeNzoPBN6ewmbieY0 wxk8BEKVDgK/G9TN7KTInXjV02JAKFqFg9bNKHksXSGTD0W8CayG5mbE2s0J75qRqGjY wX/F8CJCKqhB1qLHl+re4KIqZCZAEi55+1TgKBu5P2J+OceScbOnKCkMuU4r7GJrwSfL p4OqccUaDolHThhtqiCT4qh2ikaqZ5+DGBbi8tqSPR3vBaojJfJ27Dk4LasVqCxJ6Sg5 PUGQ== X-Gm-Message-State: AOAM5336zOHy6qG9fzZCOqGztMuxjCi1dybciCMNB57Jvod9LNHloDVm jySD4tQUY47SIQdtN2HsR/m+pQ== X-Received: by 2002:a17:906:9c82:b0:6df:c5f0:d456 with SMTP id fj2-20020a1709069c8200b006dfc5f0d456mr13907810ejc.287.1647879114648; Mon, 21 Mar 2022 09:11:54 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e19-20020a056402105300b004162d0b4cbbsm8110797edu.93.2022.03.21.09.11.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Mar 2022 09:11:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 328761FFB7; Mon, 21 Mar 2022 16:11:52 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2] gitlab: disable accelerated zlib for s390x Date: Mon, 21 Mar 2022 16:11:51 +0000 Message-Id: <20220321161151.3654386-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::632 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::632; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x632.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , Beraldo Leal , Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , "open list:S390 general arch..." , =?utf-8?q?Alex_Be?= =?utf-8?q?nn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" There appears to be a bug in the s390 hardware-accelerated version of zlib distributed with Ubuntu 20.04, which makes our test /i386/migration/multifd/tcp/zlib hit an assertion perhaps one time in 10. Fortunately zlib provides an escape hatch where we can disable the hardware-acceleration entirely by setting the environment variable DFLTCC to 0. Do this on all our CI which runs on s390 hosts, both our custom gitlab runner and also the Travis hosts. Signed-off-by: Alex Bennée Cc: Peter Maydell Reviewed-by: Daniel P. Berrangé Acked-by: Cornelia Huck --- v2 - more complete commit wording from Peter - also tweak travis rules --- .gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml | 12 ++++++++++++ .travis.yml | 6 ++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml index 0333872113..4f292a8a5b 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml @@ -8,6 +8,8 @@ ubuntu-20.04-s390x-all-linux-static: tags: - ubuntu_20.04 - s390x + variables: + DFLTCC: 0 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: "$S390X_RUNNER_AVAILABLE" @@ -27,6 +29,8 @@ ubuntu-20.04-s390x-all: tags: - ubuntu_20.04 - s390x + variables: + DFLTCC: 0 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: "$S390X_RUNNER_AVAILABLE" @@ -43,6 +47,8 @@ ubuntu-20.04-s390x-alldbg: tags: - ubuntu_20.04 - s390x + variables: + DFLTCC: 0 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' when: manual @@ -64,6 +70,8 @@ ubuntu-20.04-s390x-clang: tags: - ubuntu_20.04 - s390x + variables: + DFLTCC: 0 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' when: manual @@ -84,6 +92,8 @@ ubuntu-20.04-s390x-tci: tags: - ubuntu_20.04 - s390x + variables: + DFLTCC: 0 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' when: manual @@ -103,6 +113,8 @@ ubuntu-20.04-s390x-notcg: tags: - ubuntu_20.04 - s390x + variables: + DFLTCC: 0 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' when: manual diff --git a/.travis.yml b/.travis.yml index c3c8048842..9afc4a54b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -218,6 +218,7 @@ jobs: - TEST_CMD="make check check-tcg V=1" - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS},s390x-linux-user" - UNRELIABLE=true + - DFLTCC=0 script: - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$? - | @@ -257,7 +258,7 @@ jobs: env: - CONFIG="--disable-containers --audio-drv-list=sdl --disable-user --target-list-exclude=${MAIN_SOFTMMU_TARGETS}" - + - DFLTCC=0 - name: "[s390x] GCC (user)" arch: s390x dist: focal @@ -269,7 +270,7 @@ jobs: - ninja-build env: - CONFIG="--disable-containers --disable-system" - + - DFLTCC=0 - name: "[s390x] Clang (disable-tcg)" arch: s390x dist: focal @@ -303,3 +304,4 @@ jobs: - CONFIG="--disable-containers --disable-tcg --enable-kvm --disable-tools --host-cc=clang --cxx=clang++" - UNRELIABLE=true + - DFLTCC=0