9fd9b7de61
In commit f7b78602fdc6c6e4be we added the CPU cluster number to the
cflags field of the TB hash; this included adding it to the value
kept in tb->cflags, since we pass that field directly into the hash
calculation in some places. Unfortunately we forgot to check whether
other parts of the code were doing comparisons against tb->cflags
that would need to be updated.
It turns out that there is exactly one such place: the
tb_lookup__cpu_state() function checks whether the TB it has
found in the tb_jmp_cache has a tb->cflags matching the cf_mask
that is passed in. The tb->cflags has the cluster_index in it
but the cf_mask does not.
Hoist the "add cluster index to the cf_mask" code up from
tb_htable_lookup() to tb_lookup__cpu_state() so it can be considered
in the "did this TB match in the jmp cache" condition, as well as
when we do the full hash lookup by physical PC, flags, etc.
(tb_htable_lookup() is only called from tb_lookup__cpu_state(),
so this change doesn't require any further knock-on changes.)
Fixes: f7b78602fdc6c6e4be ("accel/tcg: Add cluster number to TCG TB hash")
Tested-by: Cleber Rosa <crosa@redhat.com>
Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reported-by: Howard Spoelstra <hsp.cat7@gmail.com>
Reported-by: Cleber Rosa <crosa@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20190205151810.571-1-peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
52 lines
1.4 KiB
C
52 lines
1.4 KiB
C
/*
|
|
* Copyright (C) 2017, Emilio G. Cota <cota@braap.org>
|
|
*
|
|
* License: GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*/
|
|
#ifndef EXEC_TB_LOOKUP_H
|
|
#define EXEC_TB_LOOKUP_H
|
|
|
|
#ifdef NEED_CPU_H
|
|
#include "cpu.h"
|
|
#else
|
|
#include "exec/poison.h"
|
|
#endif
|
|
|
|
#include "exec/exec-all.h"
|
|
#include "exec/tb-hash.h"
|
|
|
|
/* Might cause an exception, so have a longjmp destination ready */
|
|
static inline TranslationBlock *
|
|
tb_lookup__cpu_state(CPUState *cpu, target_ulong *pc, target_ulong *cs_base,
|
|
uint32_t *flags, uint32_t cf_mask)
|
|
{
|
|
CPUArchState *env = (CPUArchState *)cpu->env_ptr;
|
|
TranslationBlock *tb;
|
|
uint32_t hash;
|
|
|
|
cpu_get_tb_cpu_state(env, pc, cs_base, flags);
|
|
hash = tb_jmp_cache_hash_func(*pc);
|
|
tb = atomic_rcu_read(&cpu->tb_jmp_cache[hash]);
|
|
|
|
cf_mask &= ~CF_CLUSTER_MASK;
|
|
cf_mask |= cpu->cluster_index << CF_CLUSTER_SHIFT;
|
|
|
|
if (likely(tb &&
|
|
tb->pc == *pc &&
|
|
tb->cs_base == *cs_base &&
|
|
tb->flags == *flags &&
|
|
tb->trace_vcpu_dstate == *cpu->trace_dstate &&
|
|
(tb_cflags(tb) & (CF_HASH_MASK | CF_INVALID)) == cf_mask)) {
|
|
return tb;
|
|
}
|
|
tb = tb_htable_lookup(cpu, *pc, *cs_base, *flags, cf_mask);
|
|
if (tb == NULL) {
|
|
return NULL;
|
|
}
|
|
atomic_set(&cpu->tb_jmp_cache[hash], tb);
|
|
return tb;
|
|
}
|
|
|
|
#endif /* EXEC_TB_LOOKUP_H */
|