Commit 59ed3fe8 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Block layer patches:

- block: Fix crash on migration with explicit child nodes
- nvme: Fix spurious interrupts

# gpg: Signature made Tue 27 Nov 2018 11:59:40 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:
  nvme: Fix spurious interrupts
  iotests: Test migration with -blockdev
  block: Don't inactivate children before parents

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 2264faa5 6da02181

block.c

+53 −31
Original line number Diff line number Diff line
@@ -4612,26 +4612,48 @@ void bdrv_invalidate_cache_all(Error **errp) 
    }

}



static int bdrv_inactivate_recurse(BlockDriverState *bs,

                                   bool setting_flag)

static bool bdrv_has_bds_parent(BlockDriverState *bs, bool only_active)

{

    BdrvChild *parent;



    QLIST_FOREACH(parent, &bs->parents, next_parent) {

        if (parent->role->parent_is_bds) {

            BlockDriverState *parent_bs = parent->opaque;

            if (!only_active || !(parent_bs->open_flags & BDRV_O_INACTIVE)) {

                return true;

            }

        }

    }



    return false;

}



static int bdrv_inactivate_recurse(BlockDriverState *bs)

{

    BdrvChild *child, *parent;

    uint64_t perm, shared_perm;

    int ret;



    if (!bs->drv) {

        return -ENOMEDIUM;

    }



    if (!setting_flag && bs->drv->bdrv_inactivate) {

    /* Make sure that we don't inactivate a child before its parent.

     * It will be covered by recursion from the yet active parent. */

    if (bdrv_has_bds_parent(bs, true)) {

        return 0;

    }



    assert(!(bs->open_flags & BDRV_O_INACTIVE));



    /* Inactivate this node */

    if (bs->drv->bdrv_inactivate) {

        ret = bs->drv->bdrv_inactivate(bs);

        if (ret < 0) {

            return ret;

        }

    }



    if (setting_flag && !(bs->open_flags & BDRV_O_INACTIVE)) {

        uint64_t perm, shared_perm;



    QLIST_FOREACH(parent, &bs->parents, next_parent) {

        if (parent->role->inactivate) {

            ret = parent->role->inactivate(parent);
@@ -4647,10 +4669,11 @@ static int bdrv_inactivate_recurse(BlockDriverState *bs, 
    bdrv_get_cumulative_perm(bs, &perm, &shared_perm);

    bdrv_check_perm(bs, NULL, perm, shared_perm, NULL, &error_abort);

    bdrv_set_perm(bs, perm, shared_perm);

    }





    /* Recursively inactivate children */

    QLIST_FOREACH(child, &bs->children, next) {

        ret = bdrv_inactivate_recurse(child->bs, setting_flag);

        ret = bdrv_inactivate_recurse(child->bs);

        if (ret < 0) {

            return ret;

        }
@@ -4664,7 +4687,6 @@ int bdrv_inactivate_all(void) 
    BlockDriverState *bs = NULL;

    BdrvNextIterator it;

    int ret = 0;

    int pass;

    GSList *aio_ctxs = NULL, *ctx;



    for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {
@@ -4676,19 +4698,19 @@ int bdrv_inactivate_all(void) 
        }

    }



    /* We do two passes of inactivation. The first pass calls to drivers'

     * .bdrv_inactivate callbacks recursively so all cache is flushed to disk;

     * the second pass sets the BDRV_O_INACTIVE flag so that no further write

     * is allowed. */

    for (pass = 0; pass < 2; pass++) {

    for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {

            ret = bdrv_inactivate_recurse(bs, pass);

        /* Nodes with BDS parents are covered by recursion from the last

         * parent that gets inactivated. Don't inactivate them a second

         * time if that has already happened. */

        if (bdrv_has_bds_parent(bs, false)) {

            continue;

        }

        ret = bdrv_inactivate_recurse(bs);

        if (ret < 0) {

            bdrv_next_cleanup(&it);

            goto out;

        }

    }

    }



out:

    for (ctx = aio_ctxs; ctx != NULL; ctx = ctx->next) {

hw/block/nvme.c

+3 −1
Original line number Diff line number Diff line
@@ -272,8 +272,10 @@ static void nvme_post_cqes(void *opaque) 
            sizeof(req->cqe));

        QTAILQ_INSERT_TAIL(&sq->req_list, req, entry);

    }

    if (cq->tail != cq->head) {

        nvme_irq_assert(n, cq);

    }

}



static void nvme_enqueue_req_completion(NvmeCQueue *cq, NvmeRequest *req)

{

tests/qemu-iotests/234

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

#

# Copyright (C) 2018 Red Hat, Inc.

#

# 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/>.

#

# Creator/Owner: Kevin Wolf <kwolf@redhat.com>

#

# Check that block node activation and inactivation works with a block graph

# that is built with individually created nodes



import iotests

import os



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

iotests.verify_platform(['linux'])



with iotests.FilePath('img') as img_path, \

     iotests.FilePath('backing') as backing_path, \

     iotests.FilePath('mig_fifo_a') as fifo_a, \

     iotests.FilePath('mig_fifo_b') as fifo_b, \

     iotests.VM(path_suffix='a') as vm_a, \

     iotests.VM(path_suffix='b') as vm_b:



    iotests.qemu_img_pipe('create', '-f', iotests.imgfmt, backing_path, '64M')

    iotests.qemu_img_pipe('create', '-f', iotests.imgfmt, img_path, '64M')



    os.mkfifo(fifo_a)

    os.mkfifo(fifo_b)



    iotests.log('Launching source VM...')

    (vm_a.add_blockdev('file,filename=%s,node-name=drive0-file' % (img_path))

         .add_blockdev('%s,file=drive0-file,node-name=drive0' % (iotests.imgfmt))

         .add_blockdev('file,filename=%s,node-name=drive0-backing-file' % (backing_path))

         .add_blockdev('%s,file=drive0-backing-file,node-name=drive0-backing' % (iotests.imgfmt))

         .launch())



    iotests.log('Launching destination VM...')

    (vm_b.add_blockdev('file,filename=%s,node-name=drive0-file' % (img_path))

         .add_blockdev('%s,file=drive0-file,node-name=drive0' % (iotests.imgfmt))

         .add_blockdev('file,filename=%s,node-name=drive0-backing-file' % (backing_path))

         .add_blockdev('%s,file=drive0-backing-file,node-name=drive0-backing' % (iotests.imgfmt))

         .add_incoming("exec: cat '%s'" % (fifo_a))

         .launch())



    # Add a child node that was created after the parent node. The reverse case

    # is covered by the -blockdev options above.

    iotests.log(vm_a.qmp('blockdev-snapshot', node='drive0-backing',

                         overlay='drive0'))

    iotests.log(vm_b.qmp('blockdev-snapshot', node='drive0-backing',

                         overlay='drive0'))



    iotests.log('Enabling migration QMP events on A...')

    iotests.log(vm_a.qmp('migrate-set-capabilities', capabilities=[

        {

            'capability': 'events',

            'state': True

        }

    ]))



    iotests.log('Starting migration to B...')

    iotests.log(vm_a.qmp('migrate', uri='exec:cat >%s' % (fifo_a)))

    with iotests.Timeout(3, 'Migration does not complete'):

        while True:

            event = vm_a.event_wait('MIGRATION')

            iotests.log(event, filters=[iotests.filter_qmp_event])

            if event['data']['status'] == 'completed':

                break



    iotests.log(vm_a.qmp('query-migrate')['return']['status'])

    iotests.log(vm_b.qmp('query-migrate')['return']['status'])



    iotests.log(vm_a.qmp('query-status'))

    iotests.log(vm_b.qmp('query-status'))



    iotests.log('Add a second parent to drive0-file...')

    iotests.log(vm_b.qmp('blockdev-add', driver='raw', file='drive0-file',

                         node_name='drive0-raw'))



    iotests.log('Restart A with -incoming and second parent...')

    vm_a.shutdown()

    (vm_a.add_blockdev('raw,file=drive0-file,node-name=drive0-raw')

         .add_incoming("exec: cat '%s'" % (fifo_b))

         .launch())



    iotests.log(vm_a.qmp('blockdev-snapshot', node='drive0-backing',

                         overlay='drive0'))



    iotests.log('Enabling migration QMP events on B...')

    iotests.log(vm_b.qmp('migrate-set-capabilities', capabilities=[

        {

            'capability': 'events',

            'state': True

        }

    ]))



    iotests.log('Starting migration back to A...')

    iotests.log(vm_b.qmp('migrate', uri='exec:cat >%s' % (fifo_b)))

    with iotests.Timeout(3, 'Migration does not complete'):

        while True:

            event = vm_b.event_wait('MIGRATION')

            iotests.log(event, filters=[iotests.filter_qmp_event])

            if event['data']['status'] == 'completed':

                break



    iotests.log(vm_a.qmp('query-migrate')['return']['status'])

    iotests.log(vm_b.qmp('query-migrate')['return']['status'])



    iotests.log(vm_a.qmp('query-status'))

    iotests.log(vm_b.qmp('query-status'))

tests/qemu-iotests/234.out

0 → 100644
+30 −0
Original line number Diff line number Diff line 
Launching source VM...

Launching destination VM...

{"return": {}}

{"return": {}}

Enabling migration QMP events on A...

{"return": {}}

Starting migration to B...

{"return": {}}

{"data": {"status": "setup"}, "event": "MIGRATION", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}

{"data": {"status": "active"}, "event": "MIGRATION", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}

{"data": {"status": "completed"}, "event": "MIGRATION", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}

completed

completed

{"return": {"running": false, "singlestep": false, "status": "postmigrate"}}

{"return": {"running": true, "singlestep": false, "status": "running"}}

Add a second parent to drive0-file...

{"return": {}}

Restart A with -incoming and second parent...

{"return": {}}

Enabling migration QMP events on B...

{"return": {}}

Starting migration back to A...

{"return": {}}

{"data": {"status": "setup"}, "event": "MIGRATION", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}

{"data": {"status": "active"}, "event": "MIGRATION", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}

{"data": {"status": "completed"}, "event": "MIGRATION", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}

completed

completed

{"return": {"running": true, "singlestep": false, "status": "running"}}

{"return": {"running": false, "singlestep": false, "status": "postmigrate"}}

tests/qemu-iotests/group

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

232 auto quick

233 auto quick

234 auto quick migration