From patchwork Thu Mar 7 17:04:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 159906 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp7689896jad; Thu, 7 Mar 2019 09:23:22 -0800 (PST) X-Google-Smtp-Source: APXvYqyObE3AmyJIif1gF13IXHNB4qInghR1SJkBAe9qINSP/4MNWmCjyMS2CQVrwEa6ajuDNtLB X-Received: by 2002:a25:d614:: with SMTP id n20mr12287590ybg.436.1551979402130; Thu, 07 Mar 2019 09:23:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551979402; cv=none; d=google.com; s=arc-20160816; b=v8YUMsgxJgoxkEephvlL2t5zZOBaU/DdqSJLqNyDl6U+VZeewNSVIz2WS+ZO79za8+ 5FcXxVjcjYagnMTHkyRhw6X0uPhy4WoOZY14jnkGQdtlWW8go79Cmm1LRddxYEAt2iDC OmWaCIQh3P4DrC8oEIf2pDWQxzBWjc7UQYHrTBQ7IC0ZblHATneQKw/ONll2raWVfRGf Tv76/m1bU7q3Xk9hs9liDhIFEfJdVzs1BollZfjwVqesvDtWrfh/z2NdSBU2oW1WMK8a okGRKMfnLtEvmW9aRv3kJhiehr6vmJ1/pjsQgVjAKVs3KP1FBqJ28Cp3tOty0PQrE2bk XSkA== 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:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=S62ne+fzmxVWOcg1VdlK0dr2mFZWCa/ldZdfdyxAfIs=; b=LKpUnOJ2YAhhA13NWFWWmJrltFQfl451gZ4UDJ03spqRFzC6L1VMWww05NjnBpkBnD uc9KJwYMyEl5bTMA3844LlL4Safpz0A2qdr0gBoyINsmJamgbsoA7/+wmHxcZdpq7UBg mIfOW8/YlKsRH/fq8E2YKw2MUUNWcgc5qKVuAsyr/F/ml1ro323Rbk/nNS8uUqXMm+TF DEGFwfOLrI3p7dBHrYCDVCnxRNd5ffgiVJipAo22zam0yoIIL5AtVcAtiVplwnaa4YSN F2WIz84k2OSreVN6fX1BmV/tks0BIP6nKDwvft6Fl/jR7pX6oIFBI5WJJVoCxIeCPXQo ltng== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="R4b/ReyR"; 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 f184si3084410ywb.219.2019.03.07.09.23.22 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 07 Mar 2019 09:23:22 -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="R4b/ReyR"; 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 ([127.0.0.1]:55854 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1wjp-0003XI-Ju for patch@linaro.org; Thu, 07 Mar 2019 12:23:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1wTQ-0007RG-6b for qemu-devel@nongnu.org; Thu, 07 Mar 2019 12:06:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1wTK-0006K4-Ta for qemu-devel@nongnu.org; Thu, 07 Mar 2019 12:06:21 -0500 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:33218) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1wTF-0004bC-Lh for qemu-devel@nongnu.org; Thu, 07 Mar 2019 12:06:15 -0500 Received: by mail-pg1-x543.google.com with SMTP id h11so11749897pgl.0 for ; Thu, 07 Mar 2019 09:05:03 -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; bh=S62ne+fzmxVWOcg1VdlK0dr2mFZWCa/ldZdfdyxAfIs=; b=R4b/ReyR6abk+xsUXxaJGqFeuJ2E89rc3xtVQQgXIQIJ5gjqf/lTvUT3eal6fCUksP 3gSgNLzsKOmWE7GaDb17cTN7Zr/X4PAeMEXLSoTUxpE+V8LCPde6VOkr0bg083Twgb7I YvboxjyCmtmBs8ME7RTxgHyjpUH/FlHl1XO+fPJCB10c12wErPRYF7zEIFaGuDhPn30u fp1pDum/iTeTxX8vLqhNybwODuhEY2wyC8oWhwDM45JY8MX4ufC646gKM35euSnKgJhE Tb3lL3mQrx3ZweRw1Cca6f5/i8Pnb2Nfnrg0rxEPcHIa69NTi8ItHe+IOUDyGj0UJIzd f5lg== 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; bh=S62ne+fzmxVWOcg1VdlK0dr2mFZWCa/ldZdfdyxAfIs=; b=RkbWmVLBZTvfFoAuJENx5gWlhunuZxKss7sucgr9tO8KRBTi84Y+0i6Fhxp3dHgckJ tFsaPbtpEi0ajAOGO6P3MmFpzPT+4r2E/ZL29joEgbGvkBVL9OE9wSowXhjv6xHD43no jVEN1s8Wm4r6e7/oRHnsUCom+HloseEHQvR52n7xezMi6bXDMPDTXd1Y8VtcvzYQuLkH UuSkmsvJ5yaPy0uJnFlpCloLfZWNqpFAb3oG/phRSopUJzBZIBKZ2vKw2XhX32fnGvhA F1fJidQTmZeANcdtEd0lGtsxs0fV9iXGpfMr3t9DCOx0G1tsuAvpyOtuv5ip0wEAuDf/ B2rg== X-Gm-Message-State: APjAAAVd7XFgV0NSOTZfNXyWLuwlAO0FVowvrCXoEgrsWBhJGMZKrcum CVpVOCcYHBDwHzjj6ajbq0wG9arX1nQ= X-Received: by 2002:a17:902:242:: with SMTP id 60mr8990332plc.128.1551978302520; Thu, 07 Mar 2019 09:05:02 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id r82sm10040562pfa.161.2019.03.07.09.05.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Mar 2019 09:05:01 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 09:04:34 -0800 Message-Id: <20190307170440.3113-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190307170440.3113-1-richard.henderson@linaro.org> References: <20190307170440.3113-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::543 Subject: [Qemu-devel] [PATCH v4 16/22] target/arm: Implement data cache set allocation tags 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@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is DC GVA and DC GZVA. Signed-off-by: Richard Henderson --- v2: Use allocation_tag_mem + memset. v3: Require pre-cleaned addresses. --- target/arm/cpu.h | 4 +++- target/arm/helper-a64.h | 1 + target/arm/helper.c | 16 ++++++++++++++++ target/arm/mte_helper.c | 28 ++++++++++++++++++++++++++++ target/arm/translate-a64.c | 9 +++++++++ 5 files changed, 57 insertions(+), 1 deletion(-) -- 2.17.2 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index b9b33bc285..e24d1e082c 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -2178,7 +2178,9 @@ static inline uint64_t cpreg_to_kvm_id(uint32_t cpregid) #define ARM_CP_NZCV (ARM_CP_SPECIAL | 0x0300) #define ARM_CP_CURRENTEL (ARM_CP_SPECIAL | 0x0400) #define ARM_CP_DC_ZVA (ARM_CP_SPECIAL | 0x0500) -#define ARM_LAST_SPECIAL ARM_CP_DC_ZVA +#define ARM_CP_DC_GVA (ARM_CP_SPECIAL | 0x0600) +#define ARM_CP_DC_GZVA (ARM_CP_SPECIAL | 0x0700) +#define ARM_LAST_SPECIAL ARM_CP_DC_GZVA #define ARM_CP_FPU 0x1000 #define ARM_CP_SVE 0x2000 #define ARM_CP_NO_GDB 0x4000 diff --git a/target/arm/helper-a64.h b/target/arm/helper-a64.h index 5bcdfcf81b..ec4e7f7cf5 100644 --- a/target/arm/helper-a64.h +++ b/target/arm/helper-a64.h @@ -117,3 +117,4 @@ DEF_HELPER_FLAGS_3(st2g_parallel, TCG_CALL_NO_WG, void, env, i64, i64) DEF_HELPER_FLAGS_2(ldgm, TCG_CALL_NO_WG, i64, env, i64) DEF_HELPER_FLAGS_3(stgm, TCG_CALL_NO_WG, void, env, i64, i64) DEF_HELPER_FLAGS_3(stzgm, TCG_CALL_NO_WG, void, env, i64, i64) +DEF_HELPER_FLAGS_2(dc_gva, TCG_CALL_NO_RWG, void, env, i64) diff --git a/target/arm/helper.c b/target/arm/helper.c index a16c87d0d9..c8773a5528 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -5841,6 +5841,22 @@ static const ARMCPRegInfo mte_reginfo[] = { { .name = "CIGDVAC", .state = ARM_CP_STATE_AA64, .opc0 = 1, .opc1 = 3, .crn = 7, .crm = 14, .opc2 = 5, .type = ARM_CP_NOP, .access = PL1_W }, + { .name = "GVA", .state = ARM_CP_STATE_AA64, + .opc0 = 1, .opc1 = 3, .crn = 7, .crm = 4, .opc2 = 3, + .access = PL0_W, .type = ARM_CP_DC_GVA, +#ifndef CONFIG_USER_ONLY + /* Avoid overhead of an access check that always passes in user-mode */ + .accessfn = aa64_zva_access, +#endif + }, + { .name = "GZVA", .state = ARM_CP_STATE_AA64, + .opc0 = 1, .opc1 = 3, .crn = 7, .crm = 4, .opc2 = 4, + .access = PL0_W, .type = ARM_CP_DC_GZVA, +#ifndef CONFIG_USER_ONLY + /* Avoid overhead of an access check that always passes in user-mode */ + .accessfn = aa64_zva_access, +#endif + }, REGINFO_SENTINEL }; #endif diff --git a/target/arm/mte_helper.c b/target/arm/mte_helper.c index afa4c26535..6d0f82eb99 100644 --- a/target/arm/mte_helper.c +++ b/target/arm/mte_helper.c @@ -473,3 +473,31 @@ void HELPER(stzgm)(CPUARMState *env, uint64_t ptr, uint64_t val) } } } + +void HELPER(dc_gva)(CPUARMState *env, uint64_t ptr) +{ + ARMCPU *cpu = arm_env_get_cpu(env); + size_t blocklen = 4 << cpu->dcz_blocksize; + int el; + uint64_t sctlr; + uint8_t *mem; + int rtag; + + ptr = QEMU_ALIGN_DOWN(ptr, blocklen); + + /* Trap if accessing an invalid page. */ + mem = allocation_tag_mem(env, ptr, true, GETPC()); + + /* No action if page does not support tags, or if access is disabled. */ + el = arm_current_el(env); + sctlr = arm_sctlr(env, el); + if (!mem || !allocation_tag_access_enabled(env, el, sctlr)) { + return; + } + + rtag = allocation_tag_from_addr(ptr); + rtag |= rtag << 4; + + assert(QEMU_IS_ALIGNED(blocklen, 2 * TAG_GRANULE)); + memset(mem, rtag, blocklen / (2 * TAG_GRANULE)); +} diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index a02c829db2..74ef1cd9c1 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -1897,6 +1897,15 @@ static void handle_sys(DisasContext *s, uint32_t insn, bool isread, tcg_rt = clean_data_tbi(s, cpu_reg(s, rt), false); gen_helper_dc_zva(cpu_env, tcg_rt); return; + case ARM_CP_DC_GVA: + tcg_rt = clean_data_tbi(s, cpu_reg(s, rt), false); + gen_helper_dc_gva(cpu_env, tcg_rt); + return; + case ARM_CP_DC_GZVA: + tcg_rt = clean_data_tbi(s, cpu_reg(s, rt), false); + gen_helper_dc_zva(cpu_env, tcg_rt); + gen_helper_dc_gva(cpu_env, tcg_rt); + return; default: break; }