From patchwork Thu Feb 13 22:51:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 183447 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp1088438ile; Thu, 13 Feb 2020 15:04:12 -0800 (PST) X-Google-Smtp-Source: APXvYqxh3M4Qy2gPwxl8l8g7aM/HneZ34ZtXMnul+1wzf3pnFUmavWhkJdLcMPkadu5818BWCIJX X-Received: by 2002:ae9:e602:: with SMTP id z2mr11071qkf.50.1581635052602; Thu, 13 Feb 2020 15:04:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581635052; cv=none; d=google.com; s=arc-20160816; b=mEHK0Ioa09BePxbmo1mqRUrQY7TUbCurh3YPC89cmqI3x2a0PmgRbqGbCZHW9CZ6R8 W5zld1yqG0Kn/zwQ7lRs+sfYyZDZSgATlLIHBNEoss7/4ES9qTVZ6gpyOwLiQk06PP7F aVThCXgrdYZlg58ONk5ID/T4FNc2PZWtunXyeIqCGbhqt+piX4Xuc/Zt+KFAkbLZQFMu Hk6XktzaC0Nv4w5eLkjpAFfBRRXce5UzioTEf8FH4GS2YiwRCv+BBvqfchvzxG/i6NhU ddAqTWkWyRP+2v8WIQ+iHk1gWJuPc9s5blJZFI5myk04nL+th4zPBF1pJ+MmQsu9WteS Iosw== 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=KXMngXIFaO7CsnyCy/hFBjzW3N8yM4HjBEk1iXtE1Sc=; b=gt0L1gt/a3YobneUGJeHzfBipVbJ6ERwJD0DEaQyduzKPJDXwEL1YVMCKD9KG2dkbg dk+JMPGsKsBd86QJ2ml5xlaJRPZs8trrTMXwSG53kiQllpXKAIK+nJVfq2hu8ncsevMQ vVvY+lt3Par8ZxNGVSugg62zp+AmSYr+whH3IsYTQyr7NmAJhRzAEeHDcIx5SpAg/ajg gIfYCIkLME3gXHzpjUpeN4lWiG1IUknPWHwLBg1v4KiSnZYgQQpmZl7/f5Sc5aKHKo6s TOpvs8lWOVBlDY4CnwJmWe0l/S6IuvOQagmyeFpVjROENjPM+Jb6X+sa4zm6qvhetQlL uceg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="hjLNs/VK"; 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 t7si1737136qvs.186.2020.02.13.15.04.12 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Feb 2020 15:04:12 -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="hjLNs/VK"; 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]:60644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2NWl-0007Mx-T6 for patch@linaro.org; Thu, 13 Feb 2020 18:04:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40177) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2NKV-00058V-4C for qemu-devel@nongnu.org; Thu, 13 Feb 2020 17:51:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2NKT-00048a-QG for qemu-devel@nongnu.org; Thu, 13 Feb 2020 17:51:31 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:35928) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j2NKT-00046A-In for qemu-devel@nongnu.org; Thu, 13 Feb 2020 17:51:29 -0500 Received: by mail-wm1-x343.google.com with SMTP id p17so8613500wma.1 for ; Thu, 13 Feb 2020 14:51:29 -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=KXMngXIFaO7CsnyCy/hFBjzW3N8yM4HjBEk1iXtE1Sc=; b=hjLNs/VKAMUlMkReH7wRf1oxOUGeghpQBm9N2Hz8Mh4RmPFZGmz8ve/7deldGMwvWJ Y31gXGXoApTbx+/j7vnJSLtHn6Unkm6h1vWTY2zs4NrMWge6i6rxbU2Cow7eyH9ivIFe c+4jPnNJGjNqpc/i6AV+sJQFxeNuvJDWzRRflNE5Bh0DVUf655aKQs0iHASXt+LuJ4nQ SJqluhI0Hm4ra8vtzmknMo0JyNGHy66GcGi2FlWdqPjSiF3nrStJzPnkQzCCHqJGkBOT CQyKRmjN0F4iEtTgr7xcIUz3fcRLBrSNzavhmFyiy1iIfHlHuPdVQYdXtcp+5HuBS/lM fTKQ== 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=KXMngXIFaO7CsnyCy/hFBjzW3N8yM4HjBEk1iXtE1Sc=; b=mUQ+K3awauo0kKqk9uvWjopLACZsUembMMa8gLpCssPi5mwX19RaKJ7BPSv+ifWrUJ 5j7vgY64B4uUFaQ4wg6+n0V4/d1M1Nq5IWF68EO/6EMT+9ZVofUkQWTPHGNZRInH5ogo NyY5BZ3GKlXNk4cs4nZSKhmU5l5mA9O71NHp4dzbq6KHyRq7KXIZqy6fHagIhJjO1Lpc YNumf0DldMK4S1kmWY+Ol4EMwCJG9AiNwjHKVt6FbznHZVPnbiYlxuwZEUXj7QfsLXyp IZu/t/nWt9KfgJgGTE5XCOYuloRcPcT3slJcjuV1byxGjffejkqaSsRpIXk1Mercrsw5 lLbg== X-Gm-Message-State: APjAAAVU7k6GdzxizQeY5yZRWFYvrWNy8B9tmArb7R91wRyCzBnEPJBH HCdQ8iycmKdzdBSLyqaWjv8hHw== X-Received: by 2002:a7b:ce98:: with SMTP id q24mr297673wmj.41.1581634288590; Thu, 13 Feb 2020 14:51:28 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f12sm4702437wmj.10.2020.02.13.14.51.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2020 14:51:20 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 223FB1FFA6; Thu, 13 Feb 2020 22:51:11 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 17/19] tcg: save vaddr temp for plugin usage Date: Thu, 13 Feb 2020 22:51:07 +0000 Message-Id: <20200213225109.13120-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200213225109.13120-1-alex.bennee@linaro.org> References: <20200213225109.13120-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 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: fam@euphon.net, berrange@redhat.com, robert.foley@linaro.org, pbonzini@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , richard.henderson@linaro.org, f4bug@amsat.org, robhenry@microsoft.com, qemu-stable@nongnu.org, marcandre.lureau@redhat.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, kuhn.chenqun@huawei.com, peter.puhov@linaro.org, aurelien@aurel32.net, Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson While do_gen_mem_cb does copy (via extu_tl_i64) vaddr into a new temp this won't help if the vaddr temp gets clobbered by the actual load/store op. To avoid this clobbering we explicitly copy vaddr before the op to ensure it is live my the time we do the instrumentation. Suggested-by: Richard Henderson Signed-off-by: Alex Bennée Cc: qemu-stable@nongnu.org --- tcg/tcg-op.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) -- 2.20.1 Reviewed-by: Richard Henderson Reviewed-by: Emilio G. Cota diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index 7d782002e3f..e2e25ebf7db 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -2794,13 +2794,26 @@ static void tcg_gen_req_mo(TCGBar type) } } +static inline TCGv plugin_prep_mem_callbacks(TCGv vaddr) +{ +#ifdef CONFIG_PLUGIN + if (tcg_ctx->plugin_insn != NULL) { + /* Save a copy of the vaddr for use after a load. */ + TCGv temp = tcg_temp_new(); + tcg_gen_mov_tl(temp, vaddr); + return temp; + } +#endif + return vaddr; +} + static inline void plugin_gen_mem_callbacks(TCGv vaddr, uint16_t info) { #ifdef CONFIG_PLUGIN - if (tcg_ctx->plugin_insn == NULL) { - return; + if (tcg_ctx->plugin_insn != NULL) { + plugin_gen_empty_mem_callback(vaddr, info); + tcg_temp_free(vaddr); } - plugin_gen_empty_mem_callback(vaddr, info); #endif } @@ -2822,6 +2835,7 @@ void tcg_gen_qemu_ld_i32(TCGv_i32 val, TCGv addr, TCGArg idx, MemOp memop) } } + addr = plugin_prep_mem_callbacks(addr); gen_ldst_i32(INDEX_op_qemu_ld_i32, val, addr, memop, idx); plugin_gen_mem_callbacks(addr, info); @@ -2868,6 +2882,7 @@ void tcg_gen_qemu_st_i32(TCGv_i32 val, TCGv addr, TCGArg idx, MemOp memop) memop &= ~MO_BSWAP; } + addr = plugin_prep_mem_callbacks(addr); gen_ldst_i32(INDEX_op_qemu_st_i32, val, addr, memop, idx); plugin_gen_mem_callbacks(addr, info); @@ -2905,6 +2920,7 @@ void tcg_gen_qemu_ld_i64(TCGv_i64 val, TCGv addr, TCGArg idx, MemOp memop) } } + addr = plugin_prep_mem_callbacks(addr); gen_ldst_i64(INDEX_op_qemu_ld_i64, val, addr, memop, idx); plugin_gen_mem_callbacks(addr, info); @@ -2967,6 +2983,7 @@ void tcg_gen_qemu_st_i64(TCGv_i64 val, TCGv addr, TCGArg idx, MemOp memop) memop &= ~MO_BSWAP; } + addr = plugin_prep_mem_callbacks(addr); gen_ldst_i64(INDEX_op_qemu_st_i64, val, addr, memop, idx); plugin_gen_mem_callbacks(addr, info);