[PULL,00/51] Block layer patches
mbox

Message ID 20200515124521.335403-1-kwolf@redhat.com
State New
Headers show

Pull-request

git://repo.or.cz/qemu/kevin.git tags/for-upstream

Message

Kevin Wolf May 15, 2020, 12:44 p.m. UTC
The following changes since commit 013a18edbbc59cdad019100c7d03c0494642b74c:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200514' into staging (2020-05-14 16:17:55 +0100)

are available in the Git repository at:

  git://repo.or.cz/qemu/kevin.git tags/for-upstream

for you to fetch changes up to 7d8f21a650e562270f5ed5341134c9c2c39dc5e8:

  iotests/030: Reduce run time by unthrottling job earlier (2020-05-15 14:12:34 +0200)

----------------------------------------------------------------
Block layer patches:

- Introduce real BdrvChildRole
- blk/bdrv_make_empty() functions instead of calling callbacks directly
- mirror: Make sure that source and target size match
- block-copy: Fix uninitialized variable
- block/replication: Avoid cancelling the job twice
- ahci: Log lost IRQs
- iotests: Run pylint and mypy in a testcase
- iotests: log messages from notrun()

----------------------------------------------------------------
John Snow (1):
      iotests: log messages from notrun()

Kevin Wolf (8):
      iotests/109: Don't mirror with mismatched size
      iotests/229: Use blkdebug to inject an error
      mirror: Make sure that source and target size match
      iotests: Mirror with different source/target size
      iotests: Fix incomplete type declarations
      iotests: Run pylint and mypy in a testcase
      replication: Avoid blk_make_empty() on read-only child
      iotests/030: Reduce run time by unthrottling job earlier

Lukas Straub (1):
      block/replication.c: Avoid cancelling the job twice

Max Reitz (38):
      block: Add bdrv_make_empty()
      block: Add blk_make_empty()
      block: Use blk_make_empty() after commits
      block: Use bdrv_make_empty() where possible
      block: Mark commit, mirror, blkreplay as filters
      block: Add BlockDriver.is_format
      block: Rename BdrvChildRole to BdrvChildClass
      block: Add BdrvChildRole and BdrvChildRoleBits
      block: Add BdrvChildRole to BdrvChild
      block: Pass BdrvChildRole to bdrv_child_perm()
      block: Pass BdrvChildRole to .inherit_options()
      block: Pass parent_is_format to .inherit_options()
      block: Rename bdrv_inherited_options()
      block: Add generic bdrv_inherited_options()
      block: Use bdrv_inherited_options()
      block: Unify bdrv_child_cb_attach()
      block: Unify bdrv_child_cb_detach()
      block: Add child_of_bds
      block: Distinguish paths in *_format_default_perms
      block: Pull out bdrv_default_perms_for_cow()
      block: Pull out bdrv_default_perms_for_storage()
      block: Relax *perms_for_storage for data children
      block: Add bdrv_default_perms()
      raw-format: Split raw_read_options()
      block: Switch child_format users to child_of_bds
      block: Drop child_format
      block: Make backing files child_of_bds children
      block: Drop child_backing
      block: Make format drivers use child_of_bds
      block: Make filter drivers use child_of_bds
      block: Use child_of_bds in remaining places
      tests: Use child_of_bds instead of child_file
      block: Use bdrv_default_perms()
      block: Make bdrv_filter_default_perms() static
      block: Drop bdrv_format_default_perms()
      block: Drop child_file
      block: Pass BdrvChildRole in remaining cases
      block: Drop @child_class from bdrv_child_perm()

Philippe Mathieu-Daudé (3):
      block/block-copy: Fix uninitialized variable in block_copy_task_entry
      block/block-copy: Simplify block_copy_do_copy()
      hw/ide/ahci: Log lost IRQs

 include/block/block.h            |  65 ++++-
 include/block/block_int.h        |  57 ++--
 include/sysemu/block-backend.h   |   2 +
 block.c                          | 601 ++++++++++++++++++++++++---------------
 block/backup-top.c               |  11 +-
 block/blkdebug.c                 |  10 +-
 block/blklogwrites.c             |  16 +-
 block/blkreplay.c                |   8 +-
 block/blkverify.c                |  10 +-
 block/block-backend.c            |  30 +-
 block/block-copy.c               |  14 +-
 block/bochs.c                    |   7 +-
 block/cloop.c                    |   7 +-
 block/commit.c                   |  20 +-
 block/copy-on-read.c             |   7 +-
 block/crypto.c                   |   8 +-
 block/dmg.c                      |   7 +-
 block/filter-compress.c          |   7 +-
 block/io.c                       |  22 +-
 block/mirror.c                   |  25 +-
 block/parallels.c                |   7 +-
 block/qcow.c                     |   7 +-
 block/qcow2.c                    |  20 +-
 block/qed.c                      |   7 +-
 block/quorum.c                   |   8 +-
 block/raw-format.c               | 128 +++++----
 block/replication.c              |  23 +-
 block/throttle.c                 |   7 +-
 block/vdi.c                      |   7 +-
 block/vhdx.c                     |   7 +-
 block/vmdk.c                     |  23 +-
 block/vpc.c                      |   7 +-
 block/vvfat.c                    |  17 +-
 blockjob.c                       |   7 +-
 hw/ide/ahci.c                    |   1 +
 qemu-img.c                       |  19 +-
 tests/test-bdrv-drain.c          |  72 +++--
 tests/test-bdrv-graph-mod.c      |  10 +-
 tests/test-block-iothread.c      |  17 +-
 tests/qemu-iotests/iotests.py    |  19 +-
 tests/qemu-iotests/030           |   6 +-
 tests/qemu-iotests/041           |  45 +++
 tests/qemu-iotests/041.out       |   4 +-
 tests/qemu-iotests/098.out       |   8 +-
 tests/qemu-iotests/109           |  10 +-
 tests/qemu-iotests/109.out       |  74 ++---
 tests/qemu-iotests/229           |  15 +-
 tests/qemu-iotests/229.out       |   6 +-
 tests/qemu-iotests/297           |  44 +++
 tests/qemu-iotests/297.out       |   3 +
 tests/qemu-iotests/common.filter |   5 +
 tests/qemu-iotests/group         |   1 +
 52 files changed, 995 insertions(+), 573 deletions(-)
 create mode 100755 tests/qemu-iotests/297
 create mode 100644 tests/qemu-iotests/297.out

