From patchwork Mon Apr 17 16:40:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 673844 Delivered-To: patch@linaro.org Received: by 2002:adf:fcce:0:0:0:0:0 with SMTP id f14csp1604453wrs; Mon, 17 Apr 2023 09:41:09 -0700 (PDT) X-Google-Smtp-Source: AKy350ZMGcFtAxbMIS4O+VSU6+4nkxZwQ2Je3aObgVR0F6iNtI7ZsPl/voyccIewbHia/O14Ipiq X-Received: by 2002:ad4:5baf:0:b0:5b4:1d9a:75e7 with SMTP id 15-20020ad45baf000000b005b41d9a75e7mr17946885qvq.13.1681749669811; Mon, 17 Apr 2023 09:41:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681749669; cv=none; d=google.com; s=arc-20160816; b=FVETloo1GXiEb6AZUprDsKuIq/VUO99k0ndVud/JsBOX/Eak2BQf0jXKneudetMPxm Jmg/Mub2uNhTNrbbQEQoft4XSrvwTJvxTlytbbW62Ad4zMP1VIR5L4CdT+SMBdI7f1kg 55TEHWFQWsfoo1pfrGy3MFYR8USaaBc7ADhxGfOBoWPnxwFMuaa+YXCk8UxYFoptXdpN ytx7foD2oQKjhYHnYUgXjWJEXBG6CsGc710B5pCSq9XWek2bpqG6lHo4lTEO3BKQ/9GQ /PJTUihsFYBBXSAWyzr/uwnp8S7JCKyi7yIOq+VR/GOCGKR8v3ynDpnYZM+lTACBKfl4 koew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:sender:errors-to:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:delivered-to:delivered-to:dkim-signature; bh=Gs+iC0C5OHKEybS9WeBQh25/t1gv+/9yrwaTYs2naWg=; b=kx95k9tFoqB5SkEK/fVIMfhUWKQYD95oq7tuSlyQrKdGFdX8b9BO5IDDQt+nlF0wd2 NZn8aM4mTRq/WkvjQC/S2ifbg8YtID4gRQipsTqMobYJ8R7hhRAkpujgV0VWb4PZkul9 dZm6YlbJ5gYEu3usAmMQ4s+ZA7Fhei8kT2akhFCFjg+SRxdLX6chXXbDQrY7FZFplKJ0 UIgVBLC5DdRJxUgwOVzKio3/IoTV2VmdQlPTKahdzFUIwBSiDOdlKkKGmHLrmmbAWBMD 2ZQp3ixGoQ/Ul0MWPN8er/VuOQq7nOoekJnI09ct2x8w0dFlRab2x63zLL+YskXICJI+ O0Gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=MOApy0CY; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com. [170.10.129.124]) by mx.google.com with ESMTPS id js6-20020a0562142aa600b0058beac18028si5748585qvb.75.2023.04.17.09.41.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 09:41:09 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=MOApy0CY; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681749669; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Gs+iC0C5OHKEybS9WeBQh25/t1gv+/9yrwaTYs2naWg=; b=MOApy0CYXg/2NlUtN6trqhEhZzhnrAqV6FwtrwlFS6zXuWQwm/jDFC0HwkfE5nSkL/ErRh 3jSuzOK0qAie/+S/cdtWHB7ZN1AZVH3Bxp9vk3BEc79sdcqguJ+3RNO5h3OwVfgtb14wlA 9n/IkeUgexwsokpjdrLVDAOXgHxDMdY= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-583-2sE8uLyTNhioJeA0YraUJw-1; Mon, 17 Apr 2023 12:41:01 -0400 X-MC-Unique: 2sE8uLyTNhioJeA0YraUJw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D4C731C00ADE; Mon, 17 Apr 2023 16:40:55 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 86720492B13; Mon, 17 Apr 2023 16:40:55 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5F1D719465A3; Mon, 17 Apr 2023 16:40:55 +0000 (UTC) X-Original-To: libvir-list@listman.corp.redhat.com Delivered-To: libvir-list@listman.corp.redhat.com Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0EC77194658C for ; Mon, 17 Apr 2023 16:40:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E65ACC15E7F; Mon, 17 Apr 2023 16:40:50 +0000 (UTC) Delivered-To: libvir-list@redhat.com Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DF145C15BA0 for ; Mon, 17 Apr 2023 16:40:50 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C3ACE88B7A0 for ; Mon, 17 Apr 2023 16:40:50 +0000 (UTC) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-168-f5rn4Sr6Mg-d8uiaf-prWg-1; Mon, 17 Apr 2023 12:40:46 -0400 X-MC-Unique: f5rn4Sr6Mg-d8uiaf-prWg-1 Received: by mail-wm1-f52.google.com with SMTP id d8-20020a05600c3ac800b003ee6e324b19so13412991wms.1 for ; Mon, 17 Apr 2023 09:40:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681749645; x=1684341645; 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=Gs+iC0C5OHKEybS9WeBQh25/t1gv+/9yrwaTYs2naWg=; b=dKoF2Ez8oIL+CCenAGhdgKfTExl45bvtH2IkQUqWcoCk1pF6AjfiiEa/RayQQz/2JD g3+CPJJyk/8vdEMC2+fK/S6D36oFAb3vviIzfynnDSYDDb8eFPF01Jle9wKbpGXura5X DnNuGfmSHNCyDBOgNQTmSsG7tWUdwszGoq0+zIim3Z0634q3G9kQts8GxTWb3BfGm4Fe PlJnhGxgWmxsAo8vQwAkgXfFvlUQlncpY4FueHPvgUj8so7qSTKsoJmDKXRdBqNsympW iCxbdw1gFoNfDvRGVB20xiQSIvrtERpid9jn/lcMeV+b4UE39iqLLrQj/hkstc0VQJi2 VndQ== X-Gm-Message-State: AAQBX9c/Bm17LgPwHRsVa/eXp1QmE8D+5u66Y6Rty7tUysOMc8qH1nO7 PWEG2JDFpPpGkqeGdIRYDPLL9Q== X-Received: by 2002:a05:600c:2051:b0:3f1:6ec5:bc6e with SMTP id p17-20020a05600c205100b003f16ec5bc6emr6279173wmg.3.1681749644708; Mon, 17 Apr 2023 09:40:44 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id q17-20020a5d61d1000000b002faaa9a1721sm2595103wrv.58.2023.04.17.09.40.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 09:40:44 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH v3 03/10] accel/tcg: Use one_insn_per_tb global instead of old singlestep global Date: Mon, 17 Apr 2023 17:40:34 +0100 Message-Id: <20230417164041.684562-4-peter.maydell@linaro.org> In-Reply-To: <20230417164041.684562-1-peter.maydell@linaro.org> References: <20230417164041.684562-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: libvir-list@redhat.com, Kyle Evans , Richard Henderson , Markus Armbruster , Laurent Vivier , Eric Blake , Warner Losh Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: linaro.org The only place left that looks at the old 'singlestep' global variable is the TCG curr_cflags() function. Replace the old global with a new 'one_insn_per_tb' which is defined in tcg-all.c and declared in accel/tcg/internal.h. This keeps it restricted to the TCG code, unlike 'singlestep' which was available to every file in the system and defined in multiple different places for softmmu vs linux-user vs bsd-user. While we're making this change, use qatomic_read() and qatomic_set() on the accesses to the new global, because TCG will read it without holding a lock. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé --- In discussion on v2, we talked about combining this with the 'nochain' flag so as to have a single 'tcg_cflags_global' that held the flags for the current (one_insn_per_tb, nochain) state. I have not attempted that here, because it's a little tricky: * util/log.c is built into some binaries that don't have an accelerator at all (the tools), so it can't simply call current_accel() to get the TCG accelerator * the initial value of the logging flags is set before the TCG accelerator is even created So I leave that to somebody else to have a go at if they like. --- accel/tcg/internal.h | 2 ++ include/exec/cpu-common.h | 2 -- accel/tcg/cpu-exec.c | 2 +- accel/tcg/tcg-all.c | 6 ++++-- bsd-user/main.c | 1 - linux-user/main.c | 1 - softmmu/globals.c | 1 - 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/accel/tcg/internal.h b/accel/tcg/internal.h index 96f198b28b4..7bb0fdbe149 100644 --- a/accel/tcg/internal.h +++ b/accel/tcg/internal.h @@ -67,4 +67,6 @@ static inline target_ulong log_pc(CPUState *cpu, const TranslationBlock *tb) extern int64_t max_delay; extern int64_t max_advance; +extern bool one_insn_per_tb; + #endif /* ACCEL_TCG_INTERNAL_H */ diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 6feaa40ca7b..0be74f1e706 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -163,8 +163,6 @@ int cpu_memory_rw_debug(CPUState *cpu, vaddr addr, void *ptr, size_t len, bool is_write); /* vl.c */ -extern int singlestep; - void list_cpus(const char *optarg); #endif /* CPU_COMMON_H */ diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 8370c92c05e..bc0e1c3299a 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -159,7 +159,7 @@ uint32_t curr_cflags(CPUState *cpu) */ if (unlikely(cpu->singlestep_enabled)) { cflags |= CF_NO_GOTO_TB | CF_NO_GOTO_PTR | CF_SINGLE_STEP | 1; - } else if (singlestep) { + } else if (qatomic_read(&one_insn_per_tb)) { cflags |= CF_NO_GOTO_TB | 1; } else if (qemu_loglevel_mask(CPU_LOG_TB_NOCHAIN)) { cflags |= CF_NO_GOTO_TB; diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c index fcf361c8db6..a831f8d7c37 100644 --- a/accel/tcg/tcg-all.c +++ b/accel/tcg/tcg-all.c @@ -31,6 +31,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/accel.h" +#include "qemu/atomic.h" #include "qapi/qapi-builtin-visit.h" #include "qemu/units.h" #if !defined(CONFIG_USER_ONLY) @@ -110,6 +111,7 @@ static void tcg_accel_instance_init(Object *obj) } bool mttcg_enabled; +bool one_insn_per_tb; static int tcg_init_machine(MachineState *ms) { @@ -219,8 +221,8 @@ static void tcg_set_one_insn_per_tb(Object *obj, bool value, Error **errp) { TCGState *s = TCG_STATE(obj); s->one_insn_per_tb = value; - /* For the moment, set the global also: this changes the behaviour */ - singlestep = value; + /* Set the global also: this changes the behaviour */ + qatomic_set(&one_insn_per_tb, value); } static int tcg_gdbstub_supported_sstep_flags(void) diff --git a/bsd-user/main.c b/bsd-user/main.c index 09b84da190c..a9e5a127d38 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -49,7 +49,6 @@ #include "host-os.h" #include "target_arch_cpu.h" -int singlestep; static bool opt_one_insn_per_tb; uintptr_t guest_base; bool have_guest_base; diff --git a/linux-user/main.c b/linux-user/main.c index 489694ad654..c7020b413bc 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -68,7 +68,6 @@ char *exec_path; char real_exec_path[PATH_MAX]; -int singlestep; static bool opt_one_insn_per_tb; static const char *argv0; static const char *gdbstub; diff --git a/softmmu/globals.c b/softmmu/globals.c index 39678aa8c58..e83b5428d12 100644 --- a/softmmu/globals.c +++ b/softmmu/globals.c @@ -43,7 +43,6 @@ int vga_interface_type = VGA_NONE; bool vga_interface_created; Chardev *parallel_hds[MAX_PARALLEL_PORTS]; int win2k_install_hack; -int singlestep; int fd_bootchk = 1; int graphic_rotate; QEMUOptionRom option_rom[MAX_OPTION_ROMS];