From patchwork Tue Jul 5 16:18:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 71397 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp438650qgy; Tue, 5 Jul 2016 11:03:31 -0700 (PDT) X-Received: by 10.55.192.88 with SMTP id o85mr23896140qki.15.1467741810990; Tue, 05 Jul 2016 11:03:30 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id a190si661203qkg.174.2016.07.05.11.03.30 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 05 Jul 2016 11:03:30 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:56883 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKUh0-00012p-EE for patch@linaro.org; Tue, 05 Jul 2016 14:03:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56632) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKT3H-0007At-GU for qemu-devel@nongnu.org; Tue, 05 Jul 2016 12:18:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKT3F-0001xw-0I for qemu-devel@nongnu.org; Tue, 05 Jul 2016 12:18:22 -0400 Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]:36534) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKT3E-0001xi-Lt for qemu-devel@nongnu.org; Tue, 05 Jul 2016 12:18:20 -0400 Received: by mail-wm0-x22e.google.com with SMTP id f126so143763725wma.1 for ; Tue, 05 Jul 2016 09:18:20 -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=BCwMWZfva07iWhOKMRrgtu9VryuAlyyr4wgH0zXMYcA=; b=iaSj5anPhojkVyZIJCRUYxO59qXSnhXUG3+krkiPDu4c53vezL9LyGb0bT5NiuRcym 0bsNlhutm7IwSHpoaSm3cNeKu44N2/nViXNi0l57AZ2Is33MwXzQKQRao/gmH8A/nqMz liJNMwhH48d0FC5QLoFDOi/XvblHlpIMUfkdk= 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=BCwMWZfva07iWhOKMRrgtu9VryuAlyyr4wgH0zXMYcA=; b=AqZ7Sy5NGS1GCnPGQm+LJhUnkA7TPTqIKpVi54ev2u/Yx8mgFbfh/U3svwdAebUU2l //EE6VbzTbsAjKpHxxNQGvYoqOvKj3MjuTxF0ghAJq4sEH2grobt+FDZ9IrvPwhlzX/W 80csiZnx3E38dn5UZWCD6I24rwiTw7BMwU6SkZsWIyp7stu+k5IAcQMoegFtREnHpCfh Eym6ApUCwBzEQq4Uwt6bgrzhQ/HIDyyp8Imv8/D7Qk2mGKiXSUVJjkqjkjcbTN/nx+li cLzO+qrhyVTGsf6+LwGS7tpc87iaQSjUWkh9bI26IcoZCEWtpbq6+UUTCU8VUXFmgkTe Z/ag== X-Gm-Message-State: ALyK8tJI98Gr5GmcHwmSuuzjSuRbPJLn6peHaC2KJTSlTmkNE+zcAviHqclDSt7pWXEP2wyw X-Received: by 10.194.102.202 with SMTP id fq10mr16150001wjb.156.1467735499971; Tue, 05 Jul 2016 09:18:19 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q71sm1317613wme.17.2016.07.05.09.18.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Jul 2016 09:18:18 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id CED4A3E0548; Tue, 5 Jul 2016 17:18:17 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: mttcg@listserver.greensocs.com, qemu-devel@nongnu.org, fred.konrad@greensocs.com, a.rigo@virtualopensystems.com, serge.fdrv@gmail.com, cota@braap.org, bobby.prani@gmail.com, rth@twiddle.net Date: Tue, 5 Jul 2016 17:18:16 +0100 Message-Id: <1467735496-16256-7-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1467735496-16256-1-git-send-email-alex.bennee@linaro.org> References: <1467735496-16256-1-git-send-email-alex.bennee@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:400c:c09::22e Subject: [Qemu-devel] [PATCH v2 6/6] tcg: cpu-exec: roll-up tb_find_fast/slow 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: peter.maydell@linaro.org, Peter Crosthwaite , claudio.fontana@huawei.com, mark.burton@greensocs.com, jan.kiszka@siemens.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" In an effort not to re-take locks I've re-factored the code so everything is done inside the new tb_find function. The fast path will only take a lock if the previous TB needs patching. The generation path will do the patching inside the generation critical section. Signed-off-by: Alex Bennée --- cpu-exec.c | 117 ++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 66 insertions(+), 51 deletions(-) -- 2.7.4 diff --git a/cpu-exec.c b/cpu-exec.c index 59c2ec5..529eae1 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -281,7 +281,8 @@ static TranslationBlock *tb_find_physical(CPUState *cpu, /* * Patch the last TB with a jump to the current TB. * - * Modification of the TB has to be protected with tb_lock. + * Modification of the TB has to be protected with tb_lock which can + * either be already held or taken here. */ static inline void maybe_patch_last_tb(CPUState *cpu, TranslationBlock *tb, @@ -306,72 +307,86 @@ static inline void maybe_patch_last_tb(CPUState *cpu, #endif /* See if we can patch the calling TB. */ if (*last_tb && !qemu_loglevel_mask(CPU_LOG_TB_NOCHAIN)) { - tb_lock(); + bool locked = tb_lock_recursive(); tb_add_jump(*last_tb, tb_exit, tb); - tb_unlock(); - } -} - -static TranslationBlock *tb_find_slow(CPUState *cpu, - target_ulong pc, - target_ulong cs_base, - uint32_t flags) -{ - TranslationBlock *tb; - - /* Ensure that we won't find a TB in the shared hash table - * if it is being invalidated by some other thread. - * Otherwise we'd put it back to CPU's local cache. - * Pairs with smp_wmb() in tb_phys_invalidate(). */ - smp_rmb(); - tb = tb_find_physical(cpu, pc, cs_base, flags); - if (!tb) { - - /* 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. - */ - mmap_lock(); - tb_lock(); - - /* There's a chance that our desired tb has been translated while - * taking the locks so we check again inside the lock. - */ - tb = tb_find_physical(cpu, pc, cs_base, flags); - if (!tb) { - /* if no translated code available, then translate it now */ - tb = tb_gen_code(cpu, pc, cs_base, flags, 0); + if (locked) { + tb_unlock(); } - - tb_unlock(); - mmap_unlock(); } - - /* We add the TB in the virtual pc hash table for the fast lookup */ - atomic_set(&cpu->tb_jmp_cache[tb_jmp_cache_hash_func(pc)], tb); - return tb; } -static inline TranslationBlock *tb_find_fast(CPUState *cpu, - TranslationBlock **last_tb, - int tb_exit) +/* + * tb_find - find next TB, possibly generating it + * + * There is a multi-level lookup for finding the next TB which avoids + * locks unless generation is required. + * + * 1. Lookup via the per-vcpu tb_jmp_cache + * 2. Lookup via tb_find_physical (using QHT) + * + * If both of those fail then we need to grab the mmap_lock and + * tb_lock and do code generation. + * + * As the jump patching of code also needs to be protected by locks we + * have multiple paths into maybe_patch_last_tb taking advantage of + * the fact we may already have locks held for code generation. + */ +static TranslationBlock *tb_find(CPUState *cpu, + TranslationBlock **last_tb, + int tb_exit) { CPUArchState *env = (CPUArchState *)cpu->env_ptr; TranslationBlock *tb; target_ulong cs_base, pc; + unsigned int h; uint32_t flags; /* we record a subset of the CPU state. It will always be the same before a given translated block is executed. */ cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags); - tb = atomic_read(&cpu->tb_jmp_cache[tb_jmp_cache_hash_func(pc)]); + h = tb_jmp_cache_hash_func(pc); + tb = atomic_read(&cpu->tb_jmp_cache[h]); + if (unlikely(!tb || tb->pc != pc || tb->cs_base != cs_base || tb->flags != flags)) { - tb = tb_find_slow(cpu, pc, cs_base, flags); - } - maybe_patch_last_tb(cpu, tb, last_tb, tb_exit); + /* Ensure that we won't find a TB in the shared hash table + * if it is being invalidated by some other thread. + * Otherwise we'd put it back to CPU's local cache. + * Pairs with smp_wmb() in tb_phys_invalidate(). */ + smp_rmb(); + tb = tb_find_physical(cpu, pc, cs_base, flags); + + if (!tb) { + /* 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. + */ + mmap_lock(); + tb_lock(); + + /* There's a chance that our desired tb has been translated while + * taking the locks so we check again inside the lock. + */ + tb = tb_find_physical(cpu, pc, cs_base, flags); + if (!tb) { + /* if no translated code available, then translate it now */ + tb = tb_gen_code(cpu, pc, cs_base, flags, 0); + } + maybe_patch_last_tb(cpu, tb, last_tb, tb_exit); + + tb_unlock(); + mmap_unlock(); + } else { + maybe_patch_last_tb(cpu, tb, last_tb, tb_exit); + } + + /* We update the TB in the virtual pc hash table for the fast lookup */ + atomic_set(&cpu->tb_jmp_cache[h], tb); + } else { + maybe_patch_last_tb(cpu, tb, last_tb, tb_exit); + } return tb; } @@ -452,7 +467,7 @@ static inline bool cpu_handle_exception(CPUState *cpu, int *ret) && cpu->icount_decr.u16.low + cpu->icount_extra == 0) { /* try to cause an exception pending in the log */ TranslationBlock *last_tb = NULL; /* Avoid chaining TBs */ - cpu_exec_nocache(cpu, 1, tb_find_fast(cpu, &last_tb, 0), true); + cpu_exec_nocache(cpu, 1, tb_find(cpu, &last_tb, 0), true); *ret = -1; return true; #endif @@ -636,7 +651,7 @@ int cpu_exec(CPUState *cpu) cpu->tb_flushed = false; /* reset before first TB lookup */ for(;;) { cpu_handle_interrupt(cpu, &last_tb); - tb = tb_find_fast(cpu, &last_tb, tb_exit); + tb = tb_find(cpu, &last_tb, tb_exit); cpu_loop_exec_tb(cpu, tb, &last_tb, &tb_exit, &sc); /* Try to align the host and virtual clocks if the guest is in advance */