From patchwork Mon Dec 14 08:41:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alvise Rigo X-Patchwork-Id: 556329 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48387140216 for ; Mon, 14 Dec 2015 19:46:35 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=virtualopensystems-com.20150623.gappssmtp.com header.i=@virtualopensystems-com.20150623.gappssmtp.com header.b=JIWt+dzX; dkim-atps=neutral Received: from localhost ([::1]:58515 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a8Om9-00055J-8l for incoming@patchwork.ozlabs.org; Mon, 14 Dec 2015 03:46:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55598) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a8Ohf-0005Vt-J8 for qemu-devel@nongnu.org; Mon, 14 Dec 2015 03:41:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a8Ohd-0001tn-PA for qemu-devel@nongnu.org; Mon, 14 Dec 2015 03:41:55 -0500 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]:33965) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a8Ohd-0001tg-G9 for qemu-devel@nongnu.org; Mon, 14 Dec 2015 03:41:53 -0500 Received: by mail-wm0-x236.google.com with SMTP id p66so50837876wmp.1 for ; Mon, 14 Dec 2015 00:41:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtualopensystems-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BdfLoZUuNG98VVgbgJ4lw9BvwzT42vGhOodlLjB1hvQ=; b=JIWt+dzXX/UA3u2DfG/kVmtqL7tusmP+hk+yc7Va/HELwZDotp2ufe9W6PjyxUSvKP d03gTR4ZBldBm4a+KPXFmECRajT75zUJMQIcqx+Y5qkk1SkLLgZXMtK615cokyya4+G8 fNi2fR/MG/Bw/lvB3Fsped2zPSvJDJ940Gi3WP3CVlpMCoQzTGw2nU5ABdtxYj1Y4xGP F/HbY0RzIN/KSb/vgQdhd1g2bohqHfdiJ4wXmMTAx6SPGfernspGPcryfELrFQeUSwKd S/DcHRioB2eU7JGo8Pd5SJaidMJBxXGs5fk1qRZz54Aw1ltD7db7m6AnUhhrXO9b9h7O x/Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BdfLoZUuNG98VVgbgJ4lw9BvwzT42vGhOodlLjB1hvQ=; b=c93he7rrMt0Y6ygiGZ/uBDq3FGAKBL5rUSOhbcSsqccBzO0N9ZOqfnFqXzz9c+DUHm p+cMNeUmONSzUiL5EtCd7B96CSJMFWL+0c0Sz5gkEI9EgPUjpXWNow2bEH+1pJXp2gcC iKI3t30wE9TT8HtGGgPWpAeT+WDUY82MsfRxj0iYzsk4RegblsGIed/lCjrCGPnW7hyz s9x3Ns3PBjhU9Li4u/ftuKWWDdgA8/SvZwUM25JPBu+Us4kmAWF+6WA1JDq3A/63BS0T lsJI6mGLx3gzkk2suyt8ZDZcRVUg7LAOhFiftlVOmieV7cL7h2vYxYVg5OOmtEs4UROa 1UHw== X-Gm-Message-State: ALoCoQkxPGhbpsJXEmUSOqpKajf++QB1oH18S1v8iKmAIryNA3oLrYaSQmwvKFzmqzqMPeQ4Y1GBxRrO18j5ej4k7JzjlgChdQ== X-Received: by 10.194.2.168 with SMTP id 8mr41841195wjv.66.1450082512920; Mon, 14 Dec 2015 00:41:52 -0800 (PST) Received: from localhost.localdomain (LPuteaux-656-1-278-113.w80-15.abo.wanadoo.fr. [80.15.154.113]) by smtp.googlemail.com with ESMTPSA id xs9sm1100526wjc.43.2015.12.14.00.41.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Dec 2015 00:41:52 -0800 (PST) From: Alvise Rigo To: qemu-devel@nongnu.org, mttcg@listserver.greensocs.com Date: Mon, 14 Dec 2015 09:41:29 +0100 Message-Id: <1450082498-27109-6-git-send-email-a.rigo@virtualopensystems.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1450082498-27109-1-git-send-email-a.rigo@virtualopensystems.com> References: <1450082498-27109-1-git-send-email-a.rigo@virtualopensystems.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::236 Cc: claudio.fontana@huawei.com, pbonzini@redhat.com, jani.kokkonen@huawei.com, tech@virtualopensystems.com, alex.bennee@linaro.org, rth@twiddle.net Subject: [Qemu-devel] [RFC v6 05/14] tcg: Create new runtime helpers for excl accesses X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Introduce a set of new runtime helpers do handle exclusive instructions. This helpers are used as hooks to call the respective LL/SC helpers in softmmu_llsc_template.h from TCG code. Suggested-by: Jani Kokkonen Suggested-by: Claudio Fontana Signed-off-by: Alvise Rigo --- Makefile.target | 2 +- include/exec/helper-gen.h | 1 + include/exec/helper-proto.h | 1 + include/exec/helper-tcg.h | 1 + tcg-llsc-helper.c | 109 ++++++++++++++++++++++++++++++++++++++++++++ tcg-llsc-helper.h | 35 ++++++++++++++ tcg/tcg-llsc-gen-helper.h | 32 +++++++++++++ 7 files changed, 180 insertions(+), 1 deletion(-) create mode 100644 tcg-llsc-helper.c create mode 100644 tcg-llsc-helper.h create mode 100644 tcg/tcg-llsc-gen-helper.h diff --git a/Makefile.target b/Makefile.target index 962d004..e9fbcdc 100644 --- a/Makefile.target +++ b/Makefile.target @@ -135,7 +135,7 @@ obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o numa.o obj-y += qtest.o bootdevice.o obj-y += hw/ obj-$(CONFIG_KVM) += kvm-all.o -obj-y += memory.o cputlb.o +obj-y += memory.o cputlb.o tcg-llsc-helper.o obj-y += memory_mapping.o obj-y += dump.o obj-y += migration/ram.o migration/savevm.o diff --git a/include/exec/helper-gen.h b/include/exec/helper-gen.h index 0d0da3a..d45cdad2 100644 --- a/include/exec/helper-gen.h +++ b/include/exec/helper-gen.h @@ -60,6 +60,7 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) \ #include "trace/generated-helpers.h" #include "trace/generated-helpers-wrappers.h" #include "tcg-runtime.h" +#include "tcg-llsc-gen-helper.h" #undef DEF_HELPER_FLAGS_0 #undef DEF_HELPER_FLAGS_1 diff --git a/include/exec/helper-proto.h b/include/exec/helper-proto.h index effdd43..90be2fd 100644 --- a/include/exec/helper-proto.h +++ b/include/exec/helper-proto.h @@ -29,6 +29,7 @@ dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2), dh_ctype(t3), \ #include "helper.h" #include "trace/generated-helpers.h" #include "tcg-runtime.h" +#include "tcg/tcg-llsc-gen-helper.h" #undef DEF_HELPER_FLAGS_0 #undef DEF_HELPER_FLAGS_1 diff --git a/include/exec/helper-tcg.h b/include/exec/helper-tcg.h index 79fa3c8..0c0dc71 100644 --- a/include/exec/helper-tcg.h +++ b/include/exec/helper-tcg.h @@ -38,6 +38,7 @@ #include "helper.h" #include "trace/generated-helpers.h" #include "tcg-runtime.h" +#include "tcg-llsc-gen-helper.h" #undef DEF_HELPER_FLAGS_0 #undef DEF_HELPER_FLAGS_1 diff --git a/tcg-llsc-helper.c b/tcg-llsc-helper.c new file mode 100644 index 0000000..04cc8b1 --- /dev/null +++ b/tcg-llsc-helper.c @@ -0,0 +1,109 @@ +/* + * Runtime helpers for atomic istruction emulation + * + * Copyright (c) 2015 Virtual Open Systems + * + * Authors: + * Alvise Rigo + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see . + */ + +#include "exec/cpu_ldst.h" +#include "exec/helper-head.h" +#include "tcg-llsc-helper.h" + +#define LDEX_HELPER(SUFF, OPC, FUNC) \ +uint32_t HELPER(ldlink_aa32_i##SUFF)(CPUArchState *env, uint32_t addr, \ + uint32_t index) \ +{ \ + CPUArchState *state = env; \ + TCGMemOpIdx op; \ + \ + op = make_memop_idx(OPC, index); \ + \ + return (uint32_t)FUNC(state, addr, op, GETRA()); \ +} + +LDEX_HELPER(8, MO_UB, helper_ret_ldlinkub_mmu) + +LDEX_HELPER(16_be, MO_BEUW, helper_be_ldlinkuw_mmu) +LDEX_HELPER(32_be, MO_BEUL, helper_be_ldlinkul_mmu) + +uint64_t HELPER(ldlink_aa32_i64_be)(CPUArchState *env, uint32_t addr, + uint32_t index) +{ + CPUArchState *state = env; + TCGMemOpIdx op; + + op = make_memop_idx(MO_BEQ, index); + + return helper_be_ldlinkq_mmu(state, addr, op, GETRA()); +} + +LDEX_HELPER(16_le, MO_LEUW, helper_le_ldlinkuw_mmu) +LDEX_HELPER(32_le, MO_LEUL, helper_le_ldlinkq_mmu) + +uint64_t HELPER(ldlink_aa32_i64_le)(CPUArchState *env, uint32_t addr, + uint32_t index) +{ + CPUArchState *state = env; + TCGMemOpIdx op; + + op = make_memop_idx(MO_LEQ, index); + + return helper_le_ldlinkq_mmu(state, addr, op, GETRA()); +} + +#define STEX_HELPER(SUFF, DATA_TYPE, OPC, FUNC) \ +uint32_t HELPER(stcond_aa32_i##SUFF)(CPUArchState *env, uint32_t addr, \ + uint32_t val, uint32_t index) \ +{ \ + CPUArchState *state = env; \ + TCGMemOpIdx op; \ + \ + op = make_memop_idx(OPC, index); \ + \ + return (uint32_t)FUNC(state, addr, val, op, GETRA()); \ +} + +STEX_HELPER(8, uint8_t, MO_UB, helper_ret_stcondb_mmu) + +STEX_HELPER(16_be, uint16_t, MO_BEUW, helper_be_stcondw_mmu) +STEX_HELPER(32_be, uint32_t, MO_BEUL, helper_be_stcondl_mmu) + +uint32_t HELPER(stcond_aa32_i64_be)(CPUArchState *env, uint32_t addr, + uint64_t val, uint32_t index) +{ + CPUArchState *state = env; + TCGMemOpIdx op; + + op = make_memop_idx(MO_BEQ, index); + + return (uint32_t)helper_be_stcondq_mmu(state, addr, val, op, GETRA()); +} + +STEX_HELPER(16_le, uint16_t, MO_LEUW, helper_le_stcondw_mmu) +STEX_HELPER(32_le, uint32_t, MO_LEUL, helper_le_stcondl_mmu) + +uint32_t HELPER(stcond_aa32_i64_le)(CPUArchState *env, uint32_t addr, + uint64_t val, uint32_t index) +{ + CPUArchState *state = env; + TCGMemOpIdx op; + + op = make_memop_idx(MO_LEQ, index); + + return (uint32_t)helper_le_stcondq_mmu(state, addr, val, op, GETRA()); +} diff --git a/tcg-llsc-helper.h b/tcg-llsc-helper.h new file mode 100644 index 0000000..bbe42c3 --- /dev/null +++ b/tcg-llsc-helper.h @@ -0,0 +1,35 @@ +#ifndef HELPER_LLSC_HEAD_H +#define HELPER_LLSC_HEAD_H 1 + +uint32_t HELPER(ldlink_aa32_i8)(CPUArchState *env, uint32_t addr, + uint32_t index); +uint32_t HELPER(ldlink_aa32_i16_be)(CPUArchState *env, uint32_t addr, + uint32_t index); +uint32_t HELPER(ldlink_aa32_i32_be)(CPUArchState *env, uint32_t addr, + uint32_t index); +uint64_t HELPER(ldlink_aa32_i64_be)(CPUArchState *env, uint32_t addr, + uint32_t index); +uint32_t HELPER(ldlink_aa32_i16_le)(CPUArchState *env, uint32_t addr, + uint32_t index); +uint32_t HELPER(ldlink_aa32_i32_le)(CPUArchState *env, uint32_t addr, + uint32_t index); +uint64_t HELPER(ldlink_aa32_i64_le)(CPUArchState *env, uint32_t addr, + uint32_t index); + + +uint32_t HELPER(stcond_aa32_i8)(CPUArchState *env, uint32_t addr, + uint32_t val, uint32_t index); +uint32_t HELPER(stcond_aa32_i16_be)(CPUArchState *env, uint32_t addr, + uint32_t val, uint32_t index); +uint32_t HELPER(stcond_aa32_i32_be)(CPUArchState *env, uint32_t addr, + uint32_t val, uint32_t index); +uint32_t HELPER(stcond_aa32_i64_be)(CPUArchState *env, uint32_t addr, + uint64_t val, uint32_t index); +uint32_t HELPER(stcond_aa32_i16_le)(CPUArchState *env, uint32_t addr, + uint32_t val, uint32_t index); +uint32_t HELPER(stcond_aa32_i32_le)(CPUArchState *env, uint32_t addr, + uint32_t val, uint32_t index); +uint32_t HELPER(stcond_aa32_i64_le)(CPUArchState *env, uint32_t addr, + uint64_t val, uint32_t index); + +#endif diff --git a/tcg/tcg-llsc-gen-helper.h b/tcg/tcg-llsc-gen-helper.h new file mode 100644 index 0000000..2b647cd --- /dev/null +++ b/tcg/tcg-llsc-gen-helper.h @@ -0,0 +1,32 @@ +DEF_HELPER_3(ldlink_aa32_i8, i32, env, i32, i32) +DEF_HELPER_3(ldlink_aa32_i16_be, i32, env, i32, i32) +DEF_HELPER_3(ldlink_aa32_i32_be, i32, env, i32, i32) +DEF_HELPER_3(ldlink_aa32_i64_be, i64, env, i32, i32) +DEF_HELPER_3(ldlink_aa32_i16_le, i32, env, i32, i32) +DEF_HELPER_3(ldlink_aa32_i32_le, i32, env, i32, i32) +DEF_HELPER_3(ldlink_aa32_i64_le, i64, env, i32, i32) + +DEF_HELPER_4(stcond_aa32_i8, i32, env, i32, i32, i32) +DEF_HELPER_4(stcond_aa32_i16_be, i32, env, i32, i32, i32) +DEF_HELPER_4(stcond_aa32_i32_be, i32, env, i32, i32, i32) +DEF_HELPER_4(stcond_aa32_i64_be, i32, env, i32, i64, i32) +DEF_HELPER_4(stcond_aa32_i16_le, i32, env, i32, i32, i32) +DEF_HELPER_4(stcond_aa32_i32_le, i32, env, i32, i32, i32) +DEF_HELPER_4(stcond_aa32_i64_le, i32, env, i32, i64, i32) + +/* Convenient aliases */ +#ifdef TARGET_WORDS_BIGENDIAN +#define gen_helper_stcond_aa32_i16 gen_helper_stcond_aa32_i16_be +#define gen_helper_stcond_aa32_i32 gen_helper_stcond_aa32_i32_be +#define gen_helper_stcond_aa32_i64 gen_helper_stcond_aa32_i64_be +#define gen_helper_ldlink_aa32_i16 gen_helper_ldlink_aa32_i16_be +#define gen_helper_ldlink_aa32_i32 gen_helper_ldlink_aa32_i32_be +#define gen_helper_ldlink_aa32_i64 gen_helper_ldlink_aa32_i64_be +#else +#define gen_helper_stcond_aa32_i16 gen_helper_stcond_aa32_i16_le +#define gen_helper_stcond_aa32_i32 gen_helper_stcond_aa32_i32_le +#define gen_helper_stcond_aa32_i64 gen_helper_stcond_aa32_i64_le +#define gen_helper_ldlink_aa32_i16 gen_helper_ldlink_aa32_i16_le +#define gen_helper_ldlink_aa32_i32 gen_helper_ldlink_aa32_i32_le +#define gen_helper_ldlink_aa32_i64 gen_helper_ldlink_aa32_i64_le +#endif