From patchwork Fri Aug 4 19:16:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 710237 Delivered-To: patch@linaro.org Received: by 2002:a05:6359:d30:b0:129:c516:61db with SMTP id gp48csp163029rwb; Fri, 4 Aug 2023 12:19:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFV8v1R/A33qeuHnK5cH0A64CyMwFJYjyJISOtwe75n0CAnu7ywIjeGy6vpsI47crQmMWBA X-Received: by 2002:a05:620a:400b:b0:768:1d1e:29ce with SMTP id h11-20020a05620a400b00b007681d1e29cemr3503216qko.5.1691176790491; Fri, 04 Aug 2023 12:19:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691176790; cv=none; d=google.com; s=arc-20160816; b=Xp1fnzrSyMtH587bKN60pZgh71pVIJRlD5SwXfgsMP2zkBSrIAq3HOkkB/yyGQvXl8 Lit0Y7Agagh/gxVaw2v4Z2BKzeqmRqocYIUhtUxoZ3ahuBtl3CRq0fi3Vdb7feYkykOK jShUTYX/WgeaoODgW166Hyr1Rx4VFRWtyRsnQT5S20LRlQOAWj3Ko17IN482EMZ9eCZx X+svtjelPGjK1kGSr8g/h3VzlFJ8JaSDJyWvE84ysz9nGSbXQMMng8kdRoXkKmvSklZW Eq1x/siPmfu8uTXPmXGBVPBpNw514+wxKZK/3KyxWRwqrKMS6YrJAQAm3LSBQEXzPtz6 rXdg== 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=30eqFVi/VZqmtwb/4cWi5Jj+KrNJYmXMAC62wW/uaYs=; fh=L4rfWCYvgJSPl2MlAyDx7JRNwJ2TCiSBvmAQuo2o+WM=; b=mhHSPoZFN6Z693QTiZcMRsPVXSMwx7l2iRP87nEi0zbuXIUFqPkUbslm+mzMCiFtuu 15o+tMa1C8gaUJyca926+pnABOG8jAcpZyGyO3rhS2YibO4eXhyMnqLah0DCM+/QBMsT V4FrlLuHH2iwP4zlON34zYfHmW1asSR//zfa94UjAKS1RpYJ4AY0gH7/fUpvjXtP97Fl pDkTDZ038kX4lfn0tIaJkywq6bF18l++kFOEdGVK7VTx08S7rbLvWkwhBK3hngWbGNnY EGFdTlorm1053YtAHeDIhaOIxctzSXxZxeiGP27Uv12p4M35QXv2Vhqq1mcxuzAiw6cD VgpQ== 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 n2-20020a05620a294200b00767cae047dcsi1777967qkp.267.2023.08.04.12.19.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Aug 2023 12:19:50 -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 1qS0Io-0000ZY-E1; Fri, 04 Aug 2023 15:17:34 -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 1qS0Im-0000YL-V2; Fri, 04 Aug 2023 15:17:32 -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 1qS0Il-0006y2-BX; Fri, 04 Aug 2023 15:17:32 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 1680C1845D; Fri, 4 Aug 2023 22:17:12 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id A10A71B8A0; Fri, 4 Aug 2023 22:16:51 +0300 (MSK) Received: (nullmailer pid 1875720 invoked by uid 1000); Fri, 04 Aug 2023 19:16:49 -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-8.0.4 43/63] target/ppc: Disable goto_tb with architectural singlestep Date: Fri, 4 Aug 2023 22:16:26 +0300 Message-Id: <20230804191647.1875608-12-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 49a6b91842..26222e9078 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -4132,6 +4132,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); }