From patchwork Mon Aug 10 15:26:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: fred.konrad@greensocs.com X-Patchwork-Id: 505666 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E76C61401C7 for ; Tue, 11 Aug 2015 01:28:23 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=greensocs.com header.i=@greensocs.com header.b=xQDiFo/V; dkim=fail reason="signature verification failed" (1024-bit key) header.d=greensocs.com header.i=@greensocs.com header.b=lNmdy6Ym; dkim-atps=neutral Received: from localhost ([::1]:58838 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZOozt-00078n-CL for incoming@patchwork.ozlabs.org; Mon, 10 Aug 2015 11:28:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39592) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZOozF-00065X-Vk for qemu-devel@nongnu.org; Mon, 10 Aug 2015 11:27:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZOozC-000876-3a for qemu-devel@nongnu.org; Mon, 10 Aug 2015 11:27:41 -0400 Received: from greensocs.com ([193.104.36.180]:59112) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZOozB-00086v-QY for qemu-devel@nongnu.org; Mon, 10 Aug 2015 11:27:38 -0400 Received: from localhost (localhost [127.0.0.1]) by greensocs.com (Postfix) with ESMTP id 3844018CE2A; Mon, 10 Aug 2015 17:27:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1439220457; bh=V/L10ATW140Sh9+ae6Y461C3iCqoe9OLqI81WKuUj+g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=xQDiFo/V/JZCm7TNJpnMW4JqJB7VRA6++DaOQGzBzbfbGEy8mYzWiH11D5QXb9B+z +MNY1afi095KZHB3lY7KeNRa7dXSAtJMh7OFE5lvHtGBEVufF0qjvS5ush/SvttY2g Bz5MK+EQzf3EIgZ/CCs1TsOtEGJIHeobvuOhJITk= X-Virus-Scanned: amavisd-new at greensocs.com Authentication-Results: gs-01.greensocs.com (amavisd-new); dkim=pass (1024-bit key) header.d=greensocs.com Received: from greensocs.com ([127.0.0.1]) by localhost (gs-01.greensocs.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gBLSbVgp1iGf; Mon, 10 Aug 2015 17:27:24 +0200 (CEST) Received: from localhost.localdomain (AToulouse-555-1-147-173.w109-223.abo.wanadoo.fr [109.223.34.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: fred.konrad@greensocs.com) by greensocs.com (Postfix) with ESMTPSA id 0CE2F18B293; Mon, 10 Aug 2015 17:27:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1439220444; bh=V/L10ATW140Sh9+ae6Y461C3iCqoe9OLqI81WKuUj+g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=lNmdy6Ymm6KMf8/1secUJWtXO3AgDPA2Ty+xK33AqHlqET00cJv05GOeA+VX1BEqJ xgapp6eVuBQCbg7E7oUgV/U17vANEFWvAP1sBxjHRmBqag4atTSEu5tIGK868rET/k pQajSSwdTPb60hT1q5ohcflnZ5ck9PXTcLwW4eyk= From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org, mttcg@listserver.greensocs.com Date: Mon, 10 Aug 2015 17:26:59 +0200 Message-Id: <1439220437-23957-2-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1439220437-23957-1-git-send-email-fred.konrad@greensocs.com> References: <1439220437-23957-1-git-send-email-fred.konrad@greensocs.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 193.104.36.180 Cc: mark.burton@greensocs.com, a.rigo@virtualopensystems.com, guillaume.delbergue@greensocs.com, pbonzini@redhat.com, alex.bennee@linaro.org, fred.konrad@greensocs.com Subject: [Qemu-devel] [RFC PATCH V7 01/19] cpus: protect queued_work_* with work_mutex. 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: KONRAD Frederic This protects queued_work_* used by async_run_on_cpu, run_on_cpu and flush_queued_work with a new lock (work_mutex) to prevent multiple (concurrent) access. Signed-off-by: KONRAD Frederic Reviewed-by: Alex Bennée Changes V1 -> V2: * Unlock the mutex while running the callback. --- cpus.c | 11 +++++++++++ include/qom/cpu.h | 3 +++ qom/cpu.c | 1 + 3 files changed, 15 insertions(+) diff --git a/cpus.c b/cpus.c index b00a423..eabd4b1 100644 --- a/cpus.c +++ b/cpus.c @@ -845,6 +845,8 @@ void run_on_cpu(CPUState *cpu, void (*func)(void *data), void *data) wi.func = func; wi.data = data; wi.free = false; + + qemu_mutex_lock(&cpu->work_mutex); if (cpu->queued_work_first == NULL) { cpu->queued_work_first = &wi; } else { @@ -853,6 +855,7 @@ void run_on_cpu(CPUState *cpu, void (*func)(void *data), void *data) cpu->queued_work_last = &wi; wi.next = NULL; wi.done = false; + qemu_mutex_unlock(&cpu->work_mutex); qemu_cpu_kick(cpu); while (!wi.done) { @@ -876,6 +879,8 @@ void async_run_on_cpu(CPUState *cpu, void (*func)(void *data), void *data) wi->func = func; wi->data = data; wi->free = true; + + qemu_mutex_lock(&cpu->work_mutex); if (cpu->queued_work_first == NULL) { cpu->queued_work_first = wi; } else { @@ -884,6 +889,7 @@ void async_run_on_cpu(CPUState *cpu, void (*func)(void *data), void *data) cpu->queued_work_last = wi; wi->next = NULL; wi->done = false; + qemu_mutex_unlock(&cpu->work_mutex); qemu_cpu_kick(cpu); } @@ -896,15 +902,20 @@ static void flush_queued_work(CPUState *cpu) return; } + qemu_mutex_lock(&cpu->work_mutex); while ((wi = cpu->queued_work_first)) { cpu->queued_work_first = wi->next; + qemu_mutex_unlock(&cpu->work_mutex); wi->func(wi->data); + qemu_mutex_lock(&cpu->work_mutex); wi->done = true; if (wi->free) { g_free(wi); } } cpu->queued_work_last = NULL; + qemu_mutex_unlock(&cpu->work_mutex); + qemu_cond_broadcast(&qemu_work_cond); } diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 20aabc9..efa9624 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -242,6 +242,8 @@ struct kvm_run; * @mem_io_pc: Host Program Counter at which the memory was accessed. * @mem_io_vaddr: Target virtual address at which the memory was accessed. * @kvm_fd: vCPU file descriptor for KVM. + * @work_mutex: Lock to prevent multiple access to queued_work_*. + * @queued_work_first: First asynchronous work pending. * * State of one CPU core or thread. */ @@ -262,6 +264,7 @@ struct CPUState { uint32_t host_tid; bool running; struct QemuCond *halt_cond; + QemuMutex work_mutex; struct qemu_work_item *queued_work_first, *queued_work_last; bool thread_kicked; bool created; diff --git a/qom/cpu.c b/qom/cpu.c index eb9cfec..4e12598 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -316,6 +316,7 @@ static void cpu_common_initfn(Object *obj) cpu->gdb_num_regs = cpu->gdb_num_g_regs = cc->gdb_num_core_regs; QTAILQ_INIT(&cpu->breakpoints); QTAILQ_INIT(&cpu->watchpoints); + qemu_mutex_init(&cpu->work_mutex); } static void cpu_common_finalize(Object *obj)