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@linux.vnet.ibm.com>

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 357cb2d1e37df5cbe369e66924d9570605ccca63..9646782828a4dbfed47f2cbf6ea2b745af4a4804 100644 (file)
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -1932,6 +1932,7 @@
   <event name='bus_cycles' enabled='no'/>
   <event name='stalled_cycles_frontend' enabled='no'/>
   <event name='stalled_cycles_backend' enabled='no'/>
+  <event name='ref_cpu_cycles' enabled='no'/>
 </perf>
 ...
 </pre>
@@ -2004,6 +2005,12 @@
           processor pipeline 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 total cpu cycles not affected by CPU frequency scaling
+         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 c148f336f492264dfaddc1ffb9eb3e7945fdaf56..80ac304cd705e9402c0325943ab12cc765920202 100644 (file)
--- a/docs/news.html.in
+++ b/docs/news.html.in
@@ -37,8 +37,8 @@
           <li>perf: Add more perf statistics<br/>
           Add support to get the count of branch instructions
           executed, branch misses, bus cycles, stalled frontend
-          cpu cycles, and stalled backend cpu cycles by applications
-          running on the platform
+          cpu cycles, stalled backend cpu cycles, 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 e5b5fb5c7b9f82d2c134133dae653d25164d9ae1..4d76315b09fba262abddd8b9bf36eba8a69c73fc 100644 (file)
--- 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 ad9eef3573df8734af9d9147338135b86d4fc3d4..63629470873b5c8f188bab98d3597a34b2340adb 100644 (file)
--- a/include/libvirt/libvirt-domain.h
+++ b/include/libvirt/libvirt-domain.h
@@ -2177,6 +2177,17 @@ 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 total cpu
+ * cycles not affected by CPU frequency scaling 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 d40760963fb5ae643d70c2f8d53b48cc3c87f6f1..5b3e842058067a5bd17f8ed8045e61526edcf8bb 100644 (file)
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -11246,6 +11246,10 @@ virConnectGetDomainCapabilities(virConnectPtr conn,
  *                                      pipeline as unsigned long long. It is
  *                                      produced by stalled_cycles_backend
  *                                      perf event.
+ *     "perf.ref_cpu_cycles" - The count of total cpu cycles not affected by
+ *                             CPU frequency scaling by applications running
+ *                             as unsigned long long. It is produced by the
+ *                             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 140a785fa0dfae96aedb8ccab4b5bed1e8377875..0bf18564466f52c4012e3fc091f2cd602fbd1f94 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -9858,6 +9858,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 c9a0e3948327a70bd696ed357228dc73fec733a9..49ec2584985f0d311e0e9be122ed4e2e508d3bd8 100644 (file)
--- 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 e5b9ae850c887e809fc66878cf69b003fbf680f7..1f43c92beb26acb9eabdfb4725a97545403246fe 100644 (file)
--- a/src/util/virperf.h
+++ b/src/util/virperf.h
@@ -46,6 +46,7 @@ typedef enum {
     VIR_PERF_EVENT_STALLED_CYCLES_BACKEND, /* Count of stalled cpu cycles in
                                               the backend of the instruction
                                               processor pipeline */
+    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 f01d574e6f8ac5f9d0caf705fa0361cb6702bf9d..437cd65ccc99dd855e3635dcd88cee92bc7f58e5 100644 (file)
--- 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 fb0758dfa0e959f8da11609882040a6606b8aae9..940c64611c5d679cbdb163770756c8c5e1336b63 100644 (file)
--- 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 frontend cpu cycles,
-"perf.stalled_cycles_backend" - the count of stalled backend cpu cycles
+"perf.stalled_cycles_backend" - the count of stalled backend cpu cycles,
+"perf.ref_cpu_cycles" - the count of ref cpu cycles
 
 See the B<perf> command for more details about each event.
 
@@ -2312,6 +2313,9 @@ B<Valid perf event names>
                            cycles in the backend of the
                            instruction processor pipeline by
                            applications running on the platform.
+  ref_cpu_cycles   -  Provides the count of total cpu cycles
+                      not affected by CPU frequency scaling by
+                      applications running on the platform.
 
 B<Note>: The statistics can be retrieved using the B<domstats> command using
 the I<--perf> flag.