From nobody Tue Jul 1 09:59:55 2025 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1674585296; cv=none; d=zohomail.com; s=zohoarc; b=LC7jEGcEIQ3jMjTeapDAJKk6m+sz8MPGpVJTykTn1G9zrI5DJO0h3+w9lyWv4J/k3MGw2nShZ0Y/dnjBLRUElhn6spHblt5Zu8pMNePP0tTekgf0nKSap0QxJGV2LrkVHGLWOCf+FvmbMEuxtFKsF11c4iL+HZp4uyr6OE1nJ3Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674585296; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yF79W/oG8BIP2TY7X/k2rfY64Zx5JTk5QXqtO8k21/c=; b=DjqUzmRVM/R/GWZX1dMSMLwHaJc5Trn8/gDjLoxY4JI38bJYxOAEpuro7jMdby3ehL8qJO/9NAO7OY8dcu7MGhvCE0Y5GG/J2wOx4BwPKj7xZwic78m/EIM8I5TqlFfSDfmGklYkmO+iNydMY5rSd9z4L2LkynJKSEDTxjnHKLc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674585296419289.33378932164067; Tue, 24 Jan 2023 10:34:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pKNhc-0005Gv-83; Tue, 24 Jan 2023 13:07:24 -0500 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 1pKNhF-0004yh-3X for qemu-devel@nongnu.org; Tue, 24 Jan 2023 13:07:03 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pKNhD-00073e-CE for qemu-devel@nongnu.org; Tue, 24 Jan 2023 13:07:00 -0500 Received: by mail-wr1-x434.google.com with SMTP id b7so14737599wrt.3 for ; Tue, 24 Jan 2023 10:06:58 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id q14-20020adff78e000000b002be07cbefb2sm2902794wrp.18.2023.01.24.10.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 10:06:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6D4C21FFD2; Tue, 24 Jan 2023 18:01:31 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=yF79W/oG8BIP2TY7X/k2rfY64Zx5JTk5QXqtO8k21/c=; b=ekgFWCiAljHyOA3AgWNH51A0FrWr/r1mG5jZkolFJgUjIjqCcWLQ9SViPOMIc0DnBA hHZWBgk1xmcDcEO9ghLc6LIJqrug0hwwG1llL39Pqrl1IhCuf3oEZgzSsAMTZxDqxb9s dm/81BCOmU03h5jtAi90NU3GnPtgHkQ5tMG5L2eZilaAW7tvAlyWmgMAJUYqGQsJvR8+ Z7WMFdRCOl0NWe2tPKEzPxlEiAf1IXDTrnrmYO6u4iiDFoJhdK+yju+RXYg6T7xkfORM baS4MFHdUwxlfQFm5OwLVH91jWBXh/1pXNROjCAcAZ1u4rNsEdCyQ6bOpqyYYx6FixBC e9HA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=yF79W/oG8BIP2TY7X/k2rfY64Zx5JTk5QXqtO8k21/c=; b=NzHz0S514NUN/T2aY58YSnkvRJvXzg+RW+ZYFq5hktu+47FMob1hDLNaiDY6xvWZTw uldeVItO9EvpG3AZTkiINqos0sMtet//5Va8r5VNNvV4bwR25qugMOlHUI4zmAbeFhCC 14W43QAUM0OoKFBt0xee+OI4XpBGpHPqtOGhMwR4dHNPFvE1sADTE/vre9KLZS/2fVRJ pcIdyAHynspW1tQfwqgjBMr/EmgDurrmPEnTCqc475b92UUgN74IbIOQoHzAqVR7pn7Z Yn7O3gywKVpDMg2K/1837mZE3YvzCSVTXyOLF0vtqDsMk5Ducfx8Hy3mnO2kXy2lWCUg rYvQ== X-Gm-Message-State: AFqh2kqagfyeQLqEYbwKslOFQzvcxKuY0oCWqfJwGHQSS7L9lfuLho7q jt3PWqzPCUmmz004FeYUYwpgbg== X-Google-Smtp-Source: AMrXdXtKc9rQZMZioj9sLzYynVvlcRznxyzfUtKemGtFONrm6kxPJBgot/7jA0h1EJASN6VMnmde6A== X-Received: by 2002:adf:e9d2:0:b0:257:15b9:8b66 with SMTP id l18-20020adfe9d2000000b0025715b98b66mr24864437wrn.62.1674583616765; Tue, 24 Jan 2023 10:06:56 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Ed Maste , Thomas Huth , Alexandre Iooss , Markus Armbruster , Jagannathan Raman , John G Johnson , Mahmoud Mandour , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Bandan Das , Elena Ufimtseva , Michael Roth , Eduardo Habkost , Beraldo Leal , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Qiuhao Li , Stefan Hajnoczi , Alexander Bulekov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , Paolo Bonzini , Darren Kenny , qemu-arm@nongnu.org, Yanan Wang , Cleber Rosa , Wainer dos Santos Moschetta , Marcel Apfelbaum , Li-Wen Hsu , Peter Maydell , Emilio Cota Subject: [PATCH v2 32/35] translator: always pair plugin_gen_insn_{start, end} calls Date: Tue, 24 Jan 2023 18:01:24 +0000 Message-Id: <20230124180127.1881110-33-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230124180127.1881110-1-alex.bennee@linaro.org> References: <20230124180127.1881110-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.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=unavailable 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1674585298331100003 From: Emilio Cota Related: #1381 Signed-off-by: Emilio Cota Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20230108164731.61469-3-cota@braap.org> Signed-off-by: Alex Benn=C3=A9e --- accel/tcg/translator.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index 061519691f..ef5193c67e 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -100,19 +100,24 @@ void translator_loop(CPUState *cpu, TranslationBlock = *tb, int max_insns, ops->translate_insn(db, cpu); } =20 - /* Stop translation if translate_insn so indicated. */ - if (db->is_jmp !=3D DISAS_NEXT) { - break; - } - /* * We can't instrument after instructions that change control * flow although this only really affects post-load operations. + * + * Calling plugin_gen_insn_end() before we possibly stop translati= on + * is important. Even if this ends up as dead code, plugin generat= ion + * needs to see a matching plugin_gen_insn_{start,end}() pair in o= rder + * to accurately track instrumented helpers that might access memo= ry. */ if (plugin_enabled) { plugin_gen_insn_end(); } =20 + /* Stop translation if translate_insn so indicated. */ + if (db->is_jmp !=3D DISAS_NEXT) { + break; + } + /* Stop translation if the output buffer is full, or we have executed all of the allowed instructions. */ if (tcg_op_buf_full() || db->num_insns >=3D db->max_insns) { --=20 2.34.1