From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36908) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYxRq-0000Oh-PS for qemu-devel@nongnu.org; Thu, 25 Feb 2016 10:03:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYxRn-0008Ul-Ip for qemu-devel@nongnu.org; Thu, 25 Feb 2016 10:03:22 -0500 Received: from roura.ac.upc.edu ([147.83.33.10]:37973 helo=roura.ac.upc.es) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYxRn-0008UT-3e for qemu-devel@nongnu.org; Thu, 25 Feb 2016 10:03:19 -0500 From: =?utf-8?b?TGx1w61z?= Vilanova Date: Thu, 25 Feb 2016 16:03:18 +0100 Message-Id: <145641259776.30097.4785269283671764840.stgit@localhost> In-Reply-To: <145641255678.30097.2919142707547689749.stgit@localhost> References: <145641255678.30097.2919142707547689749.stgit@localhost> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 6/6] trace: Add QAPI/QMP interfaces to query and control per-vCPU tracing state List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Luiz Capitulino , Eduardo Habkost , Stefan Hajnoczi , Markus Armbruster Signed-off-by: Llu=C3=ADs Vilanova --- monitor.c | 4 +- qapi/trace.json | 20 ++++++-- qmp-commands.hx | 18 ++++++- trace/qmp.c | 143 ++++++++++++++++++++++++++++++++++++++++++++-----= ------ 4 files changed, 147 insertions(+), 38 deletions(-) diff --git a/monitor.c b/monitor.c index 73eac17..0d090c8 100644 --- a/monitor.c +++ b/monitor.c @@ -888,7 +888,7 @@ static void hmp_trace_event(Monitor *mon, const QDict= *qdict) bool new_state =3D qdict_get_bool(qdict, "option"); Error *local_err =3D NULL; =20 - qmp_trace_event_set_state(tp_name, new_state, true, true, &local_err= ); + qmp_trace_event_set_state(tp_name, new_state, true, true, false, 0, = &local_err); if (local_err) { error_report_err(local_err); } @@ -1047,7 +1047,7 @@ static void hmp_info_cpustats(Monitor *mon, const Q= Dict *qdict) =20 static void hmp_info_trace_events(Monitor *mon, const QDict *qdict) { - TraceEventInfoList *events =3D qmp_trace_event_get_state("*", NULL); + TraceEventInfoList *events =3D qmp_trace_event_get_state("*", false,= 0, NULL); TraceEventInfoList *elem; =20 for (elem =3D events; elem !=3D NULL; elem =3D elem->next) { diff --git a/qapi/trace.json b/qapi/trace.json index 01b0a52..b9f2e65 100644 --- a/qapi/trace.json +++ b/qapi/trace.json @@ -1,6 +1,6 @@ # -*- mode: python -*- # -# Copyright (C) 2011-2014 Llu=C3=ADs Vilanova +# Copyright (C) 2011-2016 Llu=C3=ADs Vilanova # # This work is licensed under the terms of the GNU GPL, version 2 or lat= er. # See the COPYING file in the top-level directory. @@ -29,11 +29,12 @@ # # @name: Event name. # @state: Tracing state. +# @vcpu: Whether this is a per-vCPU event (since 2.6). # # Since 2.2 ## { 'struct': 'TraceEventInfo', - 'data': {'name': 'str', 'state': 'TraceEventState'} } + 'data': {'name': 'str', 'state': 'TraceEventState', 'vcpu': 'bool'} } =20 ## # @trace-event-get-state: @@ -41,13 +42,18 @@ # Query the state of events. # # @name: Event name pattern (case-sensitive glob). +# @vcpu: #optional The vCPU to check (any by default; since 2.6). # # Returns: a list of @TraceEventInfo for the matching events # +# For any event without the "vcpu" property: +# - If @name is a pattern and @vcpu is set, events are ignored. +# - If @name is not a pattern and @vcpu is set, an error is raised. +# # Since 2.2 ## { 'command': 'trace-event-get-state', - 'data': {'name': 'str'}, + 'data': {'name': 'str', '*vcpu': 'int'}, 'returns': ['TraceEventInfo'] } =20 ## @@ -58,8 +64,14 @@ # @name: Event name pattern (case-sensitive glob). # @enable: Whether to enable tracing. # @ignore-unavailable: #optional Do not match unavailable events with @n= ame. +# @vcpu: #optional The vCPU to act upon (all by default; since 2.6). +# +# For any event without the "vcpu" property: +# - If @name is a pattern and @vcpu is set, events are ignored. +# - If @name is not a pattern and @vcpu is set, an error is raised. # # Since 2.2 ## { 'command': 'trace-event-set-state', - 'data': {'name': 'str', 'enable': 'bool', '*ignore-unavailable': 'bool= '} } + 'data': {'name': 'str', 'enable': 'bool', '*ignore-unavailable': 'bool= ', + '*vcpu': 'int'} } diff --git a/qmp-commands.hx b/qmp-commands.hx index 085dc7d..1e4f9a7 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -4596,7 +4596,7 @@ EQMP =20 { .name =3D "trace-event-get-state", - .args_type =3D "name:s", + .args_type =3D "name:s,vcpu:i?", .mhandler.cmd_new =3D qmp_marshal_trace_event_get_state, }, =20 @@ -4606,6 +4606,11 @@ trace-event-get-state =20 Query the state of events. =20 +Arguments: + +- "name": Event name pattern (json-string). +- "vcpu": Specific vCPU to query, any vCPU by default (json-int, optiona= l). + Example: =20 -> { "execute": "trace-event-get-state", "arguments": { "name": "qemu_me= malign" } } @@ -4614,7 +4619,7 @@ EQMP =20 { .name =3D "trace-event-set-state", - .args_type =3D "name:s,enable:b,ignore-unavailable:b?", + .args_type =3D "name:s,enable:b,ignore-unavailable:b?,vcpu:i?", .mhandler.cmd_new =3D qmp_marshal_trace_event_set_state, }, =20 @@ -4624,6 +4629,14 @@ trace-event-set-state =20 Set the state of events. =20 +Arguments: + +- "name": Event name pattern (json-string). +- "enable": Whether to enable or disable the event (json-bool). +- "ignore-unavailable": Whether to ignore errors for events that cannot = be + changed (json-bool, optional). +- "vcpu": Specific vCPU to set, all vCPUs by default (json-int, optional= ). + Example: =20 -> { "execute": "trace-event-set-state", "arguments": { "name": "qemu_me= malign", "enable": "true" } } @@ -4692,7 +4705,6 @@ Move mouse pointer to absolute coordinates (20000, = 400). { "type": "abs", "data" : { "axis": "X", "value" : 20000 = } }, { "type": "abs", "data" : { "axis": "Y", "value" : 400 } = } ] } } <- { "return": {} } - EQMP =20 { diff --git a/trace/qmp.c b/trace/qmp.c index 6320b4b..876e789 100644 --- a/trace/qmp.c +++ b/trace/qmp.c @@ -1,7 +1,7 @@ /* * QMP commands for tracing events. * - * Copyright (C) 2014 Llu=C3=ADs Vilanova + * Copyright (C) 2014-2016 Llu=C3=ADs Vilanova * * This work is licensed under the terms of the GNU GPL, version 2 or la= ter. * See the COPYING file in the top-level directory. @@ -13,63 +13,148 @@ #include "trace/control.h" =20 =20 -TraceEventInfoList *qmp_trace_event_get_state(const char *name, Error **= errp) +static bool get_cpu(bool has_vcpu, int vcpu, CPUState **cpu, Error **err= p) +{ + if (has_vcpu) { + *cpu =3D qemu_get_cpu(vcpu); + if (*cpu =3D=3D NULL) { + error_setg(errp, "invalid vCPU index %u", vcpu); + return false; + } + } else { + *cpu =3D NULL; + } + return true; +} + +static bool check_events(bool has_vcpu, bool ignore_unavailable, bool is= _pattern, + const char *name, Error **errp) +{ + if (!is_pattern) { + TraceEvent *ev =3D trace_event_name(name); + + /* error for non-existing event */ + if (ev =3D=3D NULL) { + error_setg(errp, "unknown event \"%s\"", name); + return false; + } + + /* error for non-vcpu event */ + if (has_vcpu && trace_event_get_cpu_id(ev) =3D=3D trace_event_cp= u_count()) { + error_setg(errp, "event \"%s\" is not vCPU-specific", name); + return false; + } + + /* error for unavailable event */ + if (!ignore_unavailable && !trace_event_get_state_static(ev)) { + error_setg(errp, "event \"%s\" is disabled", name); + return false; + } + + return true; + } else { + /* error for unavailable events */ + TraceEvent *ev =3D NULL; + while ((ev =3D trace_event_pattern(name, ev)) !=3D NULL) { + if (!ignore_unavailable && !trace_event_get_state_static(ev)= ) { + error_setg(errp, "event \"%s\" is disabled", trace_event= _get_name(ev)); + return false; + } + } + return true; + } +} + +TraceEventInfoList *qmp_trace_event_get_state(const char *name, + bool has_vcpu, int64_t vcp= u, + Error **errp) { TraceEventInfoList *events =3D NULL; - bool found =3D false; TraceEvent *ev; + bool is_pattern =3D trace_event_is_pattern(name); + CPUState *cpu; =20 + /* Check provided vcpu */ + if (!get_cpu(has_vcpu, vcpu, &cpu, errp)) { + return NULL; + } + + /* Check events */ + if (!check_events(has_vcpu, true, is_pattern, name, errp)) { + return NULL; + } + + /* Get states (all errors checked above) */ ev =3D NULL; while ((ev =3D trace_event_pattern(name, ev)) !=3D NULL) { - TraceEventInfoList *elem =3D g_new(TraceEventInfoList, 1); + TraceEventInfoList *elem; + bool is_vcpu =3D trace_event_get_cpu_id(ev) !=3D trace_event_cpu= _count(); + if (has_vcpu && !is_vcpu) { + continue; + } + + elem =3D g_new(TraceEventInfoList, 1); elem->value =3D g_new(TraceEventInfo, 1); + elem->value->vcpu =3D is_vcpu; elem->value->name =3D g_strdup(trace_event_get_name(ev)); + if (!trace_event_get_state_static(ev)) { elem->value->state =3D TRACE_EVENT_STATE_UNAVAILABLE; - } else if (!trace_event_get_state_dynamic(ev)) { - elem->value->state =3D TRACE_EVENT_STATE_DISABLED; } else { - elem->value->state =3D TRACE_EVENT_STATE_ENABLED; + if (has_vcpu) { + if (is_vcpu) { + if (trace_event_get_cpu_state_dynamic(cpu, ev)) { + elem->value->state =3D TRACE_EVENT_STATE_ENABLED= ; + } else { + elem->value->state =3D TRACE_EVENT_STATE_DISABLE= D; + } + } + /* else: already skipped above */ + } else { + if (trace_event_get_state_dynamic(ev)) { + elem->value->state =3D TRACE_EVENT_STATE_ENABLED; + } else { + elem->value->state =3D TRACE_EVENT_STATE_DISABLED; + } + } } elem->next =3D events; events =3D elem; - found =3D true; - } - - if (!found && !trace_event_is_pattern(name)) { - error_setg(errp, "unknown event \"%s\"", name); } =20 return events; } =20 void qmp_trace_event_set_state(const char *name, bool enable, - bool has_ignore_unavailable, - bool ignore_unavailable, Error **errp) + bool has_ignore_unavailable, bool ignore_= unavailable, + bool has_vcpu, int64_t vcpu, + Error **errp) { - bool found =3D false; TraceEvent *ev; + bool is_pattern =3D trace_event_is_pattern(name); + CPUState *cpu; =20 - /* Check all selected events are dynamic */ - ev =3D NULL; - while ((ev =3D trace_event_pattern(name, ev)) !=3D NULL) { - found =3D true; - if (!(has_ignore_unavailable && ignore_unavailable) && - !trace_event_get_state_static(ev)) { - error_setg(errp, "cannot set dynamic tracing state for \"%s\= "", - trace_event_get_name(ev)); - return; - } + /* Check provided vcpu */ + if (!get_cpu(has_vcpu, vcpu, &cpu, errp)) { + return; } - if (!found && !trace_event_is_pattern(name)) { - error_setg(errp, "unknown event \"%s\"", name); + + /* Check events */ + if (!check_events(has_vcpu, has_ignore_unavailable && ignore_unavail= able, + is_pattern, name, errp)) { return; } =20 - /* Apply changes */ + /* Apply changes (all errors checked above) */ ev =3D NULL; while ((ev =3D trace_event_pattern(name, ev)) !=3D NULL) { - if (trace_event_get_state_static(ev)) { + if (!trace_event_get_state_static(ev) || + (has_vcpu && trace_event_get_cpu_id(ev) =3D=3D trace_event_c= pu_count())) { + continue; + } + if (has_vcpu) { + trace_event_set_cpu_state_dynamic(cpu, ev, enable); + } else { trace_event_set_state_dynamic(ev, enable); } }