[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v8 3/7] trace: [tcg] Delay changes to dynamic state
From: |
Emilio G. Cota |
Subject: |
[Qemu-devel] [PATCH v8 3/7] trace: [tcg] Delay changes to dynamic state when translating |
Date: |
Thu, 8 Jun 2017 22:25:18 -0400 |
From: Lluís Vilanova <address@hidden>
This keeps consistency across all decisions taken during translation
when the dynamic state of a vCPU is changed in the middle of translating
some guest code.
Signed-off-by: Lluís Vilanova <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
[cota: use CPU_TRACE_DSTATE_MAX_EVENTS instead of trace_get_vcpu_event_count()]
Signed-off-by: Emilio G. Cota <address@hidden>
---
include/qom/cpu.h | 3 +++
trace/control-target.c | 21 ++++++++++++++++++---
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index bc6e20f..29f4a32 100644
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -303,6 +303,8 @@ struct qemu_work_item;
* @kvm_fd: vCPU file descriptor for KVM.
* @work_mutex: Lock to prevent multiple access to queued_work_*.
* @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).
*
* State of one CPU core or thread.
@@ -375,6 +377,7 @@ struct CPUState {
struct kvm_run *kvm_run;
/* Used for events with 'vcpu' and *without* the 'disabled' properties */
+ DECLARE_BITMAP(trace_dstate_delayed, CPU_TRACE_DSTATE_MAX_EVENTS);
DECLARE_BITMAP(trace_dstate, CPU_TRACE_DSTATE_MAX_EVENTS);
/* TODO Move common fields from CPUArchState here. */
diff --git a/trace/control-target.c b/trace/control-target.c
index 6266e63..416d14e 100644
--- a/trace/control-target.c
+++ b/trace/control-target.c
@@ -1,13 +1,14 @@
/*
* Interface for configuring and controlling the state of tracing events.
*
- * Copyright (C) 2014-2016 Lluís Vilanova <address@hidden>
+ * Copyright (C) 2014-2017 Lluís Vilanova <address@hidden>
*
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
#include "qemu/osdep.h"
+#include "qom/cpu.h"
#include "cpu.h"
#include "trace-root.h"
#include "trace/control.h"
@@ -34,6 +35,13 @@ void trace_event_set_state_dynamic_init(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);
+}
+
void trace_event_set_state_dynamic(TraceEvent *ev, bool state)
{
CPUState *vcpu;
@@ -69,13 +77,20 @@ void trace_event_set_vcpu_state_dynamic(CPUState *vcpu,
if (state_pre != state) {
if (state) {
trace_events_enabled_count++;
- set_bit(vcpu_id, vcpu->trace_dstate);
+ set_bit(vcpu_id, vcpu->trace_dstate_delayed);
(*ev->dstate)++;
} else {
trace_events_enabled_count--;
- clear_bit(vcpu_id, vcpu->trace_dstate);
+ clear_bit(vcpu_id, vcpu->trace_dstate_delayed);
(*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);
}
}
--
2.7.4
- [Qemu-devel] [PATCH v8 0/7] trace: [tcg] Optimize per-vCPU tracing states, Emilio G. Cota, 2017/06/08
- [Qemu-devel] [PATCH v8 7/7] trace: [trivial] Statically enable all guest events, Emilio G. Cota, 2017/06/08
- Re: [Qemu-devel] [PATCH v8 7/7] trace: [trivial] Statically enable all guest events, Daniel P. Berrange, 2017/06/26
- Re: [Qemu-devel] [PATCH v8 7/7] trace: [trivial] Statically enable all guest events, Lluís Vilanova, 2017/06/26
- Re: [Qemu-devel] [PATCH v8 7/7] trace: [trivial] Statically enable all guest events, Daniel P. Berrange, 2017/06/26
- Re: [Qemu-devel] [PATCH v8 7/7] trace: [trivial] Statically enable all guest events, Laurent Desnogues, 2017/06/26
- Re: [Qemu-devel] [PATCH v8 7/7] trace: [trivial] Statically enable all guest events, Lluís Vilanova, 2017/06/26
- Re: [Qemu-devel] [PATCH v8 7/7] trace: [trivial] Statically enable all guest events, Daniel P. Berrange, 2017/06/26
[Qemu-devel] [PATCH v8 3/7] trace: [tcg] Delay changes to dynamic state when translating,
Emilio G. Cota <=
[Qemu-devel] [PATCH v8 2/7] cpu: allocate cpu->trace_dstate in place, Emilio G. Cota, 2017/06/08
[Qemu-devel] [PATCH v8 4/7] exec: [tcg] Use different TBs according to the vCPU's dynamic tracing state, Emilio G. Cota, 2017/06/08
[Qemu-devel] [PATCH v8 6/7] trace: [tcg, trivial] Re-align generated code, Emilio G. Cota, 2017/06/08
[Qemu-devel] [PATCH v8 5/7] trace: [tcg] Do not generate TCG code to trace dinamically-disabled events, Emilio G. Cota, 2017/06/08
[Qemu-devel] [PATCH v8 1/7] exec: [tcg] Refactor flush of per-CPU virtual TB cache, Emilio G. Cota, 2017/06/08