b0c44badd0
- kvm-block-graph-lock-fix-missed-wakeup-in-bdrv_graph_co_.patch [RHEL-216952] - kvm-block-curl-fix-curl-internal-handles-handling.patch [RHEL-216952] - kvm-block-curl.c-Use-explicit-long-constants-in-curl_eas.patch [RHEL-216952] - kvm-block-curl.c-Fix-CURLOPT_VERBOSE-parameter-type.patch [RHEL-216952] - kvm-block-curl-fix-concurrent-completion-handling.patch [RHEL-216952] - kvm-block-curl-free-s-password-in-cleanup-paths.patch [RHEL-216952] - kvm-nvme-Kick-and-check-completions-in-BDS-context.patch [RHEL-216952] - kvm-nvme-Note-in-which-AioContext-some-functions-run.patch [RHEL-216952] - kvm-block-remove-detached-header-option-from-opts-after-.patch [RHEL-216952] - kvm-block-fix-luks-amend-when-run-in-coroutine.patch [RHEL-216952] - kvm-qed-Don-t-try-to-flush-during-incoming-migration.patch [RHEL-216952] - kvm-block-vmdk-fix-OOB-read-in-vmdk_read_extent.patch [RHEL-216952] - kvm-block-throttle-groups-fix-deadlock-with-iolimits-and.patch [RHEL-216952] - kvm-throttle-group-Fix-race-condition-in-throttle_group_.patch [RHEL-216952] - kvm-qemu-img-Fix-amend-option-parse-error-handling.patch [RHEL-216952] - kvm-qemu-img-rebase-don-t-exceed-IO_BUF_SIZE-in-one-oper.patch [RHEL-216952] - kvm-python-backport-drop-Python3.6-workarounds.patch [RHEL-216952] - kvm-python-backport-Remove-deprecated-get_event_loop-cal.patch [RHEL-216952] - kvm-python-backport-avoid-creating-additional-event-loop.patch [RHEL-216952] - kvm-iotests-147-ensure-temporary-sockets-are-closed-befo.patch [RHEL-216952] - kvm-iotests-151-ensure-subprocesses-are-cleaned-up.patch [RHEL-216952] - kvm-tests-qemu-iotest-fix-iotest-024-with-qed-images.patch [RHEL-216952] - kvm-tests-qemu-iotests-Fix-check-for-existing-file-in-_r.patch [RHEL-216952] - kvm-async-access-bottom-half-flags-with-qatomic_read.patch [RHEL-216952] - kvm-block-linux-aio-bound-ioq_submit-recursion-depth.patch [RHEL-216952] - kvm-block-io-fallback-to-bounce-buffer-if-BLKZEROOUT-is-.patch [RHEL-216952] - kvm-file-posix-populate-pwrite_zeroes_alignment.patch [RHEL-216952] - kvm-block-use-pwrite_zeroes_alignment-when-writing-first.patch [RHEL-216952] - kvm-iotests-add-Linux-loop-device-image-creation-test.patch [RHEL-216952] - kvm-virtio-Fix-crash-when-sriov-pf-is-set-for-non-PCI-Ex.patch [RHEL-216952] - kvm-virtio-scsi-pass-the-same-cdb_size-to-virtio_scsi_po.patch [RHEL-216952] - kvm-hw-scsi-avoid-deadlock-upon-TMF-request-cancelling-w.patch [RHEL-216952] - kvm-virtio-blk-fix-zone-report-buffer-out-of-memory-CVE-.patch [RHEL-216952] - kvm-ide-Fix-potential-assertion-failure-on-VM-stop-for-P.patch [RHEL-216952] - kvm-block-Create-DEFAULT_BLOCK_CONF-macro.patch [RHEL-216952] - kvm-block-Add-more-defaults-to-DEFAULT_BLOCK_CONF.patch [RHEL-216952] - kvm-block-mirror-check-range-when-setting-zero-bitmap-fo.patch [RHEL-216952] - kvm-iotests-test-active-mirror-with-unaligned-small-writ.patch [RHEL-216952] - kvm-block-mirror-fix-assertion-failure-upon-duplicate-co.patch [RHEL-216952] - kvm-commit-Drain-nodes-across-all-of-bdrv_commit.patch [RHEL-216952] - kvm-qemu-io-Add-aio_discard-command.patch [RHEL-216952] - kvm-qcow2-Fix-corruption-on-discard-during-write-with-CO.patch [RHEL-216952] - kvm-iotests-046-Test-that-discard-write_zeroes-wait-for-.patch [RHEL-216952] - kvm-qcow2-Fix-data-loss-on-zero-write-with-detect-zeroes.patch [RHEL-216952] - kvm-block-Fix-crash-after-setting-latency-historygram-wi.patch [RHEL-216952] - Resolves: RHEL-216952 (virt-storage: Backport stable branch fixes [rhel-9])
70 lines
2.7 KiB
Diff
70 lines
2.7 KiB
Diff
From fa878edb9d9532fc33fc8c4d1e7ea37e111a6658 Mon Sep 17 00:00:00 2001
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Mon, 13 Oct 2025 18:24:54 +0200
|
|
Subject: [PATCH 24/45] async: access bottom half flags with qatomic_read
|
|
|
|
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
RH-MergeRequest: 515: virt-storage: Backport stable branch fixes [9.9]
|
|
RH-Jira: RHEL-216952
|
|
RH-Acked-by: Hanna Czenczek <hreitz@redhat.com>
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
RH-Commit: [24/45] e8ea4f948d8a5101342f9b689c4974a4a799ccdc (kmwolf/centos-qemu-kvm)
|
|
|
|
Running test-aio-multithread under TSAN reveals data races on bh->flags.
|
|
Because bottom halves may be scheduled or canceled asynchronously,
|
|
without taking a lock, adjust aio_compute_bh_timeout() and aio_ctx_check()
|
|
to use a relaxed read to access the flags.
|
|
|
|
Use an acquire load to ensure that anything that was written prior to
|
|
qemu_bh_schedule() is visible.
|
|
|
|
Closes: https://gitlab.com/qemu-project/qemu/-/issues/2749
|
|
Closes: https://gitlab.com/qemu-project/qemu/-/issues/851
|
|
Cc: qemu-stable@nongnu.org
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit 5142397c79330aab9bef3230991c8ac0c251110f)
|
|
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
---
|
|
util/async.c | 11 +++++++----
|
|
1 file changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/util/async.c b/util/async.c
|
|
index 2719c629ae..a736d2cd0d 100644
|
|
--- a/util/async.c
|
|
+++ b/util/async.c
|
|
@@ -256,8 +256,9 @@ static int64_t aio_compute_bh_timeout(BHList *head, int timeout)
|
|
QEMUBH *bh;
|
|
|
|
QSLIST_FOREACH_RCU(bh, head, next) {
|
|
- if ((bh->flags & (BH_SCHEDULED | BH_DELETED)) == BH_SCHEDULED) {
|
|
- if (bh->flags & BH_IDLE) {
|
|
+ int flags = qatomic_load_acquire(&bh->flags);
|
|
+ if ((flags & (BH_SCHEDULED | BH_DELETED)) == BH_SCHEDULED) {
|
|
+ if (flags & BH_IDLE) {
|
|
/* idle bottom halves will be polled at least
|
|
* every 10ms */
|
|
timeout = 10000000;
|
|
@@ -335,14 +336,16 @@ aio_ctx_check(GSource *source)
|
|
aio_notify_accept(ctx);
|
|
|
|
QSLIST_FOREACH_RCU(bh, &ctx->bh_list, next) {
|
|
- if ((bh->flags & (BH_SCHEDULED | BH_DELETED)) == BH_SCHEDULED) {
|
|
+ int flags = qatomic_load_acquire(&bh->flags);
|
|
+ if ((flags & (BH_SCHEDULED | BH_DELETED)) == BH_SCHEDULED) {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
QSIMPLEQ_FOREACH(s, &ctx->bh_slice_list, next) {
|
|
QSLIST_FOREACH_RCU(bh, &s->bh_list, next) {
|
|
- if ((bh->flags & (BH_SCHEDULED | BH_DELETED)) == BH_SCHEDULED) {
|
|
+ int flags = qatomic_load_acquire(&bh->flags);
|
|
+ if ((flags & (BH_SCHEDULED | BH_DELETED)) == BH_SCHEDULED) {
|
|
return true;
|
|
}
|
|
}
|
|
--
|
|
2.52.0
|
|
|