From patchwork Wed Jun 14 14:02:09 2017 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: 105519 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp308009qgd; Wed, 14 Jun 2017 07:02:05 -0700 (PDT) X-Received: by 10.31.82.65 with SMTP id g62mr138305vkb.69.1497448925257; Wed, 14 Jun 2017 07:02:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497448925; cv=none; d=google.com; s=arc-20160816; b=0L73P6/5HXuJ5knUTzlTmac4BXzI9VMbRuoT1OK6eJ31wU9Bcquq+JBvro+52ERIPz N1q+Frc2z1/eya2Cn0VpgrPf/vA54R0XtwDOAAGESBn85244qwocII+ekYZMg6KFWQMI xn3qzt9/rEJBK7Wlvg8m3jfqLRB4NBz2H1IPz3dbc/bxvn5Hi8kbbJcazMTE6VkJC4wn BjqzhOTxs2m4wlPYA9Rm414BG2jqV9MP9Wv//1RPkRSUFf9uvs17uPYuRLLVeCUftnke OPhiHJnKjp7qUeoM8EVL132zUW6i65+d9GMjucxUJ7j8e0B1KO+A/UwpiWDN8QvUf2Ia 0Kcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=5XbcuNiXJFzSBmXK9wtSUW1G2OBQKs3np4JcmVupowE=; b=RkI3fx3UHMwmzw9HpXGz6Xp2iggblG6GY8wlmCdSFfUm44CCLb4UusT7s0gDQjjr0k F+FxYfsmzURJbBvj2t/GtKAZUCuBlL3/IpoJyu5Ovs7QeuRFcYe2rif3ZBpgwx9TF1TY eiDC9NFkS4hk6ie5cugUJ2A1YahXXrRsd8UKDgC7uDCBv0AYrMgxtSferOPxBZ/ncuZp +XJgH96SMy1w6v1/COtQ0UTtnuqMRUljzOGoG6kIFiLMty1w9t+nrx9+zMlPjBImz5oa 1LjyXdi1X9akS39MdXJYKRU1HQczQ3LXhMVYiLZPDV/IXy3Ucz8675wzN0tvANXXIMI7 iAFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=UY63zGAZ; 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 sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id b27si56192uac.114.2017.06.14.07.02.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 14 Jun 2017 07:02:05 -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 header.b=UY63zGAZ; 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 sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49216 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dL8s0-0005tO-Nh for patch@linaro.org; Wed, 14 Jun 2017 10:02:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40204) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dL8rh-0005sB-Dh for qemu-devel@nongnu.org; Wed, 14 Jun 2017 10:01:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dL8rb-0008GM-He for qemu-devel@nongnu.org; Wed, 14 Jun 2017 10:01:45 -0400 Received: from mail-wr0-x22d.google.com ([2a00:1450:400c:c0c::22d]:36237) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dL8rb-0008Fy-Bw for qemu-devel@nongnu.org; Wed, 14 Jun 2017 10:01:39 -0400 Received: by mail-wr0-x22d.google.com with SMTP id 36so1938933wry.3 for ; Wed, 14 Jun 2017 07:01:39 -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=5XbcuNiXJFzSBmXK9wtSUW1G2OBQKs3np4JcmVupowE=; b=UY63zGAZT+N8ZTW3irO+xgKjQWV25+vE/iRKDCWBBtaGkgcttRPNktpPGwfnxN0Woe T8kdSv4nAZWGLM1xLW+Z2SE2QSCnW5M5Ae8T6Kw0JW7xG4BxZinFJYO1mI52GHEqxrjK RVDyDlB45hTNOG3xFVxF2Bq3od/mh1wRwBhLU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5XbcuNiXJFzSBmXK9wtSUW1G2OBQKs3np4JcmVupowE=; b=SCUf92LpZpZSnfnQVTtEYhKanxx6J6mZKqkkLhJw/+/hRkgnMg/U9+K5gQXnJJAH16 aq58BeilrqlT2V2tXQOabKuPrlOqEgcA5k5TZmypwuoFcj8oE45qYhVNAwFdHLTiuOvJ cFlk0nkbaoUG5B1Jxz1TD2UTJileIW18t5H7NBD+hCV8hyUAGNHSpl2SkEGZ9C0NBaMc U8X4L4qwVkkGpNTXzgUtREMXiWKquRF7bBod/SGbJpvULRuM9Eqiz4jgMFK7t/xXMnjV 6MWZ/Q4VP8wC+dezbKev7+vttNnr/yoK0EnU+pCcvZhSeKBdYPc6Lr/Pu9RNDAEA45CA 5eRQ== X-Gm-Message-State: AKS2vOymHhidFlxYOWh83lQUNMvznIhLN5YiGtMevJfA5muhT25E3e38 lcmzoJjAhLhlrjuB X-Received: by 10.28.135.2 with SMTP id j2mr174336wmd.72.1497448898256; Wed, 14 Jun 2017 07:01:38 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x94sm119863wrb.47.2017.06.14.07.01.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Jun 2017 07:01:36 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 8FCC53E0386; Wed, 14 Jun 2017 15:02:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, pbonzini@redhat.com, rth@twiddle.net, cota@braap.org Date: Wed, 14 Jun 2017 15:02:09 +0100 Message-Id: <20170614140209.29847-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170614140209.29847-1-alex.bennee@linaro.org> References: <20170614140209.29847-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22d Subject: [Qemu-devel] [PATCH v1 3/3] tcg-runtime: short-circuit lookup_tb_ptr on IRQs 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" While the next TB would detect the exit flag has been set there is no point if we can exit sooner. We also check cpu->interrupt_request as some front-ends can set it rather than using the cpu_interrupt() API call and would normally be expecting the IRQ to get picked up on the previously fairly regular exits from the run loop. Signed-off-by: Alex Bennée --- tcg-runtime.c | 47 +++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 20 deletions(-) -- 2.13.0 diff --git a/tcg-runtime.c b/tcg-runtime.c index f4bfa9cea6..a025a6f194 100644 --- a/tcg-runtime.c +++ b/tcg-runtime.c @@ -147,28 +147,35 @@ uint64_t HELPER(ctpop_i64)(uint64_t arg) void *HELPER(lookup_tb_ptr)(CPUArchState *env, target_ulong addr) { CPUState *cpu = ENV_GET_CPU(env); - unsigned int addr_hash = tb_jmp_cache_hash_func(addr); void *code_ptr = NULL; - TranslationBlock *tb; - - tb = atomic_rcu_read(&cpu->tb_jmp_cache[addr_hash]); - if (likely(tb)) { - target_ulong cs_base, pc; - uint32_t flags; - - cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags); - - if (likely(tb->pc == addr && tb->cs_base == cs_base && - tb->flags == flags)) { - code_ptr = tb->tc_ptr; - } else { - /* If we didn't find it in the jmp_cache we still might - * find it in the global tb_htable - */ - tb = tb_htable_lookup(cpu, addr, cs_base, flags); - if (likely(tb)) { - atomic_set(&cpu->tb_jmp_cache[addr_hash], tb); + + /* If there is an interrupt pending request or the TCG exit flag + * has been set we might as well stop here and return to the main + * loop. + */ + if (!cpu->icount_decr.u16.high && !cpu->interrupt_request) { + unsigned int addr_hash = tb_jmp_cache_hash_func(addr); + TranslationBlock *tb; + + tb = atomic_rcu_read(&cpu->tb_jmp_cache[addr_hash]); + if (likely(tb)) { + target_ulong cs_base, pc; + uint32_t flags; + + cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags); + + if (likely(tb->pc == addr && tb->cs_base == cs_base && + tb->flags == flags)) { code_ptr = tb->tc_ptr; + } else { + /* If we didn't find it in the jmp_cache we still might + * find it in the global tb_htable + */ + tb = tb_htable_lookup(cpu, addr, cs_base, flags); + if (likely(tb)) { + atomic_set(&cpu->tb_jmp_cache[addr_hash], tb); + code_ptr = tb->tc_ptr; + } } } }