Re: [libvirt] [PATCH 3/4] perf: add stalled_cycles_backend perf event support

This patch adds support and documentation for the stalled_cycles_backend perf event. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com&gt; --- 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 | 3 +++ 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 | 6 +++++- 10 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 424b4de..6cff639 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1931,6 +1931,7 @@ &lt;event name='branch_misses' enabled='no'/&gt; &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;/perf&gt; ... </pre> @@ -1996,6 +1997,11 @@ <td>the count of stalled cycles frontend by applications running on the platform</td> <td><code>perf.stalled_cycles_frontend</code></td> </tr> + <tr> + <td><code>stalled_cycles_backend</code></td> + <td>the count of stalled cycles backend by applications running on the platform</td> + <td><code>perf.stalled_cycles_backend</code></td> + </tr> </table> <h3><a name="elementsDevices">Devices</a></h3> diff --git a/docs/news.html.in b/docs/news.html.in index ea91d99..4e0a4da 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -32,7 +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 by applications running on the platform + frontend, stalled cycles backend by applications + running on the platform </li> </ul> </li> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 9ce7cc9..e5b5fb5 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -431,6 +431,7 @@ <value>branch_misses</value> <value>bus_cycles</value> <value>stalled_cycles_frontend</value> + <value>stalled_cycles_backend</value> </choice> </attribute> <attribute name="enabled"> diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 0741d14..86db4ae 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -2165,6 +2165,16 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats); */ # define VIR_PERF_PARAM_STALLED_CYCLES_FRONTEND "stalled_cycles_frontend" +/** + * VIR_PERF_PARAM_STALLED_CYCLES_BACKEND: + * + * Macro for typed parameter name that represents stalled_cycles_backend + * perf event which can be used to measure the count of stalled cycles backend + * by applications running on the platform. It corresponds to the + * "perf.stalled_cycles_backend" field in the *Stats APIs. + */ +# define VIR_PERF_PARAM_STALLED_CYCLES_BACKEND "stalled_cycles_backend" + int virDomainGetPerfEvents(virDomainPtr dom, virTypedParameterPtr *params, int *nparams, diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 0d23d31..de865b0 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11239,6 +11239,9 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * "perf.stalled_cycles_frontend" - The count of stalled cycles frontend * as unsigned long long. It is produced * by stalled_cycles_frontend perf event. + * "perf.stalled_cycles_backend" - The count of stalled cycles backend + * as unsigned long long. It is produced + * by stalled_cycles_backend 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 273dbeb..cf92e43 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9856,6 +9856,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom, VIR_PERF_PARAM_BRANCH_MISSES, VIR_TYPED_PARAM_BOOLEAN, 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, NULL) < 0) return -1; diff --git a/src/util/virperf.c b/src/util/virperf.c index c21147a..c9a0e39 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -42,7 +42,8 @@ VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST, "cpu_cycles", "instructions", "cache_references", "cache_misses", "branch_instructions", "branch_misses", - "bus_cycles", "stalled_cycles_frontend"); + "bus_cycles", "stalled_cycles_frontend", + "stalled_cycles_backend"); struct virPerfEvent { int type; @@ -99,6 +100,9 @@ static struct virPerfEventAttr attrs[] = { {.type = VIR_PERF_EVENT_STALLED_CYCLES_FRONTEND, .attrType = PERF_TYPE_HARDWARE, .attrConfig = PERF_COUNT_HW_STALLED_CYCLES_FRONTEND}, + {.type = VIR_PERF_EVENT_STALLED_CYCLES_BACKEND, + .attrType = PERF_TYPE_HARDWARE, + .attrConfig = PERF_COUNT_HW_STALLED_CYCLES_BACKEND}, }; typedef struct virPerfEventAttr *virPerfEventAttrPtr; diff --git a/src/util/virperf.h b/src/util/virperf.h index 0aee1ba..6dfad34 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -41,6 +41,7 @@ typedef enum { 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_LAST } virPerfEventType; diff --git a/tests/genericxml2xmlindata/generic-perf.xml b/tests/genericxml2xmlindata/generic-perf.xml index db76843..f01d574 100644 --- a/tests/genericxml2xmlindata/generic-perf.xml +++ b/tests/genericxml2xmlindata/generic-perf.xml @@ -24,6 +24,7 @@ <event name='branch_misses' enabled='yes'/> <event name='bus_cycles' enabled='yes'/> <event name='stalled_cycles_frontend' enabled='yes'/> + <event name='stalled_cycles_backend' enabled='yes'/> </perf> <devices> </devices> diff --git a/tools/virsh.pod b/tools/virsh.pod index f9a6a19..ada1dce 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -949,7 +949,8 @@ I<--perf> returns the statistics of all enabled perf events: "perf.branch_instructions" - the count of branch instructions, "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_frontend" - the count of stalled cycles frontend, +"perf.stalled_cycles_backend" - the count of stalled cycles backend See the B<perf> command for more details about each event. @@ -2306,6 +2307,9 @@ B<Valid perf event names> stalled_cycles_frontend - Provides the count of stalled cycles frontend by applications running on the platform. + stalled_cycles_backend - Provides the count of stalled cycles + backend by applications running on + the platform. B<Note>: The statistics can be retrieved using the B<domstats> command using the I<--perf> flag.