From nobody Sat May 4 20:15:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1488295992915787.1035307534722; Tue, 28 Feb 2017 07:33:12 -0800 (PST) Received: from localhost ([::1]:33935 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cijlz-0000f9-GT for importer@patchew.org; Tue, 28 Feb 2017 10:33:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52278) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cijMy-0003e9-2j for qemu-devel@nongnu.org; Tue, 28 Feb 2017 10:07:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cijMv-0002mj-9j for qemu-devel@nongnu.org; Tue, 28 Feb 2017 10:07:16 -0500 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:32983) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cijMv-0002mM-3b for qemu-devel@nongnu.org; Tue, 28 Feb 2017 10:07:13 -0500 Received: by mail-wm0-x22d.google.com with SMTP id i17so3363544wmf.0 for ; Tue, 28 Feb 2017 07:07:13 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a35sm2710706wra.21.2017.02.28.07.07.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Feb 2017 07:07:10 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 943883E0422; Tue, 28 Feb 2017 15:07:09 +0000 (GMT) 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=f6HLJVeLVrAiIcmM79bHFqbHiBLrVBiHzZVtZ+KgaKw=; b=T3sP5oFnkFMD1KME6VYsOC2YZE+DthCXa7NaSfM0NPzu5IpekHhrTg/szq4liS2t4a l1E085CrtK17ObTCXSDe0hKTA+ZTDQ7gvUDANSXz1aWgIvutx8ZZizZSx2DknKyvs0s4 D79F1Tmmzd/qdcon7IdHSsH21t/3ykGK38q+0= 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=f6HLJVeLVrAiIcmM79bHFqbHiBLrVBiHzZVtZ+KgaKw=; b=CQU67VQM8fpDm/cYFD8aw0OilXvHkt4GYQ1BfzjkF5CNfMdUUb6RNRM5kqps6PGB8c wDsT8P9Nh/SgCvhwYcGSXoOeFu++PrcSQQbY5UhzwX1fAGS7snGR075g5IJnOIPr7sV4 /6WNyZ9XL+AxzkmM9R7srrnru+uyZw71tp8+lUU89uaDrNNvhAwHVzEMy4THK1dHA3/v T5oniomutiLPVz8uNQ/T8QiHKQTK8kzsqZHya0K34Sgr6BWX6d7Vz83FMYw3linhQLLE Mb2X0Fb/kYtf4Ans90tPahpZBOjyu3CAwooAtkZWBUEVMA0CjjiGUixXacKN60d3hRUG FF6w== X-Gm-Message-State: AMke39nGMKD09DW/z7GTdulZrcb2r2NMPoS4X3U3qGTeZiRcg1gxQuB4D4Yr20gNdkBuhoeG X-Received: by 10.28.70.2 with SMTP id t2mr2868392wma.34.1488294431996; Tue, 28 Feb 2017 07:07:11 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: rth@twiddle.net Date: Tue, 28 Feb 2017 15:07:07 +0000 Message-Id: <20170228150709.27453-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170228150709.27453-1-alex.bennee@linaro.org> References: <20170228150709.27453-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22d Subject: [Qemu-devel] [PATCH v1 1/3] vl/cpus: be smarter with icount and MTTCG X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mttcg@listserver.greensocs.com, peter.maydell@linaro.org, nikunj@linux.vnet.ibm.com, Peter Crosthwaite , a.rigo@virtualopensystems.com, qemu-devel@nongnu.org, cota@braap.org, Paolo Bonzini , bobby.prani@gmail.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , fred.konrad@greensocs.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 The sense of the test was inverted. Make it simple, if icount is enabled then we disabled MTTCG by default. If the user tries to force MTTCG upon us then we tell them "no". Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson --- cpus.c | 7 +++---- vl.c | 7 ++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/cpus.c b/cpus.c index 8200ac6b75..e9aab9f70f 100644 --- a/cpus.c +++ b/cpus.c @@ -185,10 +185,7 @@ static bool check_tcg_memory_orders_compatible(void) =20 static bool default_mttcg_enabled(void) { - QemuOpts *icount_opts =3D qemu_find_opts_singleton("icount"); - const char *rr =3D qemu_opt_get(icount_opts, "rr"); - - if (rr || TCG_OVERSIZED_GUEST) { + if (use_icount || TCG_OVERSIZED_GUEST) { return false; } else { #ifdef TARGET_SUPPORTS_MTTCG @@ -206,6 +203,8 @@ void qemu_tcg_configure(QemuOpts *opts, Error **errp) if (strcmp(t, "multi") =3D=3D 0) { if (TCG_OVERSIZED_GUEST) { error_setg(errp, "No MTTCG when guest word size > hosts"); + } else if (use_icount) { + error_setg(errp, "No MTTCG when icount is enabled"); } else { if (!check_tcg_memory_orders_compatible()) { error_report("Guest expects a stronger memory ordering= " diff --git a/vl.c b/vl.c index e10a27bdd6..bbbf1baadf 100644 --- a/vl.c +++ b/vl.c @@ -4025,8 +4025,6 @@ int main(int argc, char **argv, char **envp) =20 replay_configure(icount_opts); =20 - qemu_tcg_configure(accel_opts, &error_fatal); - machine_class =3D select_machine(); =20 set_memory_options(&ram_slots, &maxram_size, machine_class); @@ -4393,14 +4391,13 @@ int main(int argc, char **argv, char **envp) if (!tcg_enabled()) { error_report("-icount is not allowed with hardware virtualizat= ion"); exit(1); - } else if (qemu_tcg_mttcg_enabled()) { - error_report("-icount does not currently work with MTTCG"); - exit(1); } configure_icount(icount_opts, &error_abort); qemu_opts_del(icount_opts); } =20 + qemu_tcg_configure(accel_opts, &error_fatal); + if (default_net) { QemuOptsList *net =3D qemu_find_opts("net"); qemu_opts_set(net, NULL, "type", "nic", &error_abort); --=20 2.11.0 From nobody Sat May 4 20:15:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1488296269657415.11631247294963; Tue, 28 Feb 2017 07:37:49 -0800 (PST) Received: from localhost ([::1]:33984 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cijqV-0004aq-CR for importer@patchew.org; Tue, 28 Feb 2017 10:37:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52299) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cijN1-0003fB-3T for qemu-devel@nongnu.org; Tue, 28 Feb 2017 10:07:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cijMw-0002mv-IM for qemu-devel@nongnu.org; Tue, 28 Feb 2017 10:07:19 -0500 Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]:37790) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cijMw-0002mo-CT for qemu-devel@nongnu.org; Tue, 28 Feb 2017 10:07:14 -0500 Received: by mail-wm0-x230.google.com with SMTP id v77so14046074wmv.0 for ; Tue, 28 Feb 2017 07:07:14 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 32sm2694883wre.15.2017.02.28.07.07.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Feb 2017 07:07:10 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id A674C3E04C0; Tue, 28 Feb 2017 15:07:09 +0000 (GMT) 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=YvduB1BPC145SuKWt0T0Ir7K9FeA5RATmNlBxj1BzBM=; b=FE/ZIlDp9+5sEDBdXzk+s9c+pEXSx4jX+9qARWGopOiZ0rZFMw7GtGGVdzGm7+w0Wj AJmWo8F+wNHLXItovyjI1/KsZNxoDCxPGzw+lrtOVzpc97ZKURs6um4wlR+tCWgeMb5n WYV9IthLScaGx++3PO5TVP8TLleBXj9WBipdc= 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=YvduB1BPC145SuKWt0T0Ir7K9FeA5RATmNlBxj1BzBM=; b=Ej2G3pGabp+Gg14cHpHkQi6FYqtQiG/JtPijpk04WJTf35U0h45CYRJQyHMLNWFoeO oVOxoZpBPl9KJGFkLwnpfpTWn8EuSrIxcxQWuUv3CENJneQyjHc2vzytl/7uU7W0bFVf FJjhm+p2oWaPPDV6UAPWEs5htFDY0dNaRKPoQ/1d6IQfwFdD21dA1EyS2G9696D1VFWA Z56FgqXvGg1tYokrtoiOl+vZHosG9FzPzX6TeOKPVO/clkhUiwgtS6l2R+q05K567ZQq 6EYSvn0j8PtkKhC6a54Z2GlbIrcunzYcRLb9kqvW29bsH7CCrysb1hAfI1vmbG3l6H+L XUcg== X-Gm-Message-State: AMke39k2cV30bd4MWPUrD8CEfOazB8iSREcl6zTqDmg0OtDFyLDrSerKwkGrEwkdU8nRA+Yh X-Received: by 10.28.132.9 with SMTP id g9mr3055444wmd.28.1488294433277; Tue, 28 Feb 2017 07:07:13 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: rth@twiddle.net Date: Tue, 28 Feb 2017 15:07:08 +0000 Message-Id: <20170228150709.27453-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170228150709.27453-1-alex.bennee@linaro.org> References: <20170228150709.27453-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::230 Subject: [Qemu-devel] [PATCH v1 2/3] target/i386/cpu.h: declare TCG_GUEST_DEFAULT_MO X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mttcg@listserver.greensocs.com, peter.maydell@linaro.org, Eduardo Habkost , nikunj@linux.vnet.ibm.com, a.rigo@virtualopensystems.com, qemu-devel@nongnu.org, cota@braap.org, Paolo Bonzini , bobby.prani@gmail.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , fred.konrad@greensocs.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 This suppresses the incorrect warning when forcing MTTCG for x86 guests on x86 hosts. A future patch will still warn when TARGET_SUPPORT_MTTCG hasn't been defined for the guest (which is still pending for x86). Reported-by: Paolo Bonzini Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson --- target/i386/cpu.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 573f2aa988..6be19d7e74 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -30,6 +30,9 @@ #define TARGET_LONG_BITS 32 #endif =20 +/* The x86 has a strong memory model with some store-after-load re-orderin= g */ +#define TCG_GUEST_DEFAULT_MO (TCG_MO_ALL & ~TCG_MO_ST_LD) + /* Maximum instruction code size */ #define TARGET_MAX_INSN_SIZE 16 =20 --=20 2.11.0 From nobody Sat May 4 20:15:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1488295723076420.43228841520283; Tue, 28 Feb 2017 07:28:43 -0800 (PST) Received: from localhost ([::1]:33913 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cijhe-0004lY-Hm for importer@patchew.org; Tue, 28 Feb 2017 10:28:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52280) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cijMy-0003eD-84 for qemu-devel@nongnu.org; Tue, 28 Feb 2017 10:07:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cijMx-0002n7-EQ for qemu-devel@nongnu.org; Tue, 28 Feb 2017 10:07:16 -0500 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:35555) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cijMx-0002mt-8S for qemu-devel@nongnu.org; Tue, 28 Feb 2017 10:07:15 -0500 Received: by mail-wm0-x231.google.com with SMTP id v186so87825517wmd.0 for ; Tue, 28 Feb 2017 07:07:15 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q4sm2709130wrc.35.2017.02.28.07.07.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Feb 2017 07:07:10 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id B7FC03E0813; Tue, 28 Feb 2017 15:07:09 +0000 (GMT) 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=GBzMg0Bu+xAy+YqM6RO8K4/10f4EHMvced4QEwwuZu8=; b=hOC+6gsPJN4PrtUqbFIK33PxCJYVyrEG4mVfswmyr3wG/bfgk8MKodcfqY4V5kYvUJ 4wX/ZpB9GFxHjMbVGcuKk1V3Z2kpipzRsSWq1FhyGqOQx2XGPYnjggB9bhhb9bdf/yH/ ycnDnSfmBZVFaeXLul6ZyU7hMIbG6h05Imlzk= 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=GBzMg0Bu+xAy+YqM6RO8K4/10f4EHMvced4QEwwuZu8=; b=EUpwaoqRa8ien6pIloWNTpId8kFp7/1XR5l5qxgmOAxveSEB1lmir6/KZnPyRS5bwt IJQqIZU2acyWkTmlo0S5VoSz+TCJArZ+byuxktblcQg4Rlew9D1odG/OFWxexu/Oc6Qb DPh0gZ+Evro5MBERyWc15HMIAp6bhvTRz5s6M6HE6GzLcbRQXjXnsVUO+VySWwISDHAV 5qh7CIqXd0hJDyWUy/M0nEacLnRWxwXOdwDuyvcvLL//CXA3aPGMP2omhJukXhnLc6WN a3+ulZ7g/d46XZ57uNXCGI00F3yN2tBvvqVMEAwKJFFla1fg9drUh7Y2MwCeDKlFNDHf xX4g== X-Gm-Message-State: AMke39kRQPqNvyfPdcDhotZARPNi+jABA6Qrd4MjrTpcfZOZQC/7bI7zyhSd3BYF8TuD9Umz X-Received: by 10.28.8.213 with SMTP id 204mr2947157wmi.100.1488294434195; Tue, 28 Feb 2017 07:07:14 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: rth@twiddle.net Date: Tue, 28 Feb 2017 15:07:09 +0000 Message-Id: <20170228150709.27453-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170228150709.27453-1-alex.bennee@linaro.org> References: <20170228150709.27453-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::231 Subject: [Qemu-devel] [PATCH v1 3/3] cpus.c: add additional error_report when !TARGET_SUPPORT_MTTCG X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mttcg@listserver.greensocs.com, peter.maydell@linaro.org, nikunj@linux.vnet.ibm.com, Peter Crosthwaite , a.rigo@virtualopensystems.com, qemu-devel@nongnu.org, cota@braap.org, Paolo Bonzini , bobby.prani@gmail.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , fred.konrad@greensocs.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 While we may fail the memory ordering check later that can be confusing. So in cases where TARGET_SUPPORT_MTTCG has yet to be defined we should say so specifically. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson --- cpus.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cpus.c b/cpus.c index e9aab9f70f..2459f564ea 100644 --- a/cpus.c +++ b/cpus.c @@ -206,6 +206,10 @@ void qemu_tcg_configure(QemuOpts *opts, Error **errp) } else if (use_icount) { error_setg(errp, "No MTTCG when icount is enabled"); } else { +#ifndef TARGET_SUPPORT_MTTCG + error_report("Guest not yet converted to MTTCG - " + "you may get unexpected results"); +#endif if (!check_tcg_memory_orders_compatible()) { error_report("Guest expects a stronger memory ordering= " "than the host provides"); --=20 2.11.0