From patchwork Sun Jun 19 22:28:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sergey.fedorov@linaro.org X-Patchwork-Id: 9186251 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EB90A6075E for ; Sun, 19 Jun 2016 22:30:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E68F3212D7 for ; Sun, 19 Jun 2016 22:30:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D7E0A212DA; Sun, 19 Jun 2016 22:30:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 74FA0212D7 for ; Sun, 19 Jun 2016 22:30:08 +0000 (UTC) Received: from localhost ([::1]:40251 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bElEF-0005GR-FT for patchwork-qemu-devel@patchwork.kernel.org; Sun, 19 Jun 2016 18:30:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49752) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bElDj-0005G3-QV for qemu-devel@nongnu.org; Sun, 19 Jun 2016 18:29:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bElDh-0002LH-KF for qemu-devel@nongnu.org; Sun, 19 Jun 2016 18:29:34 -0400 Received: from mail-lf0-x236.google.com ([2a00:1450:4010:c07::236]:33879) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bElDh-0002KZ-7L for qemu-devel@nongnu.org; Sun, 19 Jun 2016 18:29:33 -0400 Received: by mail-lf0-x236.google.com with SMTP id h129so26380857lfh.1 for ; Sun, 19 Jun 2016 15:29:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pFBK/cNJtU70PVjCPkCrC3N46jJQhe5K2K+KUjCXemA=; b=Fn/G1MH0EdqcRBknEB326cu1kyrAsKlPY/xbG5mO3R8yUvKvKNckLmyyTAv0Hv8IYC XV5GiCUvGaEt5Bo6SkxW/iK64+tW16jRgUAYItVZEvGung4RxtucucACHkRxhqx4gS8M Dn968MYo8K+mxOskPQk0H2W/oi6LFPcccSeGc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pFBK/cNJtU70PVjCPkCrC3N46jJQhe5K2K+KUjCXemA=; b=WLtmX2okmngVyy4br/I0zYfoHUKaJZCkliX+8NIfV8iHkU1dBvRS7wGVY69gnkQZ+e eY2fSAjYmj0OrNbYZHkISItFvSuTkKh75LBs5gBKqC2uDEf1iYyAhLe7RkTtaIvxXZtS ee+PRjyly+5Oct2V7BfbV/WICZ88VT/nU/ybAC02S8OgGw8Vvcf9ldj72SXSqLCgHHwQ fyhthhmD8nFjf1iwOZcSDi3Q2i0I7g27Hh0rOp6zQK8gUTS1oqlySDZsDEXvwzMf4KAy HWCZhH8kwpfHQcdmimRYeIs7pUsKoWqzvktL5tZsVMZy0UfDtlEXQy2wzTqvCelo4Y6Y cPTw== X-Gm-Message-State: ALyK8tL6L8VnGYSBKNOyXUcZ169Ss9FCqi+e7FRFZGARRCaZc9M0BJLAcLdqvrca3EFCTaxt X-Received: by 10.25.154.72 with SMTP id c69mr803007lfe.72.1466375372430; Sun, 19 Jun 2016 15:29:32 -0700 (PDT) Received: from sergey-laptop.Dlink (broadband-46-188-121-115.2com.net. [46.188.121.115]) by smtp.gmail.com with ESMTPSA id eu7sm3191552lbc.39.2016.06.19.15.29.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 19 Jun 2016 15:29:31 -0700 (PDT) From: Sergey Fedorov To: qemu-devel@nongnu.org Date: Mon, 20 Jun 2016 01:28:29 +0300 Message-Id: <1466375313-7562-5-git-send-email-sergey.fedorov@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466375313-7562-1-git-send-email-sergey.fedorov@linaro.org> References: <1466375313-7562-1-git-send-email-sergey.fedorov@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::236 Subject: [Qemu-devel] [RFC 4/8] linux-user: Rework exclusive operation mechanism X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sergey Fedorov , Riku Voipio , Sergey Fedorov , patches@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Sergey Fedorov A single variable 'pending_cpus' was used for both counting currently running CPUs and for signalling the pending exclusive operation request. To prepare for supporting operations which requires a quiescent state, like translation buffer flush, it is useful to keep a counter of currently running CPUs always up to date. Use a separate variable 'tcg_pending_cpus' to count for currently running CPUs and a separate variable 'exclusive_pending' to indicate that there's an exclusive operation pending. Signed-off-by: Sergey Fedorov Signed-off-by: Sergey Fedorov --- linux-user/main.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index b9a4e0ea45ac..485336f78b8f 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -111,7 +111,8 @@ static pthread_mutex_t cpu_list_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t exclusive_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_cond_t exclusive_cond = PTHREAD_COND_INITIALIZER; static pthread_cond_t exclusive_resume = PTHREAD_COND_INITIALIZER; -static int pending_cpus; +static bool exclusive_pending; +static int tcg_pending_cpus; /* Make sure everything is in a consistent state for calling fork(). */ void fork_start(void) @@ -133,7 +134,8 @@ void fork_end(int child) QTAILQ_REMOVE(&cpus, cpu, node); } } - pending_cpus = 0; + tcg_pending_cpus = 0; + exclusive_pending = false; pthread_mutex_init(&exclusive_lock, NULL); pthread_mutex_init(&cpu_list_mutex, NULL); pthread_cond_init(&exclusive_cond, NULL); @@ -150,7 +152,7 @@ void fork_end(int child) must be held. */ static inline void exclusive_idle(void) { - while (pending_cpus) { + while (exclusive_pending) { pthread_cond_wait(&exclusive_resume, &exclusive_lock); } } @@ -164,15 +166,14 @@ static inline void start_exclusive(void) pthread_mutex_lock(&exclusive_lock); exclusive_idle(); - pending_cpus = 1; + exclusive_pending = true; /* Make all other cpus stop executing. */ CPU_FOREACH(other_cpu) { if (other_cpu->running) { - pending_cpus++; cpu_exit(other_cpu); } } - if (pending_cpus > 1) { + while (tcg_pending_cpus) { pthread_cond_wait(&exclusive_cond, &exclusive_lock); } } @@ -180,7 +181,7 @@ static inline void start_exclusive(void) /* Finish an exclusive operation. */ static inline void __attribute__((unused)) end_exclusive(void) { - pending_cpus = 0; + exclusive_pending = false; pthread_cond_broadcast(&exclusive_resume); pthread_mutex_unlock(&exclusive_lock); } @@ -191,6 +192,7 @@ static inline void cpu_exec_start(CPUState *cpu) pthread_mutex_lock(&exclusive_lock); exclusive_idle(); cpu->running = true; + tcg_pending_cpus++; pthread_mutex_unlock(&exclusive_lock); } @@ -199,11 +201,9 @@ static inline void cpu_exec_end(CPUState *cpu) { pthread_mutex_lock(&exclusive_lock); cpu->running = false; - if (pending_cpus > 1) { - pending_cpus--; - if (pending_cpus == 1) { - pthread_cond_signal(&exclusive_cond); - } + tcg_pending_cpus--; + if (!tcg_pending_cpus) { + pthread_cond_broadcast(&exclusive_cond); } exclusive_idle(); pthread_mutex_unlock(&exclusive_lock);