[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH V2 1/7] net/colo-compare.c: Create event_bh with the right AioCon
From: |
Zhang Chen |
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 |
From: Lukas Straub <address@hidden>
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 <address@hidden>
Reviewed-by: Zhang Chen <address@hidden>
Reviewed-by: Derek Su <address@hidden>
Tested-by: Derek Su <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
---
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
- [PATCH V2 0/7] Latest COLO tree queued patches, Zhang Chen, 2020/05/22
- [PATCH V2 2/7] chardev/char.c: Use qemu_co_sleep_ns if in coroutine, Zhang Chen, 2020/05/22
- [PATCH V2 1/7] net/colo-compare.c: Create event_bh with the right AioContext,
Zhang Chen <=
- [PATCH V2 3/7] net/colo-compare.c: Fix deadlock in compare_chr_send, Zhang Chen, 2020/05/22
- [PATCH V2 4/7] net/colo-compare.c: Only hexdump packets if tracing is enabled, Zhang Chen, 2020/05/22
- [PATCH V2 5/7] net/colo-compare.c: Check that colo-compare is active, Zhang Chen, 2020/05/22
- [PATCH V2 6/7] net/colo-compare.c: Correct ordering in complete and finalize, Zhang Chen, 2020/05/22
- [PATCH V2 7/7] colo-compare: Fix memory leak in packet_enqueue(), Zhang Chen, 2020/05/22
- Re: [PATCH V2 0/7] Latest COLO tree queued patches, Jason Wang, 2020/05/24