From patchwork Wed Oct 4 08:02:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 729246 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a4e:0:b0:31d:da82:a3b4 with SMTP id v14csp219830wrs; Wed, 4 Oct 2023 01:07:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHRMDq5B3bA7YPzXtYcd7IX7Go58zL03iPskMf+Qx1QiaHNlTey+livk2onUCFvusFw/4H6 X-Received: by 2002:a05:622a:1ba8:b0:418:1194:42f7 with SMTP id bp40-20020a05622a1ba800b00418119442f7mr1793527qtb.51.1696406841279; Wed, 04 Oct 2023 01:07:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696406841; cv=none; d=google.com; s=arc-20160816; b=uT1wGvklcrdsUL4CU5bjN9HzdGYiqn286nYU+5j2fXa4lwbnbaPMZY0BAy+B3g4w10 G/ZRjVPWWgZPt9PX76+cX4bU8RjU0i1njXXZ60L6AsYyivgTuSaZdKipovHi3QDT5Bv0 LZkwWn1OaS4msSNk7iPPKIrc5eG5MHkua/xcwVPvKqAkE0QbRBtW5ZSCgz1nsjZtOp3N l/skivYWYDhS9E38Lb3jsk0FgS1smNPMjcw7o7e9SxqTqgVuDNxCC/+xSiRGf/gmfBS9 1NhTTx26ntv778JrhOu6ciPPiQSRhG75G5s98B2pATg2YvIsMFQd+Y1pbbiVs+xuWbxX KmHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=3+vA/vYER/L8sNSnxpocL0U+uLvdD3mtNL7B4pJAGgE=; fh=K4abbxCgZAPvqzOXA+PZ7RIZh+KufMVJze7rXLOwES0=; b=uavginIzsM1U978Rzxcegi8lvjDqYjk2wnt4ZVpld2h9YQ3Jgz+Kw/PJDGxzGt8z9w 8BLTC99qEnZR/jTZ/KdmRXCJ755ro0UtWnLnC0W5ZKh6LlE7lEmcC0h4my+dt8+n0dlZ oJTJks4nHZ61pgwOAMnmav7mRh/90hzTEPOWkbkT7leyypaSpIIEjcE2olD47oAVEuz6 oQs/JoRw/+ArUiFbCF45XgrAPQEIBpDMElT7SFSWHN9JTZqAiQPIR1TJPmlN//6ZETd1 YO5TmPJbi6N1Q3KiQ8nuhYNIYpRYqk/957VGr0cmHukeeIbJHIA7iYVfLuiEztlyK/2C FPOw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h14-20020ac87d4e000000b004180cd5acadsi1285242qtb.454.2023.10.04.01.07.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Oct 2023 01:07:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qnwuE-0006gA-Gw; Wed, 04 Oct 2023 04:06:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qnwte-00062A-3i; Wed, 04 Oct 2023 04:06:27 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qnwtZ-0003iQ-K4; Wed, 04 Oct 2023 04:06:16 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 29AD8275B5; Wed, 4 Oct 2023 11:02:31 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 6EF6B2CBEE; Wed, 4 Oct 2023 11:02:30 +0300 (MSK) Received: (nullmailer pid 2702871 invoked by uid 1000); Wed, 04 Oct 2023 08:02:22 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Michael Tokarev Subject: [Stable-8.1.2 40/45] accel/tcg: Always require can_do_io Date: Wed, 4 Oct 2023 11:02:01 +0300 Message-Id: <20231004080221.2702636-40-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson Require i/o as the last insn of a TranslationBlock always, not only with icount. This is required for i/o that alters the address space, such as a pci config space write. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1866 Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson (cherry picked from commit 18a536f1f8d6222e562f59179e837fdfd8b92718) Signed-off-by: Michael Tokarev diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index dd507cd471..358214d526 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -28,12 +28,6 @@ static void set_can_do_io(DisasContextBase *db, bool val) bool translator_io_start(DisasContextBase *db) { - uint32_t cflags = tb_cflags(db->tb); - - if (!(cflags & CF_USE_ICOUNT)) { - return false; - } - set_can_do_io(db, true); /* @@ -86,15 +80,15 @@ static TCGOp *gen_tb_start(DisasContextBase *db, uint32_t cflags) tcg_gen_st16_i32(count, cpu_env, offsetof(ArchCPU, neg.icount_decr.u16.low) - offsetof(ArchCPU, env)); - /* - * cpu->can_do_io is set automatically here at the beginning of - * each translation block. The cost is minimal and only paid for - * -icount, plus it would be very easy to forget doing it in the - * translator. - */ - set_can_do_io(db, db->max_insns == 1 && (cflags & CF_LAST_IO)); } + /* + * cpu->can_do_io is set automatically here at the beginning of + * each translation block. The cost is minimal, plus it would be + * very easy to forget doing it in the translator. + */ + set_can_do_io(db, db->max_insns == 1 && (cflags & CF_LAST_IO)); + return icount_start_insn; } diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 9bb40f1849..593fc80458 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -11212,7 +11212,6 @@ static void gen_branch(DisasContext *ctx, int insn_bytes) /* Branches completion */ clear_branch_hflags(ctx); ctx->base.is_jmp = DISAS_NORETURN; - /* FIXME: Need to clear can_do_io. */ switch (proc_hflags & MIPS_HFLAG_BMASK_BASE) { case MIPS_HFLAG_FBNSLOT: gen_goto_tb(ctx, 0, ctx->base.pc_next + insn_bytes);