From patchwork Thu Jul 7 16:44:40 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: 9219183 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 34D4560574 for ; Thu, 7 Jul 2016 16:49:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 23D3627BEE for ; Thu, 7 Jul 2016 16:49:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 18594280B0; Thu, 7 Jul 2016 16:49:25 +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 625CF27F90 for ; Thu, 7 Jul 2016 16:49:24 +0000 (UTC) Received: from localhost ([::1]:41236 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLCUN-00016m-3X for patchwork-qemu-devel@patchwork.kernel.org; Thu, 07 Jul 2016 12:49:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLCQ1-00041i-H1 for qemu-devel@nongnu.org; Thu, 07 Jul 2016 12:44:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bLCPz-0002xa-Lr for qemu-devel@nongnu.org; Thu, 07 Jul 2016 12:44:52 -0400 Received: from mail-lf0-x230.google.com ([2a00:1450:4010:c07::230]:34976) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLCPz-0002xQ-DY for qemu-devel@nongnu.org; Thu, 07 Jul 2016 12:44:51 -0400 Received: by mail-lf0-x230.google.com with SMTP id l188so15203096lfe.2 for ; Thu, 07 Jul 2016 09:44:51 -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=Gk77BLd9VJXW+JgBIm9k+tOn2QmYeAozMr0Dgs+RMuo=; b=SsGIFEwSZhMWKF0ha3CTkgsDfpgM22++7nx+toQiQ3HZT8N4R7i4EMEHIhvF+7tfBF 9FgSV2ivscN2meZjz756QARxa2NhhIPC9CY8jQqHjGOm6D5wpue4oTbHv+sKk2ytB7Ec VlQnDQByquGYaLXIifIafcoWtJgOBZE/WmWGo= 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=Gk77BLd9VJXW+JgBIm9k+tOn2QmYeAozMr0Dgs+RMuo=; b=ceADF1wOUNJbQ1qks1MJcrgHSOKICDs0ZtomtzcEJXL7bJFgeITD/mlsHEFPmCUx+e pmgs/DVZBwurKRBUV2EQlvQZ7n/acfK4ki1Y5qVSBCdWY00bvPpqJ/5OBwQV7lJ7CQ+e /CWgIQmQkEYHjlyiXgNntkvh/Csu0rUj+9oyTrN2/pTW8SVSJq1jArbqdkEQwKnZDRnj bVE+uD5MXwT8J+6/xtCH9zq5ndGCkg9NZC1MnM0HYdF3i8C18MN221UX5swiq5P7t/Gz o5QOQhufmtWYIV+MSOFWrruc7HM+QOgo/Pw8jh+SRSGW3x1sGSgknkEqSkRRkdX6E3UF lSkg== X-Gm-Message-State: ALyK8tKswibvrsvNBalnyq7K0fs/S3pkcZeLvNCNf8hXIn6MREwytFGfHGBtXBJiMIvuLOZy X-Received: by 10.25.214.97 with SMTP id n94mr338870lfg.105.1467909890624; Thu, 07 Jul 2016 09:44:50 -0700 (PDT) Received: from sergey-laptop.Dlink (broadband-46-188-120-37.2com.net. [46.188.120.37]) by smtp.gmail.com with ESMTPSA id g62sm620627ljg.40.2016.07.07.09.44.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jul 2016 09:44:49 -0700 (PDT) From: Sergey Fedorov To: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Thu, 7 Jul 2016 19:44:40 +0300 Message-Id: <1467909880-18834-4-git-send-email-sergey.fedorov@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467909880-18834-1-git-send-email-sergey.fedorov@linaro.org> References: <1467735496-16256-7-git-send-email-alex.bennee@linaro.org> <1467909880-18834-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::230 Subject: [Qemu-devel] [PATCH 3/3] tcg: Avoid bouncing tb_lock between tb_gen_code() and tb_add_jump() 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: mttcg@listserver.greensocs.com, peter.maydell@linaro.org, claudio.fontana@huawei.com, Sergey Fedorov , patches@linaro.org, jan.kiszka@siemens.com, Peter Crosthwaite , mark.burton@greensocs.com, a.rigo@virtualopensystems.com, cota@braap.org, pbonzini@redhat.com, Sergey Fedorov , bobby.prani@gmail.com, rth@twiddle.net, fred.konrad@greensocs.com 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 Signed-off-by: Sergey Fedorov Signed-off-by: Sergey Fedorov --- cpu-exec.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/cpu-exec.c b/cpu-exec.c index dd0bd5007701..54c935039592 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -295,7 +295,8 @@ static TranslationBlock *tb_find_slow(CPUState *cpu, /* mmap_lock is needed by tb_gen_code, and mmap_lock must be * taken outside tb_lock. As system emulation is currently - * single threaded the locks are NOPs. + * single threaded the locks are NOPs. Both locks are to be + * released at the end of tb_find_fast(). */ mmap_lock(); tb_lock(); @@ -308,9 +309,6 @@ static TranslationBlock *tb_find_slow(CPUState *cpu, /* if no translated code available, then translate it now */ tb = tb_gen_code(cpu, pc, cs_base, flags, 0); } - - tb_unlock(); - mmap_unlock(); } /* We add the TB in the virtual pc hash table for the fast lookup */ @@ -354,10 +352,15 @@ static inline TranslationBlock *tb_find_fast(CPUState *cpu, #endif /* See if we can patch the calling TB. */ if (*last_tb && !qemu_loglevel_mask(CPU_LOG_TB_NOCHAIN)) { - tb_lock(); + if (!tb_lock_locked()) { + tb_lock(); + } tb_add_jump(*last_tb, tb_exit, tb); - tb_unlock(); } + + tb_lock_reset(); + mmap_lock_reset(); + return tb; }