diff mbox series

[10/78] backup-top: Begin drain earlier

Message ID	20200616141547.24664-11-mdroth@linux.vnet.ibm.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=Y094=75=nongnu.org=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9C0EA20786 From: Michael Roth <mdroth@linux.vnet.ibm.com> To: qemu-devel@nongnu.org Subject: [PATCH 10/78] backup-top: Begin drain earlier Date: Tue, 16 Jun 2020 09:14:39 -0500 Message-Id: <20200616141547.24664-11-mdroth@linux.vnet.ibm.com> In-Reply-To: <20200616141547.24664-1-mdroth@linux.vnet.ibm.com> References: <20200616141547.24664-1-mdroth@linux.vnet.ibm.com> Received-SPF: pass client-ip=2607:f8b0:4864:20::244; envelope-from=flukshun@gmail.com; helo=mail-oi1-x244.google.com Precedence: list Cc: qemu-stable@nongnu.org, Max Reitz <mreitz@redhat.com> Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org>
Series	Patch Round-up for stable 4.2.1, freeze on 2020-06-22 \| expand [00/78] Patch Round-up for stable 4.2.1, freeze on 2020-06-22 [01/78] block/nbd: extract the common cleanup code [02/78] block/nbd: fix memory leak in nbd_open() [03/78] i386: Resolve CPU models to v1 by default [04/78] qapi: better document NVMe blockdev @device parameter [05/78] target/arm: ensure we use current exception state after SCR update [06/78] block: Activate recursively even for already active nodes [07/78] virtio-blk: fix out-of-bounds access to bitmap in notify_guest_bh [08/78] numa: remove not needed check [09/78] numa: properly check if numa is supported [10/78] backup-top: Begin drain earlier [11/78] arm/arm-powerctl: set NSACR.{CP11, CP10} bits in arm_set_cpu_on() [12/78] arm/arm-powerctl: rebuild hflags after setting CP15 bits in arm_set_cpu_on() [13/78] hw/i386/pc: fix regression in parsing vga cmdline parameter [14/78] tests/ide-test: Create a single unit-test covering more PRDT cases [15/78] ide: Fix incorrect handling of some PRDTs in ide_dma_cb() [16/78] target/arm: Set ISSIs16Bit in make_issinfo [17/78] virtio: update queue size on guest write [18/78] virtio-mmio: update queue size on guest write [19/78] virtio: add ability to delete vq through a pointer [20/78] virtio: make virtio_delete_queue idempotent [21/78] virtio: reset region cache when on queue deletion [22/78] virtio-net: delete also control queue when TX/RX deleted [23/78] intel_iommu: a fix to vtd_find_as_from_bus_num() [24/78] intel_iommu: add present bit check for pasid table entries [25/78] vfio/pci: Don't remove irqchip notifier if not registered [26/78] qcow2-bitmaps: fix qcow2_can_store_new_dirty_bitmap [27/78] dp8393x: Mask EOL bit from descriptor addresses [28/78] dp8393x: Always use 32-bit accesses [29/78] dp8393x: Clean up endianness hacks [30/78] dp8393x: Have dp8393x_receive() return the packet size [31/78] dp8393x: Update LLFA and CRDA registers from rx descriptor [32/78] dp8393x: Clear RRRA command register bit only when appropriate [33/78] dp8393x: Implement packet size limit and RBAE interrupt [34/78] dp8393x: Don't clobber packet checksum [35/78] dp8393x: Use long-word-aligned RRA pointers in 32-bit mode [36/78] dp8393x: Pad frames to word or long word boundary [37/78] dp8393x: Clear descriptor in_use field to release packet [38/78] dp8393x: Always update RRA pointers and sequence numbers [39/78] dp8393x: Don't reset Silicon Revision register [40/78] dp8393x: Don't stop reception upon RBE interrupt assertion [41/78] s390/sclp: improve special wait psw logic [42/78] plugins/core: add missing break in cb_to_tcg_flags [43/78] tcg: save vaddr temp for plugin usage [44/78] qcow2: update_refcount(): Reset old_table_index after qcow2_cache_put() [45/78] qcow2: Fix qcow2_alloc_cluster_abort() for external data file [46/78] iotests: Test copy offloading with external data file [47/78] qcow2: Fix alloc_cluster_abort() for pre-existing clusters [48/78] iotests/026: Test EIO on preallocated zero cluster [49/78] iotests/026: Test EIO on allocation in a data-file [50/78] virtio: gracefully handle invalid region caches [51/78] scsi/qemu-pr-helper: Fix out-of-bounds access to trnptid_list[] [52/78] block/qcow2-threads: fix qcow2_decompress [53/78] job: refactor progress to separate object [54/78] block/block-copy: fix progress calculation [55/78] target/ppc: Fix rlwinm on ppc64 [56/78] block/io: fix bdrv_co_do_copy_on_readv [57/78] compat: disable edid on correct virtio-gpu device [58/78] qga: Installer: Wait for installation to finish [59/78] qga-win: Handle VSS_E_PROVIDER_ALREADY_REGISTERED error [60/78] qga-win: prevent crash when executing guest-file-read with large count [61/78] qga: Fix undefined C behavior [62/78] qemu-ga: document vsock-listen in the man page [63/78] hw/i386/amd_iommu.c: Fix corruption of log events passed to guest [64/78] tcg/i386: Fix INDEX_op_dup2_vec [65/78] dump: Fix writing of ELF section [66/78] xen-block: Fix double qlist remove and request leak [67/78] vhost-user-gpu: Release memory returned by vu_queue_pop() with free() [68/78] target/ppc: Fix mtmsr(d) L=1 variant that loses interrupts [69/78] hostmem: don't use mbind() if host-nodes is empty [70/78] target/arm: Clear tail in gvec_fmul_idx_, gvec_fmla_idx_ [71/78] qemu-nbd: Close inherited stderr [72/78] 9p: Lock directory streams with a CoMutex [73/78] net: Do not include a newline in the id of -nic devices [74/78] nbd/server: Avoid long error message assertions CVE-2020-10761 [75/78] virtio-balloon: fix free page hinting without an iothread [76/78] virtio-balloon: fix free page hinting check on unrealize [77/78] virtio-balloon: unref the iothread when unrealizing [78/78] block: Call attention to truncation of long NBD exports

Commit Message

Michael Roth June 16, 2020, 2:14 p.m. UTC

From: Max Reitz <mreitz@redhat.com>

When dropping backup-top, we need to drain the node before freeing the
BlockCopyState.  Otherwise, requests may still be in flight and then the
assertion in shres_destroy() will fail.

(This becomes visible in intermittent failure of 056.)

Cc: qemu-stable@nongnu.org
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20191219182638.104621-1-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
(cherry picked from commit 503ca1262bab2c11c533a4816d1ff4297d4f58a6)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 block/backup-top.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/block/backup-top.c b/block/backup-top.c
index 7cdb1f8eba..818d3f26b4 100644
--- a/block/backup-top.c
+++ b/block/backup-top.c
@@ -257,12 +257,12 @@  void bdrv_backup_top_drop(BlockDriverState *bs)
     BDRVBackupTopState *s = bs->opaque;
     AioContext *aio_context = bdrv_get_aio_context(bs);
 
-    block_copy_state_free(s->bcs);
-
     aio_context_acquire(aio_context);
 
     bdrv_drained_begin(bs);
 
+    block_copy_state_free(s->bcs);
+
     s->active = false;
     bdrv_child_refresh_perms(bs, bs->backing, &error_abort);
     bdrv_replace_node(bs, backing_bs(bs), &error_abort);