From patchwork Tue Jun 23 19:36:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 191546 Delivered-To: patch@linaro.org Received: by 2002:a92:1f07:0:0:0:0:0 with SMTP id i7csp2295079ile; Tue, 23 Jun 2020 13:09:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyOt4NveY9nq/G/pjocZ0oTM2GHumKU9DQSTCJSAEmBUXshJV88U7kEZsTQqvg+IIPu9Lmx X-Received: by 2002:a25:6852:: with SMTP id d79mr24810116ybc.418.1592942986141; Tue, 23 Jun 2020 13:09:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592942986; cv=none; d=google.com; s=arc-20160816; b=iOciC1GP0jABhWLpszKK3e/uCNsFGSz8abiSQefi6qsuplqPg/+CX3O0AovhpS+/pl JYD45ZlDaMfuHUL9+zQlubRAPDQF9m0mjsO5Yz9kGzeEDfFQSmUMr4nNfj/IYQODRvjW CqOhNz9dwcwjQDRX85agVND/06waYPQ7n9sK5zZiWdLD7Q3WBrd8fS805qbPWE7m71Lt PtBImTYHJCNt+8nBMMJ+8MO/TAvMfTHbEOf+106glpwA+TEzKKRob3WIHvL+EXb314Tl vN0sTkBepe//imHKQSadFbd/B2QcwJ7WL+Nud0k4eqzuZukUkEwTdaEhnur/67LFoXzA n4UQ== 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=x8aLnTbJaNLIaCAiz76x9Qe9dWMjhM4HvVRSF6yOJsA=; b=Z9Lc4ZPa1nQUWtCqSWeO9WTWwwv3b1SLQqQaFwuqoEBSmvc1Vls/DRZwH7NIUIKKYD M+0ayfP6iH5ozCmiAyPg4R5PH1YpDQfluK9S/KIEdjwnmDJglWQglfJAZ8C7ecAnxl/L p2JAqSLnlJ/0eHYaJYK2Fab9C8sKq1/QggtnyGoZlMhhKTvNfIf4+TZm7z+ZsMmA5KLW aem7qAv4GaGcwF8EI+SqV16ShU/3LMkb5lF4GiKwfjcT3u30r20Y05Qj8O2HxaTzMmZO y4mF+vW1CS9mePx1IRMAiF2MTgpSSW5HChC/93+5JVf+C2fMoloaayA2E9ZtyLk5M78w oTqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=GcBxor4W; 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 r4si16991446ybk.325.2020.06.23.13.09.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jun 2020 13:09:46 -0700 (PDT) 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=GcBxor4W; 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]:56772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jnpEn-0001dj-Lx for patch@linaro.org; Tue, 23 Jun 2020 16:09:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42840) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jnok0-000531-T5 for qemu-devel@nongnu.org; Tue, 23 Jun 2020 15:37:56 -0400 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]:43619) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jnojv-0005t6-VY for qemu-devel@nongnu.org; Tue, 23 Jun 2020 15:37:56 -0400 Received: by mail-pl1-x643.google.com with SMTP id g12so9532997pll.10 for ; Tue, 23 Jun 2020 12:37:51 -0700 (PDT) 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=x8aLnTbJaNLIaCAiz76x9Qe9dWMjhM4HvVRSF6yOJsA=; b=GcBxor4WIP3+Ief5TrQJb9n5RvCon3vQJ2ucPPEstnKSu09KllXQqe/uqHGlcNwZS1 s9Qgsx/L70jdi6kPCkVB5CtorO10gw9YUN8WPs+6ULapqxik9iSddip7Ge1GkZF+fmt5 QppPfqryLrj8N7YAkHn4BHHMxBvuXcnJgc9uOYa0B8VC5rCYaKNCZUr+STvLULPWUy23 9Si05+bPTMiHukfQe7oMx9x4o2moLspgti/zYOOwd0bFAT5J54l/BT1oFLIUT90H3i1P Ebhz7Bb3yogW5ZwPMbry1TmVUlthk8lUPwPDvBZRH46fCcpSeog7vJjNwUdczZ8AEyav lM4g== 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=x8aLnTbJaNLIaCAiz76x9Qe9dWMjhM4HvVRSF6yOJsA=; b=GwbrukYAJ0EzbIpw6cbP9tGQ6NLuP2dI+krsWhiuCcuNVwZPTqJMWLByAD8+/PaxWL XsejE6/fsGChEP7xriXKSAnqVI4+4QSf82LUFyWqU3lmyaAqUEC2Z5+DV4RmfGWo0L4O DH6lTwtq8Yg527x6aXHs7GTmnwwEcTRZvka0qb+7stt4Jsf3t5pK73QCFgi4Jn1TIKsV HHVaUy2iz6ixBNdFY9h6mQAnHedHhy1xQDEE00/7Wa7DkXCk2zvqXqqOYsHzwsYXSMt+ Z4IiQQjvLZHgFAjLeoUgbaAgyv4quahGh3S4BaTIGp/y/wdMBR4vmhqVUh9ss00VHTkW 3UDA== X-Gm-Message-State: AOAM533WPlCpDP7+aeZ9q9WtTRy3hLkjTduv2p4VpGMjC6Z1P58uB5Rj NTtmxTGWAWtnlaX6hU/QrTFOFpNNGtU= X-Received: by 2002:a17:902:aa92:: with SMTP id d18mr25328419plr.210.1592941069985; Tue, 23 Jun 2020 12:37:49 -0700 (PDT) Received: from localhost.localdomain (174-21-143-238.tukw.qwest.net. [174.21.143.238]) by smtp.gmail.com with ESMTPSA id p12sm17927642pfq.69.2020.06.23.12.37.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2020 12:37:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v8 36/45] target/arm: Handle TBI for sve scalar + int memory ops Date: Tue, 23 Jun 2020 12:36:49 -0700 Message-Id: <20200623193658.623279-37-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200623193658.623279-1-richard.henderson@linaro.org> References: <20200623193658.623279-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::643; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x643.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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=_AUTOLEARN X-Spam_action: no action 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: peter.maydell@linaro.org, qemu-arm@nongnu.org, david.spickett@linaro.org, steplong@quicinc.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We still need to handle tbi for user-only when mte is inactive. Signed-off-by: Richard Henderson --- target/arm/translate-a64.h | 1 + target/arm/translate-a64.c | 2 +- target/arm/translate-sve.c | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) -- 2.25.1 Reviewed-by: Peter Maydell diff --git a/target/arm/translate-a64.h b/target/arm/translate-a64.h index 781c441399..49e4865918 100644 --- a/target/arm/translate-a64.h +++ b/target/arm/translate-a64.h @@ -40,6 +40,7 @@ TCGv_ptr get_fpstatus_ptr(bool); bool logic_imm_decode_wmask(uint64_t *result, unsigned int immn, unsigned int imms, unsigned int immr); bool sve_access_check(DisasContext *s); +TCGv_i64 clean_data_tbi(DisasContext *s, TCGv_i64 addr); TCGv_i64 gen_mte_check1(DisasContext *s, TCGv_i64 addr, bool is_write, bool tag_checked, int log2_size); TCGv_i64 gen_mte_checkN(DisasContext *s, TCGv_i64 addr, bool is_write, diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index ec2295393d..f35b122ded 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -215,7 +215,7 @@ static void gen_a64_set_pc(DisasContext *s, TCGv_i64 src) * of the write-back address. */ -static TCGv_i64 clean_data_tbi(DisasContext *s, TCGv_i64 addr) +TCGv_i64 clean_data_tbi(DisasContext *s, TCGv_i64 addr) { TCGv_i64 clean = new_tmp_a64(s); #ifdef CONFIG_USER_ONLY diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index e4fbe48493..04eda9a126 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -4587,9 +4587,8 @@ static void do_mem_zpa(DisasContext *s, int zt, int pg, TCGv_i64 addr, * For e.g. LD4, there are not enough arguments to pass all 4 * registers as pointers, so encode the regno into the data field. * For consistency, do this even for LD1. - * TODO: mte_n check here while callers are updated. */ - if (mte_n && s->mte_active[0]) { + if (s->mte_active[0]) { int msz = dtype_msz(dtype); desc = FIELD_DP32(desc, MTEDESC, MIDX, get_mem_index(s)); @@ -4599,7 +4598,10 @@ static void do_mem_zpa(DisasContext *s, int zt, int pg, TCGv_i64 addr, desc = FIELD_DP32(desc, MTEDESC, ESIZE, 1 << msz); desc = FIELD_DP32(desc, MTEDESC, TSIZE, mte_n << msz); desc <<= SVE_MTEDESC_SHIFT; + } else { + addr = clean_data_tbi(s, addr); } + desc = simd_desc(vsz, vsz, zt | desc); t_desc = tcg_const_i32(desc); t_pg = tcg_temp_new_ptr();