10:01 a.m.
This patch adds support and documentation
for the bus_cycles perf event.
Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com>
---
docs/formatdomain.html.in | 6 ++++++
docs/news.html.in | 3 ++-
docs/schemas/domaincommon.rng | 1 +
include/libvirt/libvirt-domain.h | 10 ++++++++++
src/libvirt-domain.c | 2 ++
src/qemu/qemu_driver.c | 1 +
src/util/virperf.c | 6 +++++-
src/util/virperf.h | 1 +
tests/genericxml2xmlindata/generic-perf.xml | 1 +
tools/virsh.pod | 3 +++
10 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 086af55..cd3182b 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -1929,6 +1929,7 @@
<event name='cache_misses' enabled='no'/>
<event name='branch_instructions' enabled='no'/>
<event name='branch_misses' enabled='no'/>
+ <event name='bus_cycles' enabled='no'/>
</perf>
...
</pre>
@@ -1984,6 +1985,11 @@
<td>the count of branch misses by applications running on the
platform</td>
<td><code>perf.branch_misses</code></td>
</tr>
+ <tr>
+ <td><code>bus_cycles</code></td>
+ <td>the count of bus cycles by applications running on the
platform</td>
+ <td><code>perf.bus_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 c160411..f246b2a 100644
--- a/docs/news.html.in
+++ b/docs/news.html.in
@@ -31,7 +31,8 @@
<ul>
<li>perf: Add more perf statistics<br/>
Add support to get the count of branch instructions executed
- and branch misses by applications running on the platform
+ and branch misses and bus cycles by applications running on
+ the platform
</li>
</ul>
</li>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index bf8818d..21a7afa 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -429,6 +429,7 @@
<value>cache_misses</value>
<value>branch_instructions</value>
<value>branch_misses</value>
+ <value>bus_cycles</value>
</choice>
</attribute>
<attribute name="enabled">
diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
index 3290b10..6d74238 100644
--- a/include/libvirt/libvirt-domain.h
+++ b/include/libvirt/libvirt-domain.h
@@ -2145,6 +2145,16 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats);
*/
# define VIR_PERF_PARAM_BRANCH_MISSES "branch_misses"
+/**
+ * VIR_PERF_PARAM_BUS_CYCLES:
+ *
+ * Macro for typed parameter name that represents bus_cycles
+ * perf event which can be used to measure the count of bus cycles
+ * by applications running on the platform. It corresponds to the
+ * "perf.bus_cycles" field in the *Stats APIs.
+ */
+# define VIR_PERF_PARAM_BUS_CYCLES "bus_cycles"
+
int virDomainGetPerfEvents(virDomainPtr dom,
virTypedParameterPtr *params,
int *nparams,
diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index b287a39..19e323d 100644
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -11234,6 +11234,8 @@ virConnectGetDomainCapabilities(virConnectPtr conn,
* branch_instructions perf event.
* "perf.branch_misses" - The count of branch misses as unsigned long
* long. It is produced by branch_misses perf event.
+ * "perf.bus_cycles" - The count of bus cycles as unsigned long
+ * long. It is produced by bus_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 88778d4..cf0f5e0 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -9854,6 +9854,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom,
VIR_PERF_PARAM_CACHE_MISSES, VIR_TYPED_PARAM_BOOLEAN,
VIR_PERF_PARAM_BRANCH_INSTRUCTIONS,
VIR_TYPED_PARAM_BOOLEAN,
VIR_PERF_PARAM_BRANCH_MISSES, VIR_TYPED_PARAM_BOOLEAN,
+ VIR_PERF_PARAM_BUS_CYCLES, VIR_TYPED_PARAM_BOOLEAN,
NULL) < 0)
return -1;
diff --git a/src/util/virperf.c b/src/util/virperf.c
index 7f630da..31a5585 100644
--- a/src/util/virperf.c
+++ b/src/util/virperf.c
@@ -41,7 +41,8 @@ VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST,
"cmt", "mbmt", "mbml",
"cpu_cycles", "instructions",
"cache_references", "cache_misses",
- "branch_instructions", "branch_misses");
+ "branch_instructions", "branch_misses",
+ "bus_cycles");
struct virPerfEvent {
int type;
@@ -92,6 +93,9 @@ static struct virPerfEventAttr attrs[] = {
{.type = VIR_PERF_EVENT_BRANCH_MISSES,
.attrType = PERF_TYPE_HARDWARE,
.attrConfig = PERF_COUNT_HW_BRANCH_MISSES},
+ {.type = VIR_PERF_EVENT_BUS_CYCLES,
+ .attrType = PERF_TYPE_HARDWARE,
+ .attrConfig = PERF_COUNT_HW_BUS_CYCLES},
};
typedef struct virPerfEventAttr *virPerfEventAttrPtr;
diff --git a/src/util/virperf.h b/src/util/virperf.h
index 7049a5b..ac6d789 100644
--- a/src/util/virperf.h
+++ b/src/util/virperf.h
@@ -39,6 +39,7 @@ typedef enum {
VIR_PERF_EVENT_BRANCH_INSTRUCTIONS, /* Count of branch instructions
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_LAST
} virPerfEventType;
diff --git a/tests/genericxml2xmlindata/generic-perf.xml
b/tests/genericxml2xmlindata/generic-perf.xml
index a1e4e1c..56a6173 100644
--- a/tests/genericxml2xmlindata/generic-perf.xml
+++ b/tests/genericxml2xmlindata/generic-perf.xml
@@ -22,6 +22,7 @@
<event name='cache_misses' enabled='no'/>
<event name='branch_instructions' enabled='yes'/>
<event name='branch_misses' enabled='yes'/>
+ <event name='bus_cycles' enabled='yes'/>
</perf>
<devices>
</devices>
diff --git a/tools/virsh.pod b/tools/virsh.pod
index 74c05c9..d844dc8 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -948,6 +948,7 @@ I<--perf> returns the statistics of all enabled perf events:
"perf.cache_misses" - the count of caches misses,
"perf.branch_instructions" - the count of branch instructions,
"perf.branch_misses" - the count of branch misses
+"perf.bus_cycles" - the count of bus cycles
See the B<perf> command for more details about each event.
@@ -2299,6 +2300,8 @@ B<Valid perf event names>
platform.
branch_misses - Provides the count of branch misses executed
by applications running on the platform.
+ bus_cycles - Provides the count of bus cycles executed
+ 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