Comments

Peter Maydell May 15, 2020, 2:28 p.m. UTC | #1
On Fri, 15 May 2020 at 13:45, Kevin Wolf <kwolf@redhat.com> wrote:
>
> The following changes since commit 013a18edbbc59cdad019100c7d03c0494642b74c:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200514' into staging (2020-05-14 16:17:55 +0100)
>
> are available in the Git repository at:
>
>   git://repo.or.cz/qemu/kevin.git tags/for-upstream
>
> for you to fetch changes up to 7d8f21a650e562270f5ed5341134c9c2c39dc5e8:
>
>   iotests/030: Reduce run time by unthrottling job earlier (2020-05-15 14:12:34 +0200)
>
> ----------------------------------------------------------------
> Block layer patches:
>
> - Introduce real BdrvChildRole
> - blk/bdrv_make_empty() functions instead of calling callbacks directly
> - mirror: Make sure that source and target size match
> - block-copy: Fix uninitialized variable
> - block/replication: Avoid cancelling the job twice
> - ahci: Log lost IRQs
> - iotests: Run pylint and mypy in a testcase
> - iotests: log messages from notrun()

Hi; I'm afraid aarch64, ppc64 and aarch32 all failed on iotest 229:


PPC64:
  TEST    iotest-qcow2: 229 [fail]
QEMU          --
"/home/pm215/qemu/build/all/tests/qemu-iotests/../../ppc64-softmmu/qemu-system-ppc64"
-nodefaults -display none -accel qtest
QEMU_IMG      -- "/home/pm215/qemu/build/all/tests/qemu-iotests/../../qemu-img"
QEMU_IO       --
"/home/pm215/qemu/build/all/tests/qemu-iotests/../../qemu-io"  --cache
writeback --aio threads -f qcow2
QEMU_NBD      -- "/home/pm215/qemu/build/all/tests/qemu-iotests/../../qemu-nbd"
IMGFMT        -- qcow2 (compat=1.1)
IMGPROTO      -- file
PLATFORM      -- Linux/ppc64 gcc1-power7 3.10.0-862.14.4.el7.ppc64
TEST_DIR      -- /home/pm215/qemu/build/all/tests/qemu-iotests/scratch
SOCK_DIR      -- /tmp/tmp.6nPwQm0Y01
SOCKET_SCM_HELPER --
/home/pm215/qemu/build/all/tests/qemu-iotests/socket_scm_helper

--- /home/pm215/qemu/tests/qemu-iotests/229.out 2020-05-15
12:46:57.991595216 +0000
+++ /home/pm215/qemu/build/all/tests/qemu-iotests/229.out.bad
2020-05-15 12:55:31.022877791 +0000
@@ -21,5 +21,5 @@
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
"event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id":
"testdisk"}}
 {"return": {}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
"event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id":
"testdisk"}}
-{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
"event": "BLOCK_JOB_CANCELLED", "data": {"device": "testdisk", "len":
2097152, "offset": 2097152, "speed": 0, "type": "mirror"}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
"event": "BLOCK_JOB_CANCELLED", "data": {"device": "testdisk", "len":
2097152, "offset": 1048576, "speed": 0, "type": "mirror"}}
 *** done

AArch64:
  TEST    iotest-qcow2: 229 [fail]
QEMU          --
"/home/pm/qemu/build/all/tests/qemu-iotests/../../aarch64-softmmu/qemu-system-aarch64"
-nodefaults -dis
play none -machine virt -accel qtest
QEMU_IMG      -- "/home/pm/qemu/build/all/tests/qemu-iotests/../../qemu-img"
QEMU_IO       --
"/home/pm/qemu/build/all/tests/qemu-iotests/../../qemu-io"  --cache
writeback --aio threads -f qcow2
QEMU_NBD      -- "/home/pm/qemu/build/all/tests/qemu-iotests/../../qemu-nbd"
IMGFMT        -- qcow2 (compat=1.1)
IMGPROTO      -- file
PLATFORM      -- Linux/aarch64 qemu-test 5.4.19
TEST_DIR      -- /home/pm/qemu/build/all/tests/qemu-iotests/scratch
SOCK_DIR      -- /tmp/tmp.xiNXu5VDz9
SOCKET_SCM_HELPER --
/home/pm/qemu/build/all/tests/qemu-iotests/socket_scm_helper

