From nobody Thu Nov 6 10:38:34 2025 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.zohomail.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 1540490529308962.837937266586; Thu, 25 Oct 2018 11:02:09 -0700 (PDT) Received: from localhost ([::1]:56238 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFjxD-0004R4-2B for importer@patchew.org; Thu, 25 Oct 2018 14:01:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40351) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFjKm-0006ht-D1 for qemu-devel@nongnu.org; Thu, 25 Oct 2018 13:22:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gFjKJ-00008D-5V for qemu-devel@nongnu.org; Thu, 25 Oct 2018 13:21:44 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:51715) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gFjKH-0008Q9-90 for qemu-devel@nongnu.org; Thu, 25 Oct 2018 13:21:41 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id D94952212E; Thu, 25 Oct 2018 13:21:09 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 25 Oct 2018 13:21:09 -0400 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 74295E4074; Thu, 25 Oct 2018 13:21:09 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=braap.org; h= from:to:cc:subject:date:message-id:in-reply-to:references; s= mesmtp; bh=DsCaQrNP/7gV6grEs/67BbM9qG/fCds8qH+++Q104yg=; b=EjA9L A53pPJsGI9kIv5pJzb93ydNn2fed151GGr6WraLnmGERUnoDRaO2iT1VKXYD9Viw nxTc81N5FUCJNDWBqbvWGRqC6A0k0KXhED4lwLUeNRCex9Rvsp/msmeEXPyZwlDW ef8KZpz+4PttDNsmTjoukhTzFRm/cK9VGY2boA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=DsCaQrNP/7gV6grEs/67BbM9qG/fC ds8qH+++Q104yg=; b=h6Q8WU53IizFkWDEGpUfer/mTsBBQEv14Tkf5l4OydYQn pdwaPl95qbL7IlXBOw8HwZSqlKPL+N+CO8f67LJW0/pj1QVXdTHzlbH/ZdjQ5Tyu 182i4gY7IT9Mxq5CtGC0KUKmPqrqGmlhZcvhXinFb/o2r9M8gfdYaP/1BDgKkrKQ 9U/0i2swW65sNLJn9JAhu5elqTN2L0p1yxCUJ7weEOxJm6540aGsyqK/7bMAyUi7 FEorls64FtM1QgF4Zcfkrnxh+mp6FH6ldgKAFVVi/aIHuv/RO7+dKPQVlmJ5L8oW kErtBQN+jpGzkusarKvtdH86MZ4uTapSurxEz+Ypw== X-ME-Sender: X-ME-Proxy: From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Thu, 25 Oct 2018 13:20:21 -0400 Message-Id: <20181025172057.20414-13-cota@braap.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181025172057.20414-1-cota@braap.org> References: <20181025172057.20414-1-cota@braap.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.111.4.27 Subject: [Qemu-devel] [RFC 12/48] atomic_template: define pre/post macros 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: Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Llu=C3=ADs=20Vilanova?= , Pavel Dovgalyuk , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" In preparation for plugin support. Signed-off-by: Emilio G. Cota --- accel/tcg/atomic_template.h | 92 +++++++++++++++++++++++-------------- 1 file changed, 57 insertions(+), 35 deletions(-) diff --git a/accel/tcg/atomic_template.h b/accel/tcg/atomic_template.h index 8d177fefef..b13318c1ce 100644 --- a/accel/tcg/atomic_template.h +++ b/accel/tcg/atomic_template.h @@ -59,25 +59,26 @@ # define ABI_TYPE uint32_t #endif =20 -#define ATOMIC_TRACE_RMW do { \ - uint8_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, fal= se); \ - \ - trace_guest_mem_before_exec(ENV_GET_CPU(env), addr, info); \ - trace_guest_mem_before_exec(ENV_GET_CPU(env), addr, \ - info | TRACE_MEM_ST); \ - } while (0) - -#define ATOMIC_TRACE_LD do { \ - uint8_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, fal= se); \ - \ - trace_guest_mem_before_exec(ENV_GET_CPU(env), addr, info); \ - } while (0) - -# define ATOMIC_TRACE_ST do { \ - uint8_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, tru= e); \ - \ - trace_guest_mem_before_exec(ENV_GET_CPU(env), addr, info); \ - } while (0) +/* these don't depend on MEND/SHIFT, so we just define them once */ +#ifndef ATOMIC_TRACE_RMW_PRE +# define ATOMIC_TRACE_RMW_PRE do { = \ + trace_guest_mem_before_exec(ENV_GET_CPU(env), addr, info); = \ + trace_guest_mem_before_exec(ENV_GET_CPU(env), addr, info | TRACE_MEM_S= T); \ +} while (0) + +# define ATOMIC_TRACE_RMW_POST \ + +# define ATOMIC_TRACE_LD_PRE \ + trace_guest_mem_before_exec(ENV_GET_CPU(env), addr, info) + +# define ATOMIC_TRACE_LD_POST \ + +# define ATOMIC_TRACE_ST_PRE \ + trace_guest_mem_before_exec(ENV_GET_CPU(env), addr, info) + +# define ATOMIC_TRACE_ST_POST \ + +#endif /* ATOMIC_TRACE_RMW_PRE */ =20 /* Define host-endian atomic operations. Note that END is used within the ATOMIC_NAME macro, and redefined below. */ @@ -98,14 +99,16 @@ ABI_TYPE ATOMIC_NAME(cmpxchg)(CPUArchState *env, target= _ulong addr, ATOMIC_MMU_DECLS; DATA_TYPE *haddr =3D ATOMIC_MMU_LOOKUP; DATA_TYPE ret; + uint8_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, false); =20 - ATOMIC_TRACE_RMW; + ATOMIC_TRACE_RMW_PRE; #if DATA_SIZE =3D=3D 16 ret =3D atomic16_cmpxchg(haddr, cmpv, newv); #else ret =3D atomic_cmpxchg__nocheck(haddr, cmpv, newv); #endif ATOMIC_MMU_CLEANUP; + ATOMIC_TRACE_RMW_POST; return ret; } =20 @@ -115,10 +118,12 @@ ABI_TYPE ATOMIC_NAME(ld)(CPUArchState *env, target_ul= ong addr EXTRA_ARGS) { ATOMIC_MMU_DECLS; DATA_TYPE val, *haddr =3D ATOMIC_MMU_LOOKUP; + uint8_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, false); =20 - ATOMIC_TRACE_LD; + ATOMIC_TRACE_LD_PRE; val =3D atomic16_read(haddr); ATOMIC_MMU_CLEANUP; + ATOMIC_TRACE_LD_POST; return val; } =20 @@ -127,10 +132,12 @@ void ATOMIC_NAME(st)(CPUArchState *env, target_ulong = addr, { ATOMIC_MMU_DECLS; DATA_TYPE *haddr =3D ATOMIC_MMU_LOOKUP; + uint8_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, true); =20 - ATOMIC_TRACE_ST; + ATOMIC_TRACE_ST_PRE; atomic16_set(haddr, val); ATOMIC_MMU_CLEANUP; + ATOMIC_TRACE_ST_POST; } #endif #else @@ -140,10 +147,12 @@ ABI_TYPE ATOMIC_NAME(xchg)(CPUArchState *env, target_= ulong addr, ATOMIC_MMU_DECLS; DATA_TYPE *haddr =3D ATOMIC_MMU_LOOKUP; DATA_TYPE ret; + uint8_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, false); =20 - ATOMIC_TRACE_RMW; + ATOMIC_TRACE_RMW_PRE; ret =3D atomic_xchg__nocheck(haddr, val); ATOMIC_MMU_CLEANUP; + ATOMIC_TRACE_RMW_POST; return ret; } =20 @@ -154,10 +163,12 @@ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, target_ulo= ng addr, \ ATOMIC_MMU_DECLS; \ DATA_TYPE *haddr =3D ATOMIC_MMU_LOOKUP; \ DATA_TYPE ret; \ + uint8_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, false);= \ \ - ATOMIC_TRACE_RMW; \ + ATOMIC_TRACE_RMW_PRE; \ ret =3D atomic_##X(haddr, val); \ ATOMIC_MMU_CLEANUP; \ + ATOMIC_TRACE_RMW_POST; \ return ret; \ } =20 @@ -186,8 +197,9 @@ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, target_ulong= addr, \ ATOMIC_MMU_DECLS; \ XDATA_TYPE *haddr =3D ATOMIC_MMU_LOOKUP; \ XDATA_TYPE cmp, old, new, val =3D xval; \ + uint8_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, false);= \ \ - ATOMIC_TRACE_RMW; \ + ATOMIC_TRACE_RMW_PRE; \ smp_mb(); \ cmp =3D atomic_read__nocheck(haddr); \ do { \ @@ -195,6 +207,7 @@ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, target_ulong= addr, \ cmp =3D atomic_cmpxchg__nocheck(haddr, old, new); \ } while (cmp !=3D old); \ ATOMIC_MMU_CLEANUP; \ + ATOMIC_TRACE_RMW_POST; \ return RET; \ } =20 @@ -232,14 +245,16 @@ ABI_TYPE ATOMIC_NAME(cmpxchg)(CPUArchState *env, targ= et_ulong addr, ATOMIC_MMU_DECLS; DATA_TYPE *haddr =3D ATOMIC_MMU_LOOKUP; DATA_TYPE ret; + uint8_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, false); =20 - ATOMIC_TRACE_RMW; + ATOMIC_TRACE_RMW_PRE; #if DATA_SIZE =3D=3D 16 ret =3D atomic16_cmpxchg(haddr, BSWAP(cmpv), BSWAP(newv)); #else ret =3D atomic_cmpxchg__nocheck(haddr, BSWAP(cmpv), BSWAP(newv)); #endif ATOMIC_MMU_CLEANUP; + ATOMIC_TRACE_RMW_POST; return BSWAP(ret); } =20 @@ -249,10 +264,12 @@ ABI_TYPE ATOMIC_NAME(ld)(CPUArchState *env, target_ul= ong addr EXTRA_ARGS) { ATOMIC_MMU_DECLS; DATA_TYPE val, *haddr =3D ATOMIC_MMU_LOOKUP; + uint8_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, false); =20 - ATOMIC_TRACE_LD; + ATOMIC_TRACE_LD_PRE; val =3D atomic16_read(haddr); ATOMIC_MMU_CLEANUP; + ATOMIC_TRACE_LD_POST; return BSWAP(val); } =20 @@ -261,11 +278,14 @@ void ATOMIC_NAME(st)(CPUArchState *env, target_ulong = addr, { ATOMIC_MMU_DECLS; DATA_TYPE *haddr =3D ATOMIC_MMU_LOOKUP; + uint8_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, true); =20 - ATOMIC_TRACE_ST; + val =3D BSWAP(val); + ATOMIC_TRACE_ST_PRE; val =3D BSWAP(val); atomic16_set(haddr, val); ATOMIC_MMU_CLEANUP; + ATOMIC_TRACE_ST_POST; } #endif #else @@ -275,10 +295,12 @@ ABI_TYPE ATOMIC_NAME(xchg)(CPUArchState *env, target_= ulong addr, ATOMIC_MMU_DECLS; DATA_TYPE *haddr =3D ATOMIC_MMU_LOOKUP; ABI_TYPE ret; + uint8_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, false); =20 - ATOMIC_TRACE_RMW; + ATOMIC_TRACE_RMW_PRE; ret =3D atomic_xchg__nocheck(haddr, BSWAP(val)); ATOMIC_MMU_CLEANUP; + ATOMIC_TRACE_RMW_POST; return BSWAP(ret); } =20 @@ -289,10 +311,12 @@ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, target_ulo= ng addr, \ ATOMIC_MMU_DECLS; \ DATA_TYPE *haddr =3D ATOMIC_MMU_LOOKUP; \ DATA_TYPE ret; \ + uint8_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, false);= \ \ - ATOMIC_TRACE_RMW; \ + ATOMIC_TRACE_RMW_PRE; \ ret =3D atomic_##X(haddr, BSWAP(val)); \ ATOMIC_MMU_CLEANUP; \ + ATOMIC_TRACE_RMW_POST; \ return BSWAP(ret); \ } =20 @@ -319,8 +343,9 @@ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, target_ulong= addr, \ ATOMIC_MMU_DECLS; \ XDATA_TYPE *haddr =3D ATOMIC_MMU_LOOKUP; \ XDATA_TYPE ldo, ldn, old, new, val =3D xval; \ + uint8_t info =3D glue(trace_mem_build_info_no_se, MEND)(SHIFT, false);= \ \ - ATOMIC_TRACE_RMW; \ + ATOMIC_TRACE_RMW_PRE; \ smp_mb(); \ ldn =3D atomic_read__nocheck(haddr); \ do { \ @@ -328,6 +353,7 @@ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, target_ulong= addr, \ ldn =3D atomic_cmpxchg__nocheck(haddr, ldo, BSWAP(new)); \ } while (ldo !=3D ldn); \ ATOMIC_MMU_CLEANUP; \ + ATOMIC_TRACE_RMW_POST; \ return RET; \ } =20 @@ -355,10 +381,6 @@ GEN_ATOMIC_HELPER_FN(add_fetch, ADD, DATA_TYPE, new) #undef MEND #endif /* DATA_SIZE > 1 */ =20 -#undef ATOMIC_TRACE_ST -#undef ATOMIC_TRACE_LD -#undef ATOMIC_TRACE_RMW - #undef BSWAP #undef ABI_TYPE #undef DATA_TYPE --=20 2.17.1