perf: Add cache_l1d perf event support

This patch adds support and documentation for
a generalized hardware cache event called cache_l1d
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 f7bef51dece54aa03197f6bb58d0fd39c0324a40..e192b77d0985c3249c4ca7bc5d0d803686f9e681 100644 (file)
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -1937,6 +1937,7 @@
   <event name='stalled_cycles_frontend' enabled='no'/>
   <event name='stalled_cycles_backend' enabled='no'/>
   <event name='ref_cpu_cycles' enabled='no'/>
+  <event name='cache_l1d' enabled='no'/>
 </perf>
 ...
 </pre>
@@ -2015,6 +2016,12 @@
          by applications running on the platform</td>
       <td><code>perf.ref_cpu_cycles</code></td>
     </tr>
+    <tr>
+      <td><code>cache_l1d</code></td>
+      <td>the count of total level 1 data cache by applications running on
+           the platform</td>
+      <td><code>perf.cache_l1d</code></td>
+    </tr>
   </table>
 
     <h3><a name="elementsDevices">Devices</a></h3>

diff --git a/docs/news.html.in b/docs/news.html.in
index c2220753ea3145c0d9fdc1f649828dc14a222ae1..052a3e6b346552b3b8d65777dd3980dbc55cc721 100644 (file)
--- a/docs/news.html.in
+++ b/docs/news.html.in
@@ -46,8 +46,9 @@
           <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, stalled backend cpu cycles, and ref cpu
-          cycles by applications running on the platform
+          cpu cycles, stalled backend cpu cycles, ref cpu
+          cycles and cache l1d by applications running on
+          the platform
           </li>
           <li>conf: Display &lt;physical&gt; for volume xml<br/>
           Add a display of the &lt;physical&gt; size of a disk

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 4d76315b09fba262abddd8b9bf36eba8a69c73fc..be0a609abac2ebc6907396ec733a062b9778c08a 100644 (file)
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -433,6 +433,7 @@
               <value>stalled_cycles_frontend</value>
               <value>stalled_cycles_backend</value>
               <value>ref_cpu_cycles</value>
+              <value>cache_l1d</value>
             </choice>
           </attribute>
           <attribute name="enabled">

diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
index e303140a23311d445f6ba18c9fe344c9e8fdc95c..1e0e74c634a231882613651f28a37c46bb413d2f 100644 (file)
--- a/include/libvirt/libvirt-domain.h
+++ b/include/libvirt/libvirt-domain.h
@@ -2188,6 +2188,17 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats);
  */
 # define VIR_PERF_PARAM_REF_CPU_CYCLES "ref_cpu_cycles"
 
+/**
+ * VIR_PERF_PARAM_CACHE_L1D:
+ *
+ * Macro for typed parameter name that represents cache_l1d
+ * perf event which can be used to measure the count of total
+ * level 1 data cache by applications running on the platform.
+ * It corresponds to the "perf.cache_l1d" field in the
+ * *Stats APIs.
+ */
+# define VIR_PERF_PARAM_CACHE_L1D "cache_l1d"
+
 int virDomainGetPerfEvents(virDomainPtr dom,
                            virTypedParameterPtr *params,
                            int *nparams,

diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index 5b3e842058067a5bd17f8ed8045e61526edcf8bb..3023f30876cc4173044ca20efe89911f5042a94b 100644 (file)
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -11250,6 +11250,8 @@ virConnectGetDomainCapabilities(virConnectPtr conn,
  *                             CPU frequency scaling by applications running
  *                             as unsigned long long. It is produced by the
  *                             ref_cpu_cycles perf event.
+ *     "perf.cache_l1d" - The count of total level 1 data cache as unsigned
+ *                        long long. It is produced by cache_l1d 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 89fd6b22a992bdb5cd6ba84e97ba1bd5505779eb..e3bc8cc77bb128171bc693f9cdbff88308b797c2 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -9859,6 +9859,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom,
                                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,
+                               VIR_PERF_PARAM_CACHE_L1D, VIR_TYPED_PARAM_BOOLEAN,
                                NULL) < 0)
         return -1;
 

diff --git a/src/util/virperf.c b/src/util/virperf.c
index f64692bf39c49ec9edacbd40e8411ec3a898ebed..8554723b52ea9f21214cdab6f4bfaa43cac70898 100644 (file)
--- a/src/util/virperf.c
+++ b/src/util/virperf.c
@@ -43,7 +43,8 @@ VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST,
               "cache_references", "cache_misses",
               "branch_instructions", "branch_misses",
               "bus_cycles", "stalled_cycles_frontend",
-              "stalled_cycles_backend", "ref_cpu_cycles");
+              "stalled_cycles_backend", "ref_cpu_cycles",
+              "cache_l1d");
 
 struct virPerfEvent {
     int type;
@@ -112,6 +113,9 @@ static struct virPerfEventAttr attrs[] = {
      .attrConfig = 0,
 # endif
     },
+    {.type = VIR_PERF_EVENT_CACHE_L1D,
+     .attrType = PERF_TYPE_HW_CACHE,
+     .attrConfig = PERF_COUNT_HW_CACHE_L1D},
 };
 typedef struct virPerfEventAttr *virPerfEventAttrPtr;
 

diff --git a/src/util/virperf.h b/src/util/virperf.h
index 1f43c92beb26acb9eabdfb4725a97545403246fe..4c562afba18e2627c6c301d7d7205df2629f5c11 100644 (file)
--- a/src/util/virperf.h
+++ b/src/util/virperf.h
@@ -47,6 +47,7 @@ typedef enum {
                                               the backend of the instruction
                                               processor pipeline */
     VIR_PERF_EVENT_REF_CPU_CYCLES,   /* Count of ref cpu cycles */
+    VIR_PERF_EVENT_CACHE_L1D, /* Count of level 1 data cache*/
 
     VIR_PERF_EVENT_LAST
 } virPerfEventType;

diff --git a/tests/genericxml2xmlindata/generic-perf.xml b/tests/genericxml2xmlindata/generic-perf.xml
index 437cd65ccc99dd855e3635dcd88cee92bc7f58e5..d1418d08c8f6ed8f0c2171eca5f77c2a7ac1bb28 100644 (file)
--- a/tests/genericxml2xmlindata/generic-perf.xml
+++ b/tests/genericxml2xmlindata/generic-perf.xml
@@ -26,6 +26,7 @@
     <event name='stalled_cycles_frontend' enabled='yes'/>
     <event name='stalled_cycles_backend' enabled='yes'/>
     <event name='ref_cpu_cycles' enabled='yes'/>
+    <event name='cache_l1d' enabled='yes'/>
   </perf>
   <devices>
   </devices>

diff --git a/tools/virsh.pod b/tools/virsh.pod
index 84694ffbbd2b0106369595200ba5c4d4609baa4e..a70f32238a69d81a9157d64bea981e6abe5987d6 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.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.ref_cpu_cycles" - the count of ref cpu cycles
+"perf.ref_cpu_cycles" - the count of ref cpu cycles,
+"perf.cache_l1d" - the count of level 1 data cache
 
 See the B<perf> command for more details about each event.
 
@@ -2315,6 +2316,8 @@ B<Valid perf event names>
   ref_cpu_cycles   -  Provides the count of total cpu cycles
                       not affected by CPU frequency scaling by
                       applications running on the platform.
+  cache_l1d - Provides the count of total level 1 data cache
+              by applications running on the platform.
 
 B<Note>: The statistics can be retrieved using the B<domstats> command using
 the I<--perf> flag.