Skip to contentSkip to conversation

travis-ci: Add a KVM-only s390x job

PATCH Superseded Philippe Mathieu-Daudé 3 participants 10 messages Mar 17, 2020 – Mar 18, 2020

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover travis-ci: Add a KVM-only s390x job

Add a Travis job to build a KVM-only QEMU on s390x.

This series also contains few fixes for Travis/s390x.

Philippe Mathieu-Daudé (4):
tests/test-util-filemonitor: Fix Travis-CI $ARCH env variable name tests/test-util-sockets: Skip test on non-x86 Travis containers tests/migration: Disable autoconverge test on Travis-CI s390x .travis.yml: Add a KVM-only s390x job

 tests/qtest/migration-test.c  | 10 +++++++++
 tests/test-util-filemonitor.c |  2 +-
 tests/test-util-sockets.c     |  7 ++++++
 .travis.yml                   | 42 +++++++++++++++++++++++++++++++++++
 4 files changed, 60 insertions(+), 1 deletion(-)
Signature · 1 line
2.21.1
#1 lore raw

PATCH 1/4 tests/test-util-filemonitor: Fix Travis-CI $ARCH env variable name

While we can find reference of a 'TRAVIS_ARCH' variable in the environment and source [1], per the Travis-CI multi-arch documentation [2] the variable is named TRAVIS_CPU_ARCH.

[1] https://github.com/travis-ci/travis-build/blob/v10.0.0/lib/travis/build/bash/travis_setup_env.bash#L39
[2] https://docs.travis-ci.com/user/multi-cpu-architectures/#identifying-cpu-architecture-of-build-jobs

---
 tests/test-util-filemonitor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/test-util-filemonitor.c +1 -1
index 45009c69f4..e703a7f8fc 100644
@@ -415,7 +415,7 @@ test_file_monitor_events(void)
      * This test does not work on Travis LXD containers since some
      * syscalls are blocked in that environment.
      */
