* [PATCH v2] gitlab: disable accelerated zlib for s390x
@ 2022-03-21 16:11 Alex Bennée
2022-03-21 16:16 ` Thomas Huth
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Alex Bennée @ 2022-03-21 16:11 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Thomas Huth, Beraldo Leal, Cornelia Huck,
Philippe Mathieu-Daudé, Wainer dos Santos Moschetta,
open list:S390 general arch..., Alex Bennée
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 <alex.bennee@linaro.org>
Cc: Peter Maydell <peter.maydell@linaro.org>
---
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
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2] gitlab: disable accelerated zlib for s390x
2022-03-21 16:11 [PATCH v2] gitlab: disable accelerated zlib for s390x Alex Bennée
@ 2022-03-21 16:16 ` Thomas Huth
2022-03-21 16:22 ` Daniel P. Berrangé
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Thomas Huth @ 2022-03-21 16:16 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
Cc: Peter Maydell, Beraldo Leal, Cornelia Huck,
Philippe Mathieu-Daudé, Wainer dos Santos Moschetta,
open list:S390 general arch...
On 21/03/2022 17.11, Alex Bennée wrote:
> 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 <alex.bennee@linaro.org>
> Cc: Peter Maydell <peter.maydell@linaro.org>
>
> ---
> 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
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2] gitlab: disable accelerated zlib for s390x
2022-03-21 16:11 [PATCH v2] gitlab: disable accelerated zlib for s390x Alex Bennée
2022-03-21 16:16 ` Thomas Huth
@ 2022-03-21 16:22 ` Daniel P. Berrangé
2022-03-21 16:38 ` Cornelia Huck
2022-03-22 18:42 ` Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: Daniel P. Berrangé @ 2022-03-21 16:22 UTC (permalink / raw)
To: Alex Bennée
Cc: Peter Maydell, Thomas Huth, Beraldo Leal, Cornelia Huck,
qemu-devel, Wainer dos Santos Moschetta,
Philippe Mathieu-Daudé, open list:S390 general arch...
On Mon, Mar 21, 2022 at 04:11:51PM +0000, Alex Bennée wrote:
> 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 <alex.bennee@linaro.org>
> Cc: Peter Maydell <peter.maydell@linaro.org>
>
> ---
> 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(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] gitlab: disable accelerated zlib for s390x
2022-03-21 16:11 [PATCH v2] gitlab: disable accelerated zlib for s390x Alex Bennée
2022-03-21 16:16 ` Thomas Huth
2022-03-21 16:22 ` Daniel P. Berrangé
@ 2022-03-21 16:38 ` Cornelia Huck
2022-03-22 18:42 ` Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: Cornelia Huck @ 2022-03-21 16:38 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
Cc: Peter Maydell, Thomas Huth, Beraldo Leal,
Philippe Mathieu-Daudé, Wainer dos Santos Moschetta,
open list:S390 general arch..., Alex Bennée
On Mon, Mar 21 2022, Alex Bennée <alex.bennee@linaro.org> wrote:
> 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 <alex.bennee@linaro.org>
> Cc: Peter Maydell <peter.maydell@linaro.org>
>
> ---
> 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(-)
Acked-by: Cornelia Huck <cohuck@redhat.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] gitlab: disable accelerated zlib for s390x
2022-03-21 16:11 [PATCH v2] gitlab: disable accelerated zlib for s390x Alex Bennée
` (2 preceding siblings ...)
2022-03-21 16:38 ` Cornelia Huck
@ 2022-03-22 18:42 ` Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2022-03-22 18:42 UTC (permalink / raw)
To: Alex Bennée
Cc: Thomas Huth, Beraldo Leal, Cornelia Huck, qemu-devel,
Wainer dos Santos Moschetta, Philippe Mathieu-Daudé,
open list:S390 general arch...
On Mon, 21 Mar 2022 at 16:11, Alex Bennée <alex.bennee@linaro.org> wrote:
>
> 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 <alex.bennee@linaro.org>
> Cc: Peter Maydell <peter.maydell@linaro.org>
Applied to master, thanks.
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-03-22 18:47 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-21 16:11 [PATCH v2] gitlab: disable accelerated zlib for s390x Alex Bennée
2022-03-21 16:16 ` Thomas Huth
2022-03-21 16:22 ` Daniel P. Berrangé
2022-03-21 16:38 ` Cornelia Huck
2022-03-22 18:42 ` Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.