From patchwork Fri Aug 4 18:53:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 710227 Delivered-To: patch@linaro.org Received: by 2002:a05:6359:d30:b0:129:c516:61db with SMTP id gp48csp150099rwb; Fri, 4 Aug 2023 11:54:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE0WOZJmDEiir/byTZmt4PYgV1N/7w3rirMfiL1PuBPZYGlbhagZvm+4ncGK9UwIlHllsTX X-Received: by 2002:a05:620a:3847:b0:762:3a20:7719 with SMTP id po7-20020a05620a384700b007623a207719mr2227337qkn.18.1691175289809; Fri, 04 Aug 2023 11:54:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691175289; cv=none; d=google.com; s=arc-20160816; b=sJsxqL6vXdUIyEzMGVxdBF/Jy2F4dwC5JWvxKJAT5ipUT81dDpnf/moa8rzcq0x8DQ ZxIX8UfY7r/sJrGcRpWgaQ02HDoDJoPsZnpDXakdxBAQBxlVDCgYycfzeykXem915qPX 8reKZHErfRcpXHYz+tbSn0LltSgRBwGxYCxTsWIBuGfv6lTtmyqS6fzMaHPwKaCw/iMM vmhFUKFd7/30z1E5sV2aTYRKgQZ+fiqwGABDxfVAUoLdT9tptS/az87Mj+wq3CRHPR0C u9a41/6hfCMRRAMooSAGCGSjW0I4yhFI5hb3Y4aQ1CrK4QqOeECiSHLQgRae8kc3K+92 p0EQ== 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=Nm6q8y6T7lw2wqevqXLXIZp5fz8iHt4wB+aVg/PlpZg=; fh=L4rfWCYvgJSPl2MlAyDx7JRNwJ2TCiSBvmAQuo2o+WM=; b=zyQ3M1ufqK9u4W9t7ghRLfNd1QMdnfLkc6+9n/9AnDbRbkS4qm1ZSGn80RWWCLJPzN bG1Y81wLn7Rf2cZNAs7iumHAMgFXduFOAJHUueL/5+1Jw4UDElhuyPwOnrUd8FTcwg3r 3LcOrxyukOERIsw3CdIYFWyZK0AxX3vILiUPA3DqCKWLjCW6cdjmBXGsbIMlHChg8xEw HKSgKoDQZdeN1t11/OlIKwMtBekz+/Ep5fPjCoQIObl2773as9pbgYsLdAeSqX0nHXd7 cSL/ZOYn3/ftBMMwUGs4P929XKVlkEtxeoT98CD9O3aHCwl87SGv21bGD77XwVb0pISe Hd9g== 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 h12-20020a05620a400c00b00765a5168fcdsi1754411qko.528.2023.08.04.11.54.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Aug 2023 11:54:49 -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 1qRzwC-0002GW-Od; Fri, 04 Aug 2023 14:54:12 -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 1qRzwB-0002G7-I8; Fri, 04 Aug 2023 14:54:11 -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 1qRzw9-00087T-Fi; Fri, 04 Aug 2023 14:54:11 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id B4BC218408; Fri, 4 Aug 2023 21:54:17 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 5DCB91B87F; Fri, 4 Aug 2023 21:53:57 +0300 (MSK) Received: (nullmailer pid 1874206 invoked by uid 1000); Fri, 04 Aug 2023 18:53:56 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , =?utf-8?q?C=C3=A9dric_Le_Goater?= , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Michael Tokarev Subject: [Stable-7.2.5 18/36] target/ppc: Disable goto_tb with architectural singlestep Date: Fri, 4 Aug 2023 21:53:31 +0300 Message-Id: <20230804185350.1874133-5-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 The change to use translator_use_goto_tb went too far, as the CF_SINGLE_STEP flag managed by the translator only handles gdb single stepping and not the architectural single stepping modeled in DisasContext.singlestep_enabled. Fixes: 6e9cc373ec5 ("target/ppc: Use translator_use_goto_tb") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1795 Reviewed-by: Cédric Le Goater Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson (cherry picked from commit 2e718e665706d5fcc3e3501bda26f277f055ed85) Signed-off-by: Michael Tokarev diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 1de7eca9c4..90f749a728 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -4327,6 +4327,9 @@ static void pmu_count_insns(DisasContext *ctx) static inline bool use_goto_tb(DisasContext *ctx, target_ulong dest) { + if (unlikely(ctx->singlestep_enabled)) { + return false; + } return translator_use_goto_tb(&ctx->base, dest); }