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 V2 1/7] net/colo-compare.c: Create event_bh with the right AioContext
Date: Fri, 22 May 2020 15:53:51 +0800 [thread overview]
Message-ID: <20200522075357.19883-2-chen.zhang@intel.com> (raw)
In-Reply-To: <20200522075357.19883-1-chen.zhang@intel.com>
From: Lukas Straub <lukasstraub2@web.de>
qemu_bh_new will set the bh to be executed in the main
loop. This causes crashes as colo_compare_handle_event assumes
that it has exclusive access the queues, which are also
concurrently accessed in the iothread.
Create the bh with the AioContext of the iothread to fulfill
these assumptions and fix the crashes. This is safe, because
the bh already takes the appropriate locks.
Signed-off-by: Lukas Straub <lukasstraub2@web.de>
Reviewed-by: Zhang Chen <chen.zhang@intel.com>
Reviewed-by: Derek Su <dereksu@qnap.com>
Tested-by: Derek Su <dereksu@qnap.com>
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
---
net/colo-compare.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/colo-compare.c b/net/colo-compare.c
index c07e7c1c09..e557da70e5 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -890,6 +890,7 @@ static void colo_compare_handle_event(void *opaque)
static void colo_compare_iothread(CompareState *s)
{
+ AioContext *ctx = iothread_get_aio_context(s->iothread);
object_ref(OBJECT(s->iothread));
s->worker_context = iothread_get_g_main_context(s->iothread);
@@ -906,7 +907,7 @@ static void colo_compare_iothread(CompareState *s)
}
colo_compare_timer_init(s);
- s->event_bh = qemu_bh_new(colo_compare_handle_event, s);
+ s->event_bh = aio_bh_new(ctx, colo_compare_handle_event, s);
}
static char *compare_get_pri_indev(Object *obj, Error **errp)
--
2.17.1
next prev parent reply other threads:[~2020-05-22 8:06 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-22 7:53 [PATCH V2 0/7] Latest COLO tree queued patches Zhang Chen
2020-05-22 7:53 ` Zhang Chen [this message]
2020-05-22 7:53 ` [PATCH V2 2/7] chardev/char.c: Use qemu_co_sleep_ns if in coroutine Zhang Chen
2020-05-22 7:53 ` [PATCH V2 3/7] net/colo-compare.c: Fix deadlock in compare_chr_send Zhang Chen
2020-05-22 7:53 ` [PATCH V2 4/7] net/colo-compare.c: Only hexdump packets if tracing is enabled Zhang Chen
2020-05-22 7:53 ` [PATCH V2 5/7] net/colo-compare.c: Check that colo-compare is active Zhang Chen
2020-05-22 7:53 ` [PATCH V2 6/7] net/colo-compare.c: Correct ordering in complete and finalize Zhang Chen
2020-05-22 7:53 ` [PATCH V2 7/7] colo-compare: Fix memory leak in packet_enqueue() Zhang Chen
2020-05-25 2:46 ` [PATCH V2 0/7] Latest COLO tree queued patches Jason Wang
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=20200522075357.19883-2-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).