From 0caba353a8208065904c8a1c80da8f0a8163bc76 Mon Sep 17 00:00:00 2001

From: Stefan Hajnoczi <stefanha@redhat.com>

Date: Fri, 22 Dec 2017 11:08:52 +0100

Subject: [PATCH 34/42] block: don't keep AioContext acquired after

 blockdev_backup_prepare()

RH-Author: Stefan Hajnoczi <stefanha@redhat.com>

Message-id: <20171222110900.24813-13-stefanha@redhat.com>

Patchwork-id: 78497

O-Subject: [RHV7.5 qemu-kvm-rhev PATCH 12/20] block: don't keep AioContext acquired after blockdev_backup_prepare()

Bugzilla: 1519721

RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>

RH-Acked-by: Jeffrey Cody <jcody@redhat.com>

RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

Reviewed-by: Kevin Wolf <kwolf@redhat.com>

Reviewed-by: Eric Blake <eblake@redhat.com>

Message-id: 20171206144550.22295-5-stefanha@redhat.com

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

(cherry picked from commit edd5adeecddf665e7954bc146ff458bb30f178ae)

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 blockdev.c | 44 ++++++++++++++++++++++++++++++++++----------

 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/blockdev.c b/blockdev.c

index c962b8a..6efae53 100644

--- a/blockdev.c

+++ b/blockdev.c

@@ -1979,7 +1979,6 @@ typedef struct BlockdevBackupState {

     BlkActionState common;

     BlockDriverState *bs;

     BlockJob *job;

-    AioContext *aio_context;

 } BlockdevBackupState;

 static BlockJob *do_blockdev_backup(BlockdevBackup *backup, BlockJobTxn *txn,

@@ -1990,6 +1989,7 @@ static void blockdev_backup_prepare(BlkActionState *common, Error **errp)

     BlockdevBackupState *state = DO_UPCAST(BlockdevBackupState, common, common);

     BlockdevBackup *backup;

     BlockDriverState *bs, *target;

+    AioContext *aio_context;

     Error *local_err = NULL;

     assert(common->action->type == TRANSACTION_ACTION_KIND_BLOCKDEV_BACKUP);

@@ -2005,29 +2005,39 @@ static void blockdev_backup_prepare(BlkActionState *common, Error **errp)

         return;

     }

-    /* AioContext is released in .clean() */

-    state->aio_context = bdrv_get_aio_context(bs);

-    if (state->aio_context != bdrv_get_aio_context(target)) {

-        state->aio_context = NULL;

+    aio_context = bdrv_get_aio_context(bs);

+    if (aio_context != bdrv_get_aio_context(target)) {

         error_setg(errp, "Backup between two IO threads is not implemented");

         return;

     }

-    aio_context_acquire(state->aio_context);

+    aio_context_acquire(aio_context);

     state->bs = bs;

+

+    /* Paired with .clean() */

     bdrv_drained_begin(state->bs);

     state->job = do_blockdev_backup(backup, common->block_job_txn, &local_err);

     if (local_err) {

         error_propagate(errp, local_err);

-        return;

+        goto out;

     }

+

+out:

+    aio_context_release(aio_context);

 }

 static void blockdev_backup_commit(BlkActionState *common)

 {

     BlockdevBackupState *state = DO_UPCAST(BlockdevBackupState, common, common);

+    AioContext *aio_context;

+

+    aio_context = bdrv_get_aio_context(state->bs);

+    aio_context_acquire(aio_context);

+

     assert(state->job);

     block_job_start(state->job);

+

+    aio_context_release(aio_context);

 }

 static void blockdev_backup_abort(BlkActionState *common)

@@ -2035,18 +2045,32 @@ static void blockdev_backup_abort(BlkActionState *common)

     BlockdevBackupState *state = DO_UPCAST(BlockdevBackupState, common, common);

     if (state->job) {

+        AioContext *aio_context;

+

+        aio_context = bdrv_get_aio_context(state->bs);

+        aio_context_acquire(aio_context);

+

         block_job_cancel_sync(state->job);

+

+        aio_context_release(aio_context);

     }

 }

 static void blockdev_backup_clean(BlkActionState *common)

 {

     BlockdevBackupState *state = DO_UPCAST(BlockdevBackupState, common, common);

+    AioContext *aio_context;

-    if (state->aio_context) {

-        bdrv_drained_end(state->bs);

-        aio_context_release(state->aio_context);

+    if (!state->bs) {

+        return;

     }

+

+    aio_context = bdrv_get_aio_context(state->bs);

+    aio_context_acquire(aio_context);

+

+    bdrv_drained_end(state->bs);

+

+    aio_context_release(aio_context);

 }

 typedef struct BlockDirtyBitmapState {

-- 

1.8.3.1