trace: Properly initialize dynamic event states in hot-plugged vCPUs

Every time a vCPU is hot-plugged, it will "inherit" its tracing state
from the global state array. That is, if *any* existing vCPU has an
event enabled, new vCPUs will have too.

Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
Message-id: 147428970768.15111.7664565956870423529.stgit@fimbulvetr.bsc.es
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Lluís Vilanova 2016-09-19 14:55:07 +02:00 committed by Stefan Hajnoczi
parent 331f5eb28a
commit 2bfe11c8fa
8 changed files with 54 additions and 33 deletions

View File

@ -1133,7 +1133,6 @@ int main(int argc, char **argv)
gdbserver_start (gdbstub_port); gdbserver_start (gdbstub_port);
gdb_handlesig(cpu, 0); gdb_handlesig(cpu, 0);
} }
trace_init_vcpu_events();
cpu_loop(env); cpu_loop(env);
/* never exits */ /* never exits */
return 0; return 0;

View File

@ -4800,7 +4800,6 @@ int main(int argc, char **argv, char **envp)
} }
gdb_handlesig(cpu, 0); gdb_handlesig(cpu, 0);
} }
trace_init_vcpu_events();
cpu_loop(env); cpu_loop(env);
/* never exits */ /* never exits */
return 0; return 0;

View File

@ -333,6 +333,9 @@ static void cpu_common_realizefn(DeviceState *dev, Error **errp)
cpu_synchronize_post_init(cpu); cpu_synchronize_post_init(cpu);
cpu_resume(cpu); cpu_resume(cpu);
} }
/* NOTE: latest generic point where the cpu is fully realized */
trace_init_vcpu(cpu);
} }
static void cpu_common_initfn(Object *obj) static void cpu_common_initfn(Object *obj)

View File

@ -44,3 +44,9 @@ void trace_event_set_vcpu_state_dynamic(CPUState *vcpu,
/* should never be called on non-target binaries */ /* should never be called on non-target binaries */
abort(); abort();
} }
void trace_init_vcpu(CPUState *vcpu)
{
/* should never be called on non-target binaries */
abort();
}

View File

@ -81,3 +81,40 @@ void trace_event_set_vcpu_state_dynamic(CPUState *vcpu,
} }
} }
} }
static bool adding_first_cpu(void)
{
CPUState *cpu;
size_t count = 0;
CPU_FOREACH(cpu) {
count++;
if (count > 1) {
return false;
}
}
return true;
}
void trace_init_vcpu(CPUState *vcpu)
{
TraceEvent *ev = NULL;
while ((ev = trace_event_pattern("*", ev)) != NULL) {
if (trace_event_is_vcpu(ev) &&
trace_event_get_state_static(ev) &&
trace_event_get_state_dynamic(ev)) {
TraceEventID id = trace_event_get_id(ev);
if (adding_first_cpu()) {
/* check preconditions */
assert(trace_events_dstate[id] == 1);
/* disable early-init state ... */
trace_events_dstate[id] = 0;
trace_events_enabled_count--;
/* ... and properly re-enable */
trace_event_set_vcpu_state_dynamic(vcpu, ev, true);
} else {
trace_event_set_vcpu_state_dynamic(vcpu, ev, true);
}
}
}
}

View File

@ -269,22 +269,3 @@ char *trace_opt_parse(const char *optarg)
return trace_file; return trace_file;
} }
void trace_init_vcpu_events(void)
{
TraceEvent *ev = NULL;
while ((ev = trace_event_pattern("*", ev)) != NULL) {
if (trace_event_is_vcpu(ev) &&
trace_event_get_state_static(ev) &&
trace_event_get_state_dynamic(ev)) {
TraceEventID id = trace_event_get_id(ev);
/* check preconditions */
assert(trace_events_dstate[id] == 1);
/* disable early-init state ... */
trace_events_dstate[id] = 0;
trace_events_enabled_count--;
/* ... and properly re-enable */
trace_event_set_state_dynamic(ev, true);
}
}
}

View File

@ -238,6 +238,14 @@ bool trace_init_backends(void);
*/ */
void trace_init_file(const char *file); void trace_init_file(const char *file);
/**
* trace_init_vcpu:
* @vcpu: Added vCPU.
*
* Set initial dynamic event state for a hot-plugged vCPU.
*/
void trace_init_vcpu(CPUState *vcpu);
/** /**
* trace_list_events: * trace_list_events:
* *
@ -269,17 +277,6 @@ extern QemuOptsList qemu_trace_opts;
*/ */
char *trace_opt_parse(const char *optarg); char *trace_opt_parse(const char *optarg);
/**
* trace_init_vcpu_events:
*
* Re-synchronize initial event state with vCPUs (which can be created after
* trace_init_events()).
*
* Precondition: event states won't be changed between trace_enable_events() and
* trace_init_vcpu_events() (e.g., through QMP).
*/
void trace_init_vcpu_events(void);
#include "trace/control-internal.h" #include "trace/control-internal.h"

1
vl.c
View File

@ -4658,7 +4658,6 @@ int main(int argc, char **argv, char **envp)
os_setup_post(); os_setup_post();
trace_init_vcpu_events();
main_loop(); main_loop();
replay_disable_events(); replay_disable_events();
iothread_stop_all(); iothread_stop_all();