From patchwork Mon Oct 29 15:53:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 149676 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4332358ljp; Mon, 29 Oct 2018 09:10:52 -0700 (PDT) X-Google-Smtp-Source: AJdET5eWAEUbwtQJjiUP7xOcLgErEwqpaCjovQU5HkclAQs8CVBC/ViLgGE8Zn45lYUkXukTYd/G X-Received: by 2002:a37:2e05:: with SMTP id u5-v6mr12783115qkh.38.1540829452703; Mon, 29 Oct 2018 09:10:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540829452; cv=none; d=google.com; s=arc-20160816; b=RUmA1TTKzsG2qVswNUvqdbpcOSJrfXuKjaO//tlvIZssVl/rw5pUAwDIlJj3XwZomp /vozV69lEvfPEzqJcmE/5GAcfzIHObtSN6OfD2jMSSxevS2EtunP9ZuwMso2o4rrCnLj gJgTRd3shGa8fhKZDxZn5P1uwr0/Ql5IzkF8SEN1e5F7a5VoXW1+tQK91i928ZUCfPaR NyYLJ/KDrGHJ4H3I8XijQBzId4+d6UHuwWTUBHphIcSFXPV0d4XiMSOiGRyBXOfY6kWK fj0eWZJ69vjCaMKp1qHq1xIZe+lZJ1yxpF6Ws8E7e2SG4vLUtzhjuImJjfefaFWPEk3H 0W5A== 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=ofW9rKlToEGgulKz6q9bEJLUs9ZXbCG+K9mtqCMjb4o=; b=0hLnqy1/Lxnr6nEP94ZvcXNsDgh9rMYjgv4EFrhETh1g1Z6aFJeHb7jI6JRNaqNSjm De7lA/Ni47KWbFzPqWVljnkCAFqO6lKKhpn7E8LoIuHW+DKewAGsOoq5yf1Osomh0ULq Q5egdr5crP3u8mn4nFp3D+nlhnhSP7lf8l9CMwRzh94tY4QuaxPm4BPUO1GybTLLH5lY X/6bLcwCVUj4MyAutVnkjp3cTDpHyAszRjy8oyxj6DSoT++lqrCtuidn/2Wi5bDGAkIP evfrfyVUPA95w5XP/alzOVupAZAvdgvmSHDZymPaZzy/XcgWXpHn+ELNPqiDEc6GaWun jkqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=YpOEZXCD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x21-v6si4630085qtx.347.2018.10.29.09.10.52 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 29 Oct 2018 09:10:52 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=YpOEZXCD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:46536 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHA7w-00076G-3c for patch@linaro.org; Mon, 29 Oct 2018 12:10:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47102) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gH9rV-0000PZ-RF for qemu-devel@nongnu.org; Mon, 29 Oct 2018 11:53:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gH9rP-0000WD-Iv for qemu-devel@nongnu.org; Mon, 29 Oct 2018 11:53:51 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:44576) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gH9rP-0000U6-8k for qemu-devel@nongnu.org; Mon, 29 Oct 2018 11:53:47 -0400 Received: by mail-wr1-x442.google.com with SMTP id d17-v6so8962685wre.11 for ; Mon, 29 Oct 2018 08:53:47 -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=ofW9rKlToEGgulKz6q9bEJLUs9ZXbCG+K9mtqCMjb4o=; b=YpOEZXCDccxplx7tP5i+6Q460lUctyOYHwmP2oUgx5C5F6uI7Z5TrFaK2nUQ5PRCxq WKuBaK+jY58eW6Qt0cWGHWdueIPsM+OaXG7OtJ6PjAfqY5VYDS/DtR/XRaZE4UvAwrhs gPdsg9Ge5BviJ6tpsurGimtK4yQLLEQQDNJok= 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=ofW9rKlToEGgulKz6q9bEJLUs9ZXbCG+K9mtqCMjb4o=; b=DzpPlHJyDorJw0dia3EqK3HiWJfkKEhoThV8OwQ8Jrwebe9xYJjI85a11f1OwwasxZ pZ/L3ZaT5jj1rROsW1U7e3+QBioS2+WLkoi5CSc+IXLNYgQlwAOiFf4a3qODfiN/o4ul +Tns46AtdeD6Oiu9io88KlzRSpgmOuM8IVuhMPkZiPkGNUikh/vvVaKbpL6b5NUY9WOJ HiCaTrG3TkpBMDH5ytxCYDEwez+ROSF4Ndr6euGiIkHdG9DRm0Tbh8CCGP8h96nbi2KF 7sjy9Va1CTrr2xDUBWBEtLLqHmUcOeQMPizmFGhHrCrK/gOxCmQwXIXZYzJeaUdA4KsM 5Hqw== X-Gm-Message-State: AGRZ1gIXkJSs54BLSzvth3yWv/l6tdk0U779VN65TkDmctuj8TlPyBpt RRDROyxXcXNUxjc8T3EXoA2H8pBT60g= X-Received: by 2002:adf:81a3:: with SMTP id 32-v6mr14056623wra.10.1540828425304; Mon, 29 Oct 2018 08:53:45 -0700 (PDT) Received: from cloudburst.twiddle.net ([5.148.65.242]) by smtp.gmail.com with ESMTPSA id p3-v6sm4700517wre.47.2018.10.29.08.53.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Oct 2018 08:53:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 29 Oct 2018 15:53:36 +0000 Message-Id: <20181029155339.15280-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181029155339.15280-1-richard.henderson@linaro.org> References: <20181029155339.15280-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH 1/4] cputlb: Add tlb_set_asid_for_mmuidx 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" Although we can't do much with ASIDs except remember them, this will allow cleanups within target/ that should make things clearer. Signed-off-by: Richard Henderson --- include/exec/cpu-defs.h | 2 ++ include/exec/exec-all.h | 19 +++++++++++++++++++ accel/tcg/cputlb.c | 23 +++++++++++++++++++++++ 3 files changed, 44 insertions(+) -- 2.17.2 diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h index 6a60f94a41..8fbfe8c8e2 100644 --- a/include/exec/cpu-defs.h +++ b/include/exec/cpu-defs.h @@ -152,6 +152,8 @@ typedef struct CPUTLBDesc { target_ulong large_page_mask; /* The next index to use in the tlb victim table. */ size_t vindex; + /* The current ASID for this tlb. */ + uint32_t asid; } CPUTLBDesc; /* diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 815e5b1e83..478f488704 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -226,6 +226,21 @@ void tlb_flush_by_mmuidx_all_cpus(CPUState *cpu, uint16_t idxmap); * depend on when the guests translation ends the TB. */ void tlb_flush_by_mmuidx_all_cpus_synced(CPUState *cpu, uint16_t idxmap); +/** + * tlb_set_asid_for_mmuidx: + * @cpu: Originating cpu + * @asid: Address Space Identifier + * @idxmap: bitmap of MMU indicies to set to @asid + * @depmap: bitmap of dependent MMU indicies + * + * Set an ASID for all of @idxmap. If any previous ASID was different, + * then we may flush the mmu idx. If a flush is required, then also flush + * all dependent mmu indicies in @depmap. This latter is typically used + * for secondary page resolution, for implementing virtualization within + * the guest. + */ +void tlb_set_asid_for_mmuidx(CPUState *cpu, uint32_t asid, + uint16_t idxmap, uint16_t dep_idxmap); /** * tlb_set_page_with_attrs: * @cpu: CPU to add this TLB entry for @@ -311,6 +326,10 @@ static inline void tlb_flush_by_mmuidx_all_cpus_synced(CPUState *cpu, uint16_t idxmap) { } +static inline void tlb_set_asid_for_mmuidx(CPUState *cpu, uint32_t asid, + uint16_t idxmap, uint16_t depmap) +{ +} #endif #define CODE_GEN_ALIGN 16 /* must be >= of the size of a icache line */ diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index af6bd8ccf9..60b3dc2de3 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -360,6 +360,29 @@ void tlb_flush_page_all_cpus_synced(CPUState *src, target_ulong addr) tlb_flush_page_by_mmuidx_all_cpus_synced(src, addr, ALL_MMUIDX_BITS); } +void tlb_set_asid_for_mmuidx(CPUState *cpu, uint32_t asid, uint16_t idxmap, + uint16_t depmap) +{ + CPUArchState *env = cpu->env_ptr; + uint16_t work, to_flush = 0; + + /* + * We don't support ASIDs except for trivially. + * If there is any change, then we must flush the TLB. + */ + for (work = idxmap; work != 0; work &= work - 1) { + int mmu_idx = ctz32(work); + if (env->tlb_d[mmu_idx].asid != asid) { + env->tlb_d[mmu_idx].asid = asid; + to_flush = idxmap; + } + } + if (to_flush) { + to_flush |= depmap; + tlb_flush_by_mmuidx_async_work(cpu, RUN_ON_CPU_HOST_INT(to_flush)); + } +} + /* update the TLBs so that writes to code in the virtual page 'addr' can be detected */ void tlb_protect_code(ram_addr_t ram_addr) From patchwork Mon Oct 29 15:53:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 149678 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4338542ljp; Mon, 29 Oct 2018 09:15:33 -0700 (PDT) X-Google-Smtp-Source: AJdET5dDNiL665V8d7oWV/hDlON+vqWIYpdC25DX/jYbsSL/FBq6mm0R2qloVgH6Piz8MFipoM+C X-Received: by 2002:ac8:1096:: with SMTP id a22-v6mr13320974qtj.359.1540829733247; Mon, 29 Oct 2018 09:15:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540829733; cv=none; d=google.com; s=arc-20160816; b=SMgYKh1ZomOkbxMk7QuvpCDdC1OFk1kWAJcMQebHCAPVdPQ1U0DOTPs/VWTXY+vKaN s+30EneewmSuvxIM6mjni9/UKdZZFfGQx/AhAWzgwFItlrlN2ddkBfrJk18UI5xAlxGT 9S2cBnjIFBKtVnd6rGvgLlR/o5Wemzvy/NEEhY80cllpV6Dd3EsqY8nUPpjjw4JeOSzE 7fGzHPlVt+JZ1y7Ukg4Zas0mh7bQcv7olJGj+UIVhNnVlrXoVlytZKZ0msyd48QAYN2y ArtHS+4/mB2Sl2qArdWo79U3sKNd+fUDsKjNqQEcQmNkHi+A28MzN6BT0W87PhFi3iaS HWFw== 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=AmAE+SggdeN2sPEPO0MNGARzD23BTp2OLLKQlCsNsjA=; b=X6BFWivLRJpZcUrmZky8dzryfFp2yQEs9YLDoEBD26TlOcaeCQSZzjQOaEmrjl7pEP vargqNuXFN4rk/39JHAk1ftDgh3LqgBX+SisuqtUaJo45XYcsWrxSK9+yxB/RD82P6rM vFvnECOr5z3WafI5jxwmLz5UdLwMOCaglrMg4PrGN4Fbgy0/fdhpF2E56u2jpCzoJ2L6 1d73FAhqrHXmKR8TrDql/4gF0BVj8vElqIDfiLn8sCQ9S6Zjry+ktPTOyW995LOi/AEU Oz2fLISDWk5wS8aqleFAMDF2i07hyf29nBqP5Cc46wenAF46te40RM1j69Bbhxs7fABg nEuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="Yr43/tx4"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id l24-v6si533354qtr.349.2018.10.29.09.15.33 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 29 Oct 2018 09:15:33 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="Yr43/tx4"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:46582 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHACS-00038R-Kj for patch@linaro.org; Mon, 29 Oct 2018 12:15:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47149) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gH9rg-0000cg-BW for qemu-devel@nongnu.org; Mon, 29 Oct 2018 11:54:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gH9rX-0000cy-E1 for qemu-devel@nongnu.org; Mon, 29 Oct 2018 11:53:58 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:41937) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gH9rT-0000WP-Tr for qemu-devel@nongnu.org; Mon, 29 Oct 2018 11:53:52 -0400 Received: by mail-wr1-x42f.google.com with SMTP id x12-v6so9251049wrw.8 for ; Mon, 29 Oct 2018 08:53:48 -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=AmAE+SggdeN2sPEPO0MNGARzD23BTp2OLLKQlCsNsjA=; b=Yr43/tx4JjmieotNR6WJZlTQ3skSzIidj5lLSDVTmU7ALXPkicDDstdC7aap9z4sjl 1+Y7VQBok+EWvbVc08S1V+Eaq9qT8eW1IiGZo1VXBEZuacdkw0S0yNSEtdRfzZanr7nd rFKbqlcfYb6E9Tdfhly4571s8pV+f/GlTXVjU= 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=AmAE+SggdeN2sPEPO0MNGARzD23BTp2OLLKQlCsNsjA=; b=FA1RX9r3Zch/6OuWzmFxJ+j/Y4lBficfOrKU6mHVSL6CqHouExDw48oHXlF8aptYDe ar0VmokRG3mXgyUeUbKNk0c7qQNXuhWmiZKjiG9tdyDDUQsb08GKtpLUh1Scua/NbJtn kkUDbGeswq5jRuzoRhTsTKp6rmS2ALbSzNp1hVwXrRPkzCDlEVg5LXWUK5W1MXk91Nkq sNiMiaNCn26JLqUaRTNmmWr2X4LMn2yKNJxDJf1yNgE58McOOW6e6lkjeq4worJnLb7H CSTNYmlk3c7gIXARA5qXZ3hE40n4CJr4I3MRssDlljRbeyi5/vXSLD/DoPRsiROX0dIQ L2kQ== X-Gm-Message-State: AGRZ1gIfeVuaocmn+NJiI1xYhkQ1f7uH49xGs0tYKznHZFVTi/qV1UuC aRJJ+9OVgD/epQ8htACY4aX/pvFuxsM= X-Received: by 2002:adf:f712:: with SMTP id r18-v6mr14948203wrp.85.1540828426978; Mon, 29 Oct 2018 08:53:46 -0700 (PDT) Received: from cloudburst.twiddle.net ([5.148.65.242]) by smtp.gmail.com with ESMTPSA id p3-v6sm4700517wre.47.2018.10.29.08.53.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Oct 2018 08:53:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 29 Oct 2018 15:53:37 +0000 Message-Id: <20181029155339.15280-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181029155339.15280-1-richard.henderson@linaro.org> References: <20181029155339.15280-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42f Subject: [Qemu-devel] [PATCH 2/4] target/arm: Install ASIDs for long-form from EL1 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" 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, 47 insertions(+), 26 deletions(-) -- 2.17.2 diff --git a/target/arm/helper.c b/target/arm/helper.c index 0ea95b0815..26d6f28793 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -2685,6 +2685,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 = CPU(arm_env_get_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) { @@ -2721,15 +2751,11 @@ 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 = arm_env_get_cpu(env); - - 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)); - } 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) @@ -2747,24 +2773,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 = arm_env_get_cpu(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 = arm_env_get_cpu(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, @@ -2810,12 +2831,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, @@ -3067,12 +3088,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 }; From patchwork Mon Oct 29 15:53:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 149686 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4359953ljp; Mon, 29 Oct 2018 09:33:41 -0700 (PDT) X-Google-Smtp-Source: AJdET5fqUmmqGglWXxS3nFlFY3EJ6mfx6EX0wLC/hVPPZNLe/kQPLKJnO1cYWWrVJk8oIG5KM2Cl X-Received: by 2002:a0c:f0c2:: with SMTP id d2mr1583536qvl.123.1540830821033; Mon, 29 Oct 2018 09:33:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540830821; cv=none; d=google.com; s=arc-20160816; b=mO87doyfQqQF6JGoRvvXACAjXuJB+v5Wrj6Hnuq5VHXEpgZJCDeEKCHv6uujgwhQfy g8on04+tT6tNn2MuTLX6roux6c+VOW0abRfytQah4l7qI4Kk/fO6x/vjg4P1oWUQf3+F glP7KTvCqmtfKtw50tp4NmrLhqyMZV/EFb8v0GTerGCFJM1LBFTB6kL0ZL3H6vAQVUzY MBvgYuEQjdUT0a0eFHaWJ0gp4g0ZD3pCeyX64FSW00wIFv+MJckV4XUzb/mKePStKVDz 5zZOqdSu+1tmAkz/q5/DMYqsINfOgvgacDCHy3sUBUNkeESiOILWrHUzFWzIx7/SUHYO /AZg== 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=ufjQzo+SI6PyAb64orKIBD88Q1YJp7NUSWPWGJqPOn4=; b=sf4vJE95KWS0Ra7TNXprJS2NCXXnIgdKfygtg6hX+J0pRq4AU1pnQ/MuSKcc5Ee+rn jVQCrR/mOCh0QhZyU0kwFHyDfjIQP9tCIBG1MjrCI5MCzaGGW9Vxu3shVgS4o9NHW/Uk I8w7hLp59PLGlSCpoA2NJ4wGOuVk3gazBqG4ittN4oy4JIUYgi3+UvwKSeUbH0YT8phd NHkVNT983US7aHrxXW6K/MB2bOCsNZmdrs/+XUyZd2n5c7awJUy42eG6k2CfleFm0TGr o1rrw775ilSn7xDw0uIAYDigWcMUcqyrrxNEkzAUEE0hhD7ChmdHWiyHfYHfK9osDM+K M22w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Oo+yuyFv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x124-v6si4663446qka.84.2018.10.29.09.33.40 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 29 Oct 2018 09:33:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Oo+yuyFv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:46743 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHAU0-0007C5-Cd for patch@linaro.org; Mon, 29 Oct 2018 12:33:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47173) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gH9rk-0000gI-TM for qemu-devel@nongnu.org; Mon, 29 Oct 2018 11:54:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gH9re-0000in-Gv for qemu-devel@nongnu.org; Mon, 29 Oct 2018 11:54:05 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:33163) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gH9rX-0000Xh-Cx for qemu-devel@nongnu.org; Mon, 29 Oct 2018 11:53:57 -0400 Received: by mail-wr1-x443.google.com with SMTP id u1-v6so9295862wrn.0 for ; Mon, 29 Oct 2018 08:53:50 -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=ufjQzo+SI6PyAb64orKIBD88Q1YJp7NUSWPWGJqPOn4=; b=Oo+yuyFvZwr7PLQVKIFhdYqNIUdgiB1UnEkCk2Cxjp7fKepzW4i/2RLYyOy+vWYmIS Z/pPgeNPPVdEg2K8d56y6aqRlVzh27xRq5Co/epQeq+lCMHX/BTwUiJlIcNz3+XMxGdR 3sevnYGfDe6Bwhf+7YbFGNIykiv4wSmUBKLLI= 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=ufjQzo+SI6PyAb64orKIBD88Q1YJp7NUSWPWGJqPOn4=; b=Cu2Z9hdssmQ7kMF5J4NgLh7xjuqG+7wD0AXf+RhqdaY9AxnoANiA6FdtPqX+OPgYeA R5aJm3S1rCOMLYKpZdggPXnR+Ze9moI1aORdbSX1TDU9BM4rMSPbXPeAw7Evv/+mkKF4 VACO4gp7QhcMPYrzp2vbcZt+65gd5OJKWlA6ucw+zqkC8JnNpvch6isgWGr9uEOaWerJ 4RS6yuP9cTiB6Vg2J40ioDk+hd3Bpyp9WGYoILqZnhvCTA1I5Lq8JRSfiBdtsDevnUlD F18d7cVWM2P5FFwy9I4+FxpCBIhm+VHRVCr8XwD/5wXZeY8Q65ao0ToqoPqje9JymSdX o2Ww== X-Gm-Message-State: AGRZ1gITt1Xsr1tdLkKc8ScCuT2YlMInbxDMxbANUwyrj89uKDa5EHG+ KV2j/RWyoiGCvXIZqPtLiFupt2csUcQ= X-Received: by 2002:adf:ca03:: with SMTP id o3-v6mr4998017wrh.148.1540828428616; Mon, 29 Oct 2018 08:53:48 -0700 (PDT) Received: from cloudburst.twiddle.net ([5.148.65.242]) by smtp.gmail.com with ESMTPSA id p3-v6sm4700517wre.47.2018.10.29.08.53.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Oct 2018 08:53:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 29 Oct 2018 15:53:38 +0000 Message-Id: <20181029155339.15280-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181029155339.15280-1-richard.henderson@linaro.org> References: <20181029155339.15280-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH 3/4] target/arm: Install ASIDs for short-form from EL1 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 less complex than the LPAE case, but still we now avoid the flush in case it is only the PROCID field that is changing. Signed-off-by: Richard Henderson --- target/arm/helper.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) -- 2.17.2 diff --git a/target/arm/helper.c b/target/arm/helper.c index 26d6f28793..f767467dcf 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -541,17 +541,31 @@ static void fcse_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) static void contextidr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) { - ARMCPU *cpu = arm_env_get_cpu(env); - - if (raw_read(env, ri) != value && !arm_feature(env, ARM_FEATURE_PMSA) - && !extended_addresses_enabled(env)) { - /* For VMSA (when not using the LPAE long descriptor page table - * format) this register includes the ASID, so do a TLB flush. - * For PMSA it is purely a process ID and no action is needed. - */ - tlb_flush(CPU(cpu)); - } raw_write(env, ri, value); + + /* + * For VMSA (when not using the LPAE long descriptor page table format) + * this register includes the ASID. For PMSA it is purely a process ID + * and no action is needed. + */ + if (!arm_feature(env, ARM_FEATURE_PMSA) && + !extended_addresses_enabled(env)) { + CPUState *cs = CPU(arm_env_get_cpu(env)); + int asid = extract32(value, 0, 8); + int idxmask; + + switch (ri->secure) { + case ARM_CP_SECSTATE_S: + idxmask = ARMMMUIdxBit_S1SE1 | ARMMMUIdxBit_S1SE0; + break; + case ARM_CP_SECSTATE_NS: + idxmask = ARMMMUIdxBit_S12NSE1 | ARMMMUIdxBit_S12NSE0; + break; + default: + g_assert_not_reached(); + } + tlb_set_asid_for_mmuidx(cs, asid, idxmask, 0); + } } /* IS variants of TLB operations must affect all cores */ From patchwork Mon Oct 29 15:53:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 149679 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4339044ljp; Mon, 29 Oct 2018 09:15:57 -0700 (PDT) X-Google-Smtp-Source: AJdET5fz0ILCAr6i+3NCMv7qg2ByFJr5nbGubfBz6y/lUUDtGO2hoxp8/JA8+Q5KZ59E2ffIRVJS X-Received: by 2002:aed:2f81:: with SMTP id m1-v6mr7441968qtd.4.1540829757051; Mon, 29 Oct 2018 09:15:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540829757; cv=none; d=google.com; s=arc-20160816; b=rkI7Us1TNmZaXfEN20rCDvVRkc10RnG4ua0GDR3azD/t/nHVQwr/nmMiR9zhFFUZlu BvAMOLoSDjuJL+A7CT1/rSHwfmY0mzJmS9l30ah55tLP6LFwyWbZsoKpaWntdR50eac2 fRbgqW4UQYpTyXPl+9qNNF8TGhZu2rmTGNwIdt7rv/Hgf6trzCQKLEpBN1euimoU+ZLq 5YQmp0tXZj/tXaoHFoV86TB/+qlqzw24/PGSaF72ScWZ0pXfgmQy/cg+/R4yo4qW+tMp Gl797Wh+FEM27YHPZnRBszgy7zO/K3cyw8qiWgUqnzPcP2yDsrAl7VtdNreHlO++3Sf3 AlCg== 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=LZQNZ6rcVxWOWRYJTTswlGPMH894sJFeWGghPgY04yI=; b=bsQh4hryf1RPP+iHijcpA5Yp42gvOutvCE5VB+TluS2dHefheT9xSWyvUm1TziRepM tPHMnLDeGLlk40e0veLf0rAYJapI8alZMsQqouBy+1BUKT7eSHbPJYX/bNw/Xf9BzMkw 9ek5nmfMXo0a7eNFyzxKO6/bAXWl9vT90RT5lLskCSXxaNZDMXNzoqozeXtJmwzDR5oM qLd6C54eJIPG37cg1wwkGLRFO3iCLUw19gw6eqzZbIZQjBagO1+P7V1oyGxc3RcIl34s O28CAj0NJMGMllEF/bOcCnofD1kwKMl88BDJas3IEJfOgHJmh7UTWacMulDSmfV/EXAo 3qEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hqhWDH5b; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id c9si1961817qve.184.2018.10.29.09.15.56 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 29 Oct 2018 09:15:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hqhWDH5b; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:46583 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHACq-0003Cq-1t for patch@linaro.org; Mon, 29 Oct 2018 12:15:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47172) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gH9rk-0000gH-TO for qemu-devel@nongnu.org; Mon, 29 Oct 2018 11:54:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gH9rb-0000gK-Ga for qemu-devel@nongnu.org; Mon, 29 Oct 2018 11:54:05 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:34100) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gH9rV-0000Yg-QH for qemu-devel@nongnu.org; Mon, 29 Oct 2018 11:53:55 -0400 Received: by mail-wr1-x444.google.com with SMTP id l6-v6so9278733wrt.1 for ; Mon, 29 Oct 2018 08:53: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; bh=LZQNZ6rcVxWOWRYJTTswlGPMH894sJFeWGghPgY04yI=; b=hqhWDH5bd9BtnniyXouzhL/u9ulvDM23+tT3KBJelBICF3HTKQIl+fZvjEqT+MhNeN jSHwNkw95O1PMakzAETobdzPQGLb5bPwR5CjdLQ8noAcsM1/gwUDq13zCABEi2vNkx69 hS0iL0lDwgBMlEfBHyX4VeKWjjl4uwILRERBM= 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=LZQNZ6rcVxWOWRYJTTswlGPMH894sJFeWGghPgY04yI=; b=r8638DRvlqbibedO96j2mr0xTKXmhqTtNkTENeYBo1RbKOTq6FHTzCz0gWtngmCYkl KKfN7Rww3e07q2Z6V8wwxZajsq5SYNyhpuXk+yKTASRbOvSt17FAfvvsi/6y91dorTmm 9ucXATp0gTzg9EwAWh8FfXVzLBaCUqiroLYJRYPfvl+m3fpOFWTmpnnrY04Z7nMDttgF fSjwZsEsIQD5bGhiPpgkJttbs0BAfmemsPX7CHteH0czosW4byFe/stJXvr/BeCPtdjB u9Z1syKVfzDXeZ07DtQgfCo1Jxo2XOqSrxoyZ9WR6jAI+F2dvyFrcXo2C9rjrsD1TGhz fxEg== X-Gm-Message-State: AGRZ1gKRD01zOwRMEzz/mokKX21n0DDhBjmI4n7Xh7f8hhFjxpmvmbGa 12A3dDZXkn1X51Ol1CycaGq/Ia5vSQM= X-Received: by 2002:adf:bf10:: with SMTP id p16-v6mr14431007wrh.235.1540828429538; Mon, 29 Oct 2018 08:53:49 -0700 (PDT) Received: from cloudburst.twiddle.net ([5.148.65.242]) by smtp.gmail.com with ESMTPSA id p3-v6sm4700517wre.47.2018.10.29.08.53.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Oct 2018 08:53:48 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 29 Oct 2018 15:53:39 +0000 Message-Id: <20181029155339.15280-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181029155339.15280-1-richard.henderson@linaro.org> References: <20181029155339.15280-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH 4/4] target/arm: Install ASIDs for EL2 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" The VMID is the ASID for the 2nd stage page lookup. Signed-off-by: Richard Henderson --- target/arm/helper.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) -- 2.17.2 Reviewed-by: Peter Maydell diff --git a/target/arm/helper.c b/target/arm/helper.c index f767467dcf..4b14f2c05b 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -2805,17 +2805,23 @@ static void vmsa_ttbr_el1_write(CPUARMState *env, const ARMCPRegInfo *ri, static void vttbr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) { - ARMCPU *cpu = arm_env_get_cpu(env); - CPUState *cs = CPU(cpu); + CPUState *cs = CPU(arm_env_get_cpu(env)); + int vmid; - /* Accesses to VTTBR may change the VMID so we must flush the TLB. */ - if (raw_read(env, ri) != value) { - tlb_flush_by_mmuidx(cs, - ARMMMUIdxBit_S12NSE1 | - ARMMMUIdxBit_S12NSE0 | - ARMMMUIdxBit_S2NS); - raw_write(env, ri, value); - } + raw_write(env, ri, value); + + /* + * TODO: with ARMv8.1-VMID16, aarch64 must examine VTCR.VS + * (re-evaluating with changes to VTCR) then use bits [63:48]. + */ + vmid = extract64(value, 48, 8); + + /* + * A change in VMID to the stage2 page table (S2NS) invalidates + * the combined stage 1&2 tlbs (S12NSE1 and S12NSE0). + */ + tlb_set_asid_for_mmuidx(cs, vmid, ARMMMUIdxBit_S2NS, + ARMMMUIdxBit_S12NSE1 | ARMMMUIdxBit_S12NSE0); } static const ARMCPRegInfo vmsa_pmsa_cp_reginfo[] = {