From nobody Mon Feb 9 16:34:57 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1500236159188501.4928508843427; Sun, 16 Jul 2017 13:15:59 -0700 (PDT) Received: from localhost ([::1]:46752 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dWpxN-0002WS-Vh for importer@patchew.org; Sun, 16 Jul 2017 16:15:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46130) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dWpmZ-0001Aj-Dj for qemu-devel@nongnu.org; Sun, 16 Jul 2017 16:04:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dWpmU-0008HG-Qa for qemu-devel@nongnu.org; Sun, 16 Jul 2017 16:04:47 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:39909) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dWpmU-0008GA-Jz for qemu-devel@nongnu.org; Sun, 16 Jul 2017 16:04:42 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id D7DE120A50; Sun, 16 Jul 2017 16:04:41 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Sun, 16 Jul 2017 16:04:41 -0400 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 9CE3A7E1FC; Sun, 16 Jul 2017 16:04:41 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=braap.org; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=G3W SHA+GbgxSeJ2Y/eqmWeXP2QoJva651P+5F3BIe3A=; b=NlgBrWMb5q4d11nVVfb HgaXxt0fohMJfL5WA5iIeupKYSDzoXI+iy7p/IkSb8wcCpomFLvdlgI0PhCTQFp3 xyDpLlF/35mfxxqU+8mhBq7hw67imeAF6RU19aKKVwgkp1iknNL+adB+v/UaDb3l CbytB64s9K8SFsgJ2oRpbYYA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=G3WSHA+GbgxSeJ2Y/eqmWeXP2QoJva651P+5F3BIe 3A=; b=aoj8P/jSbCTsBt5B/rWlg/hcDEyMDZWSCo15Big8qkzHmWibNeVo6csR9 faUnmaF6Z2yYPSHp/KhCKCts+ICuDnAJmeRRRlq7wGnN41woqUSsZq6pZn/kvkn5 onu3K+oZsjeRLdVOXiOevoRrTSCdp32nFL9RQYd/IkyBXd+lja4X3yAVWQ21zt4E BhwNg9+BbmfCVXW9249Pmfh6iGewOtzH8hkAlpAyR1BAtMprNEY2nR/WVKUqdYlH CxreZDgdtR1hX4Bs7sRwK7XVA6eOV1r8jt4VUkSuAzwr5Sxa3tu424AC5WJWq94c I2J2qnGJQ3an2fBLWbLn/kzaL5wNg== X-ME-Sender: X-Sasl-enc: 2RRP2NckoU2CdIL08BwoKPY0/ecQZinqY2+Tv9YE1JXk 1500235481 From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Sun, 16 Jul 2017 16:03:54 -0400 Message-Id: <1500235468-15341-12-git-send-email-cota@braap.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1500235468-15341-1-git-send-email-cota@braap.org> References: <1500235468-15341-1-git-send-email-cota@braap.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.111.4.25 Subject: [Qemu-devel] [PATCH v2 11/45] exec-all: bring tb->invalid into tb->cflags 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: Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This gets rid of a hole in struct TranslationBlock. Signed-off-by: Emilio G. Cota Reviewed-by: Richard Henderson --- include/exec/exec-all.h | 3 +-- accel/tcg/cpu-exec.c | 2 +- accel/tcg/translate-all.c | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 28e3a24..78a1714 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -326,12 +326,11 @@ struct TranslationBlock { #define CF_NOCACHE 0x10000 /* To be freed after execution */ #define CF_USE_ICOUNT 0x20000 #define CF_IGNORE_ICOUNT 0x40000 /* Do not generate icount code */ +#define CF_INVALID 0x80000 /* Protected by tb_lock */ =20 /* Per-vCPU dynamic tracing state used to generate this TB */ uint32_t trace_vcpu_dstate; =20 - uint16_t invalid; - void *tc_ptr; /* pointer to the translated code */ uint8_t *tc_search; /* pointer to search data */ /* original tb when cflags has CF_NOCACHE */ diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 9b5ce13..34841cd 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -387,7 +387,7 @@ static inline TranslationBlock *tb_find(CPUState *cpu, tb_lock(); acquired_tb_lock =3D true; } - if (!tb->invalid) { + if (!(tb->cflags & CF_INVALID)) { tb_add_jump(last_tb, tb_exit, tb); } } diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 6d4c05f..53fbb06 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -1082,7 +1082,7 @@ void tb_phys_invalidate(TranslationBlock *tb, tb_page= _addr_t page_addr) * Mark the TB as invalid *after* it's been removed from tb_hash, which * eliminates the need to check this bit on lookups. */ - tb->invalid =3D true; + tb->cflags |=3D CF_INVALID; =20 /* remove the TB from the page list */ if (tb->page_addr[0] !=3D page_addr) { @@ -1273,7 +1273,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu, tb->flags =3D flags; tb->cflags =3D cflags; tb->trace_vcpu_dstate =3D *cpu->trace_dstate; - tb->invalid =3D false; =20 #ifdef CONFIG_PROFILER tcg_ctx.tb_count1++; /* includes aborted translations because of --=20 2.7.4