From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org,
"Alistair Francis" <alistair.francis@wdc.com>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PULL 07/16] cputlb: Merge tlb_table_flush_by_mmuidx into tlb_flush_one_mmuidx_locked
Date: Tue, 21 Jan 2020 16:49:37 -1000 [thread overview]
Message-ID: <20200122024946.28484-8-richard.henderson@linaro.org> (raw)
In-Reply-To: <20200122024946.28484-1-richard.henderson@linaro.org>
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.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
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 02b381cf50..3a4881cf69 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)
}
}
-static inline void tlb_table_flush_by_mmuidx(CPUArchState *env, int mmu_idx)
+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 = 0;
+ env_tlb(env)->d[mmu_idx].large_page_addr = -1;
+ env_tlb(env)->d[mmu_idx].large_page_mask = -1;
+ env_tlb(env)->d[mmu_idx].vindex = 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));
}
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, size_t *pelide)
*pelide = elide;
}
-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 = -1;
- env_tlb(env)->d[mmu_idx].large_page_mask = -1;
- env_tlb(env)->d[mmu_idx].vindex = 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 = cpu->env_ptr;
--
2.20.1
next prev parent reply other threads:[~2020-01-22 2:52 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-22 2:49 [PULL 00/16] tcg patch queue Richard Henderson
2020-01-22 2:49 ` [PULL 01/16] cputlb: Handle NB_MMU_MODES > TARGET_PAGE_BITS_MIN Richard Henderson
2020-01-22 2:49 ` [PULL 02/16] util/cacheinfo: fix crash when compiling with uClibc Richard Henderson
2020-01-22 2:49 ` [PULL 03/16] vl: Remove unused variable in configure_accelerators Richard Henderson
2020-01-22 2:49 ` [PULL 04/16] vl: Reduce scope of variables " Richard Henderson
2020-01-22 2:49 ` [PULL 05/16] vl: Remove useless test " Richard Henderson
2020-01-22 2:49 ` [PULL 06/16] vl: Only choose enabled accelerators " Richard Henderson
2020-01-22 2:49 ` Richard Henderson [this message]
2020-01-22 2:49 ` [PULL 08/16] cputlb: Make tlb_n_entries private to cputlb.c Richard Henderson
2020-01-22 2:49 ` [PULL 09/16] cputlb: Pass CPUTLBDescFast to tlb_n_entries and sizeof_tlb Richard Henderson
2020-01-22 2:49 ` [PULL 10/16] cputlb: Hoist tlb portions in tlb_mmu_resize_locked Richard Henderson
2020-01-22 2:49 ` [PULL 11/16] cputlb: Hoist tlb portions in tlb_flush_one_mmuidx_locked Richard Henderson
2020-01-22 2:49 ` [PULL 12/16] cputlb: Split out tlb_mmu_flush_locked Richard Henderson
2020-01-22 2:49 ` [PULL 13/16] cputlb: Partially merge tlb_dyn_init into tlb_init Richard Henderson
2020-01-22 2:49 ` [PULL 14/16] cputlb: Initialize tlbs as flushed Richard Henderson
2020-01-22 2:49 ` [PULL 15/16] cputlb: Hoist timestamp outside of loops over tlbs Richard Henderson
2020-01-22 2:49 ` [PULL 16/16] scripts/git.orderfile: Display decodetree before C source Richard Henderson
2020-01-23 13:41 ` [PULL 00/16] tcg patch queue Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200122024946.28484-8-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=alistair.francis@wdc.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).