From patchwork Tue Jul 19 08:32:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 72275 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp557879qga; Tue, 19 Jul 2016 01:47:55 -0700 (PDT) X-Received: by 10.55.166.149 with SMTP id p143mr48609939qke.79.1468918075654; Tue, 19 Jul 2016 01:47:55 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id m69si8815493qki.176.2016.07.19.01.47.55 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Jul 2016 01:47:55 -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=@gmail.com; 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 Received: from localhost ([::1]:53860 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPQh1-0007TR-80 for patch@linaro.org; Tue, 19 Jul 2016 04:47:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42358) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPQSF-0003cr-FB for qemu-devel@nongnu.org; Tue, 19 Jul 2016 04:32:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bPQS9-0002sn-Rk for qemu-devel@nongnu.org; Tue, 19 Jul 2016 04:32:38 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:35336) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPQS9-0002sY-IB for qemu-devel@nongnu.org; Tue, 19 Jul 2016 04:32:33 -0400 Received: by mail-wm0-x244.google.com with SMTP id i5so2011925wmg.2 for ; Tue, 19 Jul 2016 01:32:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=w45PqKr6XgDWkfUGZdOdAjQIw0rVenx2iKS2DmOAzec=; b=SuxlJatiI6QBtTzflYjcaou8DztYTOQceONbBvP1lgKV//PFN46fMWVTG1VeNM4nIu W0+PWgDekPZTF9Jx6t73YPDj8e1kddWx0CLXdnQbfdv7nGalPCTdQom9S3u2j3byhasP HsHcRaglIEhaXdlOn3FG+CjQJeo36oWdkGwqi2ddLhWIkDzpGJ/09QL5Am4Wmxhlyqi8 53+xTZ75GM9kDucNbJhr220ihXXbXRo4V0mqIlUBgmvPw+Vhw6JfVL78Fkcz9KEsDI1Y pnFpaON7BmovIYv+5D5N2Sp0HcCzSiJ6PYhD25E97l7fGPeBSL2fLjnGtZ+ZNeO9ycnO Ohwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=w45PqKr6XgDWkfUGZdOdAjQIw0rVenx2iKS2DmOAzec=; b=RDBu0oP6H7Np8GS6Oo3GEWBYsHrKhR37Fhowws7tNDLYK1wxU1jKU4mk8raQbf5Aoi RYQypCHrVYCdmY6mI/wdBAL8gREkG8OOgsWtMhYHGfbmZuPm5/t9n7LNgouY+bxTq4ta m/7UJ6QcM93Jr0EJSOsewXrzX8kLFK0+ZX4i2chWiGn51guv+CYxcKWsluxRLajdlg/5 0sgmVHR/GHeeUwNUjtghs0p7COmIgkmKzWvLnkBSaHxA1cPGqTQcQI05Dz1jw09eE19+ 3sN/CJoh0aofH24YRNvO8bq4okaTGEK4acUSP73x3GR2n4Pojt7KjMZ7COCwLHudiAdM dNjQ== X-Gm-Message-State: ALyK8tIoP87Lh+4WWC+vxgG5EaiIywrtgNVaTsWiyQg4XbVBvj5smwiVHQHnnJ0QRzjncg== X-Received: by 10.28.67.129 with SMTP id q123mr2423526wma.53.1468917152770; Tue, 19 Jul 2016 01:32:32 -0700 (PDT) Received: from donizetti.lan (94-39-158-5.adsl-ull.clienti.tiscali.it. [94.39.158.5]) by smtp.gmail.com with ESMTPSA id w129sm20677087wmd.9.2016.07.19.01.32.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Jul 2016 01:32:31 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 19 Jul 2016 10:32:18 +0200 Message-Id: <1468917141-8155-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1468917141-8155-1-git-send-email-pbonzini@redhat.com> References: <1468917141-8155-1-git-send-email-pbonzini@redhat.com> 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::244 Subject: [Qemu-devel] [PATCH 07/10] tcg: cpu-exec: remove tb_lock from the hot-path 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: serge.fdrv@gmail.com, alex.bennee@linaro.org, sergey.fedorov@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alex Bennée Lock contention in the hot path of moving between existing patched TranslationBlocks is the main drag in multithreaded performance. This patch pushes the tb_lock() usage down to the two places that really need it: - code generation (tb_gen_code) - jump patching (tb_add_jump) The rest of the code doesn't really need to hold a lock as it is either using per-CPU structures, atomically updated or designed to be used in concurrent read situations (qht_lookup). To keep things simple I removed the #ifdef CONFIG_USER_ONLY stuff as the locks become NOPs anyway until the MTTCG work is completed. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Sergey Fedorov Signed-off-by: Sergey Fedorov Message-Id: <20160715175852.30749-10-sergey.fedorov@linaro.org> Signed-off-by: Paolo Bonzini --- cpu-exec.c | 48 +++++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 27 deletions(-) -- 2.7.4 diff --git a/cpu-exec.c b/cpu-exec.c index cdaab1d..7ca2b71 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -287,35 +287,29 @@ static TranslationBlock *tb_find_slow(CPUState *cpu, TranslationBlock *tb; tb = tb_find_physical(cpu, pc, cs_base, flags); - if (tb) { - goto found; - } + if (!tb) { -#ifdef CONFIG_USER_ONLY - /* mmap_lock is needed by tb_gen_code, and mmap_lock must be - * taken outside tb_lock. Since we're momentarily dropping - * tb_lock, there's a chance that our desired tb has been - * translated. - */ - tb_unlock(); - mmap_lock(); - tb_lock(); - tb = tb_find_physical(cpu, pc, cs_base, flags); - if (tb) { - mmap_unlock(); - goto found; - } -#endif + /* 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(); - /* if no translated code available, then translate it now */ - tb = tb_gen_code(cpu, pc, cs_base, flags, 0); + /* 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); + } -#ifdef CONFIG_USER_ONLY - mmap_unlock(); -#endif + tb_unlock(); + mmap_unlock(); + } -found: - /* we add the TB in the virtual pc hash table */ + /* 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; } @@ -333,7 +327,6 @@ static inline TranslationBlock *tb_find_fast(CPUState *cpu, always be the same before a given translated block is executed. */ cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags); - tb_lock(); tb = atomic_read(&cpu->tb_jmp_cache[tb_jmp_cache_hash_func(pc)]); if (unlikely(!tb || tb->pc != pc || tb->cs_base != cs_base || tb->flags != flags)) { @@ -350,14 +343,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(); /* Check if translation buffer has been flushed */ if (cpu->tb_flushed) { cpu->tb_flushed = false; } else if (!tb->invalid) { tb_add_jump(last_tb, tb_exit, tb); } + tb_unlock(); } - tb_unlock(); return tb; }