From nobody Tue Dec 16 07:06:26 2025 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; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520984744646536.4302704039483; Tue, 13 Mar 2018 16:45:44 -0700 (PDT) Received: from localhost ([::1]:43613 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evtbz-0005MU-NK for importer@patchew.org; Tue, 13 Mar 2018 19:45:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58855) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evsiv-0006Yn-0i for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evsiu-0004IN-01 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:49 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:33103) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evsit-0004Hv-PL for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:47 -0400 Received: by mail-wm0-x242.google.com with SMTP id s206so16181396wme.0 for ; Tue, 13 Mar 2018 15:48:47 -0700 (PDT) Received: from donizetti.lan (94-36-191-219.adsl-ull.clienti.tiscali.it. [94.36.191.219]) by smtp.gmail.com with ESMTPSA id x107sm1557951wrb.97.2018.03.13.15.48.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Mar 2018 15:48:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=XAh0cTYGWr98+60+kv5Q99wVSYfI9EVhd1DOIudsuN8=; b=ISFVddFbE+DQOawqORs/1fRoJkWqCCzMY4p27dYMlrRIYSPXSPhuUTbYXM+HlXD8M9 Iwu3lOogPWfldj62XrVXBp/nyyerseWEjl5GD3b3+QVuFp0oS9tz2JgAtGFuEmc5Zksb WDW4HFwcesQD4WM5qgNEwtP6MvbNDaFJRPmHbPhHGwBjSDFXY4AnY5RvFDwZoZlLPtBG qTWTXR7C8J4NDkioFHi80e3fbarWvsBe16D3Oz/ERls9yQwum/GNu5+8wOkv31gWZFoT Zt2yk5baBjeETvb85NhmDIW5tAXrAE7PO1/+4Sfz6OHkbS4HmOsdrJg85UhskesjyzDd GhtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=XAh0cTYGWr98+60+kv5Q99wVSYfI9EVhd1DOIudsuN8=; b=kPlxcGbJpW2f27YPtl6TGxZQHdekI/CK4TAiC/Nu3B7wVy0qEQE2v325NkkD/efkKb j1n1oVOcsHG3A+6wplHuAdxPNIbFd+lLxE+FM5r5oqij1JZOkp10a9WR6BThGzuP5w4s SNsYsLXg8chwq7LZSjsKeAAr6dggduK14KmhDPeDl76UXxUJClCnQtYC+nht3VaY42BJ tv9wZH7uUE701p5k0B4yY5Kp4q/2S+mHUFJ7zivnmC6aCRZx5Jw2iFJ+v463G7MYaj1Q oRxg5cuF7SQWBPhecvvjSmZeQna1XVpcdEXpQiBEvCeUFl9X4qjvSt3aY8X9iG2PRShj oqyg== X-Gm-Message-State: AElRT7E8a1ylB2u+YURDDQjNmRe2EhvuyfFd+gbWD+G8zsly1sjnVeID o5miLSqlVckocBNlLHE/HGMNzDoc X-Google-Smtp-Source: AG47ELs2qaVMJRD3n5vIjwk2ayBYfQiVOSVDrS0e8CYmARLJo58fTBICdWfKFuxOde3H5eGfuUcIEA== X-Received: by 10.28.51.67 with SMTP id z64mr1966684wmz.59.1520981326304; Tue, 13 Mar 2018 15:48:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 23:47:19 +0100 Message-Id: <20180313224719.4954-70-pbonzini@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313224719.4954-1-pbonzini@redhat.com> References: <20180313224719.4954-1-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PULL 69/69] tcg: fix cpu_io_recompile 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: Pavel Dovgalyuk Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Pavel Dovgalyuk cpu_io_recompile() function was broken by the commit 9b990ee5a3cc6aa38f81266fb0c6ef37a36c45b9. Instead of regenerating the block starting from PC of the original block, it just set the instructi= on counter for TCG. In most cases this was unnoticed, but in icount mode there was an exception for incorrect usage of CF_LAST_IO flag. This patch recovers recompilation of the original block and also configures translation for executing single IO instruction which caused a recompilation. Signed-off-by: Pavel Dovgalyuk Message-Id: <20180227095338.1060.27385.stgit@pasha-VirtualBox> Signed-off-by: Paolo Bonzini Signed-off-by: Pavel Dovgalyuk --- accel/tcg/translate-all.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 67795cd78c..5ad1b919bc 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -1728,7 +1728,8 @@ void cpu_io_recompile(CPUState *cpu, uintptr_t retadd= r) CPUArchState *env =3D cpu->env_ptr; #endif TranslationBlock *tb; - uint32_t n; + uint32_t n, flags; + target_ulong pc, cs_base; =20 tb_lock(); tb =3D tb_find_pc(retaddr); @@ -1766,8 +1767,14 @@ void cpu_io_recompile(CPUState *cpu, uintptr_t retad= dr) cpu_abort(cpu, "TB too big during recompile"); } =20 - /* Adjust the execution state of the next TB. */ - cpu->cflags_next_tb =3D curr_cflags() | CF_LAST_IO | n; + pc =3D tb->pc; + cs_base =3D tb->cs_base; + flags =3D tb->flags; + tb_phys_invalidate(tb, -1); + + /* Execute one IO instruction without caching + instead of creating large TB. */ + cpu->cflags_next_tb =3D curr_cflags() | CF_LAST_IO | CF_NOCACHE | 1; =20 if (tb->cflags & CF_NOCACHE) { if (tb->orig_tb) { @@ -1778,6 +1785,11 @@ void cpu_io_recompile(CPUState *cpu, uintptr_t retad= dr) tb_remove(tb); } =20 + /* Generate new TB instead of the current one. */ + /* FIXME: In theory this could raise an exception. In practice + we have already translated the block once so it's probably ok. */ + tb_gen_code(cpu, pc, cs_base, flags, curr_cflags() | CF_LAST_IO | n); + /* TODO: If env->pc !=3D tb->pc (i.e. the faulting instruction was not * the first in the TB) then we end up generating a whole new TB and * repeating the fault, which is horribly inefficient. --=20 2.14.3