mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-07-21 10:24:33 +00:00
-----BEGIN PGP SIGNATURE-----
iQEcBAABAgAGBQJZbKllAAoJEJykq7OBq3PIULAIAIcsTIM8KzMJBF/L/IQKm/mz OjPYHqyVazCCfrlHTlPBZNKrAjEatsjoUevPB7bCRbpI4sg4pZODmeIz0RbnYBdk aR7AepJTzWKATPhJEuOJe0YlXqrsCnB+cByoulGw8HWQJ8aZyn6iQZJN98zSCO8j 38eB0URMAkdLBCPaxbhQ5EwJi40AL2bN5ogGc02NRzx0CdVU3UUEiDDZ+j3F+Iz3 yGmqfrDHR6kndBuBh8nxv3Bb9ahZ1g7KU9RT2u0i1YzPCwOXFn/AlelteM/yJrWb vrDfQOC9PQoow7KdsG22mlXoHZ3O4eiGMTK80uxUQsCBh9VVjUQJGIgulGtGAxc= =2mu5 -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging # gpg: Signature made Mon 17 Jul 2017 13:11:17 BST # gpg: using RSA key 0x9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha/tags/tracing-pull-request: trace: update old trace events in docs trace: [trivial] Statically enable all guest events trace: [tcg, trivial] Re-align generated code trace: [tcg] Do not generate TCG code to trace dynamically-disabled events exec: [tcg] Use different TBs according to the vCPU's dynamic tracing state trace: [tcg] Delay changes to dynamic state when translating trace: Allocate cpu->trace_dstate in place Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
5a477a7806
|
@ -280,6 +280,7 @@ struct tb_desc {
|
||||||
CPUArchState *env;
|
CPUArchState *env;
|
||||||
tb_page_addr_t phys_page1;
|
tb_page_addr_t phys_page1;
|
||||||
uint32_t flags;
|
uint32_t flags;
|
||||||
|
uint32_t trace_vcpu_dstate;
|
||||||
};
|
};
|
||||||
|
|
||||||
static bool tb_cmp(const void *p, const void *d)
|
static bool tb_cmp(const void *p, const void *d)
|
||||||
|
@ -291,6 +292,7 @@ static bool tb_cmp(const void *p, const void *d)
|
||||||
tb->page_addr[0] == desc->phys_page1 &&
|
tb->page_addr[0] == desc->phys_page1 &&
|
||||||
tb->cs_base == desc->cs_base &&
|
tb->cs_base == desc->cs_base &&
|
||||||
tb->flags == desc->flags &&
|
tb->flags == desc->flags &&
|
||||||
|
tb->trace_vcpu_dstate == desc->trace_vcpu_dstate &&
|
||||||
!atomic_read(&tb->invalid)) {
|
!atomic_read(&tb->invalid)) {
|
||||||
/* check next page if needed */
|
/* check next page if needed */
|
||||||
if (tb->page_addr[1] == -1) {
|
if (tb->page_addr[1] == -1) {
|
||||||
|
@ -319,10 +321,11 @@ TranslationBlock *tb_htable_lookup(CPUState *cpu, target_ulong pc,
|
||||||
desc.env = (CPUArchState *)cpu->env_ptr;
|
desc.env = (CPUArchState *)cpu->env_ptr;
|
||||||
desc.cs_base = cs_base;
|
desc.cs_base = cs_base;
|
||||||
desc.flags = flags;
|
desc.flags = flags;
|
||||||
|
desc.trace_vcpu_dstate = *cpu->trace_dstate;
|
||||||
desc.pc = pc;
|
desc.pc = pc;
|
||||||
phys_pc = get_page_addr_code(desc.env, pc);
|
phys_pc = get_page_addr_code(desc.env, pc);
|
||||||
desc.phys_page1 = phys_pc & TARGET_PAGE_MASK;
|
desc.phys_page1 = phys_pc & TARGET_PAGE_MASK;
|
||||||
h = tb_hash_func(phys_pc, pc, flags);
|
h = tb_hash_func(phys_pc, pc, flags, *cpu->trace_dstate);
|
||||||
return qht_lookup(&tcg_ctx.tb_ctx.htable, tb_cmp, &desc, h);
|
return qht_lookup(&tcg_ctx.tb_ctx.htable, tb_cmp, &desc, h);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -342,7 +345,8 @@ static inline TranslationBlock *tb_find(CPUState *cpu,
|
||||||
cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags);
|
cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags);
|
||||||
tb = atomic_rcu_read(&cpu->tb_jmp_cache[tb_jmp_cache_hash_func(pc)]);
|
tb = atomic_rcu_read(&cpu->tb_jmp_cache[tb_jmp_cache_hash_func(pc)]);
|
||||||
if (unlikely(!tb || tb->pc != pc || tb->cs_base != cs_base ||
|
if (unlikely(!tb || tb->pc != pc || tb->cs_base != cs_base ||
|
||||||
tb->flags != flags)) {
|
tb->flags != flags ||
|
||||||
|
tb->trace_vcpu_dstate != *cpu->trace_dstate)) {
|
||||||
tb = tb_htable_lookup(cpu, pc, cs_base, flags);
|
tb = tb_htable_lookup(cpu, pc, cs_base, flags);
|
||||||
if (!tb) {
|
if (!tb) {
|
||||||
|
|
||||||
|
|
|
@ -54,6 +54,7 @@
|
||||||
#include "exec/tb-hash.h"
|
#include "exec/tb-hash.h"
|
||||||
#include "translate-all.h"
|
#include "translate-all.h"
|
||||||
#include "qemu/bitmap.h"
|
#include "qemu/bitmap.h"
|
||||||
|
#include "qemu/error-report.h"
|
||||||
#include "qemu/timer.h"
|
#include "qemu/timer.h"
|
||||||
#include "qemu/main-loop.h"
|
#include "qemu/main-loop.h"
|
||||||
#include "exec/log.h"
|
#include "exec/log.h"
|
||||||
|
@ -112,6 +113,11 @@ typedef struct PageDesc {
|
||||||
#define V_L2_BITS 10
|
#define V_L2_BITS 10
|
||||||
#define V_L2_SIZE (1 << V_L2_BITS)
|
#define V_L2_SIZE (1 << V_L2_BITS)
|
||||||
|
|
||||||
|
/* Make sure all possible CPU event bits fit in tb->trace_vcpu_dstate */
|
||||||
|
QEMU_BUILD_BUG_ON(CPU_TRACE_DSTATE_MAX_EVENTS >
|
||||||
|
sizeof(((TranslationBlock *)0)->trace_vcpu_dstate)
|
||||||
|
* BITS_PER_BYTE);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* L1 Mapping properties
|
* L1 Mapping properties
|
||||||
*/
|
*/
|
||||||
|
@ -1071,7 +1077,7 @@ void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr)
|
||||||
|
|
||||||
/* remove the TB from the hash list */
|
/* remove the TB from the hash list */
|
||||||
phys_pc = tb->page_addr[0] + (tb->pc & ~TARGET_PAGE_MASK);
|
phys_pc = tb->page_addr[0] + (tb->pc & ~TARGET_PAGE_MASK);
|
||||||
h = tb_hash_func(phys_pc, tb->pc, tb->flags);
|
h = tb_hash_func(phys_pc, tb->pc, tb->flags, tb->trace_vcpu_dstate);
|
||||||
qht_remove(&tcg_ctx.tb_ctx.htable, tb, h);
|
qht_remove(&tcg_ctx.tb_ctx.htable, tb, h);
|
||||||
|
|
||||||
/* remove the TB from the page list */
|
/* remove the TB from the page list */
|
||||||
|
@ -1216,7 +1222,7 @@ static void tb_link_page(TranslationBlock *tb, tb_page_addr_t phys_pc,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* add in the hash table */
|
/* add in the hash table */
|
||||||
h = tb_hash_func(phys_pc, tb->pc, tb->flags);
|
h = tb_hash_func(phys_pc, tb->pc, tb->flags, tb->trace_vcpu_dstate);
|
||||||
qht_insert(&tcg_ctx.tb_ctx.htable, tb, h);
|
qht_insert(&tcg_ctx.tb_ctx.htable, tb, h);
|
||||||
|
|
||||||
#ifdef DEBUG_TB_CHECK
|
#ifdef DEBUG_TB_CHECK
|
||||||
|
@ -1262,6 +1268,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu,
|
||||||
tb->cs_base = cs_base;
|
tb->cs_base = cs_base;
|
||||||
tb->flags = flags;
|
tb->flags = flags;
|
||||||
tb->cflags = cflags;
|
tb->cflags = cflags;
|
||||||
|
tb->trace_vcpu_dstate = *cpu->trace_dstate;
|
||||||
tb->invalid = false;
|
tb->invalid = false;
|
||||||
|
|
||||||
#ifdef CONFIG_PROFILER
|
#ifdef CONFIG_PROFILER
|
||||||
|
|
|
@ -14,8 +14,7 @@ for debugging, profiling, and observing execution.
|
||||||
|
|
||||||
2. Create a file with the events you want to trace:
|
2. Create a file with the events you want to trace:
|
||||||
|
|
||||||
echo bdrv_aio_readv > /tmp/events
|
echo memory_region_ops_read >/tmp/events
|
||||||
echo bdrv_aio_writev >> /tmp/events
|
|
||||||
|
|
||||||
3. Run the virtual machine to produce a trace file:
|
3. Run the virtual machine to produce a trace file:
|
||||||
|
|
||||||
|
|
|
@ -330,6 +330,9 @@ struct TranslationBlock {
|
||||||
#define CF_USE_ICOUNT 0x20000
|
#define CF_USE_ICOUNT 0x20000
|
||||||
#define CF_IGNORE_ICOUNT 0x40000 /* Do not generate icount code */
|
#define CF_IGNORE_ICOUNT 0x40000 /* Do not generate icount code */
|
||||||
|
|
||||||
|
/* Per-vCPU dynamic tracing state used to generate this TB */
|
||||||
|
uint32_t trace_vcpu_dstate;
|
||||||
|
|
||||||
uint16_t invalid;
|
uint16_t invalid;
|
||||||
|
|
||||||
void *tc_ptr; /* pointer to the translated code */
|
void *tc_ptr; /* pointer to the translated code */
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
* contiguous in memory.
|
* contiguous in memory.
|
||||||
*/
|
*/
|
||||||
static inline
|
static inline
|
||||||
uint32_t tb_hash_func5(uint64_t a0, uint64_t b0, uint32_t e)
|
uint32_t tb_hash_func6(uint64_t a0, uint64_t b0, uint32_t e, uint32_t f)
|
||||||
{
|
{
|
||||||
uint32_t v1 = TB_HASH_XX_SEED + PRIME32_1 + PRIME32_2;
|
uint32_t v1 = TB_HASH_XX_SEED + PRIME32_1 + PRIME32_2;
|
||||||
uint32_t v2 = TB_HASH_XX_SEED + PRIME32_2;
|
uint32_t v2 = TB_HASH_XX_SEED + PRIME32_2;
|
||||||
|
@ -78,11 +78,14 @@ uint32_t tb_hash_func5(uint64_t a0, uint64_t b0, uint32_t e)
|
||||||
v4 *= PRIME32_1;
|
v4 *= PRIME32_1;
|
||||||
|
|
||||||
h32 = rol32(v1, 1) + rol32(v2, 7) + rol32(v3, 12) + rol32(v4, 18);
|
h32 = rol32(v1, 1) + rol32(v2, 7) + rol32(v3, 12) + rol32(v4, 18);
|
||||||
h32 += 20;
|
h32 += 24;
|
||||||
|
|
||||||
h32 += e * PRIME32_3;
|
h32 += e * PRIME32_3;
|
||||||
h32 = rol32(h32, 17) * PRIME32_4;
|
h32 = rol32(h32, 17) * PRIME32_4;
|
||||||
|
|
||||||
|
h32 += f * PRIME32_3;
|
||||||
|
h32 = rol32(h32, 17) * PRIME32_4;
|
||||||
|
|
||||||
h32 ^= h32 >> 15;
|
h32 ^= h32 >> 15;
|
||||||
h32 *= PRIME32_2;
|
h32 *= PRIME32_2;
|
||||||
h32 ^= h32 >> 13;
|
h32 ^= h32 >> 13;
|
||||||
|
|
|
@ -58,9 +58,10 @@ static inline unsigned int tb_jmp_cache_hash_func(target_ulong pc)
|
||||||
#endif /* CONFIG_SOFTMMU */
|
#endif /* CONFIG_SOFTMMU */
|
||||||
|
|
||||||
static inline
|
static inline
|
||||||
uint32_t tb_hash_func(tb_page_addr_t phys_pc, target_ulong pc, uint32_t flags)
|
uint32_t tb_hash_func(tb_page_addr_t phys_pc, target_ulong pc, uint32_t flags,
|
||||||
|
uint32_t trace_vcpu_dstate)
|
||||||
{
|
{
|
||||||
return tb_hash_func5(phys_pc, pc, flags);
|
return tb_hash_func6(phys_pc, pc, flags, trace_vcpu_dstate);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -259,6 +259,7 @@ typedef void (*run_on_cpu_func)(CPUState *cpu, run_on_cpu_data data);
|
||||||
struct qemu_work_item;
|
struct qemu_work_item;
|
||||||
|
|
||||||
#define CPU_UNSET_NUMA_NODE_ID -1
|
#define CPU_UNSET_NUMA_NODE_ID -1
|
||||||
|
#define CPU_TRACE_DSTATE_MAX_EVENTS 32
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* CPUState:
|
* CPUState:
|
||||||
|
@ -301,6 +302,8 @@ struct qemu_work_item;
|
||||||
* @kvm_fd: vCPU file descriptor for KVM.
|
* @kvm_fd: vCPU file descriptor for KVM.
|
||||||
* @work_mutex: Lock to prevent multiple access to queued_work_*.
|
* @work_mutex: Lock to prevent multiple access to queued_work_*.
|
||||||
* @queued_work_first: First asynchronous work pending.
|
* @queued_work_first: First asynchronous work pending.
|
||||||
|
* @trace_dstate_delayed: Delayed changes to trace_dstate (includes all changes
|
||||||
|
* to @trace_dstate).
|
||||||
* @trace_dstate: Dynamic tracing state of events for this vCPU (bitmask).
|
* @trace_dstate: Dynamic tracing state of events for this vCPU (bitmask).
|
||||||
*
|
*
|
||||||
* State of one CPU core or thread.
|
* State of one CPU core or thread.
|
||||||
|
@ -370,12 +373,9 @@ struct CPUState {
|
||||||
struct KVMState *kvm_state;
|
struct KVMState *kvm_state;
|
||||||
struct kvm_run *kvm_run;
|
struct kvm_run *kvm_run;
|
||||||
|
|
||||||
/*
|
/* Used for events with 'vcpu' and *without* the 'disabled' properties */
|
||||||
* Used for events with 'vcpu' and *without* the 'disabled' properties.
|
DECLARE_BITMAP(trace_dstate_delayed, CPU_TRACE_DSTATE_MAX_EVENTS);
|
||||||
* Dynamically allocated based on bitmap requried to hold up to
|
DECLARE_BITMAP(trace_dstate, CPU_TRACE_DSTATE_MAX_EVENTS);
|
||||||
* trace_get_vcpu_event_count() entries.
|
|
||||||
*/
|
|
||||||
unsigned long *trace_dstate;
|
|
||||||
|
|
||||||
/* TODO Move common fields from CPUArchState here. */
|
/* TODO Move common fields from CPUArchState here. */
|
||||||
int cpu_index; /* used by alpha TCG */
|
int cpu_index; /* used by alpha TCG */
|
||||||
|
|
|
@ -380,7 +380,6 @@ static void cpu_common_unrealizefn(DeviceState *dev, Error **errp)
|
||||||
|
|
||||||
static void cpu_common_initfn(Object *obj)
|
static void cpu_common_initfn(Object *obj)
|
||||||
{
|
{
|
||||||
uint32_t count;
|
|
||||||
CPUState *cpu = CPU(obj);
|
CPUState *cpu = CPU(obj);
|
||||||
CPUClass *cc = CPU_GET_CLASS(obj);
|
CPUClass *cc = CPU_GET_CLASS(obj);
|
||||||
|
|
||||||
|
@ -395,18 +394,11 @@ static void cpu_common_initfn(Object *obj)
|
||||||
QTAILQ_INIT(&cpu->breakpoints);
|
QTAILQ_INIT(&cpu->breakpoints);
|
||||||
QTAILQ_INIT(&cpu->watchpoints);
|
QTAILQ_INIT(&cpu->watchpoints);
|
||||||
|
|
||||||
count = trace_get_vcpu_event_count();
|
|
||||||
if (count) {
|
|
||||||
cpu->trace_dstate = bitmap_new(count);
|
|
||||||
}
|
|
||||||
|
|
||||||
cpu_exec_initfn(cpu);
|
cpu_exec_initfn(cpu);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void cpu_common_finalize(Object *obj)
|
static void cpu_common_finalize(Object *obj)
|
||||||
{
|
{
|
||||||
CPUState *cpu = CPU(obj);
|
|
||||||
g_free(cpu->trace_dstate);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int64_t cpu_common_get_arch_id(CPUState *cpu)
|
static int64_t cpu_common_get_arch_id(CPUState *cpu)
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
"""
|
"""
|
||||||
|
|
||||||
__author__ = "Lluís Vilanova <vilanova@ac.upc.edu>"
|
__author__ = "Lluís Vilanova <vilanova@ac.upc.edu>"
|
||||||
__copyright__ = "Copyright 2012-2016, Lluís Vilanova <vilanova@ac.upc.edu>"
|
__copyright__ = "Copyright 2012-2017, Lluís Vilanova <vilanova@ac.upc.edu>"
|
||||||
__license__ = "GPL version 2 or (at your option) any later version"
|
__license__ = "GPL version 2 or (at your option) any later version"
|
||||||
|
|
||||||
__maintainer__ = "Stefan Hajnoczi"
|
__maintainer__ = "Stefan Hajnoczi"
|
||||||
|
@ -268,6 +268,7 @@ def formats(self):
|
||||||
return self._FMT.findall(self.fmt)
|
return self._FMT.findall(self.fmt)
|
||||||
|
|
||||||
QEMU_TRACE = "trace_%(name)s"
|
QEMU_TRACE = "trace_%(name)s"
|
||||||
|
QEMU_TRACE_NOCHECK = "_nocheck__" + QEMU_TRACE
|
||||||
QEMU_TRACE_TCG = QEMU_TRACE + "_tcg"
|
QEMU_TRACE_TCG = QEMU_TRACE + "_tcg"
|
||||||
QEMU_DSTATE = "_TRACE_%(NAME)s_DSTATE"
|
QEMU_DSTATE = "_TRACE_%(NAME)s_DSTATE"
|
||||||
QEMU_EVENT = "_TRACE_%(NAME)s_EVENT"
|
QEMU_EVENT = "_TRACE_%(NAME)s_EVENT"
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
"""
|
"""
|
||||||
|
|
||||||
__author__ = "Lluís Vilanova <vilanova@ac.upc.edu>"
|
__author__ = "Lluís Vilanova <vilanova@ac.upc.edu>"
|
||||||
__copyright__ = "Copyright 2012-2016, Lluís Vilanova <vilanova@ac.upc.edu>"
|
__copyright__ = "Copyright 2012-2017, Lluís Vilanova <vilanova@ac.upc.edu>"
|
||||||
__license__ = "GPL version 2 or (at your option) any later version"
|
__license__ = "GPL version 2 or (at your option) any later version"
|
||||||
|
|
||||||
__maintainer__ = "Stefan Hajnoczi"
|
__maintainer__ = "Stefan Hajnoczi"
|
||||||
|
@ -46,6 +46,6 @@ def generate_h_begin(events, group):
|
||||||
|
|
||||||
|
|
||||||
def generate_h(event, group):
|
def generate_h(event, group):
|
||||||
out(' QEMU_%(uppername)s(%(argnames)s);',
|
out(' QEMU_%(uppername)s(%(argnames)s);',
|
||||||
uppername=event.name.upper(),
|
uppername=event.name.upper(),
|
||||||
argnames=", ".join(event.args.names()))
|
argnames=", ".join(event.args.names()))
|
||||||
|
|
|
@ -29,17 +29,17 @@ def generate_h(event, group):
|
||||||
if len(event.args) > 0:
|
if len(event.args) > 0:
|
||||||
argnames = ", " + argnames
|
argnames = ", " + argnames
|
||||||
|
|
||||||
out(' {',
|
out(' {',
|
||||||
' char ftrace_buf[MAX_TRACE_STRLEN];',
|
' char ftrace_buf[MAX_TRACE_STRLEN];',
|
||||||
' int unused __attribute__ ((unused));',
|
' int unused __attribute__ ((unused));',
|
||||||
' int trlen;',
|
' int trlen;',
|
||||||
' if (trace_event_get_state(%(event_id)s)) {',
|
' if (trace_event_get_state(%(event_id)s)) {',
|
||||||
' trlen = snprintf(ftrace_buf, MAX_TRACE_STRLEN,',
|
' trlen = snprintf(ftrace_buf, MAX_TRACE_STRLEN,',
|
||||||
' "%(name)s " %(fmt)s "\\n" %(argnames)s);',
|
' "%(name)s " %(fmt)s "\\n" %(argnames)s);',
|
||||||
' trlen = MIN(trlen, MAX_TRACE_STRLEN - 1);',
|
' trlen = MIN(trlen, MAX_TRACE_STRLEN - 1);',
|
||||||
' unused = write(trace_marker_fd, ftrace_buf, trlen);',
|
' unused = write(trace_marker_fd, ftrace_buf, trlen);',
|
||||||
' }',
|
|
||||||
' }',
|
' }',
|
||||||
|
' }',
|
||||||
name=event.name,
|
name=event.name,
|
||||||
args=event.args,
|
args=event.args,
|
||||||
event_id="TRACE_" + event.name.upper(),
|
event_id="TRACE_" + event.name.upper(),
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
"""
|
"""
|
||||||
|
|
||||||
__author__ = "Lluís Vilanova <vilanova@ac.upc.edu>"
|
__author__ = "Lluís Vilanova <vilanova@ac.upc.edu>"
|
||||||
__copyright__ = "Copyright 2012-2016, Lluís Vilanova <vilanova@ac.upc.edu>"
|
__copyright__ = "Copyright 2012-2017, Lluís Vilanova <vilanova@ac.upc.edu>"
|
||||||
__license__ = "GPL version 2 or (at your option) any later version"
|
__license__ = "GPL version 2 or (at your option) any later version"
|
||||||
|
|
||||||
__maintainer__ = "Stefan Hajnoczi"
|
__maintainer__ = "Stefan Hajnoczi"
|
||||||
|
@ -35,14 +35,15 @@ def generate_h(event, group):
|
||||||
else:
|
else:
|
||||||
cond = "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper())
|
cond = "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper())
|
||||||
|
|
||||||
out(' if (%(cond)s) {',
|
out(' if (%(cond)s) {',
|
||||||
' struct timeval _now;',
|
' struct timeval _now;',
|
||||||
' gettimeofday(&_now, NULL);',
|
' gettimeofday(&_now, NULL);',
|
||||||
' qemu_log_mask(LOG_TRACE, "%%d@%%zd.%%06zd:%(name)s " %(fmt)s "\\n",',
|
' qemu_log_mask(LOG_TRACE,',
|
||||||
' getpid(),',
|
' "%%d@%%zd.%%06zd:%(name)s " %(fmt)s "\\n",',
|
||||||
' (size_t)_now.tv_sec, (size_t)_now.tv_usec',
|
' getpid(),',
|
||||||
' %(argnames)s);',
|
' (size_t)_now.tv_sec, (size_t)_now.tv_usec',
|
||||||
' }',
|
' %(argnames)s);',
|
||||||
|
' }',
|
||||||
cond=cond,
|
cond=cond,
|
||||||
name=event.name,
|
name=event.name,
|
||||||
fmt=event.fmt.rstrip("\n"),
|
fmt=event.fmt.rstrip("\n"),
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
"""
|
"""
|
||||||
|
|
||||||
__author__ = "Lluís Vilanova <vilanova@ac.upc.edu>"
|
__author__ = "Lluís Vilanova <vilanova@ac.upc.edu>"
|
||||||
__copyright__ = "Copyright 2012-2014, Lluís Vilanova <vilanova@ac.upc.edu>"
|
__copyright__ = "Copyright 2012-2017, Lluís Vilanova <vilanova@ac.upc.edu>"
|
||||||
__license__ = "GPL version 2 or (at your option) any later version"
|
__license__ = "GPL version 2 or (at your option) any later version"
|
||||||
|
|
||||||
__maintainer__ = "Stefan Hajnoczi"
|
__maintainer__ = "Stefan Hajnoczi"
|
||||||
|
@ -37,7 +37,7 @@ def generate_h_begin(events, group):
|
||||||
|
|
||||||
|
|
||||||
def generate_h(event, group):
|
def generate_h(event, group):
|
||||||
out(' _simple_%(api)s(%(args)s);',
|
out(' _simple_%(api)s(%(args)s);',
|
||||||
api=event.api(),
|
api=event.api(),
|
||||||
args=", ".join(event.args.names()))
|
args=", ".join(event.args.names()))
|
||||||
|
|
||||||
|
|
|
@ -35,9 +35,9 @@ def generate_h(event, group):
|
||||||
else:
|
else:
|
||||||
cond = "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper())
|
cond = "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper())
|
||||||
|
|
||||||
out(' if (%(cond)s) {',
|
out(' if (%(cond)s) {',
|
||||||
' syslog(LOG_INFO, "%(name)s " %(fmt)s %(argnames)s);',
|
' syslog(LOG_INFO, "%(name)s " %(fmt)s %(argnames)s);',
|
||||||
' }',
|
' }',
|
||||||
cond=cond,
|
cond=cond,
|
||||||
name=event.name,
|
name=event.name,
|
||||||
fmt=event.fmt.rstrip("\n"),
|
fmt=event.fmt.rstrip("\n"),
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
"""
|
"""
|
||||||
|
|
||||||
__author__ = "Lluís Vilanova <vilanova@ac.upc.edu>"
|
__author__ = "Lluís Vilanova <vilanova@ac.upc.edu>"
|
||||||
__copyright__ = "Copyright 2012-2016, Lluís Vilanova <vilanova@ac.upc.edu>"
|
__copyright__ = "Copyright 2012-2017, Lluís Vilanova <vilanova@ac.upc.edu>"
|
||||||
__license__ = "GPL version 2 or (at your option) any later version"
|
__license__ = "GPL version 2 or (at your option) any later version"
|
||||||
|
|
||||||
__maintainer__ = "Stefan Hajnoczi"
|
__maintainer__ = "Stefan Hajnoczi"
|
||||||
|
@ -35,6 +35,6 @@ def generate_h(event, group):
|
||||||
if len(event.args) > 0:
|
if len(event.args) > 0:
|
||||||
argnames = ", " + argnames
|
argnames = ", " + argnames
|
||||||
|
|
||||||
out(' tracepoint(qemu, %(name)s%(tp_args)s);',
|
out(' tracepoint(qemu, %(name)s%(tp_args)s);',
|
||||||
name=event.name,
|
name=event.name,
|
||||||
tp_args=argnames)
|
tp_args=argnames)
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
"""
|
"""
|
||||||
|
|
||||||
__author__ = "Lluís Vilanova <vilanova@ac.upc.edu>"
|
__author__ = "Lluís Vilanova <vilanova@ac.upc.edu>"
|
||||||
__copyright__ = "Copyright 2012-2016, Lluís Vilanova <vilanova@ac.upc.edu>"
|
__copyright__ = "Copyright 2012-2017, Lluís Vilanova <vilanova@ac.upc.edu>"
|
||||||
__license__ = "GPL version 2 or (at your option) any later version"
|
__license__ = "GPL version 2 or (at your option) any later version"
|
||||||
|
|
||||||
__maintainer__ = "Stefan Hajnoczi"
|
__maintainer__ = "Stefan Hajnoczi"
|
||||||
|
@ -49,6 +49,19 @@ def generate(events, backend, group):
|
||||||
backend.generate_begin(events, group)
|
backend.generate_begin(events, group)
|
||||||
|
|
||||||
for e in events:
|
for e in events:
|
||||||
|
# tracer without checks
|
||||||
|
out('',
|
||||||
|
'static inline void %(api)s(%(args)s)',
|
||||||
|
'{',
|
||||||
|
api=e.api(e.QEMU_TRACE_NOCHECK),
|
||||||
|
args=e.args)
|
||||||
|
|
||||||
|
if "disable" not in e.properties:
|
||||||
|
backend.generate(e, group)
|
||||||
|
|
||||||
|
out('}')
|
||||||
|
|
||||||
|
# tracer wrapper with checks (per-vCPU tracing)
|
||||||
if "vcpu" in e.properties:
|
if "vcpu" in e.properties:
|
||||||
trace_cpu = next(iter(e.args))[1]
|
trace_cpu = next(iter(e.args))[1]
|
||||||
cond = "trace_event_get_vcpu_state(%(cpu)s,"\
|
cond = "trace_event_get_vcpu_state(%(cpu)s,"\
|
||||||
|
@ -63,16 +76,15 @@ def generate(events, backend, group):
|
||||||
'static inline void %(api)s(%(args)s)',
|
'static inline void %(api)s(%(args)s)',
|
||||||
'{',
|
'{',
|
||||||
' if (%(cond)s) {',
|
' if (%(cond)s) {',
|
||||||
|
' %(api_nocheck)s(%(names)s);',
|
||||||
|
' }',
|
||||||
|
'}',
|
||||||
api=e.api(),
|
api=e.api(),
|
||||||
|
api_nocheck=e.api(e.QEMU_TRACE_NOCHECK),
|
||||||
args=e.args,
|
args=e.args,
|
||||||
|
names=", ".join(e.args.names()),
|
||||||
cond=cond)
|
cond=cond)
|
||||||
|
|
||||||
if "disable" not in e.properties:
|
|
||||||
backend.generate(e, group)
|
|
||||||
|
|
||||||
out(' }',
|
|
||||||
'}')
|
|
||||||
|
|
||||||
backend.generate_end(events, group)
|
backend.generate_end(events, group)
|
||||||
|
|
||||||
out('#endif /* TRACE_%s_GENERATED_TRACERS_H */' % group.upper())
|
out('#endif /* TRACE_%s_GENERATED_TRACERS_H */' % group.upper())
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
"""
|
"""
|
||||||
|
|
||||||
__author__ = "Lluís Vilanova <vilanova@ac.upc.edu>"
|
__author__ = "Lluís Vilanova <vilanova@ac.upc.edu>"
|
||||||
__copyright__ = "Copyright 2012-2016, Lluís Vilanova <vilanova@ac.upc.edu>"
|
__copyright__ = "Copyright 2012-2017, Lluís Vilanova <vilanova@ac.upc.edu>"
|
||||||
__license__ = "GPL version 2 or (at your option) any later version"
|
__license__ = "GPL version 2 or (at your option) any later version"
|
||||||
|
|
||||||
__maintainer__ = "Stefan Hajnoczi"
|
__maintainer__ = "Stefan Hajnoczi"
|
||||||
|
@ -46,7 +46,7 @@ def generate(events, backend, group):
|
||||||
|
|
||||||
for e in events:
|
for e in events:
|
||||||
# just keep one of them
|
# just keep one of them
|
||||||
if "tcg-trans" not in e.properties:
|
if "tcg-exec" not in e.properties:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
out('static inline void %(name_tcg)s(%(args)s)',
|
out('static inline void %(name_tcg)s(%(args)s)',
|
||||||
|
@ -58,12 +58,25 @@ def generate(events, backend, group):
|
||||||
args_trans = e.original.event_trans.args
|
args_trans = e.original.event_trans.args
|
||||||
args_exec = tracetool.vcpu.transform_args(
|
args_exec = tracetool.vcpu.transform_args(
|
||||||
"tcg_helper_c", e.original.event_exec, "wrapper")
|
"tcg_helper_c", e.original.event_exec, "wrapper")
|
||||||
|
if "vcpu" in e.properties:
|
||||||
|
trace_cpu = e.args.names()[0]
|
||||||
|
cond = "trace_event_get_vcpu_state(%(cpu)s,"\
|
||||||
|
" TRACE_%(id)s)"\
|
||||||
|
% dict(
|
||||||
|
cpu=trace_cpu,
|
||||||
|
id=e.original.event_exec.name.upper())
|
||||||
|
else:
|
||||||
|
cond = "true"
|
||||||
|
|
||||||
out(' %(name_trans)s(%(argnames_trans)s);',
|
out(' %(name_trans)s(%(argnames_trans)s);',
|
||||||
' gen_helper_%(name_exec)s(%(argnames_exec)s);',
|
' if (%(cond)s) {',
|
||||||
|
' gen_helper_%(name_exec)s(%(argnames_exec)s);',
|
||||||
|
' }',
|
||||||
name_trans=e.original.event_trans.api(e.QEMU_TRACE),
|
name_trans=e.original.event_trans.api(e.QEMU_TRACE),
|
||||||
name_exec=e.original.event_exec.api(e.QEMU_TRACE),
|
name_exec=e.original.event_exec.api(e.QEMU_TRACE),
|
||||||
argnames_trans=", ".join(args_trans.names()),
|
argnames_trans=", ".join(args_trans.names()),
|
||||||
argnames_exec=", ".join(args_exec.names()))
|
argnames_exec=", ".join(args_exec.names()),
|
||||||
|
cond=cond)
|
||||||
|
|
||||||
out('}')
|
out('}')
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
"""
|
"""
|
||||||
|
|
||||||
__author__ = "Lluís Vilanova <vilanova@ac.upc.edu>"
|
__author__ = "Lluís Vilanova <vilanova@ac.upc.edu>"
|
||||||
__copyright__ = "Copyright 2012-2016, Lluís Vilanova <vilanova@ac.upc.edu>"
|
__copyright__ = "Copyright 2012-2017, Lluís Vilanova <vilanova@ac.upc.edu>"
|
||||||
__license__ = "GPL version 2 or (at your option) any later version"
|
__license__ = "GPL version 2 or (at your option) any later version"
|
||||||
|
|
||||||
__maintainer__ = "Stefan Hajnoczi"
|
__maintainer__ = "Stefan Hajnoczi"
|
||||||
|
@ -71,10 +71,11 @@ def generate(events, backend, group):
|
||||||
|
|
||||||
out('void %(name_tcg)s(%(args_api)s)',
|
out('void %(name_tcg)s(%(args_api)s)',
|
||||||
'{',
|
'{',
|
||||||
|
# NOTE: the check was already performed at TCG-generation time
|
||||||
' %(name)s(%(args_call)s);',
|
' %(name)s(%(args_call)s);',
|
||||||
'}',
|
'}',
|
||||||
name_tcg="helper_%s_proxy" % e.api(),
|
name_tcg="helper_%s_proxy" % e.api(),
|
||||||
name=e.api(),
|
name=e.api(e.QEMU_TRACE_NOCHECK),
|
||||||
args_api=e_args_api,
|
args_api=e_args_api,
|
||||||
args_call=", ".join(e_args_call.casted()),
|
args_call=", ".join(e_args_call.casted()),
|
||||||
)
|
)
|
||||||
|
|
|
@ -158,7 +158,8 @@ void *HELPER(lookup_tb_ptr)(CPUArchState *env, target_ulong addr)
|
||||||
if (unlikely(!(tb
|
if (unlikely(!(tb
|
||||||
&& tb->pc == addr
|
&& tb->pc == addr
|
||||||
&& tb->cs_base == cs_base
|
&& tb->cs_base == cs_base
|
||||||
&& tb->flags == flags))) {
|
&& tb->flags == flags
|
||||||
|
&& tb->trace_vcpu_dstate == *cpu->trace_dstate))) {
|
||||||
tb = tb_htable_lookup(cpu, addr, cs_base, flags);
|
tb = tb_htable_lookup(cpu, addr, cs_base, flags);
|
||||||
if (!tb) {
|
if (!tb) {
|
||||||
return tcg_ctx.code_gen_epilogue;
|
return tcg_ctx.code_gen_epilogue;
|
||||||
|
|
|
@ -103,7 +103,7 @@ static bool is_equal(const void *obj, const void *userp)
|
||||||
|
|
||||||
static inline uint32_t h(unsigned long v)
|
static inline uint32_t h(unsigned long v)
|
||||||
{
|
{
|
||||||
return tb_hash_func5(v, 0, 0);
|
return tb_hash_func6(v, 0, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -106,7 +106,7 @@ vcpu guest_cpu_reset(void)
|
||||||
#
|
#
|
||||||
# Mode: user, softmmu
|
# Mode: user, softmmu
|
||||||
# Targets: TCG(all)
|
# Targets: TCG(all)
|
||||||
disable vcpu tcg guest_mem_before(TCGv vaddr, uint8_t info) "info=%d", "vaddr=0x%016"PRIx64" info=%d"
|
vcpu tcg guest_mem_before(TCGv vaddr, uint8_t info) "info=%d", "vaddr=0x%016"PRIx64" info=%d"
|
||||||
|
|
||||||
# @num: System call number.
|
# @num: System call number.
|
||||||
# @arg*: System call argument value.
|
# @arg*: System call argument value.
|
||||||
|
@ -115,7 +115,7 @@ disable vcpu tcg guest_mem_before(TCGv vaddr, uint8_t info) "info=%d", "vaddr=0x
|
||||||
#
|
#
|
||||||
# Mode: user
|
# Mode: user
|
||||||
# Targets: TCG(all)
|
# Targets: TCG(all)
|
||||||
disable vcpu guest_user_syscall(uint64_t num, uint64_t arg1, uint64_t arg2, uint64_t arg3, uint64_t arg4, uint64_t arg5, uint64_t arg6, uint64_t arg7, uint64_t arg8) "num=0x%016"PRIx64" arg1=0x%016"PRIx64" arg2=0x%016"PRIx64" arg3=0x%016"PRIx64" arg4=0x%016"PRIx64" arg5=0x%016"PRIx64" arg6=0x%016"PRIx64" arg7=0x%016"PRIx64" arg8=0x%016"PRIx64
|
vcpu guest_user_syscall(uint64_t num, uint64_t arg1, uint64_t arg2, uint64_t arg3, uint64_t arg4, uint64_t arg5, uint64_t arg6, uint64_t arg7, uint64_t arg8) "num=0x%016"PRIx64" arg1=0x%016"PRIx64" arg2=0x%016"PRIx64" arg3=0x%016"PRIx64" arg4=0x%016"PRIx64" arg5=0x%016"PRIx64" arg6=0x%016"PRIx64" arg7=0x%016"PRIx64" arg8=0x%016"PRIx64
|
||||||
|
|
||||||
# @num: System call number.
|
# @num: System call number.
|
||||||
# @ret: System call result value.
|
# @ret: System call result value.
|
||||||
|
@ -124,4 +124,4 @@ disable vcpu guest_user_syscall(uint64_t num, uint64_t arg1, uint64_t arg2, uint
|
||||||
#
|
#
|
||||||
# Mode: user
|
# Mode: user
|
||||||
# Targets: TCG(all)
|
# Targets: TCG(all)
|
||||||
disable vcpu guest_user_syscall_ret(uint64_t num, uint64_t ret) "num=0x%016"PRIx64" ret=0x%016"PRIx64
|
vcpu guest_user_syscall_ret(uint64_t num, uint64_t ret) "num=0x%016"PRIx64" ret=0x%016"PRIx64
|
||||||
|
|
|
@ -61,6 +61,14 @@ void trace_event_set_state_dynamic(TraceEvent *ev, bool state)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void trace_event_synchronize_vcpu_state_dynamic(
|
||||||
|
CPUState *vcpu, run_on_cpu_data ignored)
|
||||||
|
{
|
||||||
|
bitmap_copy(vcpu->trace_dstate, vcpu->trace_dstate_delayed,
|
||||||
|
CPU_TRACE_DSTATE_MAX_EVENTS);
|
||||||
|
cpu_tb_jmp_cache_clear(vcpu);
|
||||||
|
}
|
||||||
|
|
||||||
void trace_event_set_vcpu_state_dynamic(CPUState *vcpu,
|
void trace_event_set_vcpu_state_dynamic(CPUState *vcpu,
|
||||||
TraceEvent *ev, bool state)
|
TraceEvent *ev, bool state)
|
||||||
{
|
{
|
||||||
|
@ -73,13 +81,20 @@ void trace_event_set_vcpu_state_dynamic(CPUState *vcpu,
|
||||||
if (state_pre != state) {
|
if (state_pre != state) {
|
||||||
if (state) {
|
if (state) {
|
||||||
trace_events_enabled_count++;
|
trace_events_enabled_count++;
|
||||||
set_bit(vcpu_id, vcpu->trace_dstate);
|
set_bit(vcpu_id, vcpu->trace_dstate_delayed);
|
||||||
(*ev->dstate)++;
|
(*ev->dstate)++;
|
||||||
} else {
|
} else {
|
||||||
trace_events_enabled_count--;
|
trace_events_enabled_count--;
|
||||||
clear_bit(vcpu_id, vcpu->trace_dstate);
|
clear_bit(vcpu_id, vcpu->trace_dstate_delayed);
|
||||||
(*ev->dstate)--;
|
(*ev->dstate)--;
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
|
* Delay changes until next TB; we want all TBs to be built from a
|
||||||
|
* single set of dstate values to ensure consistency of generated
|
||||||
|
* tracing code.
|
||||||
|
*/
|
||||||
|
async_run_on_cpu(vcpu, trace_event_synchronize_vcpu_state_dynamic,
|
||||||
|
RUN_ON_CPU_NULL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -65,8 +65,15 @@ void trace_event_register_group(TraceEvent **events)
|
||||||
size_t i;
|
size_t i;
|
||||||
for (i = 0; events[i] != NULL; i++) {
|
for (i = 0; events[i] != NULL; i++) {
|
||||||
events[i]->id = next_id++;
|
events[i]->id = next_id++;
|
||||||
if (events[i]->vcpu_id != TRACE_VCPU_EVENT_NONE) {
|
if (events[i]->vcpu_id == TRACE_VCPU_EVENT_NONE) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (likely(next_vcpu_id < CPU_TRACE_DSTATE_MAX_EVENTS)) {
|
||||||
events[i]->vcpu_id = next_vcpu_id++;
|
events[i]->vcpu_id = next_vcpu_id++;
|
||||||
|
} else {
|
||||||
|
error_report("WARNING: too many vcpu trace events; dropping '%s'",
|
||||||
|
events[i]->name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
event_groups = g_renew(TraceEventGroup, event_groups, nevent_groups + 1);
|
event_groups = g_renew(TraceEventGroup, event_groups, nevent_groups + 1);
|
||||||
|
|
|
@ -165,6 +165,9 @@ void trace_event_set_state_dynamic(TraceEvent *ev, bool state);
|
||||||
* Set the dynamic tracing state of an event for the given vCPU.
|
* Set the dynamic tracing state of an event for the given vCPU.
|
||||||
*
|
*
|
||||||
* Pre-condition: trace_event_get_vcpu_state_static(ev) == true
|
* Pre-condition: trace_event_get_vcpu_state_static(ev) == true
|
||||||
|
*
|
||||||
|
* Note: Changes for execution-time events with the 'tcg' property will not be
|
||||||
|
* propagated until the next TB is executed (iff executing in TCG mode).
|
||||||
*/
|
*/
|
||||||
void trace_event_set_vcpu_state_dynamic(CPUState *vcpu,
|
void trace_event_set_vcpu_state_dynamic(CPUState *vcpu,
|
||||||
TraceEvent *ev, bool state);
|
TraceEvent *ev, bool state);
|
||||||
|
|
Loading…
Reference in a new issue