From patchwork Fri Jul 15 17:58:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: sergey.fedorov@linaro.org X-Patchwork-Id: 9232417 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 1AB3C60868 for ; Fri, 15 Jul 2016 18:16:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0B5E127F94 for ; Fri, 15 Jul 2016 18:16:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F3B3627FA4; Fri, 15 Jul 2016 18:16:02 +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 5DBB227F94 for ; Fri, 15 Jul 2016 18:16:01 +0000 (UTC) Received: from localhost ([::1]:34223 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bO7eb-0007wH-3I for patchwork-qemu-devel@patchwork.kernel.org; Fri, 15 Jul 2016 14:16:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48694) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bO7OO-0002p1-6N for qemu-devel@nongnu.org; Fri, 15 Jul 2016 13:59:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bO7OM-00074a-8Y for qemu-devel@nongnu.org; Fri, 15 Jul 2016 13:59:15 -0400 Received: from mail-lf0-x22a.google.com ([2a00:1450:4010:c07::22a]:36086) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bO7OL-00073d-Rc for qemu-devel@nongnu.org; Fri, 15 Jul 2016 13:59:14 -0400 Received: by mail-lf0-x22a.google.com with SMTP id y184so4010631lfd.3 for ; Fri, 15 Jul 2016 10:59:13 -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 :mime-version:content-transfer-encoding; bh=ThBrxst9nV3GaHB2KEm3wywYwPRJVItOOesgmZF7SUc=; b=MDniYmi8VIcBrg4+usuLPv6fL98cOjbQS07ebzcTjgWh+ATFgCFsIDalP/wnxcvL3l dPqlijSusnxXziyJMGWHIGxvPHmdaBRnY3OZWF1L0dEGWWK7ZbUR0xmF/SheECEA8QJM eIdTyphGHaunXdd9NgGXZMggkIAz+uwzRvqfA= 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:mime-version:content-transfer-encoding; bh=ThBrxst9nV3GaHB2KEm3wywYwPRJVItOOesgmZF7SUc=; b=SAcktwYHC63Dsvd3oDtrmDHZOPALckIEb6fBQ+QXprDnAW9tfTD7K2633U4Z5NLbGi DoAVTPEDslMwXM42RQHKGO6S197UN64GAyQKMjev36/cGtPqVbdbm0rKq7Pp2jrvcrVB ce1Yy1dUGNE2RzYav+cy9y9E1tgoyhCXTDL5rz5LLpdfhiI/3jdObOv7KEl/puKQGbWg aofz8Pf1lC/MuWL2jmuyTU9pihKe3eRq0qoN15Vw3ICQvV7AbrK25GYAX9LVuXkr3mkt miXmStzuczzNIt65MXwiAM2Yz64BuLA0idJ4kM9AibCa0AxTCi5oEZynYZO8KimLFUH3 GXjg== X-Gm-Message-State: ALyK8tIc4/+9C2+69Y93AjnZL1OyGZBVB358leP+HxE6gFxcaIB20MDFBDbwnovnkj+kZA6i X-Received: by 10.25.149.13 with SMTP id x13mr11171819lfd.199.1468605553007; Fri, 15 Jul 2016 10:59:13 -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 g193sm2113268lfb.14.2016.07.15.10.59.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 Jul 2016 10:59:12 -0700 (PDT) From: Sergey Fedorov To: qemu-devel@nongnu.org Date: Fri, 15 Jul 2016 20:58:50 +0300 Message-Id: <20160715175852.30749-11-sergey.fedorov@linaro.org> X-Mailer: git-send-email 2.9.1 In-Reply-To: <20160715175852.30749-1-sergey.fedorov@linaro.org> References: <20160715175852.30749-1-sergey.fedorov@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::22a Subject: [Qemu-devel] [PATCH v4 10/12] 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, =?UTF-8?q?Alex=20Benn=C3=A9e?= , 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 Reviewed-by: Alex Bennée --- cpu-exec.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/cpu-exec.c b/cpu-exec.c index bbaed5bb1978..073d783398f3 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -281,7 +281,8 @@ static TranslationBlock *tb_find_physical(CPUState *cpu, static TranslationBlock *tb_find_slow(CPUState *cpu, target_ulong pc, target_ulong cs_base, - uint32_t flags) + uint32_t flags, + bool *have_tb_lock) { TranslationBlock *tb; @@ -294,6 +295,7 @@ static TranslationBlock *tb_find_slow(CPUState *cpu, */ mmap_lock(); tb_lock(); + *have_tb_lock = true; /* There's a chance that our desired tb has been translated while * taking the locks so we check again inside the lock. @@ -304,7 +306,6 @@ static TranslationBlock *tb_find_slow(CPUState *cpu, tb = tb_gen_code(cpu, pc, cs_base, flags, 0); } - tb_unlock(); mmap_unlock(); } @@ -321,6 +322,7 @@ static inline TranslationBlock *tb_find_fast(CPUState *cpu, TranslationBlock *tb; target_ulong cs_base, pc; uint32_t flags; + bool have_tb_lock = false; /* we record a subset of the CPU state. It will always be the same before a given translated block @@ -329,8 +331,8 @@ static inline TranslationBlock *tb_find_fast(CPUState *cpu, tb = atomic_read(&cpu->tb_jmp_cache[tb_jmp_cache_hash_func(pc)]); if (unlikely(!tb || atomic_read(&tb->pc) != pc || atomic_read(&tb->cs_base) != cs_base || - atomic_read(&b->flags) != flags)) { - tb = tb_find_slow(cpu, pc, cs_base, flags); + atomic_read(&tb->flags) != flags)) { + tb = tb_find_slow(cpu, pc, cs_base, flags, &have_tb_lock); } #ifndef CONFIG_USER_ONLY /* We don't take care of direct jumps when address mapping changes in @@ -343,13 +345,18 @@ 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 (!have_tb_lock) { + tb_lock(); + have_tb_lock = true; + } /* Check if translation buffer has been flushed */ if (cpu->tb_flushed) { cpu->tb_flushed = false; } else if (!tb_is_invalid(tb)) { tb_add_jump(last_tb, tb_exit, tb); } + } + if (have_tb_lock) { tb_unlock(); } return tb;