The following changes since commit 3e08b2b9cb64bff2b73fa9128c0e49bfcde0dd40:

Merge remote-tracking branch 'remotes/philmd-gitlab/tags/edk2-next-20200121' into staging (2020-01-21 15:29:25 +0000)

https://github.com/rth7680/qemu.git tags/pull-tcg-20200121

for you to fetch changes up to 75fa376cdab5e5db2c7fdd107358e16f95503ac6:

scripts/git.orderfile: Display decodetree before C source (2020-01-21 15:26:09 -1000)

Remove another limit to NB_MMU_MODES.

Fix compilation using uclibc.

Fix defaulting of -accel parameters.

Tidy cputlb basic routines.

Adjust git.orderfile for decodetree.

Carlos Santos (1):

util/cacheinfo: fix crash when compiling with uClibc

Philippe Mathieu-Daudé (1):

scripts/git.orderfile: Display decodetree before C source

From: Philippe Mathieu-Daudé <philmd@redhat.com>

To avoid scrolling each instruction when reviewing tcg

helpers written for the decodetree script, display the

.decode files (similar to header declarations) before

the C source (implementation of previous declarations).

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

Message-Id: <20191230082856.30556-1-philmd@redhat.com>

scripts/git.orderfile | 3 +++

1 file changed, 3 insertions(+)

diff --git a/scripts/git.orderfile b/scripts/git.orderfile

--- a/scripts/git.orderfile

+++ b/scripts/git.orderfile

@@ -XXX,XX +XXX,XX @@ qga/*.json

# headers

*.h

+# decoding tree specification

+*.decode

+

# code

*.c

Do not call get_clock_realtime() in tlb_mmu_resize_locked,

but hoist outside of any loop over a set of tlbs. This is

only two (indirect) callers, tlb_flush_by_mmuidx_async_work

and tlb_flush_page_locked, so not onerous.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

accel/tcg/cputlb.c | 14 ++++++++------

1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c

--- a/accel/tcg/cputlb.c

+++ b/accel/tcg/cputlb.c

@@ -XXX,XX +XXX,XX @@ static void tlb_window_reset(CPUTLBDesc *desc, int64_t ns,

* high), since otherwise we are likely to have a significant amount of

* conflict misses.

*/

-static void tlb_mmu_resize_locked(CPUTLBDesc *desc, CPUTLBDescFast *fast)

+static void tlb_mmu_resize_locked(CPUTLBDesc *desc, CPUTLBDescFast *fast,

+ int64_t now)

size_t old_size = tlb_n_entries(fast);

size_t rate;

size_t new_size = old_size;

- 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;

@@ -XXX,XX +XXX,XX @@ static void tlb_mmu_flush_locked(CPUTLBDesc *desc, CPUTLBDescFast *fast)

memset(desc->vtable, -1, sizeof(desc->vtable));

-static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)

+static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx,

+ int64_t now)

{

CPUTLBDesc *desc = &env_tlb(env)->d[mmu_idx];

CPUTLBDescFast *fast = &env_tlb(env)->f[mmu_idx];

- tlb_mmu_resize_locked(desc, fast);

+ tlb_mmu_resize_locked(desc, fast, now);

tlb_mmu_flush_locked(desc, fast);

}

@@ -XXX,XX +XXX,XX @@ static void tlb_flush_by_mmuidx_async_work(CPUState *cpu, run_on_cpu_data data)

CPUArchState *env = cpu->env_ptr;

uint16_t asked = data.host_int;

uint16_t all_dirty, work, to_clean;

+ int64_t now = get_clock_realtime();

assert_cpu_is_self(cpu);

@@ -XXX,XX +XXX,XX @@ static void tlb_flush_by_mmuidx_async_work(CPUState *cpu, run_on_cpu_data data)

for (work = to_clean; work != 0; work &= work - 1) {

int mmu_idx = ctz32(work);

- tlb_flush_one_mmuidx_locked(env, mmu_idx);

+ tlb_flush_one_mmuidx_locked(env, mmu_idx, now);

}

qemu_spin_unlock(&env_tlb(env)->c.lock);

@@ -XXX,XX +XXX,XX @@ static void tlb_flush_page_locked(CPUArchState *env, int midx,

tlb_debug("forcing full flush midx %d ("

TARGET_FMT_lx "/" TARGET_FMT_lx ")\n",

midx, lp_addr, lp_mask);

- tlb_flush_one_mmuidx_locked(env, midx);

+ tlb_flush_one_mmuidx_locked(env, midx, get_clock_realtime());

} else {

if (tlb_flush_entry_locked(tlb_entry(env, midx, page), page)) {

tlb_n_used_entries_dec(env, midx);

We will want to be able to flush a tlb without resizing.

accel/tcg/cputlb.c | 15 ++++++++++-----

1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c

--- a/accel/tcg/cputlb.c

+++ b/accel/tcg/cputlb.c

@@ -XXX,XX +XXX,XX @@ static void tlb_mmu_resize_locked(CPUTLBDesc *desc, CPUTLBDescFast *fast)

}

}

-static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)

+static void tlb_mmu_flush_locked(CPUTLBDesc *desc, CPUTLBDescFast *fast)

{

- CPUTLBDesc *desc = &env_tlb(env)->d[mmu_idx];

- CPUTLBDescFast *fast = &env_tlb(env)->f[mmu_idx];

- tlb_mmu_resize_locked(desc, fast);

desc->n_used_entries = 0;

desc->large_page_addr = -1;

desc->large_page_mask = -1;

@@ -XXX,XX +XXX,XX @@ static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)

memset(desc->vtable, -1, sizeof(desc->vtable));

}

+static void tlb_flush_one_mmuidx_locked(CPUArchState *env, int mmu_idx)

+{

+ CPUTLBDesc *desc = &env_tlb(env)->d[mmu_idx];

+ CPUTLBDescFast *fast = &env_tlb(env)->f[mmu_idx];

+

+ tlb_mmu_resize_locked(desc, fast);

+ tlb_mmu_flush_locked(desc, fast);

+}

+

static inline void tlb_n_used_entries_inc(CPUArchState *env, uintptr_t mmu_idx)

{

env_tlb(env)->d[mmu_idx].n_used_entries++;