From patchwork Wed Jul 31 20:37:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 170239 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4471189ile; Wed, 31 Jul 2019 13:39:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqzC+4omRNc3WSJD98dMHHo1FtWyHz7QuTaGlZrUPyrZ4et2X+jOx33sGoeoAAjFRAax3/1h X-Received: by 2002:a05:6402:28e:: with SMTP id l14mr43708731edv.11.1564605553012; Wed, 31 Jul 2019 13:39:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564605553; cv=none; d=google.com; s=arc-20160816; b=lepDPMr43OOyDmT6gzGPNkcb5b0Wf6SKNx06v0l0Q3ImPeupHs/zS/Ut3BWJwWlN+D H9qoAAeSAjr24NANx916+K+3pDyvbqXYMX93WDsSaXqK3r9bCditokqEgjdA8Uj3lPSY ls/BPKt0o+wpaiTK2WFl33vVOekmN84d9iJJuTf3dp5tqAhPF4dx1SDjZsWbkUKyVTzT hdCdg8jsivMG656H8fmNSuzYeq5V4gX8uoJHgOma5LKmu69leTrYltWKnkpvxrD/oIeh y/QRJdx6msNmP4Lwm7hKwrJgIBb8TEPMGt/lYKVUTCibA7LU6WXLS/IXewqDa+KAlfKX l+YA== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=3Vv1PJfuLW2Q3y6jhZwS+VA5WdsiwenJEhdiHqcPU8E=; b=y6oUlWHnUY25EtFoswctqsgAsupDo3ijx5pKv0o1TczaE1W22Lhf5/ZngJUwMzarch Fb19LeRpDbYo+X78MT/WD9lQcSzKH6Sm3AUUkaU9H4/xhlx+mp9h3HxallopWrVFeEGC Tt3uPI36iU7BoS0IO9YOpcUi0vX9ad8ljprukGkLzKbRyNyMZw3VvggfpoeCrCHyWESD PXlnM5FyyC3KWVcyb4r4b7y4r40ZhUzqZpLIwNUj3+Ldz/bz7HWtJg89627FsmhU4uFA kOW5W6EW5vhE7k1Da7AGgRVDI+ciak75Iq1Tc3YoiqkvZBwkWGMQCiu2qSmLqVp48dZ+ 0Bnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UHN9Ri7I; 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 y25si20808719edc.377.2019.07.31.13.39.12 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 31 Jul 2019 13:39:13 -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=UHN9Ri7I; 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]:44214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsvNO-00040o-4i for patch@linaro.org; Wed, 31 Jul 2019 16:39:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60599) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsvMZ-0003vr-Kg for qemu-devel@nongnu.org; Wed, 31 Jul 2019 16:38:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hsvMY-0003H0-6V for qemu-devel@nongnu.org; Wed, 31 Jul 2019 16:38:19 -0400 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:46529) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hsvMY-0003Gh-03 for qemu-devel@nongnu.org; Wed, 31 Jul 2019 16:38:18 -0400 Received: by mail-pf1-x444.google.com with SMTP id c3so9373387pfa.13 for ; Wed, 31 Jul 2019 13:38:17 -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=3Vv1PJfuLW2Q3y6jhZwS+VA5WdsiwenJEhdiHqcPU8E=; b=UHN9Ri7INF29P80/b9NdjhxTy8SPM+M2VMwY0AJl5Igm1w4JA4pRaa4rdxWtUTls8r BwBAmwaWQPRpHk1JrvnweqW3TC0WT0YHKSW7omxdpNQh/LwLT74ok9c1Km9b2mVMcGFi aWmjsqG3OHPDlcbNnhfoN8JrogF0ucwsmaGTOAW63L3ZnrEXsOnKkQrJ56frq2ZdALFb VXQUldBYkUlfdJOpwj03UWgXB502/M6IRQ7eSzEFgbhjopCyE27+kaQm5vfACBaP7AnK wxMZbi0gmdttuWpCUmZx7r+5W5awZxidi4a/V9KCDsoQLbsOOwXuHGnV6M37q9xf0JjU szig== 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=3Vv1PJfuLW2Q3y6jhZwS+VA5WdsiwenJEhdiHqcPU8E=; b=FbjiMBZvVqTrhanxeOew8wubWqiF59Lgwovf3VRJqubKsh0B9RuxkatnWCgB1LWWOj NPINz1Z7jqzBLcSv/xR2DdTaNk7rUCX3lkpSTAnhYdyszkQjUW5/8ZEunHS07JjJaXQd EZZsMPgJiJBKu17UrzSkH4EqEK3AIitKkwsidmvlsrKTbICDXBPCxOf0Jq1mSF9cb7M0 UlSPb/++D/dq0A1ZGfPIDMKvmRBB8zj/2Bs+/FWT2xkkuONibxa3nS1AHhayt80hOd/T jdwim9aDMis8W8WZvjGiv6mkbJ3uvgK2g8fjtdtyyHMh5DhmpYbyYSRGTTlSDxsQ0uW0 yP2A== X-Gm-Message-State: APjAAAXm+Ej8vaJICjBaBm1IqEK880Bc+kJtZXqVmsyE5XLaNZtV5S3P eLAQdjlKC5cFmekyLPwjqluvai0muRI= X-Received: by 2002:a62:764d:: with SMTP id r74mr51255602pfc.110.1564605496727; Wed, 31 Jul 2019 13:38:16 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id g4sm84054164pfo.93.2019.07.31.13.38.15 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 13:38:16 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 13:37:42 -0700 Message-Id: <20190731203813.30765-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190731203813.30765-1-richard.henderson@linaro.org> References: <20190731203813.30765-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::444 Subject: [Qemu-devel] [PATCH v2 01/32] cputlb: Add tlb_set_asid_for_mmuidx 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, alex.bennee@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. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- v2: Assert cpu_is_self; only flush idx w/ asid mismatch. v3: Improve asid comment. --- include/exec/cpu-all.h | 11 +++++++++++ include/exec/cpu-defs.h | 2 ++ include/exec/exec-all.h | 19 +++++++++++++++++++ accel/tcg/cputlb.c | 26 ++++++++++++++++++++++++++ 4 files changed, 58 insertions(+) -- 2.17.1 diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 536ea58f81..40b140cbba 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -439,4 +439,15 @@ static inline CPUTLB *env_tlb(CPUArchState *env) return &env_neg(env)->tlb; } +/** + * cpu_tlb(env) + * @cpu: The generic CPUState + * + * Return the CPUTLB state associated with the cpu. + */ +static inline CPUTLB *cpu_tlb(CPUState *cpu) +{ + return &cpu_neg(cpu)->tlb; +} + #endif /* CPU_ALL_H */ diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h index 9bc713a70b..b42986d822 100644 --- a/include/exec/cpu-defs.h +++ b/include/exec/cpu-defs.h @@ -169,6 +169,8 @@ typedef struct CPUTLBDesc { size_t n_used_entries; /* The next index to use in the tlb victim table. */ size_t vindex; + /* The current ASID for this tlb, if used; otherwise ignored. */ + uint32_t asid; /* The tlb victim table, in two parts. */ CPUTLBEntry vtable[CPU_VTLB_SIZE]; CPUIOTLBEntry viotlb[CPU_VTLB_SIZE]; diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 16034ee651..9c77aa5bf9 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -225,6 +225,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 indexes to set to @asid + * @depmap: bitmap of dependent MMU indexes + * + * Set an ASID for all of @idxmap. If any previous ASID was different, + * then we will 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 @@ -310,6 +325,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 bb9897b25a..c68f57755b 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -540,6 +540,32 @@ 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) +{ + CPUTLB *tlb = cpu_tlb(cpu); + uint16_t work, to_flush = 0; + + /* It doesn't make sense to set context across cpus. */ + assert_cpu_is_self(cpu); + + /* + * 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 (tlb->d[mmu_idx].asid != asid) { + tlb->d[mmu_idx].asid = asid; + to_flush |= 1 << mmu_idx; + } + } + 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)