[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 04/20] block/export: only acquire AioContext once for vhost_us
From: |
Stefan Hajnoczi |
Subject: |
[PATCH v3 04/20] block/export: only acquire AioContext once for vhost_user_server_stop() |
Date: |
Thu, 20 Apr 2023 07:37:16 -0400 |
vhost_user_server_stop() uses AIO_WAIT_WHILE(). AIO_WAIT_WHILE()
requires that AioContext is only acquired once.
Since blk_exp_request_shutdown() already acquires the AioContext it
shouldn't be acquired again in vhost_user_server_stop().
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
util/vhost-user-server.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/util/vhost-user-server.c b/util/vhost-user-server.c
index 40f36ea214..5b6216069c 100644
--- a/util/vhost-user-server.c
+++ b/util/vhost-user-server.c
@@ -346,10 +346,9 @@ static void vu_accept(QIONetListener *listener,
QIOChannelSocket *sioc,
aio_context_release(server->ctx);
}
+/* server->ctx acquired by caller */
void vhost_user_server_stop(VuServer *server)
{
- aio_context_acquire(server->ctx);
-
qemu_bh_delete(server->restart_listener_bh);
server->restart_listener_bh = NULL;
@@ -366,8 +365,6 @@ void vhost_user_server_stop(VuServer *server)
AIO_WAIT_WHILE(server->ctx, server->co_trip);
}
- aio_context_release(server->ctx);
-
if (server->listener) {
qio_net_listener_disconnect(server->listener);
object_unref(OBJECT(server->listener));
--
2.39.2
- [PATCH v3 11/20] xen-block: implement BlockDevOps->drained_begin(), (continued)
- [PATCH v3 11/20] xen-block: implement BlockDevOps->drained_begin(), Stefan Hajnoczi, 2023/04/20
- [PATCH v3 02/20] virtio-scsi: avoid race between unplug and transport event, Stefan Hajnoczi, 2023/04/20
- [PATCH v3 12/20] hw/xen: do not set is_external=true on evtchn fds, Stefan Hajnoczi, 2023/04/20
- [PATCH v3 09/20] block: add blk_in_drain() API, Stefan Hajnoczi, 2023/04/20
- [PATCH v3 15/20] block/fuse: do not set is_external=true on FUSE fd, Stefan Hajnoczi, 2023/04/20
- [PATCH v3 01/20] hw/qdev: introduce qdev_is_realized() helper, Stefan Hajnoczi, 2023/04/20
- [PATCH v3 20/20] aio: remove aio_disable_external() API, Stefan Hajnoczi, 2023/04/20
- [PATCH v3 03/20] virtio-scsi: stop using aio_disable_external() during unplug, Stefan Hajnoczi, 2023/04/20
- [PATCH v3 04/20] block/export: only acquire AioContext once for vhost_user_server_stop(),
Stefan Hajnoczi <=
- [PATCH v3 05/20] util/vhost-user-server: rename refcount to in_flight counter, Stefan Hajnoczi, 2023/04/20
- [PATCH v3 06/20] block/export: wait for vhost-user-blk requests when draining, Stefan Hajnoczi, 2023/04/20
- [PATCH v3 14/20] block/export: don't require AioContext lock around blk_exp_ref/unref(), Stefan Hajnoczi, 2023/04/20
- [PATCH v3 13/20] block/export: rewrite vduse-blk drain code, Stefan Hajnoczi, 2023/04/20
- [PATCH v3 19/20] virtio: do not set is_external=true on host notifiers, Stefan Hajnoczi, 2023/04/20
- [PATCH v3 18/20] virtio-scsi: implement BlockDevOps->drained_begin(), Stefan Hajnoczi, 2023/04/20
- [PATCH v3 17/20] virtio-blk: implement BlockDevOps->drained_begin(), Stefan Hajnoczi, 2023/04/20