From patchwork Thu Mar 11 00:21:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 397471 Delivered-To: patch@linaro.org Received: by 2002:a17:906:a383:0:0:0:0 with SMTP id k3csp8084ejz; Wed, 10 Mar 2021 16:39:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJwIJviG4KQfDM7meyMBsm6AT7s34pJAVhzQSTbCuiETtuPrlXiQX3jUD+XJRIcLIy16Fp5g X-Received: by 2002:a05:6830:4023:: with SMTP id i3mr4754520ots.219.1615423198174; Wed, 10 Mar 2021 16:39:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615423198; cv=none; d=google.com; s=arc-20160816; b=MnFG0GiVO4w5I2aza2XbOZLALHGiY4U6LeN4zQAIXgpSSWcXN5CJiT4E+XItm1sqiK Okx7Dn23UIcOtdjKGvZ+3nX/3K/693EFCWc/lzzcIVcmzz7KXTYJN1SlH+JuuhVqp+OX M+MaJD3UxJrW/an4jCfY/hh4GZ0Zx8a1VY56VoFIBdAXUocHIOfYYqQCGw8fQ1hqLvgv EXoWUNNxZ7xpYoUiQ9RrVWLPwXSderKbUiD1pNObxnKTeBj2lbYYmZmFsRMzTLHDcZtW IkcelYt5jflEwBanKpDwj8tRnByYH2ZoxitJbAQevAcNEa2zBmgfRPtTlee8PQSDFzOj SxcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=ETRWUEEQ+5uhB9VuXEkg5ocBgOD4vsK5QwYLxXokklo=; b=Odx4HHkcQ0p+r2R8MUS9SdJmle3ZYpkaZH3TQBh2XHVj/T/zuOWXTwT5kFJT85qRjh 5wrTN9NE25IMMkQ+1XT/xBCkjipDyBaclk/IdTk+jRjP7IwLitt4xz9GqN+OkTU7Aqri qxhikcWEWORRcnNBmAd8hbkTU5YXUl0ITcC7JRJCWbvZjhY8LonV1JQx/HytCT0WuqDb 3jGEnOza5IrLfcHj8xVaWGRjSmBJpSyIHL3aCgCpJEPyabCmbtJ/z7iWlX23UjJup1Zu TEmD0x/tVoDCsBYr2ZFEmEBF/UoJkYIgiRJ92EWJV2dyE4Q9xwn7Qc8cg46Vf1Ggzkm+ pnFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=EMHqaEEn; 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=fail (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 c14si1015628oiw.98.2021.03.10.16.39.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Mar 2021 16:39:58 -0800 (PST) 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=fail header.i=@linaro.org header.s=google header.b=EMHqaEEn; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK9Mr-0007MW-FD for patch@linaro.org; Wed, 10 Mar 2021 19:39:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55260) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK960-00054U-Bt for qemu-devel@nongnu.org; Wed, 10 Mar 2021 19:22:32 -0500 Received: from mail-oo1-xc34.google.com ([2607:f8b0:4864:20::c34]:35433) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lK95r-0001NM-IW for qemu-devel@nongnu.org; Wed, 10 Mar 2021 19:22:32 -0500 Received: by mail-oo1-xc34.google.com with SMTP id c13-20020a4ab18d0000b02901b5b67cff5eso258738ooo.2 for ; Wed, 10 Mar 2021 16:22:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ETRWUEEQ+5uhB9VuXEkg5ocBgOD4vsK5QwYLxXokklo=; b=EMHqaEEn5JTpq6gUWVecKhxfnzOgT34UQsrYD71q17aoCGFb5ZkUKWczh0huwJqQ6v J4Yn5Vkx9FT2ruPa18Xq0QBixptFha7oGce9ykUgycNVnfMEbiTrMh0POTrO3IA437t1 mcfMGybr4+DddIzXmhfITDtg4xRILqubjrME9M9uvSlCF+VzIk9T1T51qYirn9Z4MzLH g3ISA6BC0IDnbrCOFxc/LmzpeSAXreTkXo+GWeDmV/lIQaT8yB4u/PGviNio09tUbJIL WjuI5M5tOncbB3qm15eJGHgcWZ9Bgwkb10mM5JF0nF9jBm56Lgb5WO38G6YC3cVh95oV PxWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ETRWUEEQ+5uhB9VuXEkg5ocBgOD4vsK5QwYLxXokklo=; b=Tk6JCtruQvrok7+A0VsQlxbIhjlGXOq0z5nIEO0a7whZ3oiIYGx+6hH/IBE57sPcHo auto8rgTWwrWeUz5aGRN1jBntJ0TxSxz9cy0GjPZTb73obRFS3WgCzcL/w2QE0TT8u+v ekefbLvViN5iK/RY4KYhWQBX5huUdieZkwM9FAGhep5kS4gHlpVW4u7b1iBwUBvIEWMV aedHBMT/R3swp7HX0A2SFjF3CYvePLlllucANcU9N77EhdeLyvkQ+aKWaHb5x+ArwR8V AoZMqQuaH/dme0gm88xOW/M4ouG6Xmtcd1OBuVmVU+dHRPhlZFHqQQF6bXI3LCqSsbGJ oIrw== X-Gm-Message-State: AOAM531UNlE+wqtQ0A5AxrC0BdZKhV7qvLqVmV697k70GJ0zl/bDyyJt d6mO1+yHeRssMaoTBpQ6jYo2UeDHmo9DfgIi X-Received: by 2002:a4a:b103:: with SMTP id a3mr4396469ooo.30.1615422138169; Wed, 10 Mar 2021 16:22:18 -0800 (PST) Received: from localhost.localdomain (fixed-187-189-51-144.totalplay.net. [187.189.51.144]) by smtp.gmail.com with ESMTPSA id a6sm300962otq.79.2021.03.10.16.22.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 16:22:17 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 15/26] tcg: Introduce tcg_max_ctxs Date: Wed, 10 Mar 2021 18:21:45 -0600 Message-Id: <20210311002156.253711-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210311002156.253711-1-richard.henderson@linaro.org> References: <20210311002156.253711-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::c34; envelope-from=richard.henderson@linaro.org; helo=mail-oo1-xc34.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=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: r.bolshakov@yadro.com, j@getutm.app Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Finish the divorce of tcg/ from hw/, and do not take the max cpu value from MachineState; just rememver what we were passed in tcg_init. Signed-off-by: Richard Henderson --- tcg/internal.h | 3 ++- tcg/region.c | 6 +++--- tcg/tcg.c | 23 ++++++++++------------- 3 files changed, 15 insertions(+), 17 deletions(-) -- 2.25.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/tcg/internal.h b/tcg/internal.h index fcfeca232f..f9906523da 100644 --- a/tcg/internal.h +++ b/tcg/internal.h @@ -28,7 +28,8 @@ #define TCG_HIGHWATER 1024 extern TCGContext **tcg_ctxs; -extern unsigned int n_tcg_ctxs; +extern unsigned int tcg_cur_ctxs; +extern unsigned int tcg_max_ctxs; void tcg_region_init(size_t tb_size, int splitwx, unsigned max_cpus); bool tcg_region_alloc(TCGContext *s); diff --git a/tcg/region.c b/tcg/region.c index 04b699da63..e3fbf6a7e7 100644 --- a/tcg/region.c +++ b/tcg/region.c @@ -347,7 +347,7 @@ void tcg_region_initial_alloc(TCGContext *s) /* Call from a safe-work context */ void tcg_region_reset_all(void) { - unsigned int n_ctxs = qatomic_read(&n_tcg_ctxs); + unsigned int n_ctxs = qatomic_read(&tcg_cur_ctxs); unsigned int i; qemu_mutex_lock(®ion.lock); @@ -922,7 +922,7 @@ void tcg_region_prologue_set(TCGContext *s) */ size_t tcg_code_size(void) { - unsigned int n_ctxs = qatomic_read(&n_tcg_ctxs); + unsigned int n_ctxs = qatomic_read(&tcg_cur_ctxs); unsigned int i; size_t total; @@ -958,7 +958,7 @@ size_t tcg_code_capacity(void) size_t tcg_tb_phys_invalidate_count(void) { - unsigned int n_ctxs = qatomic_read(&n_tcg_ctxs); + unsigned int n_ctxs = qatomic_read(&tcg_cur_ctxs); unsigned int i; size_t total = 0; diff --git a/tcg/tcg.c b/tcg/tcg.c index a89d8f6b81..a82d3a0861 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -44,11 +44,6 @@ #include "cpu.h" #include "exec/exec-all.h" - -#if !defined(CONFIG_USER_ONLY) -#include "hw/boards.h" -#endif - #include "tcg/tcg-op.h" #if UINTPTR_MAX == UINT32_MAX @@ -155,7 +150,8 @@ static int tcg_out_ldst_finalize(TCGContext *s); #endif TCGContext **tcg_ctxs; -unsigned int n_tcg_ctxs; +unsigned int tcg_cur_ctxs; +unsigned int tcg_max_ctxs; TCGv_env cpu_env = 0; const void *tcg_code_gen_epilogue; uintptr_t tcg_splitwx_diff; @@ -475,7 +471,6 @@ void tcg_register_thread(void) #else void tcg_register_thread(void) { - MachineState *ms = MACHINE(qdev_get_machine()); TCGContext *s = g_malloc(sizeof(*s)); unsigned int i, n; @@ -491,8 +486,8 @@ void tcg_register_thread(void) } /* Claim an entry in tcg_ctxs */ - n = qatomic_fetch_inc(&n_tcg_ctxs); - g_assert(n < ms->smp.max_cpus); + n = qatomic_fetch_inc(&tcg_cur_ctxs); + g_assert(n < tcg_max_ctxs); qatomic_set(&tcg_ctxs[n], s); if (n > 0) { @@ -643,9 +638,11 @@ static void tcg_context_init(unsigned max_cpus) */ #ifdef CONFIG_USER_ONLY tcg_ctxs = &tcg_ctx; - n_tcg_ctxs = 1; + tcg_cur_ctxs = 1; + tcg_max_ctxs = 1; #else - tcg_ctxs = g_new(TCGContext *, max_cpus); + tcg_max_ctxs = max_cpus; + tcg_ctxs = g_new0(TCGContext *, max_cpus); #endif tcg_debug_assert(!tcg_regset_test_reg(s->reserved_regs, TCG_AREG0)); @@ -3937,7 +3934,7 @@ static void tcg_reg_alloc_call(TCGContext *s, TCGOp *op) static inline void tcg_profile_snapshot(TCGProfile *prof, bool counters, bool table) { - unsigned int n_ctxs = qatomic_read(&n_tcg_ctxs); + unsigned int n_ctxs = qatomic_read(&tcg_cur_ctxs); unsigned int i; for (i = 0; i < n_ctxs; i++) { @@ -4000,7 +3997,7 @@ void tcg_dump_op_count(void) int64_t tcg_cpu_exec_time(void) { - unsigned int n_ctxs = qatomic_read(&n_tcg_ctxs); + unsigned int n_ctxs = qatomic_read(&tcg_cur_ctxs); unsigned int i; int64_t ret = 0;