From patchwork Fri Jun 26 15:14:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 191857 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp597541ilg; Fri, 26 Jun 2020 08:38:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx02t+mEJvsJ2OShRysuJi2zJONyvWqQcPZx0+eeHUHc0SOh0m8AKNA1oCvgNJDIya5aahh X-Received: by 2002:a25:aa89:: with SMTP id t9mr6187020ybi.348.1593185882890; Fri, 26 Jun 2020 08:38:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593185882; cv=none; d=google.com; s=arc-20160816; b=yXcqzHJBF9L7y0Huxi5KWbKUf9JiImrzgTn0OIMpaRorA0/X+MfHCdIa2FCgIIX6nV QMoHLdkjA8rxnSHZEIxRige4WIY+IJ8ZbCSIuAJiJ2390OayrCH6vmm2vRCh3iwdYove 0yLfhCuyL9TwHl3wKUdMrOccTFdCrvqFpmJJYRIR/lv31YWSNNLTtaN3LvBLWSmB58V7 rRqrkwfkeHcS9Ps5RNGqHscoXZzB4w3c2msXvjO2jf9PJ+3wcn7ntycvcc2C73wsw+hm UUXw1ksE/VlW0o3v2ZMIx1UcadD0KDcMltoid3lFTvnPOHFtiUYWc5+OFIKp+/hdsNhy cAeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=qPzOdwE4cv3nwdVXN9HVPQEkRI8ozq0YCJ+N3H/cuSI=; b=Bg+hX30YhUT5We6Wn9+42fKo/OoffABkkfciN8YHUONXL/emtwGDUIVkyUoEbX9Lii O48cjY20l6LY7DNNF6CVbaZuzi/8NVvKOWWChdeijdof8rG1uP6aHcRFsH9xEP2/DPZn FlOF5T4IIAQfzpK7pL3p8AAcUkZZIm19KNOj4uS01XQYLRKWddahOzAva6wlddLDEggx SgbI64nnJdQCt8rFnDqWs4ogZs58rbfgEAtM0uTC6TT7jLRjiMF+hvo7MiRrdozbxpwS Ov3g1lsX/GFJWfMQsC2HSaOfaX6F4tliukugX7HPBLy6Il3GYr8N6udVvcak5HsXPac6 ejHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fGAtze8j; 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=pass (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 f128si8693087ybf.34.2020.06.26.08.38.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jun 2020 08:38:02 -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=pass header.i=@linaro.org header.s=google header.b=fGAtze8j; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joqQU-0001TV-Cq for patch@linaro.org; Fri, 26 Jun 2020 11:38:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joq4d-0003Dj-WE for qemu-devel@nongnu.org; Fri, 26 Jun 2020 11:15:28 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:40801) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1joq4c-0006iN-2k for qemu-devel@nongnu.org; Fri, 26 Jun 2020 11:15:27 -0400 Received: by mail-wm1-x32f.google.com with SMTP id f139so9706871wmf.5 for ; Fri, 26 Jun 2020 08:15:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=qPzOdwE4cv3nwdVXN9HVPQEkRI8ozq0YCJ+N3H/cuSI=; b=fGAtze8jPQOzSUf6uxc/9ud7o7AxRSYNxvZii2QZ1VKwRibji3rFB3PY8feC+uzjly j/ic5LfU/I9uTCDZ55Aga5XgFaLIz7DgeCuRKzqnOWlaXDA9wygdMmaoWwHjvhzHJEug ZJQuECdw0Qm0Sn2Dj1IN6HIp5K2b1ofBDyPUMVK/qJNThy0bhf3CLAgg8cDexPgqFuk2 Ukwa5EFXrgT/UeruddrU5OngPr+bwj29BuKdTwCdat/h5/KVlhR8WXMgln10BYiecagK 87Zp50UYomeLKe9/uOCEMpbVKZlrDcR7oWJ0N3EfaGlyDGyWEM9EQ9ONjRx4HSKQAtUf tbYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qPzOdwE4cv3nwdVXN9HVPQEkRI8ozq0YCJ+N3H/cuSI=; b=GkBR3+dlDr6ct+JcCd5aooh2k+r/6KsJmj+7JpK3/K+8uE0v/foL/hkiP2PXk11APF rshZfGI/pGOVb2WFCSNHgUGMm1+Ox1jDHOGNwiNQ+zFQOcpwQmufiy+3y/3jo7DjFB+Z iliANOgYjXi92xE+e+c/3FK+Oj2eSWuT2WdIp5T5XuHVe4t2IMqnqWujy7RXcfaRJFwk ODubopBEU1MPm3Wd+jGK55E1ZG2eP1XTFq4HkA4cegWzPBsdi0YpaKBpm/lrf4j8/Jt3 9t1MdcfPf9nvFTcB6MXc18Rre4WM1rsfY9x1NiXhPAL2CG95WwG+LJo0v2wMoghpS0pR RWRQ== X-Gm-Message-State: AOAM5335VVWiEk7aEiIG62bsXrrzYAPzoVxCpJRB/RU50WZ2FuHCD9Wc PUYlnW1705bqQsI4ljmLvUvPwP3BZuHyKw== X-Received: by 2002:a1c:2d83:: with SMTP id t125mr4029737wmt.187.1593184523784; Fri, 26 Jun 2020 08:15:23 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id w13sm37838852wrr.67.2020.06.26.08.15.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 08:15:23 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 48/57] target/arm: Handle TBI for sve scalar + int memory ops Date: Fri, 26 Jun 2020 16:14:15 +0100 Message-Id: <20200626151424.30117-49-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200626151424.30117-1-peter.maydell@linaro.org> References: <20200626151424.30117-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson We still need to handle tbi for user-only when mte is inactive. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20200626033144.790098-37-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- 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.20.1 diff --git a/target/arm/translate-a64.h b/target/arm/translate-a64.h index 781c4413999..49e4865918d 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 7a3774bfda7..e46c4a49e00 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 e4fbe484930..04eda9a1264 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();