From patchwork Wed Apr 24 23:31:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 791601 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:346:15ad:a2a with SMTP id g4csp1106894wrq; Wed, 24 Apr 2024 16:34:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXL9Ky9wtvVOhw0Pk450u48mYb6u8K69coVvkYf9ymYeXVYv8YHvexAAFfJl2MxZqGSCmwKiSeOKcYdOojZBvIm X-Google-Smtp-Source: AGHT+IHSuWwL3ppI78Wvj09PbpYVVVqDxg5fwFCrdJ3XrcWqnYcv6cjHcm5VbNrvpMcLe0MWrMJV X-Received: by 2002:a05:620a:1a23:b0:790:97a3:fc3c with SMTP id bk35-20020a05620a1a2300b0079097a3fc3cmr1434775qkb.3.1714001685620; Wed, 24 Apr 2024 16:34:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714001685; cv=none; d=google.com; s=arc-20160816; b=MkwCvBsdMPYDRjuDB8sNyglBHBSBwGqpzYX+P/bkzjNWdnGeN05zIGY8RBsgKPmHGW fWphcRizNY9l/WFlLjQqjiCPJgQnoo78q5+U7nnBVv6tkP/qJDechU+aXKcfyyu+QGft YSMwoXhT0tvqEB1i1bp7qCprYv0Woj1tvIhVeq/j4bqs98NvlKBTUvo326/SVnUMnWGj 1LbDx4WzzP/s66OMUydEX0AA3g9UL8PvWxTTqFWlBb1UZk69OK1kzuWE/Gv7dtFPDNet 0YYS2zuWiEqqaHs8OSGvaWnc5CbzR5wOOG7XBGOxEpegjbwcsCUhKO4ynOvkpkYbbhMA h0wQ== 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:dkim-signature; bh=0iznKbTX8oBcbpJPieQQMWlAI4HDAUpQMvJb/sM2VnA=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=I+4GCZ8jwQ4r9u7+ZCtRqMjqhrzjH/R341xcRC1JRpOqJIpnn3HJn9qxnDlNHBCxXB KkGfch6yD6/sY7FaXFFHJmaXqKwm587Hk6EctSTL890Qs4qANXe4wkxN3EPdV5YKaNnL 8lC3uGSDc3sl7+rRIehnxI4HSHzWd+EgiG7ruJl3HH3VTCJ4hAKv6RuCn0fMOG2y8bhV 5xwt1cpTB4fznNDIv7yON3urIyeQVE70aA5PacbeKUwiSndGPNYRf0F5+5b6FK2+KOzc BBY5NNsZVofuGLrG1Md4FKp5s2mdEHK6/h9EFeU9CluDDQ3+13NmCLZihg6cWjZuO+fU qAGw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="oHeRMg/2"; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h16-20020a37de10000000b0078f0eb3b04csi15177794qkj.713.2024.04.24.16.34.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Apr 2024 16:34:45 -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; dkim=pass header.i=@linaro.org header.s=google header.b="oHeRMg/2"; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rzm5d-0005qZ-Hk; Wed, 24 Apr 2024 19:31:49 -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 1rzm5V-0005m0-WF for qemu-devel@nongnu.org; Wed, 24 Apr 2024 19:31:42 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rzm5T-0003R5-Uz for qemu-devel@nongnu.org; Wed, 24 Apr 2024 19:31:41 -0400 Received: by mail-pj1-x1031.google.com with SMTP id 98e67ed59e1d1-2ad8fb779d2so400936a91.0 for ; Wed, 24 Apr 2024 16:31:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714001497; x=1714606297; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0iznKbTX8oBcbpJPieQQMWlAI4HDAUpQMvJb/sM2VnA=; b=oHeRMg/2+/cO2VyzeYyA/D0BWR3Pcj7Ks/aQSA4VTYFAZrikXn0VBX9vIqLK3dvUrw Ibm25juYs3PAgzj8rCfCnF29UhYo1u0Co3mzb/Z42LfnvaIUxx/SduaPZVjxVDGr5NNs X9M0s+ytzse01W2v3NPhtWIgeq34WPruzpBJfZ59lJE/lnaWYMqsE9HQHS1jshyJK0yR pIvmg5x4ZtB7ocAugrKqheR1lWs2AeCjNqNTMCa7zdynDVCx4uT3cO8EvJFPdJsPmBRJ v1wzbyNj9RJG6+MtlhqmdEdqrZrtHBQFNgv1reGzq9ujF1bb1trrYeFdP4qSuRjE3+Vj jwfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714001497; x=1714606297; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0iznKbTX8oBcbpJPieQQMWlAI4HDAUpQMvJb/sM2VnA=; b=i75OTOAdkDKQ2Vq8o/oAtZAZCpmUtFLaunqYNWKa3XySsN/FjWKx3Ms2EIPk3Ndx2b 7RAQqboBVXZC+SyA2ol8hoNusqW6XMmcUV/5CjLY2Rqz1WmoIuR11US1+4507gVs4hQS 7WvKwadDbHFiWGs2N1/DPncZoecL5hKcX695BQnLTiIDQARb76GLzNTxsXexRYTbHMlT f/2gpGGoZh/13KXTbyqV7JVtmWZ53EYEn9v6jnCxN9GBIgbg3ODQQoHeRkdSVQNP5aPx odnr5ZJtNb0r7reXmjMb30x2zCQFK9pytHu+jHBjHXCAlVIBlxj86kaJBv3HAmOCN2cy brpA== X-Gm-Message-State: AOJu0YyrgErurnF2I3I4BSL6CQ5v482DAvBhu7AEkkmgrYYg++CRrPOl +Utcfm1mEEGrTHbikq06uFJArp9SGa3TLvBsLxmM1YM0OIt8bGY79jVtXzuwlSTwCL1a6avHMKR Y X-Received: by 2002:a17:90b:1d0e:b0:2a2:f284:5196 with SMTP id on14-20020a17090b1d0e00b002a2f2845196mr3902965pjb.45.1714001497549; Wed, 24 Apr 2024 16:31:37 -0700 (PDT) Received: from stoup.. ([156.19.246.23]) by smtp.gmail.com with ESMTPSA id z24-20020a17090abd9800b002a56b3931dfsm11737859pjr.49.2024.04.24.16.31.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Apr 2024 16:31:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 05/33] accel/tcg: Cap the translation block when we encounter mmio Date: Wed, 24 Apr 2024 16:31:03 -0700 Message-Id: <20240424233131.988727-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240424233131.988727-1-richard.henderson@linaro.org> References: <20240424233131.988727-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1031.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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 Do not allow translation to proceed beyond one insn with mmio, as we will not be caching the TranslationBlock. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- accel/tcg/translator.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index dbd54e25a2..c3f4d0e252 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -239,6 +239,8 @@ static bool translator_ld(CPUArchState *env, DisasContextBase *db, /* Use slow path if first page is MMIO. */ if (unlikely(tb_page_addr0(tb) == -1)) { + /* We capped translation with first page MMIO in tb_gen_code. */ + tcg_debug_assert(db->max_insns == 1); return false; } @@ -287,6 +289,8 @@ static bool translator_ld(CPUArchState *env, DisasContextBase *db, if (unlikely(new_page1 == -1)) { tb_unlock_pages(tb); tb_set_page_addr0(tb, -1); + /* Require that this be the final insn. */ + db->max_insns = db->num_insns; return false; }