From nobody Sun May 5 19:00:24 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1678067915; cv=none; d=zohomail.com; s=zohoarc; b=bJy4KZgiYEg4IYu/PTjhnYGVfYCaiTi1Yw1Pty428yMlF2op41ikz99vF/sbmVbXaNKdVBUO3qukfPeXkO3XxYQL3vZt14cHQdJoN3MwmGSDMcFyK12mj8neCV2czgyad9M3/SncaOt7YfegKSf10uKngL9+Z9jjVfqLDYOtp/E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678067915; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Bb1MvQENYvqwlCsbLz4Q8O0K4bvqjmgK92p9rz/GLeU=; b=aleTm7IwFoAW9hAsaNBaRDv5VmT7ymSPoQb5wz9uDPlqTUB0avlI1QKamTO06drutG84zqhDTbWj7jqJU1yfhmgx615E9Zvv3ptm30+oVa0SX6QFsl745uD5FuJMXOoC6Q4WTAObOoC4rBTnCfMPFuUbjmmLRFhwuFG7a7EPr0k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1678067915386391.90705977595223; Sun, 5 Mar 2023 17:58:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZ06H-000484-Bz; Sun, 05 Mar 2023 20:57:17 -0500 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 1pZ06F-00046D-D3 for qemu-devel@nongnu.org; Sun, 05 Mar 2023 20:57:15 -0500 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZ06D-0003I4-U7 for qemu-devel@nongnu.org; Sun, 05 Mar 2023 20:57:15 -0500 Received: by mail-pf1-x42a.google.com with SMTP id a7so4764262pfx.10 for ; Sun, 05 Mar 2023 17:57:13 -0800 (PST) Received: from stoup.. ([2602:ae:154a:9f01:87cc:49bb:2900:c08b]) by smtp.gmail.com with ESMTPSA id g23-20020aa78197000000b0061949fe3beasm2921056pfi.22.2023.03.05.17.57.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Mar 2023 17:57:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678067832; 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=Bb1MvQENYvqwlCsbLz4Q8O0K4bvqjmgK92p9rz/GLeU=; b=kupcKo6JPyAPlg1eWkBYKaD/AbifcgsbO4jsMG9gJCqO1p+GrRMlKV5pfs0y4+c1gv JO34AVUzjfji7+YFKh3i7zOJpX+qOYPF7YWTNpGu0uIwaWXbGi5ftg6XPw4+8BL34rfn UvDvrzXSAWd9Xf9riaR9kPVze4CmqHCjirgiLFQy00JZK8IFYPqsgbOT0fKNwfxgQkPG E9FDVmFWYBm2OKcN1x1CHvJIdfYADhpWH6A7j4oMCoKclxSWSD722HJgYU7mdxnwQ3hr Ff2NHDOwHMNvaHUS9HvyFdWtEpH67KCfvqrZIP8phSEgLyha20qbb3QM9VQkEAXboTgh MVbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678067832; 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=Bb1MvQENYvqwlCsbLz4Q8O0K4bvqjmgK92p9rz/GLeU=; b=X+iJ+uD9wOToknWCgEG2mRIPosBhdh3GVfmI2X1c5oZ88sLo+aSh2Vw0xk3b4uGtvS WxSjSNxS3xCr2yJXATJUljLWO4bySQqs3P0tZtmbICT/an2h3NM+0iDPmDTT8Ksr1o9t Bhhu7MZT4WolCUlLn2OvIL5IwWh/7BUZRloLDw+dCjmgsHKzNCrNj4PyzhamI6T/fYar JsyrVEW6NcE5LeYEYVLIa4/dStncFUlWtlSpkPTQZTfxu7ygIC2xEFVA35zYVv32NK0E ZyAVqYUoMFcl7598L/IZcfP2n3PYjk1/t3+k/VFQrhO6eBa4GUn/Ae6kZGiyES5x1fCl D1LA== X-Gm-Message-State: AO0yUKX9f/GlvTc122mdDbAb8UoUPeX2K2kLUVGoACoVu+axWP0E13pY x7/ir9P0j1/JM3bIGKI53BqKxYDLvS1yIDDSwmrgnQ== X-Google-Smtp-Source: AK7set9Iml6+iq1nGwThPXPqzQdcYfUGmlSi68U8Z/LtaipgTblZHvCCx0CzoZ/9q2bBaDDhrsz8xQ== X-Received: by 2002:aa7:9583:0:b0:5a9:b7e3:2ed6 with SMTP id z3-20020aa79583000000b005a9b7e32ed6mr10140523pfj.17.1678067832308; Sun, 05 Mar 2023 17:57:12 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com Subject: [PATCH v2 1/5] tcg: Do not elide memory barriers for !CF_PARALLEL Date: Sun, 5 Mar 2023 17:57:06 -0800 Message-Id: <20230306015710.1868853-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230306015710.1868853-1-richard.henderson@linaro.org> References: <20230306015710.1868853-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42a; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42a.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1678067917301100011 Content-Type: text/plain; charset="utf-8" The virtio devices require proper memory ordering between the vcpus and the iothreads. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tcg/tcg-op.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index 77658a88f0..75fdcdaac7 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -102,9 +102,13 @@ void tcg_gen_br(TCGLabel *l) =20 void tcg_gen_mb(TCGBar mb_type) { - if (tcg_ctx->gen_tb->cflags & CF_PARALLEL) { - tcg_gen_op1(INDEX_op_mb, mb_type); - } + /* + * It is tempting to elide the barrier in a single-threaded context + * (i.e. !(cflags & CF_PARALLEL)), however, even with a single cpu + * we have i/o threads running in parallel, and lack of memory order + * can result in e.g. virtio queue entries being read incorrectly. + */ + tcg_gen_op1(INDEX_op_mb, mb_type); } =20 /* 32 bit ops */ --=20 2.34.1 From nobody Sun May 5 19:00:24 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1678067915; cv=none; d=zohomail.com; s=zohoarc; b=M0fGY7I/7zO/hlo6Lp8SvLTq1ttaoV3VGRjafhIkCz+2iWgFuOKNVlFzQRLfCuaq7f0qTj+nEelWGhVBfGKLg8y2+jKEc5NruiQK1l+a494M931UcptkYgEE7y4CaXAdCNajGQwpm/wl7DBzV3WG2t5ZvHVuseBieIj5xTM0K8s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678067915; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+/1/w+4tCdZdhSP9X+tt6DrDGtiinyr2Hzdz5vlpulU=; b=hw7raL+81w4CAPgWI67L03tVi3y6gN7YYy6DyRjsDwWDIdMHIgW8fd2Ef0eZm0WGyIEtyTsBoTqWD7ZaetEP+qwTzX+QsL4BzPMGpbNwlAB4eYOp6RTiSr+2qdgYvP1GIPNUJ54uLCgbwdki7KaB9G7uwOVYHrbULScVnCP9jYg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1678067915304544.9308248970166; Sun, 5 Mar 2023 17:58:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZ06L-00048c-MY; Sun, 05 Mar 2023 20:57:21 -0500 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 1pZ06G-00046N-1F for qemu-devel@nongnu.org; Sun, 05 Mar 2023 20:57:16 -0500 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZ06E-0003IB-GY for qemu-devel@nongnu.org; Sun, 05 Mar 2023 20:57:15 -0500 Received: by mail-pg1-x536.google.com with SMTP id 132so4596372pgh.13 for ; Sun, 05 Mar 2023 17:57:14 -0800 (PST) Received: from stoup.. ([2602:ae:154a:9f01:87cc:49bb:2900:c08b]) by smtp.gmail.com with ESMTPSA id g23-20020aa78197000000b0061949fe3beasm2921056pfi.22.2023.03.05.17.57.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Mar 2023 17:57:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678067833; 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=+/1/w+4tCdZdhSP9X+tt6DrDGtiinyr2Hzdz5vlpulU=; b=mcF5GPkMR+E18ihieGu5KHIdv49TWmzsHj/+e1nCFODTvepOamAp+HI+jcVywrOanW LVP13pl6WPlPaQ95a2Bx0wdf3YkDe9kTmykyDWX4qboMKW7BXOqjlx+x2ijlA3OAWI/a DYVCC912KvoGRLJKqP+f92lnt6hod4Dctl6rGbJNcom0zepzD/oJr9lIITAyPPJgy2m4 VPeeOwbsyDXEaZzuwm47MqmfNmMUs6VHAihoLvhKpZxtVRabbtRwZoT1EsHU3h2XchqI eTusr+6+8tfRyrxxP/b7GQgEhF9+yXv+3q4PayDTzB5YwyDkOy6CloQm4fEoZgT2V0gr bD9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678067833; 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=+/1/w+4tCdZdhSP9X+tt6DrDGtiinyr2Hzdz5vlpulU=; b=PFp6eBQXQ5Hcoab4fIRtT9zxyc639JB14ux6AELluGXySuX1lN5XczkATEhPLZA6XW e8t/CaeZ+yovIQcgrgSdgpShFMWoT3mLME+qjB+SiTSMqB61XXk1pp3yrK+mFhft12qa NCEvKirZzTmlyNDcW4TBgKg5cV3CmwRbc9Kr/cHwzac+XJAzCqoLay/rk33wpEWFIeND zQFxCFMo3JCzNTmRGym6t1SUnwRu0axWDWlMkBqiWm9I1J7SwzjFR2K46iWoV31GvM3n b7DaJG1T02/43h9dzz07GcE4yBIgVm9bGpD3Ja+IB0BZtM/H/kgw2mUna7hSwiiWNLds 3f6g== X-Gm-Message-State: AO0yUKWEdzsJ/d/K+lV/WHaFiqdbWVvjdxEJUB17FsV7x1+9oCXZNU9x pInSLnlR2SRylcCly//KyKQTZ0H7BsBCUhoKof/K0g== X-Google-Smtp-Source: AK7set/RfJ58G+L7ejkydnnPhJtfusvKmqn2m3m5pv5SK22NCViuxjbtJFnd34iRhhfcHVo5MhkMRg== X-Received: by 2002:aa7:9525:0:b0:5a8:ab87:eda with SMTP id c5-20020aa79525000000b005a8ab870edamr7615732pfp.20.1678067833237; Sun, 05 Mar 2023 17:57:13 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com Subject: [PATCH v2 2/5] tcg: Elide memory barriers implied by the host memory model Date: Sun, 5 Mar 2023 17:57:07 -0800 Message-Id: <20230306015710.1868853-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230306015710.1868853-1-richard.henderson@linaro.org> References: <20230306015710.1868853-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::536; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x536.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1678067917310100012 Content-Type: text/plain; charset="utf-8" Reduce the set of required barriers to those needed by the host right from the beginning. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tcg/tcg-op.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index 75fdcdaac7..2721c1cab9 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -107,8 +107,13 @@ void tcg_gen_mb(TCGBar mb_type) * (i.e. !(cflags & CF_PARALLEL)), however, even with a single cpu * we have i/o threads running in parallel, and lack of memory order * can result in e.g. virtio queue entries being read incorrectly. + * + * That said, we can elide anything which the host provides for free. */ - tcg_gen_op1(INDEX_op_mb, mb_type); + mb_type &=3D ~TCG_TARGET_DEFAULT_MO; + if (mb_type & TCG_MO_ALL) { + tcg_gen_op1(INDEX_op_mb, mb_type); + } } =20 /* 32 bit ops */ --=20 2.34.1 From nobody Sun May 5 19:00:24 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1678067915; cv=none; d=zohomail.com; s=zohoarc; b=eupgJOc02IKX2IbkXBgpDyBjYKrEVhBUOuDea/NPliXh4rS789V2jXE5JxDKL56HJt5VQNuS8EaaoCsQniIazjKTiY9ll+gcw9wPJ6myAha5cNVR7of0JoiJjKegfYYZUztU6hJ3niWGbExoxj3qqF1THYztVU2mvkTT4Kz7rW8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678067915; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=L77qkOSs51Hv1VBgnoUhwAR0MTuD2MxK8XGop9z/E6E=; b=aqq9QGx7/Fe2Q9HqTuOSEuDpNCBwEhTP/9l51cIK1G/0XFm7cI+/BkYUysQF+pMDmWTs3C4nTch9xtV/3EYph027/LERKc+xmDhG4e/WzXUpF03wIL1gfw8rsFgFzWFhFeJJk8Dn+v++5zI8XVgNz/C/vMHB0nZ1fYqbSSJYvgw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1678067915259361.9414849004763; Sun, 5 Mar 2023 17:58:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZ06L-000487-Jd; Sun, 05 Mar 2023 20:57:21 -0500 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 1pZ06G-00047V-Se for qemu-devel@nongnu.org; Sun, 05 Mar 2023 20:57:16 -0500 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZ06F-0003IR-CP for qemu-devel@nongnu.org; Sun, 05 Mar 2023 20:57:16 -0500 Received: by mail-pf1-x42f.google.com with SMTP id cp12so4788587pfb.5 for ; Sun, 05 Mar 2023 17:57:15 -0800 (PST) Received: from stoup.. ([2602:ae:154a:9f01:87cc:49bb:2900:c08b]) by smtp.gmail.com with ESMTPSA id g23-20020aa78197000000b0061949fe3beasm2921056pfi.22.2023.03.05.17.57.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Mar 2023 17:57:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678067834; 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=L77qkOSs51Hv1VBgnoUhwAR0MTuD2MxK8XGop9z/E6E=; b=to/MfcvR96FlKuEX2zW6r1r1qcKzhg5q0EyU8RIlH1fAHUkuGsrcgKjSA62AmZCOLs u1P4sfPygWsaBysj/N6eVd/l6qdMPOmvK0YvC6vZLSit5H9lELko4x4oceve4Yj3lA9W m7FO7TclTo6GDujWwlYbCZEsYKG1T/fWsXJrsKlsDWWi9LhyeLUgS6v9HQy0glEF05Jw sPXL8r7e4B5ITpLTjTmNHYYs/L2Cejvakbr+AwsGtoO55NNKzp7PVAIHAAmjCxFZSvxM kbF/cBd8tpouloji32WONGLRVAdanW46YtdFFQpLzftP2rFkfEBX26hNvj6iFe3RKwSR u8kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678067834; 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=L77qkOSs51Hv1VBgnoUhwAR0MTuD2MxK8XGop9z/E6E=; b=vXnxDl3AFR6iFjaLKCZd6FB+C96q9f2F2e0nQD7myX5zADO0PwlWRyMyeZMofIcZgY dfy0aiIo2KbynkE8y7TndD7xsgCpyLADIxSEdBeR6JGXpuntb9COBr41QVbITqi8svX/ 5vgHFUOl6+wn6iFJhg4TwAzvf0LIt5VLp1ijbqHIKuDgDP1R9zyAArro+epSvO0OnL8L Tz1a6P6Z26LfwS1/QEVtBzBknIOYPkTHMXoT538ZLDVICCJteUPo+b1D98RXP5akCZmK Q1BPqqo+ed+Ga+qHxgSHSesdlUTepr5oD12y+Xr4qi6ubBP7COokQp9JUgkE9tgoZUW9 rJsw== X-Gm-Message-State: AO0yUKUTbdLew9vfcXOd0oWqZtO8Q6Jl43bPZcOnzT7CJcc46efNFTWj dafJ7De8LxU37/1+T/+cF+bbiDvNiyHg36U8v8JJFA== X-Google-Smtp-Source: AK7set+AJAzi68gHhcaoLSbma89Y6jNQXy8yuoOZje2gCu7DVNpdh5GpXqCfd8h+0XevteoGsuQVvQ== X-Received: by 2002:aa7:98de:0:b0:5ec:702c:5880 with SMTP id e30-20020aa798de000000b005ec702c5880mr7556387pfm.32.1678067834076; Sun, 05 Mar 2023 17:57:14 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com Subject: [PATCH v2 3/5] tcg: Create tcg_req_mo Date: Sun, 5 Mar 2023 17:57:08 -0800 Message-Id: <20230306015710.1868853-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230306015710.1868853-1-richard.henderson@linaro.org> References: <20230306015710.1868853-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42f; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42f.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1678067917419100019 Content-Type: text/plain; charset="utf-8" Split out the logic to emit a host memory barrier in response to a guest memory operation. Do not provide a true default for TCG_GUEST_DEFAULT_MO because the defined() check will still be useful for determining if a guest has been updated for MTTCG. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/tcg/tcg.h | 20 ++++++++++++++++++++ accel/tcg/tcg-all.c | 6 +----- tcg/tcg-op.c | 8 +------- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h index a5cf21be83..b76b597878 100644 --- a/include/tcg/tcg.h +++ b/include/tcg/tcg.h @@ -1171,6 +1171,26 @@ static inline size_t tcg_current_code_size(TCGContex= t *s) return tcg_ptr_byte_diff(s->code_ptr, s->code_buf); } =20 +/** + * tcg_req_mo: + * @type: TCGBar + * + * Filter @type to the barrier that is required for the guest + * memory ordering vs the host memory ordering. A non-zero + * result indicates that some barrier is required. + * + * If TCG_GUEST_DEFAULT_MO is not defined, assume that the + * guest requires strict alignment. + * + * This is a macro so that it's constant even without optimization. + */ +#ifdef TCG_GUEST_DEFAULT_MO +# define tcg_req_mo(type) \ + ((type) & TCG_GUEST_DEFAULT_MO & ~TCG_TARGET_DEFAULT_MO) +#else +# define tcg_req_mo(type) ((type) & ~TCG_TARGET_DEFAULT_MO) +#endif + /** * tcg_qemu_tb_exec: * @env: pointer to CPUArchState for the CPU diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c index 5dab1ae9dd..604efd1b18 100644 --- a/accel/tcg/tcg-all.c +++ b/accel/tcg/tcg-all.c @@ -74,11 +74,7 @@ DECLARE_INSTANCE_CHECKER(TCGState, TCG_STATE, =20 static bool check_tcg_memory_orders_compatible(void) { -#if defined(TCG_GUEST_DEFAULT_MO) && defined(TCG_TARGET_DEFAULT_MO) - return (TCG_GUEST_DEFAULT_MO & ~TCG_TARGET_DEFAULT_MO) =3D=3D 0; -#else - return false; -#endif + return tcg_req_mo(TCG_MO_ALL) =3D=3D 0; } =20 static bool default_mttcg_enabled(void) diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index 2721c1cab9..d6faf30c52 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -2930,13 +2930,7 @@ static void gen_ldst_i64(TCGOpcode opc, TCGv_i64 val= , TCGv addr, =20 static void tcg_gen_req_mo(TCGBar type) { -#ifdef TCG_GUEST_DEFAULT_MO - type &=3D TCG_GUEST_DEFAULT_MO; -#endif - type &=3D ~TCG_TARGET_DEFAULT_MO; - if (type) { - tcg_gen_mb(type | TCG_BAR_SC); - } + tcg_gen_mb(tcg_req_mo(type) | TCG_BAR_SC); } =20 static inline TCGv plugin_prep_mem_callbacks(TCGv vaddr) --=20 2.34.1 From nobody Sun May 5 19:00:24 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1678067915; cv=none; d=zohomail.com; s=zohoarc; b=T2XE5su7kXvPhjQSR573bCQYomsZlP26fGCgne7fhbiD7cndz3s0ltGObmk2Op8E1RPK7rutak7Faw5cAoO4FsceN/dggY2FPn4IqRxGmSqaFvMjq+Uv2G3bAxqOcFNbU6RjTsibXVfbfnvn0Jbmu5WUfVSZsCV9Kl0Rb39GJic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678067915; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qW4Tcwf/FnMqp0denRrnXohqRV8qgaCk0t1OXd3WVbQ=; b=Mc7l+7bP/e5OXJk15EUWHACANjNfQ27SU+LAEml5wOAAqlG2pzEWmTX61B/eDFqXpYWk6CT8ifPaUryEV9FeLjrVYl5Q7UeRZDM7+rOZHdcQ5DA6QnHhfWYS7mAmSF9IWvjbGzTtD/0ILgoz20LRqsjeCQ4nUweL7PvOAsuHuVI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1678067915529132.4848643017532; Sun, 5 Mar 2023 17:58:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZ06M-0004CJ-SE; Sun, 05 Mar 2023 20:57:22 -0500 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 1pZ06I-00048D-1h for qemu-devel@nongnu.org; Sun, 05 Mar 2023 20:57:21 -0500 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZ06G-0003Ii-5R for qemu-devel@nongnu.org; Sun, 05 Mar 2023 20:57:17 -0500 Received: by mail-pl1-x62b.google.com with SMTP id a2so8667484plm.4 for ; Sun, 05 Mar 2023 17:57:15 -0800 (PST) Received: from stoup.. ([2602:ae:154a:9f01:87cc:49bb:2900:c08b]) by smtp.gmail.com with ESMTPSA id g23-20020aa78197000000b0061949fe3beasm2921056pfi.22.2023.03.05.17.57.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Mar 2023 17:57:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678067835; 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=qW4Tcwf/FnMqp0denRrnXohqRV8qgaCk0t1OXd3WVbQ=; b=iYGWw6yXCufZfeCOBeYwd9kbcw2pZQRSn6PMw6lVQKXKjfiwDAeRJSW6U3PO7t9ymn dlJC5oq6bxXpA6HUFgeQbUfZdSoJPhbpO1G3RdRdLXsJKQDE2I0JQnoG7V6wtfQw7CVl CfybsVyWYq27JXpHeMidpjV+8Z9/m1RgCNWyYSdjqr2/H1iSjNynimHodIh/GAr2HTCz hrNW+Atb/KMvKcud1hlLnzcNxqfWzhnZWOX20tyUSeWyqZPNw780pXl1PS0uzDVN1lC/ wQyfuL8/AyYFbkec2y96sjzRSwKT7nP6MEi/PvXfntS54eaGOkpdnHYDFxhcujT8DD87 wGtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678067835; 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=qW4Tcwf/FnMqp0denRrnXohqRV8qgaCk0t1OXd3WVbQ=; b=TAPyvdXxZ/gqId8bTqwLr09a8XmDD2W9gwsBQIc7Gv4RbmO2PprmEhLFf9eOVKVOnd Lq2N99FK0DTvPqKWAQ2CGfcv9qvRhwMksnf5zbZbM9ff9lojBxEXJUYFSggeAJzru/sB /Qg5y5dF/rwBqXH7ZN3AqMmIl4a70lI4N26PFIazq2EtyyThV+KP2IR3Pu/Wt53Yi1GB CW8OdvGB8Y/uhyDw00piaLyrVkJv8mnXFcHn6SMFu+cI/bR4aIV1vKLZWVzxQZOUtL31 2QSxOpSxJkia+JO+MSHC5bSJEhBo+29/k5n4LK6E84SwI2zlHHVd2xL+ewM55uK2j/Fh 9FbQ== X-Gm-Message-State: AO0yUKVg0WUfD5OtTDVrfFvlRJnHPwZl6/5j5fXwXmz/EUADSESVCp/7 TOqV9h7PUVG91gyOW5Bp59oX5q+17W6gljSeCqnY1Q== X-Google-Smtp-Source: AK7set/AKCGAnimzx2aaH9XI+hz/DvkVpjolgp4+OF9Wi7+bPt7MqHrGDgGRaiaPZOhfHBGfQMBjnQ== X-Received: by 2002:a05:6a20:6909:b0:cc:ca9:4fde with SMTP id q9-20020a056a20690900b000cc0ca94fdemr16216531pzj.33.1678067834897; Sun, 05 Mar 2023 17:57:14 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com Subject: [PATCH v2 4/5] tcg: Add host memory barriers to cpu_ldst.h interfaces Date: Sun, 5 Mar 2023 17:57:09 -0800 Message-Id: <20230306015710.1868853-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230306015710.1868853-1-richard.henderson@linaro.org> References: <20230306015710.1868853-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62b.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1678067917339100014 Content-Type: text/plain; charset="utf-8" Bring the majority of helpers into line with the rest of tcg in respecting guest memory ordering. Signed-off-by: Richard Henderson --- include/tcg/tcg.h | 14 ++++++++++++++ accel/tcg/cputlb.c | 2 ++ accel/tcg/user-exec.c | 14 ++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h index b76b597878..0edda5f89f 100644 --- a/include/tcg/tcg.h +++ b/include/tcg/tcg.h @@ -1191,6 +1191,20 @@ static inline size_t tcg_current_code_size(TCGContex= t *s) # define tcg_req_mo(type) ((type) & ~TCG_TARGET_DEFAULT_MO) #endif =20 +/** + * tcg_req_mo: + * @type: TCGBar + * + * If tcg_req_mo indicates a barrier for @type is required for the + * guest memory model, issue a host memory barrier. + */ +#define cpu_req_mo(type) \ + do { \ + if (tcg_req_mo(type)) { \ + smp_mb(); \ + } \ + } while (0) + /** * tcg_qemu_tb_exec: * @env: pointer to CPUArchState for the CPU diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index e984a98dc4..6a04514427 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -2174,6 +2174,7 @@ static inline uint64_t cpu_load_helper(CPUArchState *= env, abi_ptr addr, { uint64_t ret; =20 + cpu_req_mo(TCG_MO_LD_LD | TCG_MO_ST_LD); ret =3D full_load(env, addr, oi, retaddr); qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_R); return ret; @@ -2586,6 +2587,7 @@ static inline void cpu_store_helper(CPUArchState *env= , target_ulong addr, uint64_t val, MemOpIdx oi, uintptr_t r= a, FullStoreHelper *full_store) { + cpu_req_mo(TCG_MO_LD_ST | TCG_MO_ST_ST); full_store(env, addr, val, oi, ra); qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_W); } diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 7b37fd229e..489459ae17 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -942,6 +942,7 @@ uint8_t cpu_ldb_mmu(CPUArchState *env, abi_ptr addr, =20 validate_memop(oi, MO_UB); haddr =3D cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); + cpu_req_mo(TCG_MO_LD_LD | TCG_MO_ST_LD); ret =3D ldub_p(haddr); clear_helper_retaddr(); qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_R); @@ -956,6 +957,7 @@ uint16_t cpu_ldw_be_mmu(CPUArchState *env, abi_ptr addr, =20 validate_memop(oi, MO_BEUW); haddr =3D cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); + cpu_req_mo(TCG_MO_LD_LD | TCG_MO_ST_LD); ret =3D lduw_be_p(haddr); clear_helper_retaddr(); qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_R); @@ -970,6 +972,7 @@ uint32_t cpu_ldl_be_mmu(CPUArchState *env, abi_ptr addr, =20 validate_memop(oi, MO_BEUL); haddr =3D cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); + cpu_req_mo(TCG_MO_LD_LD | TCG_MO_ST_LD); ret =3D ldl_be_p(haddr); clear_helper_retaddr(); qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_R); @@ -984,6 +987,7 @@ uint64_t cpu_ldq_be_mmu(CPUArchState *env, abi_ptr addr, =20 validate_memop(oi, MO_BEUQ); haddr =3D cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); + cpu_req_mo(TCG_MO_LD_LD | TCG_MO_ST_LD); ret =3D ldq_be_p(haddr); clear_helper_retaddr(); qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_R); @@ -998,6 +1002,7 @@ uint16_t cpu_ldw_le_mmu(CPUArchState *env, abi_ptr add= r, =20 validate_memop(oi, MO_LEUW); haddr =3D cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); + cpu_req_mo(TCG_MO_LD_LD | TCG_MO_ST_LD); ret =3D lduw_le_p(haddr); clear_helper_retaddr(); qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_R); @@ -1012,6 +1017,7 @@ uint32_t cpu_ldl_le_mmu(CPUArchState *env, abi_ptr ad= dr, =20 validate_memop(oi, MO_LEUL); haddr =3D cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); + cpu_req_mo(TCG_MO_LD_LD | TCG_MO_ST_LD); ret =3D ldl_le_p(haddr); clear_helper_retaddr(); qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_R); @@ -1026,6 +1032,7 @@ uint64_t cpu_ldq_le_mmu(CPUArchState *env, abi_ptr ad= dr, =20 validate_memop(oi, MO_LEUQ); haddr =3D cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); + cpu_req_mo(TCG_MO_LD_LD | TCG_MO_ST_LD); ret =3D ldq_le_p(haddr); clear_helper_retaddr(); qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_R); @@ -1075,6 +1082,7 @@ void cpu_stb_mmu(CPUArchState *env, abi_ptr addr, uin= t8_t val, =20 validate_memop(oi, MO_UB); haddr =3D cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); + cpu_req_mo(TCG_MO_LD_ST | TCG_MO_ST_ST); stb_p(haddr, val); clear_helper_retaddr(); qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_W); @@ -1087,6 +1095,7 @@ void cpu_stw_be_mmu(CPUArchState *env, abi_ptr addr, = uint16_t val, =20 validate_memop(oi, MO_BEUW); haddr =3D cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); + cpu_req_mo(TCG_MO_LD_ST | TCG_MO_ST_ST); stw_be_p(haddr, val); clear_helper_retaddr(); qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_W); @@ -1099,6 +1108,7 @@ void cpu_stl_be_mmu(CPUArchState *env, abi_ptr addr, = uint32_t val, =20 validate_memop(oi, MO_BEUL); haddr =3D cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); + cpu_req_mo(TCG_MO_LD_ST | TCG_MO_ST_ST); stl_be_p(haddr, val); clear_helper_retaddr(); qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_W); @@ -1111,6 +1121,7 @@ void cpu_stq_be_mmu(CPUArchState *env, abi_ptr addr, = uint64_t val, =20 validate_memop(oi, MO_BEUQ); haddr =3D cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); + cpu_req_mo(TCG_MO_LD_ST | TCG_MO_ST_ST); stq_be_p(haddr, val); clear_helper_retaddr(); qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_W); @@ -1123,6 +1134,7 @@ void cpu_stw_le_mmu(CPUArchState *env, abi_ptr addr, = uint16_t val, =20 validate_memop(oi, MO_LEUW); haddr =3D cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); + cpu_req_mo(TCG_MO_LD_ST | TCG_MO_ST_ST); stw_le_p(haddr, val); clear_helper_retaddr(); qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_W); @@ -1135,6 +1147,7 @@ void cpu_stl_le_mmu(CPUArchState *env, abi_ptr addr, = uint32_t val, =20 validate_memop(oi, MO_LEUL); haddr =3D cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); + cpu_req_mo(TCG_MO_LD_ST | TCG_MO_ST_ST); stl_le_p(haddr, val); clear_helper_retaddr(); qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_W); @@ -1147,6 +1160,7 @@ void cpu_stq_le_mmu(CPUArchState *env, abi_ptr addr, = uint64_t val, =20 validate_memop(oi, MO_LEUQ); haddr =3D cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); + cpu_req_mo(TCG_MO_LD_ST | TCG_MO_ST_ST); stq_le_p(haddr, val); clear_helper_retaddr(); qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_W); --=20 2.34.1 From nobody Sun May 5 19:00:24 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1678067930; cv=none; d=zohomail.com; s=zohoarc; b=YayM7UoLlOV5nuqn7wxp8IAEOf5rRA1vtIwn57uG6aHcpqexgdviORrc2EkLjaJfRXFycOyMy+C/TcwvutgBWuzjUyAAif0kmHUJ1Vxr7apg5LHPDYuqXx/i2wih7wXORSMEM3ebPFP9MG50hEkeLBgLoMYsubmRhDoTvq4Tges= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678067930; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=E6K0A7+gP/89i/KNPQ80KDpl9+S1ffSQBzdgEVtW8JI=; b=jtUMoxj0a5u6k32TCn4GCfHvrskTwM9oN662tCWPTq8IaGrwWIVAPkDwC+SEYE+OD/BniOjYvMzLgzNPBXdSURVVosGZvtc76abDAy4aGVnDPTbspMBuoejj4Y7SufL6XIkxKCUNcXc90QCW9mKsDy1MsyoYCfZjI3Amveiit/Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1678067930189215.1447971599174; Sun, 5 Mar 2023 17:58:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZ06M-00049E-8s; Sun, 05 Mar 2023 20:57:22 -0500 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 1pZ06I-00048E-Qd for qemu-devel@nongnu.org; Sun, 05 Mar 2023 20:57:21 -0500 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZ06H-0003J0-6V for qemu-devel@nongnu.org; Sun, 05 Mar 2023 20:57:18 -0500 Received: by mail-pj1-x1034.google.com with SMTP id m20-20020a17090ab79400b00239d8e182efso11666698pjr.5 for ; Sun, 05 Mar 2023 17:57:16 -0800 (PST) Received: from stoup.. ([2602:ae:154a:9f01:87cc:49bb:2900:c08b]) by smtp.gmail.com with ESMTPSA id g23-20020aa78197000000b0061949fe3beasm2921056pfi.22.2023.03.05.17.57.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Mar 2023 17:57:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678067835; 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=E6K0A7+gP/89i/KNPQ80KDpl9+S1ffSQBzdgEVtW8JI=; b=e6RWv3NqSAhyAeDfi8dKnE7WtFnz1kS9U2xxHD8ZATNBf1piM8vfdR9dJ7ptdK9fMT TTxdke6cdlqhZZExygK0gg+Y4p+Qbi5YY4Ml6UcX1fooREdpGlYPjL6GjgZ2IQYfmkot +4DAb0BzskOsID+fm7vJv3qyqg6/llK83BnKFLHAuMwU0ZzKVmH0nlBawc/dPqfyglWf 6KxgLDLAzvAoioJC06hQ8wjBZJAoPUZPhkmR3R/c/0kUjv/BrqQZ6R6BLjRVNlkYZlCP zPXagO1gq11es5j80Q5E1wE0Z7G0h30Pp+I5JWuvvUAMcI8AAFWUn+jpJZRowBBp0Bvy cMow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678067835; 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=E6K0A7+gP/89i/KNPQ80KDpl9+S1ffSQBzdgEVtW8JI=; b=dj33N4sJhaSIwIKaddOs/x9O+1qgz72WIoCfmmJ7VJHuPQqxfSOCZ4zDB0Wz4X+vvR 1BhiwHn3oNmpX/4u9ygWUAu1sUy1OFq1IjycFzySGjm1H12w7W0/d6p1DClcvmFcH17b 2gkv8F9RAXPUwvdoYtsU9N07tTLgqfYg+ai9CNdPNDVjWhyHJWUeDoD6TMBUIhIMcVzq DT3Hv+sgLLsZCH0XWOLq1s7XqixQPcfmfsWPUxXllBohUg/YU1eQfz3AyGWuGivmxjxm FVxr25gSA7dyc3xxXyWfjomjp+6y6eI2uSq1IVMOKNZxySJdWmymHW6JoB066YjeJNHo E6iA== X-Gm-Message-State: AO0yUKUrK9uayfhAddZRNlFRjUF7MfjbgPpcMrUFdTGsJTI2LzyH0/HR StfloFiPTj6EgUlVbucfP09vyXah/KYex5YIY9zQLw== X-Google-Smtp-Source: AK7set9Sp56KPQW0tiTm7egHOmrZzmN0L1GpKOafqy/0m1lMjjMcR7cCEA14VOfcPVkQ7Cb4I+xrew== X-Received: by 2002:a05:6a20:12d4:b0:cc:beae:c2c2 with SMTP id v20-20020a056a2012d400b000ccbeaec2c2mr10998055pzg.1.1678067835676; Sun, 05 Mar 2023 17:57:15 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com Subject: [PATCH v2 5/5] accel/tcg: Remove check_tcg_memory_orders_compatible Date: Sun, 5 Mar 2023 17:57:10 -0800 Message-Id: <20230306015710.1868853-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230306015710.1868853-1-richard.henderson@linaro.org> References: <20230306015710.1868853-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1034; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1034.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1678067931338100001 Content-Type: text/plain; charset="utf-8" We now issue host memory barriers to match the guest memory order. Continue to disable MTTCG only if the guest has not been ported. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- accel/tcg/tcg-all.c | 34 ++++++++-------------------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c index 604efd1b18..f6b44548cc 100644 --- a/accel/tcg/tcg-all.c +++ b/accel/tcg/tcg-all.c @@ -61,33 +61,20 @@ DECLARE_INSTANCE_CHECKER(TCGState, TCG_STATE, * they can set the appropriate CONFIG flags in ${target}-softmmu.mak * * Once a guest architecture has been converted to the new primitives - * there are two remaining limitations to check. - * - * - The guest can't be oversized (e.g. 64 bit guest on 32 bit host) - * - The host must have a stronger memory order than the guest - * - * It may be possible in future to support strong guests on weak hosts - * but that will require tagging all load/stores in a guest with their - * implicit memory order requirements which would likely slow things - * down a lot. + * there is one remaining limitation to check: + * - The guest can't be oversized (e.g. 64 bit guest on 32 bit host) */ =20 -static bool check_tcg_memory_orders_compatible(void) -{ - return tcg_req_mo(TCG_MO_ALL) =3D=3D 0; -} - static bool default_mttcg_enabled(void) { if (icount_enabled() || TCG_OVERSIZED_GUEST) { return false; - } else { -#ifdef TARGET_SUPPORTS_MTTCG - return check_tcg_memory_orders_compatible(); -#else - return false; -#endif } +#if defined(TARGET_SUPPORTS_MTTCG) && defined(TCG_GUEST_DEFAULT_MO) + return true; +#else + return false; +#endif } =20 static void tcg_accel_instance_init(Object *obj) @@ -150,15 +137,10 @@ static void tcg_set_thread(Object *obj, const char *v= alue, Error **errp) } else if (icount_enabled()) { error_setg(errp, "No MTTCG when icount is enabled"); } else { -#ifndef TARGET_SUPPORTS_MTTCG +#if !(defined(TARGET_SUPPORTS_MTTCG) && defined(TCG_GUEST_DEFAULT_MO)) warn_report("Guest not yet converted to MTTCG - " "you may get unexpected results"); #endif - if (!check_tcg_memory_orders_compatible()) { - warn_report("Guest expects a stronger memory ordering " - "than the host provides"); - error_printf("This may cause strange/hard to debug errors\= n"); - } s->mttcg_enabled =3D true; } } else if (strcmp(value, "single") =3D=3D 0) { --=20 2.34.1