From nobody Tue Feb 10 03:39:45 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578538282; cv=none; d=zohomail.com; s=zohoarc; b=H/RYVs19Bj9BaIhtO+6LHAy/LNwGZf2z048+etegJDBnJVabocIDik9M7JuKV1AGxkI/fbx8TdT3sBP0zW8cr11Q1Mi3fziaTHaXzgVFR7+gP700rARNirzK8Q2FrivE6YHKVrC+kqjdPGTtT1MAp7MkMIeK7r6kWKQ7HccvlJM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578538282; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lOjnREAHRE3NSpPGGVT2torwOdj/k63lQwetVtnWUzc=; b=fcNmCiYvk8jmoOafcFyTBtXx05sYarBVmxOguw7HoAQ1P3g46HAtARjAd3nfROlIbTIMyEsiWtxge8Jp+wzVs2raBTX34+7IYuOEhNy8efVVlsZjxNOAppTA+3QvJMykhTEB4xpI+7Iscgh9tsuZlkcd/N8TeC2rRuSX1daemE8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578538282579965.7927578179392; Wed, 8 Jan 2020 18:51:22 -0800 (PST) Received: from localhost ([::1]:53968 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipNur-0004Yn-3M for importer@patchew.org; Wed, 08 Jan 2020 21:51:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51453) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipNss-0002m5-Lo for qemu-devel@nongnu.org; Wed, 08 Jan 2020 21:49:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipNsr-0005wc-6b for qemu-devel@nongnu.org; Wed, 08 Jan 2020 21:49:18 -0500 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:45146) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipNsq-0005sx-T6 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 21:49:17 -0500 Received: by mail-pg1-x543.google.com with SMTP id b9so2460128pgk.12 for ; Wed, 08 Jan 2020 18:49:16 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id b4sm5337844pfd.18.2020.01.08.18.49.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 18:49:14 -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 :mime-version:content-transfer-encoding; bh=lOjnREAHRE3NSpPGGVT2torwOdj/k63lQwetVtnWUzc=; b=oRzVwyZ1BFwOC6oV6r2a33BMgVDUrI+d71bbIGtIaj9tTyuJagJ7Xv42HYzxrst7eM 5VDh4g0Kwwxwn4U2nffJfA6idrrod4G64Bpg9TXxwKc1DGc3OZiWhnw40pAHstU9DKZC 93gmmSHTgPXY49yhiTgHE7EDlXYtRoN02qfkox6oblblXx87lF3rs7CiYqgYnjrpLq2y ipSkmNk+fRXdmVdF0kvcuV1uqwTrd3oC/RnPrZo4Q6lu8aXiMeenqpDOTUQhiOlQAmcM IxoWOS28FKf3th7U7fcmSLBlThlmxXWd7SCm5NzQQHXnwsS6hsdtACVlgT2JSEglwTlV msvQ== 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=lOjnREAHRE3NSpPGGVT2torwOdj/k63lQwetVtnWUzc=; b=qWimyTeLkccy2QprtxuMcYzS69CckFSnrTVllCeGnbSLGmy3myN/dCDaNs4tnL+p0h i1pTciK2sStq9QZSJJiIIBxd+TjqEHwraM7lV3+Ao4zmoFrb7Ih0Ia7hGHbqzspnHyGN sCqKigByqlr3TCU/BboPs1erHjVGTiISOZYSDKTAjMZFQgtho18PcYNzja+gdZX+l57f +vPVSB+RgpR4HViBt1u1GQjfsy3ZttqeaE81oZQb7H1w15CCQQyOFW6skUnaD3KhxfsI iiMduvzU2UbLoc9dCilEaEeNVOqYGe3NhUtUg6wU//bOXB7jOV6UVdMlZnld20mfhiRB FXSA== X-Gm-Message-State: APjAAAXCfE9cy+yusbJksAn2VUBH8VrSXGsS9V+RauHKxiVbdzk28m1H sw4GPXlJU7JfQROdOqoqoCfhzkrbOuzeDA== X-Google-Smtp-Source: APXvYqyM3ixX06a5lwqw9cLoRCKzz9z1XMZKmGDQCPiGctMju6u+HKIPCtIRivtFPaerjQFBv6m6Gg== X-Received: by 2002:a62:b418:: with SMTP id h24mr9103623pfn.192.1578538155085; Wed, 08 Jan 2020 18:49:15 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 1/9] cputlb: Merge tlb_table_flush_by_mmuidx into tlb_flush_one_mmuidx_locked Date: Thu, 9 Jan 2020 13:48:59 +1100 Message-Id: <20200109024907.2730-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200109024907.2730-1-richard.henderson@linaro.org> References: <20200109024907.2730-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::543 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: alistair.francis@wdc.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" There is only one caller for tlb_table_flush_by_mmuidx. Place the result at the earlier line number, due to an expected user in the near future. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Alistair Francis --- accel/tcg/cputlb.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index a991ea2964..1a81886e58 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -224,11 +224,16 @@ static void tlb_mmu_resize_locked(CPUArchState *env, = int mmu_idx) } } =20 -static inline void tlb_table_flush_by_mmuidx(CPUArchState *env, int mmu_id= x) +static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx) { tlb_mmu_resize_locked(env, mmu_idx); - memset(env_tlb(env)->f[mmu_idx].table, -1, sizeof_tlb(env, mmu_idx)); env_tlb(env)->d[mmu_idx].n_used_entries =3D 0; + env_tlb(env)->d[mmu_idx].large_page_addr =3D -1; + env_tlb(env)->d[mmu_idx].large_page_mask =3D -1; + env_tlb(env)->d[mmu_idx].vindex =3D 0; + memset(env_tlb(env)->f[mmu_idx].table, -1, sizeof_tlb(env, mmu_idx)); + memset(env_tlb(env)->d[mmu_idx].vtable, -1, + sizeof(env_tlb(env)->d[0].vtable)); } =20 static inline void tlb_n_used_entries_inc(CPUArchState *env, uintptr_t mmu= _idx) @@ -289,16 +294,6 @@ void tlb_flush_counts(size_t *pfull, size_t *ppart, si= ze_t *pelide) *pelide =3D elide; } =20 -static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx) -{ - tlb_table_flush_by_mmuidx(env, mmu_idx); - env_tlb(env)->d[mmu_idx].large_page_addr =3D -1; - env_tlb(env)->d[mmu_idx].large_page_mask =3D -1; - env_tlb(env)->d[mmu_idx].vindex =3D 0; - memset(env_tlb(env)->d[mmu_idx].vtable, -1, - sizeof(env_tlb(env)->d[0].vtable)); -} - static void tlb_flush_by_mmuidx_async_work(CPUState *cpu, run_on_cpu_data = data) { CPUArchState *env =3D cpu->env_ptr; --=20 2.20.1