From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Richard Henderson <richard.henderson@linaro.org>, qemu-devel@nongnu.org
Cc: alistair.francis@wdc.com
Subject: Re: [PATCH 4/9] cputlb: Hoist tlb portions in tlb_mmu_resize_locked
Date: Mon, 20 Jan 2020 09:58:08 +0100 [thread overview]
Message-ID: <3ca547aa-a710-84f2-262b-db29f4998d46@redhat.com> (raw)
In-Reply-To: <20200109024907.2730-5-richard.henderson@linaro.org>
On 1/9/20 3:49 AM, Richard Henderson wrote:
> No functional change, but the smaller expressions make
> the code easier to read.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> accel/tcg/cputlb.c | 35 +++++++++++++++++------------------
> 1 file changed, 17 insertions(+), 18 deletions(-)
>
> diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
> index 49c605b6d8..c7dc1dc85a 100644
> --- a/accel/tcg/cputlb.c
> +++ b/accel/tcg/cputlb.c
> @@ -115,8 +115,8 @@ static void tlb_dyn_init(CPUArchState *env)
>
> /**
> * tlb_mmu_resize_locked() - perform TLB resize bookkeeping; resize if necessary
> - * @env: CPU that owns the TLB
> - * @mmu_idx: MMU index of the TLB
> + * @desc: The CPUTLBDesc portion of the TLB
> + * @fast: The CPUTLBDescFast portion of the same TLB
> *
> * Called with tlb_lock_held.
> *
> @@ -153,10 +153,9 @@ static void tlb_dyn_init(CPUArchState *env)
> * high), since otherwise we are likely to have a significant amount of
> * conflict misses.
> */
> -static void tlb_mmu_resize_locked(CPUArchState *env, int mmu_idx)
> +static void tlb_mmu_resize_locked(CPUTLBDesc *desc, CPUTLBDescFast *fast)
> {
> - CPUTLBDesc *desc = &env_tlb(env)->d[mmu_idx];
> - size_t old_size = tlb_n_entries(&env_tlb(env)->f[mmu_idx]);
> + size_t old_size = tlb_n_entries(fast);
> size_t rate;
> size_t new_size = old_size;
> int64_t now = get_clock_realtime();
> @@ -198,14 +197,15 @@ static void tlb_mmu_resize_locked(CPUArchState *env, int mmu_idx)
> return;
> }
>
> - g_free(env_tlb(env)->f[mmu_idx].table);
> - g_free(env_tlb(env)->d[mmu_idx].iotlb);
> + g_free(fast->table);
> + g_free(desc->iotlb);
>
> tlb_window_reset(desc, now, 0);
> /* desc->n_used_entries is cleared by the caller */
> - env_tlb(env)->f[mmu_idx].mask = (new_size - 1) << CPU_TLB_ENTRY_BITS;
> - env_tlb(env)->f[mmu_idx].table = g_try_new(CPUTLBEntry, new_size);
> - env_tlb(env)->d[mmu_idx].iotlb = g_try_new(CPUIOTLBEntry, new_size);
> + fast->mask = (new_size - 1) << CPU_TLB_ENTRY_BITS;
> + fast->table = g_try_new(CPUTLBEntry, new_size);
> + desc->iotlb = g_try_new(CPUIOTLBEntry, new_size);
> +
> /*
> * If the allocations fail, try smaller sizes. We just freed some
> * memory, so going back to half of new_size has a good chance of working.
> @@ -213,25 +213,24 @@ static void tlb_mmu_resize_locked(CPUArchState *env, int mmu_idx)
> * allocations to fail though, so we progressively reduce the allocation
> * size, aborting if we cannot even allocate the smallest TLB we support.
> */
> - while (env_tlb(env)->f[mmu_idx].table == NULL ||
> - env_tlb(env)->d[mmu_idx].iotlb == NULL) {
> + while (fast->table == NULL || desc->iotlb == NULL) {
> if (new_size == (1 << CPU_TLB_DYN_MIN_BITS)) {
> error_report("%s: %s", __func__, strerror(errno));
> abort();
> }
> new_size = MAX(new_size >> 1, 1 << CPU_TLB_DYN_MIN_BITS);
> - env_tlb(env)->f[mmu_idx].mask = (new_size - 1) << CPU_TLB_ENTRY_BITS;
> + fast->mask = (new_size - 1) << CPU_TLB_ENTRY_BITS;
>
> - g_free(env_tlb(env)->f[mmu_idx].table);
> - g_free(env_tlb(env)->d[mmu_idx].iotlb);
> - env_tlb(env)->f[mmu_idx].table = g_try_new(CPUTLBEntry, new_size);
> - env_tlb(env)->d[mmu_idx].iotlb = g_try_new(CPUIOTLBEntry, new_size);
> + g_free(fast->table);
> + g_free(desc->iotlb);
> + fast->table = g_try_new(CPUTLBEntry, new_size);
> + desc->iotlb = g_try_new(CPUIOTLBEntry, new_size);
> }
> }
>
> static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)
> {
> - tlb_mmu_resize_locked(env, 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 = 0;
> env_tlb(env)->d[mmu_idx].large_page_addr = -1;
> env_tlb(env)->d[mmu_idx].large_page_mask = -1;
>
next prev parent reply other threads:[~2020-01-20 8:59 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-09 2:48 [PATCH 0/9] cputlb: Various cleanups Richard Henderson
2020-01-09 2:48 ` [PATCH 1/9] cputlb: Merge tlb_table_flush_by_mmuidx into tlb_flush_one_mmuidx_locked Richard Henderson
2020-01-20 0:34 ` Alistair Francis
2020-01-20 13:34 ` Alex Bennée
2020-01-09 2:49 ` [PATCH 2/9] cputlb: Make tlb_n_entries private to cputlb.c Richard Henderson
2020-01-20 0:36 ` Alistair Francis
2020-01-20 8:53 ` Philippe Mathieu-Daudé
2020-01-20 13:34 ` Alex Bennée
2020-01-09 2:49 ` [PATCH 3/9] cputlb: Pass CPUTLBDescFast to tlb_n_entries and sizeof_tlb Richard Henderson
2020-01-20 0:37 ` Alistair Francis
2020-01-20 8:54 ` Philippe Mathieu-Daudé
2020-01-20 13:36 ` Alex Bennée
2020-01-20 13:39 ` Alex Bennée
2020-01-09 2:49 ` [PATCH 4/9] cputlb: Hoist tlb portions in tlb_mmu_resize_locked Richard Henderson
2020-01-20 8:58 ` Philippe Mathieu-Daudé [this message]
2020-01-20 12:05 ` Alistair Francis
2020-01-20 13:40 ` Alex Bennée
2020-01-09 2:49 ` [PATCH 5/9] cputlb: Hoist tlb portions in tlb_flush_one_mmuidx_locked Richard Henderson
2020-01-20 8:58 ` Philippe Mathieu-Daudé
2020-01-20 13:41 ` Alex Bennée
2020-01-20 22:56 ` Alistair Francis
2020-01-09 2:49 ` [PATCH 6/9] cputlb: Split out tlb_mmu_flush_locked Richard Henderson
2020-01-20 8:59 ` Philippe Mathieu-Daudé
2020-01-20 13:41 ` Alex Bennée
2020-01-20 22:58 ` Alistair Francis
2020-01-09 2:49 ` [PATCH 7/9] cputlb: Partially merge tlb_dyn_init into tlb_init Richard Henderson
2020-01-20 9:01 ` Philippe Mathieu-Daudé
2020-01-20 14:33 ` Alex Bennée
2020-01-20 23:00 ` Alistair Francis
2020-01-09 2:49 ` [PATCH 8/9] cputlb: Initialize tlbs as flushed Richard Henderson
2020-01-20 14:33 ` Alex Bennée
2020-01-20 23:01 ` Alistair Francis
2020-01-09 2:49 ` [PATCH 9/9] cputlb: Hoist timestamp outside of loops over tlbs Richard Henderson
2020-01-20 9:02 ` Philippe Mathieu-Daudé
2020-01-20 14:36 ` Alex Bennée
2020-01-20 23:02 ` Alistair Francis
2020-01-20 23:03 ` [PATCH 0/9] cputlb: Various cleanups Alistair Francis
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=3ca547aa-a710-84f2-262b-db29f4998d46@redhat.com \
--to=philmd@redhat.com \
--cc=alistair.francis@wdc.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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).