From: Zhang Chen <chen.zhang@intel.com >
To: Jason Wang <jasowang@redhat.com>
Cc: Zhang Chen <chen.zhang@intel.com>,
Lukas Straub <lukasstraub2@web.de>,
qemu-dev <qemu-devel@nongnu.org>,
Zhang Chen <zhangckid@gmail.com>
Subject: [PATCH 7/7] net/colo-compare.c: Correct ordering in complete and finalize
Date: Wed, 20 May 2020 04:02:07 +0800 [thread overview]
Message-ID: <20200519200207.17773-8-chen.zhang@intel.com> (raw)
In-Reply-To: <20200519200207.17773-1-chen.zhang@intel.com>
From: Lukas Straub <lukasstraub2@web.de>
In colo_compare_complete, insert CompareState into net_compares
only after everything has been initialized.
In colo_compare_finalize, remove CompareState from net_compares
before anything is deinitialized.
Signed-off-by: Lukas Straub <lukasstraub2@web.de>
Reviewed-by: Zhang Chen <chen.zhang@intel.com>
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
---
net/colo-compare.c | 45 +++++++++++++++++++++++----------------------
1 file changed, 23 insertions(+), 22 deletions(-)
diff --git a/net/colo-compare.c b/net/colo-compare.c
index 1ee8b9dc3c..8632681229 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -1290,15 +1290,6 @@ static void colo_compare_complete(UserCreatable *uc, Error **errp)
s->vnet_hdr);
}
- qemu_mutex_lock(&colo_compare_mutex);
- if (!colo_compare_active) {
- qemu_mutex_init(&event_mtx);
- qemu_cond_init(&event_complete_cond);
- colo_compare_active = true;
- }
- QTAILQ_INSERT_TAIL(&net_compares, s, next);
- qemu_mutex_unlock(&colo_compare_mutex);
-
s->out_sendco.s = s;
s->out_sendco.chr = &s->chr_out;
s->out_sendco.notify_remote_frame = false;
@@ -1321,6 +1312,16 @@ static void colo_compare_complete(UserCreatable *uc, Error **errp)
connection_destroy);
colo_compare_iothread(s);
+
+ qemu_mutex_lock(&colo_compare_mutex);
+ if (!colo_compare_active) {
+ qemu_mutex_init(&event_mtx);
+ qemu_cond_init(&event_complete_cond);
+ colo_compare_active = true;
+ }
+ QTAILQ_INSERT_TAIL(&net_compares, s, next);
+ qemu_mutex_unlock(&colo_compare_mutex);
+
return;
}
@@ -1389,19 +1390,6 @@ static void colo_compare_finalize(Object *obj)
CompareState *s = COLO_COMPARE(obj);
CompareState *tmp = NULL;
- qemu_chr_fe_deinit(&s->chr_pri_in, false);
- qemu_chr_fe_deinit(&s->chr_sec_in, false);
- qemu_chr_fe_deinit(&s->chr_out, false);
- if (s->notify_dev) {
- qemu_chr_fe_deinit(&s->chr_notify_dev, false);
- }
-
- if (s->iothread) {
- colo_compare_timer_del(s);
- }
-
- qemu_bh_delete(s->event_bh);
-
qemu_mutex_lock(&colo_compare_mutex);
QTAILQ_FOREACH(tmp, &net_compares, next) {
if (tmp == s) {
@@ -1416,6 +1404,19 @@ static void colo_compare_finalize(Object *obj)
}
qemu_mutex_unlock(&colo_compare_mutex);
+ qemu_chr_fe_deinit(&s->chr_pri_in, false);
+ qemu_chr_fe_deinit(&s->chr_sec_in, false);
+ qemu_chr_fe_deinit(&s->chr_out, false);
+ if (s->notify_dev) {
+ qemu_chr_fe_deinit(&s->chr_notify_dev, false);
+ }
+
+ if (s->iothread) {
+ colo_compare_timer_del(s);
+ }
+
+ qemu_bh_delete(s->event_bh);
+
AioContext *ctx = iothread_get_aio_context(s->iothread);
aio_context_acquire(ctx);
AIO_WAIT_WHILE(ctx, !s->out_sendco.done);
--
2.17.1
next prev parent reply other threads:[~2020-05-19 20:15 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-19 20:02 [PATCH 0/7] Latest COLO tree queued patches Zhang Chen
2020-05-19 20:02 ` [PATCH 1/7] colo-compare: Fix memory leak in packet_enqueue() Zhang Chen
2020-05-20 5:52 ` Philippe Mathieu-Daudé
2020-05-19 20:02 ` [PATCH 2/7] net/colo-compare.c: Create event_bh with the right AioContext Zhang Chen
2020-05-19 20:02 ` [PATCH 3/7] chardev/char.c: Use qemu_co_sleep_ns if in coroutine Zhang Chen
2020-05-20 5:34 ` Philippe Mathieu-Daudé
2020-05-19 20:02 ` [PATCH 4/7] net/colo-compare.c: Fix deadlock in compare_chr_send Zhang Chen
2020-05-19 20:02 ` [PATCH 5/7] net/colo-compare.c: Only hexdump packets if tracing is enabled Zhang Chen
2020-05-19 20:02 ` [PATCH 6/7] net/colo-compare.c, softmmu/vl.c: Check that colo-compare is active Zhang Chen
2020-05-19 20:02 ` Zhang Chen [this message]
2020-05-20 2:47 ` [PATCH 0/7] Latest COLO tree queued patches Jason Wang
2020-05-20 4:41 ` no-reply
2020-05-20 9:07 ` Zhang, Chen
2020-05-20 12:22 ` Jason Wang
2020-05-21 1:30 ` Zhang, Chen
2020-05-21 19:54 ` Lukas Straub
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200519200207.17773-8-chen.zhang@intel.com \
--to=chen.zhang@intel.com \
--cc=jasowang@redhat.com \
--cc=lukasstraub2@web.de \
--cc=qemu-devel@nongnu.org \
--cc=zhangckid@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).