c8bf923d5e
This patch fixes a race condition in test-bdrv-drain that is difficult to reproduce. test-bdrv-drain sometimes fails without an error message on the block pull request sent by Kevin Wolf on Sep 4, 2023. I was able to reproduce it locally and found that "block-backend: process I/O in the current AioContext" (in this patch series) is the first commit where it reproduces. I do not know why "block-backend: process I/O in the current AioContext" exposes this bug. It might be related to the fact that the test's preadv request runs in the main thread instead of IOThread a after my commit. That might simply change the timing of the test. Now on to the race condition in test-bdrv-drain. The main thread schedules a BH in IOThread a and then drains the BDS: aio_bh_schedule_oneshot(ctx_a, test_iothread_main_thread_bh, &data); /* The request is running on the IOThread a. Draining its block device * will make sure that it has completed as far as the BDS is concerned, * but the drain in this thread can continue immediately after * bdrv_dec_in_flight() and aio_ret might be assigned only slightly * later. */ do_drain_begin(drain_type, bs); If the BH completes before do_drain_begin() then there is nothing to worry about. If the BH invokes bdrv_flush() before do_drain_begin(), then do_drain_begin() waits for it to complete. The problematic case is when do_drain_begin() runs before the BH enters bdrv_flush(). Then do_drain_begin() misses the BH and the drain mechanism has failed in quiescing I/O. Fix this by incrementing the in_flight counter so that do_drain_begin() waits for test_iothread_main_thread_bh(). Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Message-ID: <20230912231037.826804-3-stefanha@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> |
||
---|---|---|
.. | ||
check-block-qdict.c | ||
check-qdict.c | ||
check-qjson.c | ||
check-qlist.c | ||
check-qlit.c | ||
check-qnull.c | ||
check-qnum.c | ||
check-qobject.c | ||
check-qom-interface.c | ||
check-qom-proplist.c | ||
check-qstring.c | ||
crypto-tls-psk-helpers.c | ||
crypto-tls-psk-helpers.h | ||
crypto-tls-x509-helpers.c | ||
crypto-tls-x509-helpers.h | ||
io-channel-helpers.c | ||
io-channel-helpers.h | ||
iothread.c | ||
iothread.h | ||
meson.build | ||
pkix_asn1_tab.c | ||
ptimer-test-stubs.c | ||
ptimer-test.c | ||
ptimer-test.h | ||
rcutorture.c | ||
socket-helpers.c | ||
socket-helpers.h | ||
test-aio-multithread.c | ||
test-aio.c | ||
test-authz-list.c | ||
test-authz-listfile.c | ||
test-authz-pam.c | ||
test-authz-simple.c | ||
test-base64.c | ||
test-bdrv-drain.c | ||
test-bdrv-graph-mod.c | ||
test-bitcnt.c | ||
test-bitmap.c | ||
test-bitops.c | ||
test-block-backend.c | ||
test-block-iothread.c | ||
test-blockjob-txn.c | ||
test-blockjob.c | ||
test-bufferiszero.c | ||
test-char.c | ||
test-clone-visitor.c | ||
test-coroutine.c | ||
test-crypto-afsplit.c | ||
test-crypto-akcipher.c | ||
test-crypto-block.c | ||
test-crypto-cipher.c | ||
test-crypto-der.c | ||
test-crypto-hash.c | ||
test-crypto-hmac.c | ||
test-crypto-ivgen.c | ||
test-crypto-pbkdf.c | ||
test-crypto-secret.c | ||
test-crypto-tlscredsx509.c | ||
test-crypto-tlssession.c | ||
test-crypto-xts.c | ||
test-cutils.c | ||
test-div128.c | ||
test-error-report.c | ||
test-forward-visitor.c | ||
test-hbitmap.c | ||
test-image-locking.c | ||
test-int128.c | ||
test-interval-tree.c | ||
test-io-channel-buffer.c | ||
test-io-channel-command.c | ||
test-io-channel-file.c | ||
test-io-channel-null.c | ||
test-io-channel-socket.c | ||
test-io-channel-tls.c | ||
test-io-task.c | ||
test-iov.c | ||
test-keyval.c | ||
test-logging.c | ||
test-mul64.c | ||
test-nested-aio-poll.c | ||
test-opts-visitor.c | ||
test-qapi-util.c | ||
test-qdev-global-props.c | ||
test-qdist.c | ||
test-qemu-opts.c | ||
test-qga.c | ||
test-qgraph.c | ||
test-qht.c | ||
test-qmp-cmds.c | ||
test-qmp-event.c | ||
test-qobject-input-visitor.c | ||
test-qobject-output-visitor.c | ||
test-qtree.c | ||
test-rcu-list.c | ||
test-rcu-simpleq.c | ||
test-rcu-slist.c | ||
test-rcu-tailq.c | ||
test-replication.c | ||
test-seccomp.c | ||
test-shift128.c | ||
test-smp-parse.c | ||
test-string-input-visitor.c | ||
test-string-output-visitor.c | ||
test-thread-pool.c | ||
test-throttle.c | ||
test-timed-average.c | ||
test-util-filemonitor.c | ||
test-util-sockets.c | ||
test-uuid.c | ||
test-visitor-serialization.c | ||
test-vmstate.c | ||
test-write-threshold.c | ||
test-x86-cpuid.c | ||
test-xbzrle.c | ||
test-xs-node.c | ||
test-yank.c |