| From 46887feac666d0d7633ff3f5af5721fe2a80a8ab Mon Sep 17 00:00:00 2001 |
| From: Kevin Wolf <kwolf@redhat.com> |
| Date: Wed, 8 Apr 2020 17:29:13 +0100 |
| Subject: [PATCH 2/6] replication: assert we own context before job_cancel_sync |
| |
| RH-Author: Kevin Wolf <kwolf@redhat.com> |
| Message-id: <20200408172917.18712-3-kwolf@redhat.com> |
| Patchwork-id: 94595 |
| O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 2/6] replication: assert we own context before job_cancel_sync |
| Bugzilla: 1817621 |
| RH-Acked-by: Eric Blake <eblake@redhat.com> |
| RH-Acked-by: Danilo de Paula <ddepaula@redhat.com> |
| RH-Acked-by: Max Reitz <mreitz@redhat.com> |
| |
| From: Stefan Reiter <s.reiter@proxmox.com> |
| |
| job_cancel_sync requires the job's lock to be held, all other callers |
| already do this (replication_stop, drive_backup_abort, |
| blockdev_backup_abort, job_cancel_sync_all, cancel_common). |
| |
| In this case we're in a BlockDriver handler, so we already have a lock, |
| just assert that it is the same as the one used for the commit_job. |
| |
| Signed-off-by: Stefan Reiter <s.reiter@proxmox.com> |
| Message-Id: <20200407115651.69472-3-s.reiter@proxmox.com> |
| Signed-off-by: Kevin Wolf <kwolf@redhat.com> |
| (cherry picked from commit 08558e33257ec796594bd411261028a93414a70c) |
| Signed-off-by: Kevin Wolf <kwolf@redhat.com> |
| Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com> |
| |
| block/replication.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| diff --git a/block/replication.c b/block/replication.c |
| index 99532ce..0ce27ee 100644 |
| |
| |
| @@ -144,12 +144,15 @@ fail: |
| static void replication_close(BlockDriverState *bs) |
| { |
| BDRVReplicationState *s = bs->opaque; |
| + Job *commit_job; |
| |
| if (s->stage == BLOCK_REPLICATION_RUNNING) { |
| replication_stop(s->rs, false, NULL); |
| } |
| if (s->stage == BLOCK_REPLICATION_FAILOVER) { |
| - job_cancel_sync(&s->commit_job->job); |
| + commit_job = &s->commit_job->job; |
| + assert(commit_job->aio_context == qemu_get_current_aio_context()); |
| + job_cancel_sync(commit_job); |
| } |
| |
| if (s->mode == REPLICATION_MODE_SECONDARY) { |
| -- |
| 1.8.3.1 |
| |