[libvirt] [PATCH 4/4] perf: add ref_cpu_cycles perf event support

This patch adds support and documentation for the ref_cpu_cycles perf event. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com&gt; --- docs/formatdomain.html.in | 6 ++++++ docs/news.html.in | 4 ++-- docs/schemas/domaincommon.rng | 1 + include/libvirt/libvirt-domain.h | 10 ++++++++++ src/libvirt-domain.c | 3 +++ src/qemu/qemu_driver.c | 1 + src/util/virperf.c | 5 ++++- src/util/virperf.h | 5 +++-- tests/genericxml2xmlindata/generic-perf.xml | 1 + tools/virsh.pod | 5 ++++- 10 files changed, 35 insertions(+), 6 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 6cff639..3dbd449 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1932,6 +1932,7 @@ &lt;event name='bus_cycles' enabled='no'/&gt; &lt;event name='stalled_cycles_frontend' enabled='no'/&gt; &lt;event name='stalled_cycles_backend' enabled='no'/&gt; + &lt;event name='ref_cpu_cycles' enabled='no'/&gt; &lt;/perf&gt; ... </pre> @@ -2002,6 +2003,11 @@ <td>the count of stalled cycles backend by applications running on the platform</td> <td><code>perf.stalled_cycles_backend</code></td> </tr> + <tr> + <td><code>ref_cpu_cycles</code></td> + <td>the count of ref cpu cycles by applications running on the platform</td> + <td><code>perf.ref_cpu_cycles</code></td> + </tr> </table> <h3><a name="elementsDevices">Devices</a></h3> diff --git a/docs/news.html.in b/docs/news.html.in index 4e0a4da..21c7de1 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -32,8 +32,8 @@ <li>perf: Add more perf statistics<br/> Add support to get the count of branch instructions executed, branch misses, bus cycles, stalled cycles - frontend, stalled cycles backend by applications - running on the platform + frontend, stalled cycles backend and ref cpu cycles + by applications running on the platform </li> </ul> </li> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index e5b5fb5..4d76315 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -432,6 +432,7 @@ <value>bus_cycles</value> <value>stalled_cycles_frontend</value> <value>stalled_cycles_backend</value> + <value>ref_cpu_cycles</value> </choice> </attribute> <attribute name="enabled"> diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 86db4ae..1723f83 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -2175,6 +2175,16 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats); */ # define VIR_PERF_PARAM_STALLED_CYCLES_BACKEND "stalled_cycles_backend" +/** + * VIR_PERF_PARAM_REF_CPU_CYCLES: + * + * Macro for typed parameter name that represents ref_cpu_cycles + * perf event which can be used to measure the count of ref cpu cycles + * by applications running on the platform. It corresponds to the + * "perf.ref_cpu_cycles" field in the *Stats APIs. + */ +# define VIR_PERF_PARAM_REF_CPU_CYCLES "ref_cpu_cycles" + int virDomainGetPerfEvents(virDomainPtr dom, virTypedParameterPtr *params, int *nparams, diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index de865b0..09d45c9 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11242,6 +11242,9 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * "perf.stalled_cycles_backend" - The count of stalled cycles backend * as unsigned long long. It is produced * by stalled_cycles_backend perf event. + * "perf.ref_cpu_cycles" - The count of ref cpu cycles as unsigned + * long long. It is produced by + * ref_cpu_cycles perf event. * * Note that entire stats groups or individual stat fields may be missing from * the output in case they are not supported by the given hypervisor, are not diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cf92e43..398aefc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9857,6 +9857,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom, VIR_PERF_PARAM_BUS_CYCLES, VIR_TYPED_PARAM_BOOLEAN, VIR_PERF_PARAM_STALLED_CYCLES_FRONTEND, VIR_TYPED_PARAM_BOOLEAN, VIR_PERF_PARAM_STALLED_CYCLES_BACKEND, VIR_TYPED_PARAM_BOOLEAN, + VIR_PERF_PARAM_REF_CPU_CYCLES, VIR_TYPED_PARAM_BOOLEAN, NULL) < 0) return -1; diff --git a/src/util/virperf.c b/src/util/virperf.c index c9a0e39..49ec258 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -43,7 +43,7 @@ VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST, "cache_references", "cache_misses", "branch_instructions", "branch_misses", "bus_cycles", "stalled_cycles_frontend", - "stalled_cycles_backend"); + "stalled_cycles_backend", "ref_cpu_cycles"); struct virPerfEvent { int type; @@ -103,6 +103,9 @@ static struct virPerfEventAttr attrs[] = { {.type = VIR_PERF_EVENT_STALLED_CYCLES_BACKEND, .attrType = PERF_TYPE_HARDWARE, .attrConfig = PERF_COUNT_HW_STALLED_CYCLES_BACKEND}, + {.type = VIR_PERF_EVENT_REF_CPU_CYCLES, + .attrType = PERF_TYPE_HARDWARE, + .attrConfig = PERF_COUNT_HW_REF_CPU_CYCLES}, }; typedef struct virPerfEventAttr *virPerfEventAttrPtr; diff --git a/src/util/virperf.h b/src/util/virperf.h index 6dfad34..c002510 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -40,8 +40,9 @@ typedef enum { for applications */ VIR_PERF_EVENT_BRANCH_MISSES, /* Count of branch misses for applications */ VIR_PERF_EVENT_BUS_CYCLES, /* Count of bus cycles for applications*/ - VIR_PERF_EVENT_STALLED_CYCLES_FRONTEND, /*Count of stalled cycles frontend*/ - VIR_PERF_EVENT_STALLED_CYCLES_BACKEND, /*Count of stalled cycles backend*/ + VIR_PERF_EVENT_STALLED_CYCLES_FRONTEND, /* Count of stalled cycles frontend */ + VIR_PERF_EVENT_STALLED_CYCLES_BACKEND, /* Count of stalled cycles backend */ + VIR_PERF_EVENT_REF_CPU_CYCLES, /* Count of ref cpu cycles */ VIR_PERF_EVENT_LAST } virPerfEventType; diff --git a/tests/genericxml2xmlindata/generic-perf.xml b/tests/genericxml2xmlindata/generic-perf.xml index f01d574..437cd65 100644 --- a/tests/genericxml2xmlindata/generic-perf.xml +++ b/tests/genericxml2xmlindata/generic-perf.xml @@ -25,6 +25,7 @@ <event name='bus_cycles' enabled='yes'/> <event name='stalled_cycles_frontend' enabled='yes'/> <event name='stalled_cycles_backend' enabled='yes'/> + <event name='ref_cpu_cycles' enabled='yes'/> </perf> <devices> </devices> diff --git a/tools/virsh.pod b/tools/virsh.pod index ada1dce..539717c 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -950,7 +950,8 @@ I<--perf> returns the statistics of all enabled perf events: "perf.branch_misses" - the count of branch misses, "perf.bus_cycles" - the count of bus cycles, "perf.stalled_cycles_frontend" - the count of stalled cycles frontend, -"perf.stalled_cycles_backend" - the count of stalled cycles backend +"perf.stalled_cycles_backend" - the count of stalled cycles backend, +"perf.ref_cpu_cycles" - the count of ref cpu cycles See the B<perf> command for more details about each event. @@ -2310,6 +2311,8 @@ B<Valid perf event names> stalled_cycles_backend - Provides the count of stalled cycles backend by applications running on the platform. + ref_cpu_cycles - Provides the count of ref cpu cycles + by applications running on the platform. B<Note>: The statistics can be retrieved using the B<domstats> command using the I<--perf> flag. -- 1.9.3