From nobody Sun Apr 27 15:13:07 2025
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=fail;
	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=fail(p=none dis=none)  header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1579661830; cv=none;
	d=zohomail.com; s=zohoarc;
	b=RJOkJ8Gqvi9xQvyzMd0kmDO8aW5fgY/CS7Yx/MHhRQwCOQsU8SQI9T/4iJhufJzwmrfftUKAc7/YifL8RBsIVupFeCDk36l0voT3X4a2qDfKlFRgVhcQRgKeIRB3nSlByNMvxkVLeJzqfJtzpSosRBFhW9osFTP9b0ETpQO0CX0=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1579661830;
 h=Content-Type: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=7JCjtS3iuX6LFH/2brU8boRCZGNEugPuBApINFMUJPI=;
	b=GXLWUJ6T7wN1ZsmxHHBOyvAJn5m8sz0wuGOOGkhYr3JBt5MImqeRrPoWI5ujQuauK24L5l69eRsq2MpESKuSysvsZNlbACz0cvavHhQ10MGTKVt6UdHtWRhHHx67lVO2Cxq/cD8E7pooPzbhdygv51bQ9wuvhJX5DARypoGc/oU=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=fail;
	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=fail header.from=<richard.henderson@linaro.org> (p=none dis=none)
 header.from=<richard.henderson@linaro.org>
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
 mx.zohomail.com
	with SMTPS id 1579661830224519.3872553295154;
 Tue, 21 Jan 2020 18:57:10 -0800 (PST)
Received: from localhost ([::1]:35792 helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
	id 1iu6Ca-0006Ps-RB
	for importer@patchew.org; Tue, 21 Jan 2020 21:57:08 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:45262)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <richard.henderson@linaro.org>) id 1iu65s-0005p5-Ee
 for qemu-devel@nongnu.org; Tue, 21 Jan 2020 21:50:13 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <richard.henderson@linaro.org>) id 1iu65r-0002oC-3n
 for qemu-devel@nongnu.org; Tue, 21 Jan 2020 21:50:12 -0500
Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:47003)
 by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
 (Exim 4.71) (envelope-from <richard.henderson@linaro.org>)
 id 1iu65q-0002o1-UO
 for qemu-devel@nongnu.org; Tue, 21 Jan 2020 21:50:11 -0500
Received: by mail-pl1-x642.google.com with SMTP id y8so2246577pll.13
 for <qemu-devel@nongnu.org>; Tue, 21 Jan 2020 18:50:10 -0800 (PST)
Received: from localhost.localdomain (rrcs-173-198-77-92.west.biz.rr.com.
 [173.198.77.92])
 by smtp.gmail.com with ESMTPSA id c22sm44149883pfo.50.2020.01.21.18.50.08
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Tue, 21 Jan 2020 18:50:09 -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=7JCjtS3iuX6LFH/2brU8boRCZGNEugPuBApINFMUJPI=;
 b=v7nGXgvceZauoiroQ5C1BTvb4JmA2VtBaBCBmGce2IZajSxdmj+A+6Eo4XNOMl9+tn
 absgO5sqdSLuAvd4TkPQ8L8mA4UmOF9NwM92JLExPAvuj2TdeDgVF2jAd/MX+fnID4ao
 PzSWFx3oGlUCx1xILyQszVfUlA3val0LALi6A2hIlawvWWP8QWRFYQeinlhCgET9k2Z3
 L+GXer2+LjtQ/XpGBG4r39KFgaBPdt2OxvYvcAHGZB09hBu/ZCPjQrtkNvtMDOCdmtw3
 4iriTdmzQm8DSP4YTq+uk31toPgyS14Z5Vc6D3BpvhsAOkVNB/5Chb+OXwR5+wDvlSXH
 kwsA==
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=7JCjtS3iuX6LFH/2brU8boRCZGNEugPuBApINFMUJPI=;
 b=XCGCS6xOfInhNK8PFiKXracZFCvJqvErCSC5CnukHn8bE9u8UrnQfTVmGFyOhgkWJn
 NnTJOBw77ND9ZIy2DWW4rOvlNOR8dDA2xGsSYwBW7MWmgx8TdNLu0Q63E6Nd3NL4F+gr
 luz3iSo69xqow0s85ip+91Q/tEdX3bDFX4oigELuEzvwwX+cz59eH7MdPg7oBHP45aru
 TIedxX8bheRbK2F4ibc4VldGWieRbi1mO0zzATQoiHwD5cZMdg1BjYAGTQmFe+sDcZCU
 AUY4z1SaBJnLF4LvHSkGcdXMIbXBH2RnqGieRVI38xMy0fL/Jggp0lbOdC1M4b6vey9C
 WOOw==
X-Gm-Message-State: APjAAAVlgecwQ+f6jGdFcUU+mmLgPlhxxevZohcFcJILBA5HUQvBt8wb
 SxH0t9uqlRcQ5aebTmgIKgwIHQwA+Yg=
X-Google-Smtp-Source: 
 APXvYqxmTN7k0288RjXc2Q6lDfgbG0voUGoxhM2bn1cearFEx9nH+UFAxXS7HcVMxJwi3QprXg+q4w==
X-Received: by 2002:a17:902:41:: with SMTP id 59mr8858013pla.39.1579661409648;
 Tue, 21 Jan 2020 18:50:09 -0800 (PST)
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 11/16] cputlb: Hoist tlb portions in
 tlb_flush_one_mmuidx_locked
Date: Tue, 21 Jan 2020 16:49:41 -1000
Message-Id: <20200122024946.28484-12-richard.henderson@linaro.org>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20200122024946.28484-1-richard.henderson@linaro.org>
References: <20200122024946.28484-1-richard.henderson@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
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::642
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: peter.maydell@linaro.org, Alistair Francis <alistair.francis@wdc.com>,
 =?UTF-8?q?Alex=20Benn=C3=A9e?= <alex.bennee@linaro.org>,
 =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: fail (Header signature does not verify)

No functional change, but the smaller expressions make
the code easier to read.

Reviewed-by: Alex Benn=C3=A9e <alex.bennee@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daud=C3=A9 <philmd@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 accel/tcg/cputlb.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index 5252bcb949..bffca0e7e7 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -230,15 +230,16 @@ static void tlb_mmu_resize_locked(CPUTLBDesc *desc, C=
PUTLBDescFast *fast)
=20
 static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)
 {
-    tlb_mmu_resize_locked(&env_tlb(env)->d[mmu_idx], &env_tlb(env)->f[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_tlb(env)->f[mmu_idx]));
-    memset(env_tlb(env)->d[mmu_idx].vtable, -1,
-           sizeof(env_tlb(env)->d[0].vtable));
+    CPUTLBDesc *desc =3D &env_tlb(env)->d[mmu_idx];
+    CPUTLBDescFast *fast =3D &env_tlb(env)->f[mmu_idx];
+
+    tlb_mmu_resize_locked(desc, fast);
+    desc->n_used_entries =3D 0;
+    desc->large_page_addr =3D -1;
+    desc->large_page_mask =3D -1;
+    desc->vindex =3D 0;
+    memset(fast->table, -1, sizeof_tlb(fast));
+    memset(desc->vtable, -1, sizeof(desc->vtable));
 }
=20
 static inline void tlb_n_used_entries_inc(CPUArchState *env, uintptr_t mmu=
_idx)
--=20
2.20.1