From patchwork Fri Sep 2 15:19:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 113160 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C8B4CB6F81 for ; Sat, 3 Sep 2011 01:20:28 +1000 (EST) Received: from localhost ([::1]:34781 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzVXc-0002rZ-K2 for incoming@patchwork.ozlabs.org; Fri, 02 Sep 2011 11:20:24 -0400 Received: from eggs.gnu.org ([140.186.70.92]:46372) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzVXO-0002UE-3L for qemu-devel@nongnu.org; Fri, 02 Sep 2011 11:20:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QzVXI-0006Jk-0C for qemu-devel@nongnu.org; Fri, 02 Sep 2011 11:20:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61666) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzVXH-0006IV-LZ for qemu-devel@nongnu.org; Fri, 02 Sep 2011 11:20:03 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p82FJuY1014045 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 2 Sep 2011 11:19:56 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-17.ams2.redhat.com [10.36.116.17]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p82FJtFW003430; Fri, 2 Sep 2011 11:19:55 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 9FB0F4161A; Fri, 2 Sep 2011 17:19:54 +0200 (CEST) From: Gerd Hoffmann To: spice-devel@freedesktop.org Date: Fri, 2 Sep 2011 17:19:54 +0200 Message-Id: <1314976794-31931-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: qemu-devel@nongnu.org, Gerd Hoffmann Subject: [Qemu-devel] [PATCH] server: don't call reds_stream_free from worker thread context X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org reds_stream_free() may call the channel_event callback which is not supposed to be callsed from worker thread context. This patch moves the reds_stream_free call for the display channel from the worker to the dispatcher to fix this issue. [ Note: not tested yet, against 0.8 branch, sending out for review & comments nevertheless ] Signed-off-by: Gerd Hoffmann --- server/red_dispatcher.c | 5 +++++ server/red_worker.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/server/red_dispatcher.c b/server/red_dispatcher.c index f74b13e..801a575 100644 --- a/server/red_dispatcher.c +++ b/server/red_dispatcher.c @@ -51,6 +51,7 @@ struct RedDispatcher { int y_res; int use_hardware_cursor; RedDispatcher *next; + RedsStream *stream; RedWorkerMessage async_message; pthread_mutex_t async_lock; QXLDevSurfaceCreate surface_create; @@ -81,6 +82,7 @@ static void red_dispatcher_set_peer(Channel *channel, RedsStream *stream, int mi red_printf(""); dispatcher = (RedDispatcher *)channel->data; + dispatcher->stream = stream; RedWorkerMessage message = RED_WORKER_MESSAGE_DISPLAY_CONNECT; write_message(dispatcher->channel, &message); send_data(dispatcher->channel, &stream, sizeof(RedsStream *)); @@ -93,6 +95,9 @@ static void red_dispatcher_shutdown_peer(Channel *channel) red_printf(""); RedWorkerMessage message = RED_WORKER_MESSAGE_DISPLAY_DISCONNECT; write_message(dispatcher->channel, &message); + read_message(dispatcher->channel, &message); + ASSERT(message == RED_WORKER_MESSAGE_READY); + reds_stream_free(dispatcher->stream); } static void red_dispatcher_migrate(Channel *channel) diff --git a/server/red_worker.c b/server/red_worker.c index 5f07803..f77b0f2 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -8486,8 +8486,6 @@ static void red_disconnect_channel(RedChannel *channel) { channel_release_res(channel); red_pipe_clear(channel); - reds_stream_free(channel->stream); - channel->stream = NULL; channel->send_data.blocked = FALSE; channel->send_data.size = channel->send_data.pos = 0; spice_marshaller_reset(channel->send_data.marshaller); @@ -10060,6 +10058,7 @@ static void handle_dev_input(EventListener *listener, uint32_t events) case RED_WORKER_MESSAGE_CURSOR_DISCONNECT: red_printf("cursor disconnect"); red_disconnect_cursor((RedChannel *)worker->cursor_channel); + write_ready = 1; break; case RED_WORKER_MESSAGE_CURSOR_MIGRATE: red_printf("cursor migrate");