Commit 9b75dcb1 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2018-07-02' into staging 



nbd patches for 2018-07-02

Bug fixes and iotest exposure of fleecing via NBD (serving a
read-only point-in-time view via blockdev-backup sync:none,
as well as serving dirty bitmaps over NBD), including a new
x-dirty-bitmap parameter when opening NBD clients as the
counterpart to x-nbd-server-add-bitmap. Also a random fix
for iscsi block_status spotted by Coverity that missed other
miscellaneous trees.

- Eric Blake: nbd/server: Fix dirty bitmap logic regression
- Eric Blake: iscsi: Avoid potential for get_status overflow
- John Snow/Vladimir Sementsov-Ogievskiy: 0/2 block: formalize and test fleecing
- Eric Blake: 0/2 test NBD bitmap export

# gpg: Signature made Tue 03 Jul 2018 02:33:03 BST
# gpg:                using RSA key A7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>"
# gpg:                 aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>"
# gpg:                 aka "[jpeg image of size 6874]"
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-nbd-2018-07-02:
  iotests: New test 223 for exporting dirty bitmap over NBD
  nbd/client: Add x-dirty-bitmap to query bitmap from server
  iotests: add 222 to test basic fleecing
  blockdev: enable non-root nodes for backup source
  iscsi: Avoid potential for get_status overflow
  nbd/server: Fix dirty bitmap logic regression

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 46d0885a a1532a22

block/iscsi.c

+1 −1
Original line number Diff line number Diff line
@@ -734,7 +734,7 @@ retry: 
        goto out_unlock;

    }



    *pnum = lbasd->num_blocks * iscsilun->block_size;

    *pnum = (int64_t) lbasd->num_blocks * iscsilun->block_size;



    if (lbasd->provisioning == SCSI_PROVISIONING_TYPE_DEALLOCATED ||

        lbasd->provisioning == SCSI_PROVISIONING_TYPE_ANCHORED) {

block/nbd-client.c

+3 −0
Original line number Diff line number Diff line
@@ -970,6 +970,7 @@ int nbd_client_init(BlockDriverState *bs, 
                    const char *export,

                    QCryptoTLSCreds *tlscreds,

                    const char *hostname,

                    const char *x_dirty_bitmap,

                    Error **errp)

{

    NBDClientSession *client = nbd_get_client_session(bs);
@@ -982,9 +983,11 @@ int nbd_client_init(BlockDriverState *bs, 
    client->info.request_sizes = true;

    client->info.structured_reply = true;

    client->info.base_allocation = true;

    client->info.x_dirty_bitmap = g_strdup(x_dirty_bitmap);

    ret = nbd_receive_negotiate(QIO_CHANNEL(sioc), export,

                                tlscreds, hostname,

                                &client->ioc, &client->info, errp);

    g_free(client->info.x_dirty_bitmap);

    if (ret < 0) {

        logout("Failed to negotiate with the NBD server\n");

        return ret;

block/nbd-client.h

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ int nbd_client_init(BlockDriverState *bs, 
                    const char *export_name,

                    QCryptoTLSCreds *tlscreds,

                    const char *hostname,

                    const char *x_dirty_bitmap,

                    Error **errp);

void nbd_client_close(BlockDriverState *bs);

block/nbd.c

+8 −2
Original line number Diff line number Diff line
@@ -378,6 +378,12 @@ static QemuOptsList nbd_runtime_opts = { 
            .type = QEMU_OPT_STRING,

            .help = "ID of the TLS credentials to use",

        },

        {

            .name = "x-dirty-bitmap",

            .type = QEMU_OPT_STRING,

            .help = "experimental: expose named dirty bitmap in place of "

                    "block status",

        },

        { /* end of list */ }

    },

};
@@ -438,8 +444,8 @@ static int nbd_open(BlockDriverState *bs, QDict *options, int flags, 
    }



    /* NBD handshake */

    ret = nbd_client_init(bs, sioc, s->export,

                          tlscreds, hostname, errp);

    ret = nbd_client_init(bs, sioc, s->export, tlscreds, hostname,

                          qemu_opt_get(opts, "x-dirty-bitmap"), errp);

 error:

    if (sioc) {

        object_unref(OBJECT(sioc));

blockdev.c

+2 −2
Original line number Diff line number Diff line
@@ -1859,7 +1859,7 @@ static void blockdev_backup_prepare(BlkActionState *common, Error **errp) 
    assert(common->action->type == TRANSACTION_ACTION_KIND_BLOCKDEV_BACKUP);

    backup = common->action->u.blockdev_backup.data;



    bs = qmp_get_root_bs(backup->device, errp);

    bs = bdrv_lookup_bs(backup->device, backup->device, errp);

    if (!bs) {

        return;

    }
@@ -3517,7 +3517,7 @@ BlockJob *do_blockdev_backup(BlockdevBackup *backup, JobTxn *txn, 
        backup->compress = false;

    }



    bs = qmp_get_root_bs(backup->device, errp);

    bs = bdrv_lookup_bs(backup->device, backup->device, errp);

    if (!bs) {

        return NULL;

    }