--- /home/pm/qemu/tests/qemu-iotests/229.out    2020-05-15
12:46:56.086403523 +0000
+++ /home/pm/qemu/build/all/tests/qemu-iotests/229.out.bad
2020-05-15 12:58:25.074083672 +0000
@@ -21,5 +21,5 @@
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
"event": "JOB_STATUS_CHANGE", "data": {"status": "ru
nning", "id": "testdisk"}}
 {"return": {}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
"event": "JOB_STATUS_CHANGE", "data": {"status": "ab
orting", "id": "testdisk"}}
-{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
"event": "BLOCK_JOB_CANCELLED", "data": {"device": "
testdisk", "len": 2097152, "offset": 2097152, "speed": 0, "type": "mirror"}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
"event": "BLOCK_JOB_CANCELLED", "data": {"device": "
testdisk", "len": 2097152, "offset": 1048576, "speed": 0, "type": "mirror"}}
 *** done

AArch32:

  TEST    iotest-qcow2: 229 [fail]
QEMU          --
"/home/peter.maydell/qemu/build/all-a32/tests/qemu-iotests/../../aarch64-softmmu/qemu-system-aarch64"
-
nodefaults -display none -machine virt -accel qtest
QEMU_IMG      --
"/home/peter.maydell/qemu/build/all-a32/tests/qemu-iotests/../../qemu-img"
QEMU_IO       --
"/home/peter.maydell/qemu/build/all-a32/tests/qemu-iotests/../../qemu-io"
 --cache writeback --aio thre
ads -f qcow2
QEMU_NBD      --
"/home/peter.maydell/qemu/build/all-a32/tests/qemu-iotests/../../qemu-nbd"
IMGFMT        -- qcow2 (compat=1.1)
IMGPROTO      -- file
PLATFORM      -- Linux/aarch64 mustang-maydell 4.15.0-51-generic
TEST_DIR      --
/home/peter.maydell/qemu/build/all-a32/tests/qemu-iotests/scratch
SOCK_DIR      -- /tmp/tmp.tbyzUS8J3l
SOCKET_SCM_HELPER --
/home/peter.maydell/qemu/build/all-a32/tests/qemu-iotests/socket_scm_helper

--- /home/peter.maydell/qemu/tests/qemu-iotests/229.out 2020-05-15
12:46:56.206202633 +0000
+++ /home/peter.maydell/qemu/build/all-a32/tests/qemu-iotests/229.out.bad
      2020-05-15 13:06:42.331534509 +0000
@@ -21,5 +21,5 @@
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
"event": "JOB_STATUS_CHANGE", "data": {"status": "ru
nning", "id": "testdisk"}}
 {"return": {}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
"event": "JOB_STATUS_CHANGE", "data": {"status": "ab
orting", "id": "testdisk"}}
-{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
"event": "BLOCK_JOB_CANCELLED", "data": {"device": "
testdisk", "len": 2097152, "offset": 2097152, "speed": 0, "type": "mirror"}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
"event": "BLOCK_JOB_CANCELLED", "data": {"device": "
testdisk", "len": 2097152, "offset": 1048576, "speed": 0, "type": "mirror"}}
 *** done

thanks
-- PMM
no-reply@patchew.org May 15, 2020, 8:30 p.m. UTC | #2
Patchew URL: https://patchew.org/QEMU/20200515124521.335403-1-kwolf@redhat.com/



Hi,

This series failed the docker-quick@centos7 build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.

=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-centos7 V=1 NETWORK=1
time make docker-test-quick@centos7 SHOW_ENV=1 J=14 NETWORK=1
=== TEST SCRIPT END ===

Not run: 259
Failures: 229
Failed 1 of 119 iotests
make: *** [check-tests/check-block.sh] Error 1
make: *** Waiting for unfinished jobs....
  TEST    check-qtest-aarch64: tests/qtest/test-hmp
  TEST    check-qtest-aarch64: tests/qtest/qos-test
---
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=50c29e1822dc4e0e9a4c063f9410f2d5', '-u', '1001', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-cfid8wn3/src/docker-src.2020-05-15-16.14.21.2026:/var/tmp/qemu:z,ro', 'qemu:centos7', '/var/tmp/qemu/run', 'test-quick']' returned non-zero exit status 2.
filter=--filter=label=com.qemu.instance.uuid=50c29e1822dc4e0e9a4c063f9410f2d5
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-cfid8wn3/src'
make: *** [docker-run-test-quick@centos7] Error 2

real    15m41.654s
user    0m9.390s


The full log is available at
http://patchew.org/logs/20200515124521.335403-1-kwolf@redhat.com/testing.docker-quick@centos7/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com