From patchwork Wed May 3 07:06:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 678601 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp903479wrs; Wed, 3 May 2023 00:08:55 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6W7aJEw8A53JRF+fiz25vqXisVgvOJV/kX6zTuEEMCYNw+q8/rd2x5iDuyp22Q8PQGaraY X-Received: by 2002:ac8:7c43:0:b0:3f0:a382:cd51 with SMTP id o3-20020ac87c43000000b003f0a382cd51mr33363732qtv.8.1683097735124; Wed, 03 May 2023 00:08:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683097735; cv=none; d=google.com; s=arc-20160816; b=Ia4UdzMKhOxH7tHr08LcWQXvbUmhH73f6tucbrgYIxmD/28mxdLhVeGbKFYh6GZDA0 +zhI6pGxEaqw18T7KzrUkBYCi56Dsnl5egcipx+FeLf6dj+VtO7fzzHCNP5J1i6fRJS0 pMl96nbSDAcuCl4PRYIbtMZRmfOFUOIPegOxCw+3HmX1PtQsrhXIIv3zn+KV+CC9CibF VYry3XFsa2iSDXdz9BnzRqDcdIhuWCBNvhoNzGkMzI9aJX2EZd5CYpyoPvY2kcdeD0mq MKzHNFTP8HNazuK8/APFIaDa/TYZIb0EDbYxpyoNJj0PuMovuGnPYvy837UZWCTp2yXQ jTwg== 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=bcNujZc9aYQmCLoddPQYpB6/3gwl5pOhsjTd6sdWfnE=; b=OQBadUYR6ZcMjSYNkZWfid2ZZ9ZwSrgzX8wQFbBvsBC1RfLYJFBZ/tUQvg10efurfU Ajc+hdph/FmnuxXANGC80e6F1/y8c831tN2+k7b3KXBr82ZhzEQeyo1yjAsNmP8sYbE6 6kU+0m/m664q6v6kAS43qCNRF5bSpXiqC+ImGw3HxF/sO87HXKkGwTyJ0Y5MoQosAbZV siRQAymghAtLUrLimBHITQHPhi0sg7t+u8b21RGzvrZrLqRV3mOGVfQQ54Uhq79t5P50 lkmLmzqG01DCrmijc6UPapVcxRpE2nkRqvn31P+14DXO4QyA1QJpQehnvJydLOoeYPl5 Ptlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="jVj/ietQ"; 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 x5-20020a05620a0b4500b0074e2a01130bsi16953077qkg.396.2023.05.03.00.08.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 May 2023 00:08:55 -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="jVj/ietQ"; 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 1pu6aN-0006B6-K3; Wed, 03 May 2023 03:07:35 -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 1pu6Zs-00050q-Pd for qemu-devel@nongnu.org; Wed, 03 May 2023 03:07:06 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pu6Zo-0005Zd-ME for qemu-devel@nongnu.org; Wed, 03 May 2023 03:07:04 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-3f178da21b5so30851635e9.3 for ; Wed, 03 May 2023 00:07:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683097619; x=1685689619; 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=bcNujZc9aYQmCLoddPQYpB6/3gwl5pOhsjTd6sdWfnE=; b=jVj/ietQx4LaMjfG8tQYpGGDdD3HDGS+JWCsVWx7lh7ZmIWnvb7VUnNku/7YzvKaWM LC4ZyUvV3TpVCz6SaW8LCU+0lEQvO2ZSD7l/4uMN5CdY7arTd7ke/obqwPH3zCEeeSQq 2lOEufTMtXpn8EVoBimsDvYKTHLfSK0ecIQa17Y3/lSpcX9HjuxVRhIKX5GxoZlpFsU9 Wrxyqrcq1ylvMe67QYSVCyH228OXvWmbNVj/ObhkO+epIy2JmclIEIlwgwRsY/2v23p8 uFKUTgZSTnLpq18nDmsYqaFilaew1epYzyRT+zKQO/Syr9F0/ZFlg/AIEDKl+ZKjdgCI 6TmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683097619; x=1685689619; 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=bcNujZc9aYQmCLoddPQYpB6/3gwl5pOhsjTd6sdWfnE=; b=CkO+6tzKdXfbaBMMHLzp392mcmrQfpeABzWNBblpP4r+dXWM0iBYZ881/0tXGQGii0 zFsx2wLHCN+t/Dhks3nI3uq7GeBJoxlUgUAXQ4keZTmUfh+BMyfxJ5svPL+sFoSKzNsn 8e53Mi61xhhg5B1qajL8XYEpVJqgWupS3NiqcDmQxPfSqLQC8RpNBBXvk1pzYZ0kgLPU njdqJahgNulaOea/8dqb9Uddkl8FdDS+ZoDmqr6Cc7Zn+byUHNbqMzcVhmtx+LPuN6yN CAmRQ/gbOlEu2A04v5NLS8Zf7Qv5mxfAzX4F/iKd4toD1jHsDz85nDM/lU2/1tyM9ieL HqYg== X-Gm-Message-State: AC+VfDwJNzLvm0Z6TPl8IasdSQkXW+E783hVQLYJi7djtAypNHQdEMK5 PM7IkKnrwVUCMRz3TDWLbNiTNCFnNA4w1HXbqaGZ6A== X-Received: by 2002:a7b:cbc8:0:b0:3ee:775:c573 with SMTP id n8-20020a7bcbc8000000b003ee0775c573mr13166311wmi.20.1683097619227; Wed, 03 May 2023 00:06:59 -0700 (PDT) Received: from stoup.Home ([2a02:c7c:74db:8d00:c01d:9d74:b630:9087]) by smtp.gmail.com with ESMTPSA id q3-20020a1cf303000000b003f3157988f8sm921184wmq.26.2023.05.03.00.06.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 May 2023 00:06:58 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: git@xen0n.name, gaosong@loongson.cn, philmd@linaro.org, qemu-arm@nongnu.org, qemu-riscv@nongnu.org, qemu-s390x@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v4 02/57] accel/tcg: Add cpu_in_serial_context Date: Wed, 3 May 2023 08:06:01 +0100 Message-Id: <20230503070656.1746170-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230503070656.1746170-1-richard.henderson@linaro.org> References: <20230503070656.1746170-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x331.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, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Like cpu_in_exclusive_context, but also true if there is no other cpu against which we could race. Use it in tb_flush as a direct replacement. Use it in cpu_loop_exit_atomic to ensure that there is no loop against cpu_exec_step_atomic. Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- accel/tcg/internal.h | 5 +++++ accel/tcg/cpu-exec-common.c | 3 +++ accel/tcg/tb-maint.c | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/accel/tcg/internal.h b/accel/tcg/internal.h index 7bb0fdbe14..8ca24420ea 100644 --- a/accel/tcg/internal.h +++ b/accel/tcg/internal.h @@ -64,6 +64,11 @@ static inline target_ulong log_pc(CPUState *cpu, const TranslationBlock *tb) } } +static inline bool cpu_in_serial_context(CPUState *cs) +{ + return !(cs->tcg_cflags & CF_PARALLEL) || cpu_in_exclusive_context(cs); +} + extern int64_t max_delay; extern int64_t max_advance; diff --git a/accel/tcg/cpu-exec-common.c b/accel/tcg/cpu-exec-common.c index e7962c9348..9a5fabf625 100644 --- a/accel/tcg/cpu-exec-common.c +++ b/accel/tcg/cpu-exec-common.c @@ -22,6 +22,7 @@ #include "sysemu/tcg.h" #include "exec/exec-all.h" #include "qemu/plugin.h" +#include "internal.h" bool tcg_allowed; @@ -81,6 +82,8 @@ void cpu_loop_exit_restore(CPUState *cpu, uintptr_t pc) void cpu_loop_exit_atomic(CPUState *cpu, uintptr_t pc) { + /* Prevent looping if already executing in a serial context. */ + g_assert(!cpu_in_serial_context(cpu)); cpu->exception_index = EXCP_ATOMIC; cpu_loop_exit_restore(cpu, pc); } diff --git a/accel/tcg/tb-maint.c b/accel/tcg/tb-maint.c index cb1f806f00..7d613d36d2 100644 --- a/accel/tcg/tb-maint.c +++ b/accel/tcg/tb-maint.c @@ -760,7 +760,7 @@ void tb_flush(CPUState *cpu) if (tcg_enabled()) { unsigned tb_flush_count = qatomic_mb_read(&tb_ctx.tb_flush_count); - if (cpu_in_exclusive_context(cpu)) { + if (cpu_in_serial_context(cpu)) { do_tb_flush(cpu, RUN_ON_CPU_HOST_INT(tb_flush_count)); } else { async_safe_run_on_cpu(cpu, do_tb_flush,