From patchwork Fri Jul 19 21:03:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 169265 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp4323179ilk; Fri, 19 Jul 2019 14:03:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqxcy5YEO7F9t3MTIJibnXFtgyoQ8txz5ZwCSWB7H3bLzUvHUBgAXZ1qnkw3e/64ENweMzrj X-Received: by 2002:a50:d1d7:: with SMTP id i23mr49276779edg.151.1563570231678; Fri, 19 Jul 2019 14:03:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563570231; cv=none; d=google.com; s=arc-20160816; b=EinuHqzKj45bWWTYffuTkRRl0NxVWdR388UVyc5SZf8E8YneAkQZXxVr9CKzZbaQbt H85rp4+4Q9LWWrtAPCAdvswcfBG8zP7NYRMFX33ug965FjMHSVRh0N0mPE0rqduihaRf 20zl+p0NiDcy42L3MSRoO1N2cP7qjyxTftq8M45PmKSRYRZ9Z9HW9jwgXAeQXotfs02s 8TZG1j17qc6gReK+Gityho5SpBCafkcJUGbBUqASu3vAIY/MhmqisOBmK92Ef27ClB73 TCpvlx3iEqMNhkzYyutIS9c78M8yPudXiHypNrwUuK3aYYSIx0J4+WFuPSb/0RjSXYJd t4LQ== 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=zxhBjUulQ9FFgklbf9F4cLZlo9yovsz2XVLX6+vkXRQ=; b=iGwDuEnu7rS/QtquND2/ElG3yz7SnJt+1/bwzwlzq9V1UfCKqIIQDON/nVA0JwvV9D iZ6dOWX+ekIVb4xj+vIyQuJ+PYxC5yNYZmbQ0TeMbsLgaMFQ6da8lKM9BIwWFCxfFDNr YVs4NT7NYEgFIdPL8RJDO8qsARNazyfJCZmCeC6Oxo9uDXKiGLAdcQSrGxg27K6aPKIc gvXXPD8UG3eIN99/nePiKQuVVAMUZWX0hbD1bbbC1gvGOl/NfbBJECgMPJ7I59PV/PLC Dokq55LI65rG8k3RrcGzKjQXEp9lMtIj5CxL19hJWiQCi5yOytMYXudy3Atbh8Yqg/BT 8kLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LwrPwGfV; 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 s25si285336eja.243.2019.07.19.14.03.51 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Jul 2019 14:03:51 -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=LwrPwGfV; 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]:48142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hoa2g-00041w-Ej for patch@linaro.org; Fri, 19 Jul 2019 17:03:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54917) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hoa2b-0003sl-28 for qemu-devel@nongnu.org; Fri, 19 Jul 2019 17:03:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hoa2T-00057Q-3J for qemu-devel@nongnu.org; Fri, 19 Jul 2019 17:03:40 -0400 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:33017) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hoa2P-00056B-JJ for qemu-devel@nongnu.org; Fri, 19 Jul 2019 17:03:36 -0400 Received: by mail-pg1-x541.google.com with SMTP id f20so5741421pgj.0 for ; Fri, 19 Jul 2019 14:03:33 -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; bh=zxhBjUulQ9FFgklbf9F4cLZlo9yovsz2XVLX6+vkXRQ=; b=LwrPwGfVpePr7CnrTaBZmKz4f/6rDQP/wL82oeyt+1i2SpnEJce8y8/q5rSbPTxhh/ 7eNit/fM3tSNgTqva4gKob/vFe2fKQDzzKUP8wc29tKptrP+bWnx96EILlzVP0Pz3FPT j30xzgbPlH50CMF0a3pN+WRMCDDORt9qb6gQUjOVNZ3qFQrImM7NQqm49PQDFohGsvw0 GjZTwyYUQmyHeKiXWCrOrFBkpj+GNQfLmrwpTUbZzLNQIS1Qd3okftXJnaxSSHk26kog cB1OItj0TvXUHM7akuVJhuRoa0xd+7aorbpwYv81L1qU6huAY5XgL3r+kpRegbKmPOqP pOGA== 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=zxhBjUulQ9FFgklbf9F4cLZlo9yovsz2XVLX6+vkXRQ=; b=BXrDVzokP2fmR3qMtvgGhhYTf3+UcUePuj6YwbLBOClt761TGvAIt+cHlXh3K43Pno 1zFq0xB00jaEhnC1ckepdb7vuguLy7+RhOaqzYJJ+bPJBxWxbd76FMRheq2A1MZ02uCa vfy90jYLKMRElH7BZvNqzgw4Ltky4fjbCynb9m9lc6CJ4N7ftlqSpBIt0Q9w5xH+6+nu FsTYKjyTpqBZ7np4d/xA/MLO/vDMV1zFYqfAX2A3B3Wmo23/HneAIMTeWY9KMh0AHAiO OqT/wgAlvU5qmE8MhZ8Awj/gyXZKsQwqQrhxp4JCxTwz/qLn3UmFwSPz/Dxqm2RM5NJ/ mhZA== X-Gm-Message-State: APjAAAU8zl6NIJNaw8BTx0N6CQyN5sjHWnPjQgdOYRStLe1Ej1fxjRJw 8gas2gjphlrosGXibEI5qEFajVfj9jo= X-Received: by 2002:a63:3009:: with SMTP id w9mr57576659pgw.260.1563570212151; Fri, 19 Jul 2019 14:03:32 -0700 (PDT) Received: from localhost.localdomain (97-126-117-207.tukw.qwest.net. [97.126.117.207]) by smtp.gmail.com with ESMTPSA id i6sm32724751pgi.40.2019.07.19.14.03.31 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 19 Jul 2019 14:03:31 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 19 Jul 2019 14:03:05 -0700 Message-Id: <20190719210326.15466-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190719210326.15466-1-richard.henderson@linaro.org> References: <20190719210326.15466-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::541 Subject: [Qemu-devel] [PATCH for-4.2 03/24] target/arm: Install ASIDs for long-form from EL1 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, beata.michalska@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" In addition to providing the core with the current ASID, this minimizes both the number of flushes due to non-changing ASID as well as the set of mmu_idx that are affected by each flush. In particular, updates to the secure mode registers flushes only the relevant secure mode mmu_idx's, and similarly non-secure updates only affect non-secure mmu_idx's. Signed-off-by: Richard Henderson --- target/arm/helper.c | 73 +++++++++++++++++++++++++++++---------------- 1 file changed, 48 insertions(+), 25 deletions(-) -- 2.17.1 Reviewed-by: Alex Bennée diff --git a/target/arm/helper.c b/target/arm/helper.c index 20f8728be1..0f21a077de 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -3327,6 +3327,36 @@ static const ARMCPRegInfo pmsav5_cp_reginfo[] = { REGINFO_SENTINEL }; +/* Called after a change to any of TTBR*_EL1 or TTBCR_EL1. */ +static void update_lpae_el1_asid(CPUARMState *env, int secure) +{ + CPUState *cs = env_cpu(env); + uint64_t ttbr0, ttbr1, ttcr; + int asid, idxmask; + + switch (secure) { + case ARM_CP_SECSTATE_S: + ttbr0 = env->cp15.ttbr0_s; + ttbr1 = env->cp15.ttbr1_s; + ttcr = env->cp15.tcr_el[3].raw_tcr; + /* Note that cp15.ttbr0_s == cp15.ttbr0_el[3], so S1E3 is affected. */ + /* ??? Secure EL3 really using the ASID field? Doesn't make sense. */ + idxmask = ARMMMUIdxBit_S1SE1 | ARMMMUIdxBit_S1SE0 | ARMMMUIdxBit_S1E3; + break; + case ARM_CP_SECSTATE_NS: + ttbr0 = env->cp15.ttbr0_ns; + ttbr1 = env->cp15.ttbr1_ns; + ttcr = env->cp15.tcr_el[1].raw_tcr; + idxmask = ARMMMUIdxBit_S12NSE1 | ARMMMUIdxBit_S12NSE0; + break; + default: + g_assert_not_reached(); + } + asid = extract64(ttcr & TTBCR_A1 ? ttbr1 : ttbr0, 48, 16); + + tlb_set_asid_for_mmuidx(cs, asid, idxmask, 0); +} + static void vmsa_ttbcr_raw_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) { @@ -3363,18 +3393,16 @@ static void vmsa_ttbcr_raw_write(CPUARMState *env, const ARMCPRegInfo *ri, static void vmsa_ttbcr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) { - ARMCPU *cpu = env_archcpu(env); TCR *tcr = raw_ptr(env, ri); - if (arm_feature(env, ARM_FEATURE_LPAE)) { - /* With LPAE the TTBCR could result in a change of ASID - * via the TTBCR.A1 bit, so do a TLB flush. - */ - tlb_flush(CPU(cpu)); - } /* Preserve the high half of TCR_EL1, set via TTBCR2. */ value = deposit64(tcr->raw_tcr, 0, 32, value); vmsa_ttbcr_raw_write(env, ri, value); + + if (arm_feature(env, ARM_FEATURE_LPAE)) { + /* The A1 bit controls which ASID is active. */ + update_lpae_el1_asid(env, ri->secure); + } } static void vmsa_ttbcr_reset(CPUARMState *env, const ARMCPRegInfo *ri) @@ -3392,24 +3420,19 @@ static void vmsa_ttbcr_reset(CPUARMState *env, const ARMCPRegInfo *ri) static void vmsa_tcr_el1_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) { - ARMCPU *cpu = env_archcpu(env); - TCR *tcr = raw_ptr(env, ri); - - /* For AArch64 the A1 bit could result in a change of ASID, so TLB flush. */ - tlb_flush(CPU(cpu)); - tcr->raw_tcr = value; + raw_write(env, ri, value); + /* The A1 bit controls which ASID is active. */ + update_lpae_el1_asid(env, ri->secure); } -static void vmsa_ttbr_write(CPUARMState *env, const ARMCPRegInfo *ri, - uint64_t value) +static void vmsa_ttbr_el1_write(CPUARMState *env, const ARMCPRegInfo *ri, + uint64_t value) { - /* If the ASID changes (with a 64-bit write), we must flush the TLB. */ - if (cpreg_field_is_64bit(ri) && - extract64(raw_read(env, ri) ^ value, 48, 16) != 0) { - ARMCPU *cpu = env_archcpu(env); - tlb_flush(CPU(cpu)); - } raw_write(env, ri, value); + if (cpreg_field_is_64bit(ri)) { + /* The LPAE format (64-bit write) contains an ASID field. */ + update_lpae_el1_asid(env, ri->secure); + } } static void vttbr_write(CPUARMState *env, const ARMCPRegInfo *ri, @@ -3455,12 +3478,12 @@ static const ARMCPRegInfo vmsa_cp_reginfo[] = { .fieldoffset = offsetof(CPUARMState, cp15.esr_el[1]), .resetvalue = 0, }, { .name = "TTBR0_EL1", .state = ARM_CP_STATE_BOTH, .opc0 = 3, .opc1 = 0, .crn = 2, .crm = 0, .opc2 = 0, - .access = PL1_RW, .writefn = vmsa_ttbr_write, .resetvalue = 0, + .access = PL1_RW, .writefn = vmsa_ttbr_el1_write, .resetvalue = 0, .bank_fieldoffsets = { offsetof(CPUARMState, cp15.ttbr0_s), offsetof(CPUARMState, cp15.ttbr0_ns) } }, { .name = "TTBR1_EL1", .state = ARM_CP_STATE_BOTH, .opc0 = 3, .opc1 = 0, .crn = 2, .crm = 0, .opc2 = 1, - .access = PL1_RW, .writefn = vmsa_ttbr_write, .resetvalue = 0, + .access = PL1_RW, .writefn = vmsa_ttbr_el1_write, .resetvalue = 0, .bank_fieldoffsets = { offsetof(CPUARMState, cp15.ttbr1_s), offsetof(CPUARMState, cp15.ttbr1_ns) } }, { .name = "TCR_EL1", .state = ARM_CP_STATE_AA64, @@ -3715,12 +3738,12 @@ static const ARMCPRegInfo lpae_cp_reginfo[] = { .access = PL1_RW, .type = ARM_CP_64BIT | ARM_CP_ALIAS, .bank_fieldoffsets = { offsetof(CPUARMState, cp15.ttbr0_s), offsetof(CPUARMState, cp15.ttbr0_ns) }, - .writefn = vmsa_ttbr_write, }, + .writefn = vmsa_ttbr_el1_write, }, { .name = "TTBR1", .cp = 15, .crm = 2, .opc1 = 1, .access = PL1_RW, .type = ARM_CP_64BIT | ARM_CP_ALIAS, .bank_fieldoffsets = { offsetof(CPUARMState, cp15.ttbr1_s), offsetof(CPUARMState, cp15.ttbr1_ns) }, - .writefn = vmsa_ttbr_write, }, + .writefn = vmsa_ttbr_el1_write, }, REGINFO_SENTINEL };