From patchwork Wed Jul 6 12:19:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 103472 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 46A69B6F00 for ; Wed, 6 Jul 2011 22:58:24 +1000 (EST) Received: from localhost ([::1]:39978 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeRgK-0003CH-W7 for incoming@patchwork.ozlabs.org; Wed, 06 Jul 2011 08:58:21 -0400 Received: from eggs.gnu.org ([140.186.70.92]:34012) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeR52-0001ef-4o for qemu-devel@nongnu.org; Wed, 06 Jul 2011 08:19:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QeR4z-0005DJ-W6 for qemu-devel@nongnu.org; Wed, 06 Jul 2011 08:19:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1623) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeR4z-0005D9-Dt for qemu-devel@nongnu.org; Wed, 06 Jul 2011 08:19:45 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p66CJiWa026498 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 6 Jul 2011 08:19:44 -0400 Received: from bow.redhat.com (vpn-10-220.rdu.redhat.com [10.11.10.220]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p66CJR0p022836; Wed, 6 Jul 2011 08:19:43 -0400 From: Alon Levy To: qemu-devel@nongnu.org Date: Wed, 6 Jul 2011 14:19:18 +0200 Message-Id: <1309954766-9728-10-git-send-email-alevy@redhat.com> In-Reply-To: <1309954766-9728-1-git-send-email-alevy@redhat.com> References: <1309954766-9728-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: yhalperi@redhat.com, kraxel@redhat.com Subject: [Qemu-devel] [PATCH] qxl: fix surface tracking & locking 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 From: Gerd Hoffmann Surface tracking needs proper locking with some commands affecting surfaces running in a thread, add it. Also reset the surface counter when zapping all surfaces. [ alon: use track_lock instead of wlock for guest_surfaces ] Signed-off-by: Gerd Hoffmann --- hw/qxl.c | 13 ++++++++++++- hw/qxl.h | 2 ++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index 830ddae..241c27c 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -153,7 +153,12 @@ void qxl_spice_update_area(PCIQXLDevice *qxl, uint32_t surface_id, void qxl_spice_destroy_surface_wait(PCIQXLDevice *qxl, uint32_t id) { qemu_mutex_lock(&qxl->ssd.wlock); + qemu_mutex_lock(&qxl->track_lock); + PANIC_ON(id >= NUM_SURFACES); qxl->ssd.worker->destroy_surface_wait(qxl->ssd.worker, id); + qxl->guest_surfaces.cmds[id] = 0; + qxl->guest_surfaces.count--; + qemu_mutex_unlock(&qxl->track_lock); qemu_mutex_unlock(&qxl->ssd.wlock); } @@ -182,7 +187,11 @@ void qxl_spice_reset_memslots(PCIQXLDevice *qxl) void qxl_spice_destroy_surfaces(PCIQXLDevice *qxl) { qemu_mutex_lock(&qxl->ssd.wlock); + qemu_mutex_lock(&qxl->track_lock); qxl->ssd.worker->destroy_surfaces(qxl->ssd.worker); + memset(&qxl->guest_surfaces.cmds, 0, sizeof(qxl->guest_surfaces.cmds)); + qxl->guest_surfaces.count = 0; + qemu_mutex_unlock(&qxl->track_lock); qemu_mutex_unlock(&qxl->ssd.wlock); } @@ -346,6 +355,7 @@ static void qxl_track_command(PCIQXLDevice *qxl, struct QXLCommandExt *ext) QXLSurfaceCmd *cmd = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id); uint32_t id = le32_to_cpu(cmd->surface_id); PANIC_ON(id >= NUM_SURFACES); + qemu_mutex_lock(&qxl->track_lock); if (cmd->type == QXL_SURFACE_CMD_CREATE) { qxl->guest_surfaces.cmds[id] = ext->cmd.data; qxl->guest_surfaces.count++; @@ -356,6 +366,7 @@ static void qxl_track_command(PCIQXLDevice *qxl, struct QXLCommandExt *ext) qxl->guest_surfaces.cmds[id] = 0; qxl->guest_surfaces.count--; } + qemu_mutex_unlock(&qxl->track_lock); break; } case QXL_CMD_CURSOR: @@ -897,7 +908,6 @@ static void qxl_reset_surfaces(PCIQXLDevice *d) dprint(d, 1, "%s:\n", __FUNCTION__); d->mode = QXL_MODE_UNDEFINED; qxl_spice_destroy_surfaces(d); - memset(&d->guest_surfaces.cmds, 0, sizeof(d->guest_surfaces.cmds)); } /* called from spice server thread context only */ @@ -1321,6 +1331,7 @@ static int qxl_init_common(PCIQXLDevice *qxl) qxl->generation = 1; qxl->num_memslots = NUM_MEMSLOTS; qxl->num_surfaces = NUM_SURFACES; + qemu_mutex_init(&qxl->track_lock); switch (qxl->revision) { case 1: /* spice 0.4 -- qxl-1 */ diff --git a/hw/qxl.h b/hw/qxl.h index 489d518..087ef6b 100644 --- a/hw/qxl.h +++ b/hw/qxl.h @@ -55,6 +55,8 @@ typedef struct PCIQXLDevice { } guest_surfaces; QXLPHYSICAL guest_cursor; + QemuMutex track_lock; + /* thread signaling */ pthread_t main; int pipe[2];