Commit 3af8c4be authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging 



Block layer patches:

- mirror: Fix deadlock

# gpg: Signature made Mon 03 Dec 2018 16:57:33 GMT
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  iotests: simple mirror test with kvm on 1G image
  mirror: fix dead-lock

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 83ea23cd db5e8210

block/mirror.c

+5 −8
Original line number Diff line number Diff line
@@ -199,7 +199,6 @@ static void coroutine_fn mirror_write_complete(MirrorOp *op, int ret) 
{

    MirrorBlockJob *s = op->s;



    aio_context_acquire(blk_get_aio_context(s->common.blk));

    if (ret < 0) {

        BlockErrorAction action;
@@ -209,15 +208,14 @@ static void coroutine_fn mirror_write_complete(MirrorOp *op, int ret) 
            s->ret = ret;

        }

    }



    mirror_iteration_done(op, ret);

    aio_context_release(blk_get_aio_context(s->common.blk));

}



static void coroutine_fn mirror_read_complete(MirrorOp *op, int ret)

{

    MirrorBlockJob *s = op->s;



    aio_context_acquire(blk_get_aio_context(s->common.blk));

    if (ret < 0) {

        BlockErrorAction action;
@@ -228,12 +226,11 @@ static void coroutine_fn mirror_read_complete(MirrorOp *op, int ret) 
        }



        mirror_iteration_done(op, ret);

    } else {

        ret = blk_co_pwritev(s->target, op->offset,

                             op->qiov.size, &op->qiov, 0);

        mirror_write_complete(op, ret);

        return;

    }

    aio_context_release(blk_get_aio_context(s->common.blk));



    ret = blk_co_pwritev(s->target, op->offset, op->qiov.size, &op->qiov, 0);

    mirror_write_complete(op, ret);

}



/* Clip bytes relative to offset to not exceed end-of-file */

tests/qemu-iotests/235

0 → 100755
+76 −0
Original line number Diff line number Diff line 
#!/usr/bin/env python

#

# Simple mirror test

#

# Copyright (c) 2018 Virtuozzo International GmbH. All rights reserved.

#

# This program is free software; you can redistribute it and/or modify

# it under the terms of the GNU General Public License as published by

# the Free Software Foundation; either version 2 of the License, or

# (at your option) any later version.

#

# This program is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

# GNU General Public License for more details.

#

# You should have received a copy of the GNU General Public License

# along with this program.  If not, see <http://www.gnu.org/licenses/>.

#



import sys

import os

import iotests

from iotests import qemu_img_create, qemu_io, file_path, log



sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'scripts'))



from qemu import QEMUMachine



# Note:

# This test was added to check that mirror dead-lock was fixed (see previous

# commit before this test addition).

# And it didn't reproduce if at least one of the following:

# 1. use small image size

# 2. use raw format (not qcow2)

# 3. drop kvm and use iotests.VM() (maybe, because of qtest) (however, it still

#    reproduces, if just drop kvm, but gdb failed to produce full backtraces

#    for me)

# 4. add iothread



size = 1 * 1024 * 1024 * 1024



iotests.verify_image_format(supported_fmts=['qcow2'])



disk = file_path('disk')



# prepare source image

qemu_img_create('-f', iotests.imgfmt, '-o', 'preallocation=metadata', disk,

                str(size))



vm = QEMUMachine(iotests.qemu_prog)

vm.add_args('-machine', 'pc,accel=kvm')

vm.add_args('-drive', 'id=src,file=' + disk)

vm.launch()



log(vm.qmp('object-add', qom_type='throttle-group', id='tg0',

           props={ 'x-bps-total': size }))



log(vm.qmp('blockdev-add',

           **{ 'node-name': 'target',

               'driver': 'throttle',

               'throttle-group': 'tg0',

               'file': {

                   'driver': 'null-co',

                   'size': size

                } }))



log(vm.qmp('blockdev-mirror', device='src', target='target', sync='full'))



try:

    vm.event_wait('BLOCK_JOB_READY', timeout=10.0)

except:

    vm.shutdown()

    raise



vm.shutdown()

tests/qemu-iotests/235.out

0 → 100644
+3 −0
Original line number Diff line number Diff line 
{"return": {}}

{"return": {}}

{"return": {}}

tests/qemu-iotests/group

+1 −0
Original line number Diff line number Diff line
@@ -232,3 +232,4 @@ 
232 auto quick

233 auto quick

234 auto quick migration

235 auto quick