-    travis_arch = getenv("TRAVIS_ARCH");
+    travis_arch = getenv("TRAVIS_CPU_ARCH");
     if (travis_arch && !g_str_equal(travis_arch, "x86_64")) {
         g_test_skip("Test does not work on non-x86 Travis containers.");
         return;
Signature · 1 line
2.21.1
Reviewed-by on v1 1/4
#2 lore raw

Re: [PATCH 1/4] tests/test-util-filemonitor: Fix Travis-CI $ARCH env variable name

Quoted 11 lines · Philippe Mathieu-Daudé

While we can find reference of a 'TRAVIS_ARCH' variable in the environment and source [1], per the Travis-CI multi-arch documentation [2] the variable is named TRAVIS_CPU_ARCH.

[1] https://github.com/travis-ci/travis-build/blob/v10.0.0/lib/travis/build/bash/travis_setup_env.bash#L39
[2] https://docs.travis-ci.com/user/multi-cpu-architectures/#identifying-cpu-architecture-of-build-jobs

---
 tests/test-util-filemonitor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Regards,
Daniel

Signature · 3 lines
|: 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 :|
#3 lore raw

PATCH 2/4 tests/test-util-sockets: Skip test on non-x86 Travis containers

In reply to Philippe Mathieu-Daudé

Similarly to commit 4f370b1098, test-util-sockets fails in restricted non-x86 Travis containers since they apparently blacklisted some required system calls there. Let's simply skip the test if we detect such an environment.

---
 tests/test-util-sockets.c | 7 +++++++
 1 file changed, 7 insertions(+)
tests/test-util-sockets.c +7 -0
index 5fd947c7bf..046ebec8ba 100644
@@ -231,11 +231,18 @@ static void test_socket_fd_pass_num_nocli(void)
 int main(int argc, char **argv)
 {
     bool has_ipv4, has_ipv6;
+    char *travis_arch;
 
     socket_init();
 
     g_test_init(&argc, &argv, NULL);
 
+    travis_arch = getenv("TRAVIS_CPU_ARCH");
+    if (travis_arch && !g_str_equal(travis_arch, "x86_64")) {
+        g_printerr("Test does not work on non-x86 Travis containers.");
+        goto end;
+    }
+
     /* We're creating actual IPv4/6 sockets, so we should
      * check if the host running tests actually supports
      * each protocol to avoid breaking tests on machines
Signature · 1 line
2.21.1
Reviewed-by on v1 2/4
#4 lore raw

Re: [PATCH 2/4] tests/test-util-sockets: Skip test on non-x86 Travis containers

Quoted 9 lines · Philippe Mathieu-Daudé

Similarly to commit 4f370b1098, test-util-sockets fails in restricted non-x86 Travis containers since they apparently blacklisted some required system calls there. Let's simply skip the test if we detect such an environment.

---
 tests/test-util-sockets.c | 7 +++++++
 1 file changed, 7 insertions(+)

Regards,
Daniel

Signature · 3 lines
|: 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 :|
#5 lore raw

PATCH 3/4 tests/migration: Disable autoconverge test on Travis-CI s390x

In reply to Philippe Mathieu-Daudé

This test fails on Travis-CI s390x when configured with --disable-tcg:

  $ make check-qtest
    TEST    check-qtest-s390x: tests/qtest/boot-serial-test
  qemu-system-s390x: -accel tcg: invalid accelerator tcg
  qemu-system-s390x: falling back to KVM
    TEST    check-qtest-s390x: tests/qtest/pxe-test
    TEST    check-qtest-s390x: tests/qtest/test-netfilter
    TEST    check-qtest-s390x: tests/qtest/test-filter-mirror
    TEST    check-qtest-s390x: tests/qtest/test-filter-redirector
    TEST    check-qtest-s390x: tests/qtest/drive_del-test
    TEST    check-qtest-s390x: tests/qtest/device-plug-test
    TEST    check-qtest-s390x: tests/qtest/virtio-ccw-test
    TEST    check-qtest-s390x: tests/qtest/cpu-plug-test
    TEST    check-qtest-s390x: tests/qtest/migration-test
  **
  ERROR:tests/qtest/migration-test.c:1229:test_migrate_auto_converge: 'got_stop' should be FALSE
  ERROR - Bail out! ERROR:tests/qtest/migration-test.c:1229:test_migrate_auto_converge: 'got_stop' should be FALSE
  make: *** [tests/Makefile.include:633: check-qtest-s390x] Error 1

Per David Gilbert, it might be a threshold requiring tuning:
"it could just be the writing is slow on s390 and the migration thread fast; in which case the autocomplete wouldn't be needed. Perhaps we just need to reduce the bandwidth limit."

Disable the autoconverge test for now.

---
 tests/qtest/migration-test.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
tests/qtest/migration-test.c +10 -0
index 3d6cc83b88..878399666e 100644
@@ -1181,6 +1181,16 @@ static void test_migrate_auto_converge(void)
     MigrateStart *args = migrate_start_new();
     QTestState *from, *to;
     int64_t remaining, percentage;
+    char *travis_arch;
+
+    /*
+     * This test does not work reliably on Travis s390x.
+     */
+    travis_arch = getenv("TRAVIS_CPU_ARCH");
+    if (travis_arch && g_str_equal(travis_arch, "s390x")) {
+        g_test_skip("Test does not work reliably on s390x Travis containers.");
+        return;
+    }
 
     /*
      * We want the test to be stable and as fast as possible.
Signature · 1 line
2.21.1
#6 lore raw

Re: [PATCH 3/4] tests/migration: Disable autoconverge test on Travis-CI s390x

Quoted 11 lines · * Philippe Mathieu-Daudé ([email protected]) wrote:

This test fails on Travis-CI s390x when configured with --disable-tcg:

  $ make check-qtest
    TEST    check-qtest-s390x: tests/qtest/boot-serial-test
  qemu-system-s390x: -accel tcg: invalid accelerator tcg
  qemu-system-s390x: falling back to KVM
    TEST    check-qtest-s390x: tests/qtest/pxe-test
    TEST    check-qtest-s390x: tests/qtest/test-netfilter
    TEST    check-qtest-s390x: tests/qtest/test-filter-mirror
    TEST    check-qtest-s390x: tests/qtest/test-filter-redirector
    TEST    check-qtest-s390x: tests/qtest/drive_del-test
Quoted 8 lines
    TEST    check-qtest-s390x: tests/qtest/device-plug-test
    TEST    check-qtest-s390x: tests/qtest/virtio-ccw-test
    TEST    check-qtest-s390x: tests/qtest/cpu-plug-test
    TEST    check-qtest-s390x: tests/qtest/migration-test
  **
  ERROR:tests/qtest/migration-test.c:1229:test_migrate_auto_converge: 'got_stop' should be FALSE
  ERROR - Bail out! ERROR:tests/qtest/migration-test.c:1229:test_migrate_auto_converge: 'got_stop' should be FALSE
  make: *** [tests/Makefile.include:633: check-qtest-s390x] Error 1

Before we take the hammer to it, could you try reducing it's initial bandwidth, the code that says:

    /*
     * Set the initial parameters so that the migration could not converge
     * without throttling.
     */
    migrate_set_parameter_int(from, "downtime-limit", 1);
    migrate_set_parameter_int(from, "max-bandwidth", 100000000); /* ~100Mb/s */

knock a couple of 0's off that and see if it's happy.

Dave

Quoted 36 lines

Per David Gilbert, it might be a threshold requiring tuning:
"it could just be the writing is slow on s390 and the migration thread fast; in which case the autocomplete wouldn't be needed. Perhaps we just need to reduce the bandwidth limit."

Disable the autoconverge test for now.

---
 tests/qtest/migration-test.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
tests/qtest/migration-test.c +10 -0
index 3d6cc83b88..878399666e 100644
@@ -1181,6 +1181,16 @@ static void test_migrate_auto_converge(void)
     MigrateStart *args = migrate_start_new();
     QTestState *from, *to;
     int64_t remaining, percentage;
+    char *travis_arch;
+
+    /*
+     * This test does not work reliably on Travis s390x.
+     */
+    travis_arch = getenv("TRAVIS_CPU_ARCH");
+    if (travis_arch && g_str_equal(travis_arch, "s390x")) {
+        g_test_skip("Test does not work reliably on s390x Travis containers.");
+        return;
+    }
 
     /*
      * We want the test to be stable and as fast as possible.
Signature · 1 line
2.21.1

--
Dr. David Alan Gilbert / [email protected] / Manchester, UK

#7 lore raw

Re: [PATCH 3/4] tests/migration: Disable autoconverge test on Travis-CI s390x

Quoted 24 lines · Dr. David Alan Gilbert
Quoted 11 lines · * Philippe Mathieu-Daudé ([email protected]) wrote:

This test fails on Travis-CI s390x when configured with --disable-tcg:

   $ make check-qtest
     TEST    check-qtest-s390x: tests/qtest/boot-serial-test
   qemu-system-s390x: -accel tcg: invalid accelerator tcg
   qemu-system-s390x: falling back to KVM
     TEST    check-qtest-s390x: tests/qtest/pxe-test
     TEST    check-qtest-s390x: tests/qtest/test-netfilter
     TEST    check-qtest-s390x: tests/qtest/test-filter-mirror
     TEST    check-qtest-s390x: tests/qtest/test-filter-redirector
     TEST    check-qtest-s390x: tests/qtest/drive_del-test
Quoted 8 lines
     TEST    check-qtest-s390x: tests/qtest/device-plug-test
     TEST    check-qtest-s390x: tests/qtest/virtio-ccw-test
     TEST    check-qtest-s390x: tests/qtest/cpu-plug-test
     TEST    check-qtest-s390x: tests/qtest/migration-test
   **
   ERROR:tests/qtest/migration-test.c:1229:test_migrate_auto_converge: 'got_stop' should be FALSE
   ERROR - Bail out! ERROR:tests/qtest/migration-test.c:1229:test_migrate_auto_converge: 'got_stop' should be FALSE
   make: *** [tests/Makefile.include:633: check-qtest-s390x] Error 1

Before we take the hammer to it, could you try reducing it's initial bandwidth, the code that says:

Quoted 8 lines
     /*
      * Set the initial parameters so that the migration could not converge
      * without throttling.
      */
     migrate_set_parameter_int(from, "downtime-limit", 1);
     migrate_set_parameter_int(from, "max-bandwidth", 100000000); /* ~100Mb/s */

knock a couple of 0's off that and see if it's happy.

You are right! One 0 is not enough, but a couple makes the test succeed.

Can that change have other (bad) effects on other archs?
IOW can I send a generic patch updating this value, or should I add a check on the architecture?

Thanks!

Quoted 42 lines

Dave

Quoted 36 lines

Per David Gilbert, it might be a threshold requiring tuning:
"it could just be the writing is slow on s390 and the migration thread fast; in which case the autocomplete wouldn't be needed. Perhaps we just need to reduce the bandwidth limit."

Disable the autoconverge test for now.

---
  tests/qtest/migration-test.c | 10 ++++++++++
  1 file changed, 10 insertions(+)
tests/qtest/migration-test.c +10 -0
index 3d6cc83b88..878399666e 100644
@@ -1181,6 +1181,16 @@ static void test_migrate_auto_converge(void)
      MigrateStart *args = migrate_start_new();
      QTestState *from, *to;
      int64_t remaining, percentage;
+    char *travis_arch;
+
+    /*
+     * This test does not work reliably on Travis s390x.
+     */
+    travis_arch = getenv("TRAVIS_CPU_ARCH");
+    if (travis_arch && g_str_equal(travis_arch, "s390x")) {
+        g_test_skip("Test does not work reliably on s390x Travis containers.");
+        return;
+    }
 
      /*
       * We want the test to be stable and as fast as possible.
Signature · 1 line
2.21.1

--
Dr. David Alan Gilbert / [email protected] / Manchester, UK

#8 lore raw

Re: [PATCH 3/4] tests/migration: Disable autoconverge test on Travis-CI s390x

Quoted 32 lines · * Philippe Mathieu-Daudé ([email protected]) wrote:
Quoted 31 lines · Dr. David Alan Gilbert
Quoted 11 lines · * Philippe Mathieu-Daudé ([email protected]) wrote:

This test fails on Travis-CI s390x when configured with --disable-tcg:

   $ make check-qtest
     TEST    check-qtest-s390x: tests/qtest/boot-serial-test
   qemu-system-s390x: -accel tcg: invalid accelerator tcg
   qemu-system-s390x: falling back to KVM
     TEST    check-qtest-s390x: tests/qtest/pxe-test
     TEST    check-qtest-s390x: tests/qtest/test-netfilter
     TEST    check-qtest-s390x: tests/qtest/test-filter-mirror
     TEST    check-qtest-s390x: tests/qtest/test-filter-redirector
     TEST    check-qtest-s390x: tests/qtest/drive_del-test
Quoted 8 lines
     TEST    check-qtest-s390x: tests/qtest/device-plug-test
     TEST    check-qtest-s390x: tests/qtest/virtio-ccw-test
     TEST    check-qtest-s390x: tests/qtest/cpu-plug-test
     TEST    check-qtest-s390x: tests/qtest/migration-test
   **
   ERROR:tests/qtest/migration-test.c:1229:test_migrate_auto_converge: 'got_stop' should be FALSE
   ERROR - Bail out! ERROR:tests/qtest/migration-test.c:1229:test_migrate_auto_converge: 'got_stop' should be FALSE
   make: *** [tests/Makefile.include:633: check-qtest-s390x] Error 1

Before we take the hammer to it, could you try reducing it's initial bandwidth, the code that says:

     /*
      * Set the initial parameters so that the migration could not converge
      * without throttling.
      */
     migrate_set_parameter_int(from, "downtime-limit", 1);
     migrate_set_parameter_int(from, "max-bandwidth", 100000000); /* ~100Mb/s */
Quoted 7 lines
Quoted 1 line

knock a couple of 0's off that and see if it's happy.

You are right! One 0 is not enough, but a couple makes the test succeed.

Can that change have other (bad) effects on other archs?
IOW can I send a generic patch updating this value, or should I add a check on the architecture?

I think generic is fine; as soon as the code notices that it's throttling it increases the bandwidth to let it complete, so it should be OK to have this low.

Dave

Quoted 44 lines

Thanks!

Quoted 41 lines

Dave

Quoted 35 lines

Per David Gilbert, it might be a threshold requiring tuning:
"it could just be the writing is slow on s390 and the migration thread fast; in which case the autocomplete wouldn't be needed. Perhaps we just need to reduce the bandwidth limit."

Disable the autoconverge test for now.

---
  tests/qtest/migration-test.c | 10 ++++++++++
  1 file changed, 10 insertions(+)
tests/qtest/migration-test.c +10 -0
index 3d6cc83b88..878399666e 100644
@@ -1181,6 +1181,16 @@ static void test_migrate_auto_converge(void)
      MigrateStart *args = migrate_start_new();
      QTestState *from, *to;
      int64_t remaining, percentage;
+    char *travis_arch;
+
+    /*
+     * This test does not work reliably on Travis s390x.
+     */
+    travis_arch = getenv("TRAVIS_CPU_ARCH");
+    if (travis_arch && g_str_equal(travis_arch, "s390x")) {
+        g_test_skip("Test does not work reliably on s390x Travis containers.");
+        return;
+    }
      /*
       * We want the test to be stable and as fast as possible.
Signature · 1 line
2.21.1

--
Dr. David Alan Gilbert / [email protected] / Manchester, UK

--
Dr. David Alan Gilbert / [email protected] / Manchester, UK

#9 lore raw

PATCH 4/4 .travis.yml: Add a KVM-only s390x job

In reply to Philippe Mathieu-Daudé

Add a job to build QEMU on s390x with TCG disabled, so this configuration won't bitrot over time.

This job is quick, running check-unit: Ran for 4 min 48 sec
https://travis-ci.org/github/philmd/qemu/jobs/663659486

---
 .travis.yml | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
.travis.yml +42 -0
index b92798ac3b..0109f02ed4 100644
@@ -524,6 +524,48 @@ jobs:
               $(exit $BUILD_RC);
           fi
 
+    - name: "[s390x] GCC check (KVM)"
+      arch: s390x
+      dist: bionic
+      addons:
+        apt_packages:
+          - libaio-dev
+          - libattr1-dev
+          - libbrlapi-dev
+          - libcap-ng-dev
+          - libgcrypt20-dev
+          - libgnutls28-dev
+          - libgtk-3-dev
+          - libiscsi-dev
+          - liblttng-ust-dev
+          - libncurses5-dev
+          - libnfs-dev
+          - libnss3-dev
+          - libpixman-1-dev
+          - libpng-dev
+          - librados-dev
+          - libsdl2-dev
+          - libseccomp-dev
+          - liburcu-dev
+          - libusb-1.0-0-dev
+          - libvdeplug-dev
+          - libvte-2.91-dev
+          # Tests dependencies
+          - genisoimage
+      env:
+        - TEST_CMD="make check-unit"
+        - CONFIG="--disable-containers --disable-tcg --enable-kvm --disable-tools"
+      script:
+        - ( cd ${SRC_DIR} ; git submodule update --init roms/SLOF )
+        - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$?
+        - |
+          if [ "$BUILD_RC" -eq 0 ] ; then
+              mv pc-bios/s390-ccw/*.img pc-bios/ ;
+              ${TEST_CMD} ;
+          else
+              $(exit $BUILD_RC);
+          fi
+
     # Release builds
     # The make-release script expect a QEMU version, so our tag must start with a 'v'.
     # This is the case when release candidate tags are created.
Signature · 1 line
2.21.1