summary refs log tree commit diff stats
path: root/include/sysemu/block-backend.h
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2017-06-05 14:38:58 +0200
committerFam Zheng <famz@redhat.com>2017-06-16 07:55:00 +0800
commit93001e9d87ae40e7569eb0ece0eb86d9c9582e41 (patch)
tree5a1566507d01274c72ed7fa3cca5c845a3a7e8d5 /include/sysemu/block-backend.h
parent3b170dc86732539ebc5927880097d32d4f11df8c (diff)
downloadfocaccia-qemu-93001e9d87ae40e7569eb0ece0eb86d9c9582e41.tar.gz
focaccia-qemu-93001e9d87ae40e7569eb0ece0eb86d9c9582e41.zip
throttle-groups: protect throttled requests with a CoMutex
Another possibility is to use tg->lock, which we're holding anyway in
both schedule_next_request and throttle_group_co_io_limits_intercept.
This would require open-coding the CoQueue however, so I've chosen this
alternative.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20170605123908.18777-10-pbonzini@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Diffstat (limited to 'include/sysemu/block-backend.h')
-rw-r--r--include/sysemu/block-backend.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
index 24b63d6b03..999eb2333a 100644
--- a/include/sysemu/block-backend.h
+++ b/include/sysemu/block-backend.h
@@ -72,11 +72,8 @@ typedef struct BlockDevOps {
  * fields that must be public. This is in particular for QLIST_ENTRY() and
  * friends so that BlockBackends can be kept in lists outside block-backend.c */
 typedef struct BlockBackendPublic {
-    /* I/O throttling has its own locking, but also some fields are
-     * protected by the AioContext lock.
-     */
-
-    /* Protected by AioContext lock.  */
+    /* throttled_reqs_lock protects the CoQueues for throttled requests.  */
+    CoMutex      throttled_reqs_lock;
     CoQueue      throttled_reqs[2];
 
     /* Nonzero if the I/O limits are currently being ignored; generally