From patchwork Tue Jun 4 20:33:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 165813 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp6328100ili; Tue, 4 Jun 2019 13:34:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqxcf5V87a5ddNWEWmt7eLXcpSjk+BkHZeLe/DIGsiOCNRMhOQAcCfNB0SPVThyoD6syiV6p X-Received: by 2002:ac8:2763:: with SMTP id h32mr30771024qth.350.1559680463487; Tue, 04 Jun 2019 13:34:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559680463; cv=none; d=google.com; s=arc-20160816; b=pvoWkD2uCq8P9Kn+rvfiQxHO00ea1XklPHrqG2zIXxEiHt5LtC3YLTaaSAI7RMNlQy +KsjWO7i7U2QeKzFMPZxIC8Bu+zg5uSNxxToYOKvrYL36WeBhbX3aH0Kuz6U7uall6Wg mLAWc/++ksOEk5jimQEvsCSs5GdIHd5hOioajX3OAvXUdtx2XR2Ol1zNG9E6PksjPp/N MDcOJ05g4EnQHItnAdBv3cvnNGaTu91cGPEtUhM8kk2mmLOi2Wnetl+XvwMJ8INJgEqK f0phTYH+TbB13HBVfsCzT8/pqcLFUYnZsD6gLBM7DGxN7Q4dZcMg+AFnslI1bQxtqelY fmag== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=SsD841efZqo7uciuvvdZgxC3XyiWIUZWbge19pY103g=; b=TmpJC+V/AvLUlsdQWLQ4pbH6aplCEACdraNpVmQgFoK8LRaOGjubtoSpjgRck9Wyko Ezylg2fEFoBH7hAXoQVKPfaeHkdvsyDMxZRLED05CZ36M6SydSRBrLj0fPZhf2AFa+SB iCQ2OfFwK7CyWhut7ty5FkMOIENerZv7g5MZpHZ4G3A0HUO/s6ow1hX7Sq9UgUIXOlmB i3trTVTxpO1+n3xfM50fKJ2t4APHxvYPr74q8uYa9sbKYRh3cjkYkOtKYlZ6YNRwE4WY eAip5ssAaDaTm4TEK2EhxfCz2K1fdRionTOkK5+DMVtL3WamPVhtalsPoAi46VxMrUKD tlNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KvFhHb3S; 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 n48si4946416qtc.312.2019.06.04.13.34.23 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 04 Jun 2019 13:34:23 -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=KvFhHb3S; 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]:57565 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYG8V-0000uw-0L for patch@linaro.org; Tue, 04 Jun 2019 16:34:23 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35381) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYG86-0000uf-Pl for qemu-devel@nongnu.org; Tue, 04 Jun 2019 16:33:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYG85-0003xs-L3 for qemu-devel@nongnu.org; Tue, 04 Jun 2019 16:33:58 -0400 Received: from mail-oi1-x244.google.com ([2607:f8b0:4864:20::244]:45858) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYG85-0003xQ-GK for qemu-devel@nongnu.org; Tue, 04 Jun 2019 16:33:57 -0400 Received: by mail-oi1-x244.google.com with SMTP id m206so1328480oib.12 for ; Tue, 04 Jun 2019 13:33:57 -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=SsD841efZqo7uciuvvdZgxC3XyiWIUZWbge19pY103g=; b=KvFhHb3SAShtgHAUjH5dqVDJqyjIl8If/pMPiuRNI9c8DBuTUIonor4lXyQHWwUvzI jJ16f3R+Si68LJPYUARZ5kis6dOukRny8PmscbO4vlQ5kcww4ze6dEKZ4MOawxoieHmd 7AJ6iJlIjh9fdzY/XIQnU8Y12e4wFqtWeI91Ah1x78HNM6iwzr43Waz398KZr7WsT63G rgTkc/8y2NeAKNme8m5bl0VtJrFEfoSjGRTDYzWTcvK6iKMwFED+lkfWUWHAbjBXXWrx Udt0m0py2GYJWhJ1awF/VrsrlLMs8bv1rjsdwAjgbtCAfK72S4i2cPsiCREzqAq8VjMq oRSw== 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=SsD841efZqo7uciuvvdZgxC3XyiWIUZWbge19pY103g=; b=GttKA2EL+DItZ09Sq3fAg9kHT25jeUWoExtzbhoq5dLLFBj4Tb6C6FXJ2ZkCwxzlgK ttkOUpVKveDXgfaTlmppEDS5pjxNo1JkEIoqpPN1SQpNt2Rhy+2SPmF8yx9pSszUodF9 rkL0Rux4Yjfa0Dto+yl37ARlqv/Ydj4JvWxoTblm2MuqQiGWvIYLt4Iaz9K8g/X/kD/W 8qc5GykRK2dmSrYy0kwWflpOYd5dUVD4cnlGibtWQEnXoD0pDDAd/8UlD5SM3vXd2UJS dgjqcsbHklIcNsZVSun3/0jZpOkBrHjm3XiReWZPgQRkFwBOX3MMipf9wL1k+jl0bd4r OxAA== X-Gm-Message-State: APjAAAXq4uNtFiza7eAFj1X98CedApAzj1T9n7Xu31S2kFuppteoKqFs 0DBemvLkCJaHtXr6E8hDqarlTazXispYwg== X-Received: by 2002:aca:5b57:: with SMTP id p84mr5549475oib.4.1559680436510; Tue, 04 Jun 2019 13:33:56 -0700 (PDT) Received: from localhost.localdomain (200-56-192-86-cable.cybercable.net.mx. [200.56.192.86]) by smtp.gmail.com with ESMTPSA id h1sm5979901otj.78.2019.06.04.13.33.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jun 2019 13:33:55 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 4 Jun 2019 15:33:13 -0500 Message-Id: <20190604203351.27778-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190604203351.27778-1-richard.henderson@linaro.org> References: <20190604203351.27778-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::244 Subject: [Qemu-devel] [PATCH v4 01/39] tcg: Fold CPUTLBWindow into CPUTLBDesc 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Both structures are allocated once per mmu_idx. There is no reason for them to be separate. Reviewed-by: Alistair Francis Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- include/exec/cpu-defs.h | 17 ++++------------- accel/tcg/cputlb.c | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 25 deletions(-) -- 2.17.1 diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h index 8f2a848bf5..52d150aaf1 100644 --- a/include/exec/cpu-defs.h +++ b/include/exec/cpu-defs.h @@ -127,18 +127,6 @@ typedef struct CPUIOTLBEntry { MemTxAttrs attrs; } CPUIOTLBEntry; -/** - * struct CPUTLBWindow - * @begin_ns: host time (in ns) at the beginning of the time window - * @max_entries: maximum number of entries observed in the window - * - * See also: tlb_mmu_resize_locked() - */ -typedef struct CPUTLBWindow { - int64_t begin_ns; - size_t max_entries; -} CPUTLBWindow; - typedef struct CPUTLBDesc { /* * Describe a region covering all of the large pages allocated @@ -148,9 +136,12 @@ typedef struct CPUTLBDesc { */ target_ulong large_page_addr; target_ulong large_page_mask; + /* host time (in ns) at the beginning of the time window */ + int64_t window_begin_ns; + /* maximum number of entries observed in the window */ + size_t window_max_entries; /* The next index to use in the tlb victim table. */ size_t vindex; - CPUTLBWindow window; size_t n_used_entries; } CPUTLBDesc; diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index cdcc377102..41f2296f93 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -79,11 +79,11 @@ static inline size_t sizeof_tlb(CPUArchState *env, uintptr_t mmu_idx) return env->tlb_mask[mmu_idx] + (1 << CPU_TLB_ENTRY_BITS); } -static void tlb_window_reset(CPUTLBWindow *window, int64_t ns, +static void tlb_window_reset(CPUTLBDesc *desc, int64_t ns, size_t max_entries) { - window->begin_ns = ns; - window->max_entries = max_entries; + desc->window_begin_ns = ns; + desc->window_max_entries = max_entries; } static void tlb_dyn_init(CPUArchState *env) @@ -94,7 +94,7 @@ static void tlb_dyn_init(CPUArchState *env) CPUTLBDesc *desc = &env->tlb_d[i]; size_t n_entries = 1 << CPU_TLB_DYN_DEFAULT_BITS; - tlb_window_reset(&desc->window, get_clock_realtime(), 0); + tlb_window_reset(desc, get_clock_realtime(), 0); desc->n_used_entries = 0; env->tlb_mask[i] = (n_entries - 1) << CPU_TLB_ENTRY_BITS; env->tlb_table[i] = g_new(CPUTLBEntry, n_entries); @@ -151,18 +151,18 @@ static void tlb_mmu_resize_locked(CPUArchState *env, int mmu_idx) int64_t now = get_clock_realtime(); int64_t window_len_ms = 100; int64_t window_len_ns = window_len_ms * 1000 * 1000; - bool window_expired = now > desc->window.begin_ns + window_len_ns; + bool window_expired = now > desc->window_begin_ns + window_len_ns; - if (desc->n_used_entries > desc->window.max_entries) { - desc->window.max_entries = desc->n_used_entries; + if (desc->n_used_entries > desc->window_max_entries) { + desc->window_max_entries = desc->n_used_entries; } - rate = desc->window.max_entries * 100 / old_size; + rate = desc->window_max_entries * 100 / old_size; if (rate > 70) { new_size = MIN(old_size << 1, 1 << CPU_TLB_DYN_MAX_BITS); } else if (rate < 30 && window_expired) { - size_t ceil = pow2ceil(desc->window.max_entries); - size_t expected_rate = desc->window.max_entries * 100 / ceil; + size_t ceil = pow2ceil(desc->window_max_entries); + size_t expected_rate = desc->window_max_entries * 100 / ceil; /* * Avoid undersizing when the max number of entries seen is just below @@ -182,7 +182,7 @@ static void tlb_mmu_resize_locked(CPUArchState *env, int mmu_idx) if (new_size == old_size) { if (window_expired) { - tlb_window_reset(&desc->window, now, desc->n_used_entries); + tlb_window_reset(desc, now, desc->n_used_entries); } return; } @@ -190,7 +190,7 @@ static void tlb_mmu_resize_locked(CPUArchState *env, int mmu_idx) g_free(env->tlb_table[mmu_idx]); g_free(env->iotlb[mmu_idx]); - tlb_window_reset(&desc->window, now, 0); + tlb_window_reset(desc, now, 0); /* desc->n_used_entries is cleared by the caller */ env->tlb_mask[mmu_idx] = (new_size - 1) << CPU_TLB_ENTRY_BITS; env->tlb_table[mmu_idx] = g_try_new(CPUTLBEntry, new_size);