This patch adds support and documentation
for the page_faults_min perf event.
Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com>
---
docs/formatdomain.html.in | 7 +++++++
docs/news.xml | 5 +++--
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 | 5 +++++
10 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index f0efab1..1857168 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -1942,6 +1942,7 @@
<event name='page_faults' enabled='no'/>
<event name='context_switches' enabled='no'/>
<event name='cpu_migrations' enabled='no'/>
+ <event name='page_faults_min' enabled='no'/>
</perf>
...
</pre>
@@ -2045,6 +2046,12 @@
<td>the count of cpu migrations by applications running on the
platform</td>
<td><code>perf.cpu_migrations</code></td>
</tr>
+ <tr>
+ <td><code>page_faults_min</code></td>
+ <td>the count of minor page faults by applications running on the
+ platform</td>
+ <td><code>perf.page_faults_min</code></td>
+ </tr>
</table>
<h3><a name="elementsDevices">Devices</a></h3>
diff --git a/docs/news.xml b/docs/news.xml
index 0489c42..0e7c0d2 100644
--- a/docs/news.xml
+++ b/docs/news.xml
@@ -137,8 +137,9 @@
Add support to get the count of branch instructions
executed, branch misses, bus cycles, stalled frontend
cpu cycles, stalled backend cpu cycles, ref cpu cycles,
- cpu clock, task clock, page faults, context switches and
- cpu migrations by applications running on the platform.
+ cpu clock, task clock, page faults, context switches,
+ cpu migrations and page faults min by applications
+ running on the platform.
</description>
</change>
<change>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 5bd06cb..f30ec0d 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -438,6 +438,7 @@
<value>page_faults</value>
<value>context_switches</value>
<value>cpu_migrations</value>
+ <value>page_faults_min</value>
</choice>
</attribute>
<attribute name="enabled">
diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
index b4abdb0..108591a 100644
--- a/include/libvirt/libvirt-domain.h
+++ b/include/libvirt/libvirt-domain.h
@@ -2238,6 +2238,16 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats);
*/
# define VIR_PERF_PARAM_CPU_MIGRATIONS "cpu_migrations"
+/**
+ * VIR_PERF_PARAM_PAGE_FAULTS_MIN:
+ *
+ * Macro for typed parameter name that represents page_faults_min
+ * perf event which can be used to measure the count of minor page
+ * faults by applications running on the platform. It corresponds
+ * to the "perf.page_faults_min" field in the *Stats APIs.
+ */
+# define VIR_PERF_PARAM_PAGE_FAULTS_MIN "page_faults_min"
+
int virDomainGetPerfEvents(virDomainPtr dom,
virTypedParameterPtr *params,
int *nparams,
diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index d063414..1be385e 100644
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -11262,6 +11262,9 @@ virConnectGetDomainCapabilities(virConnectPtr conn,
* "perf.cpu_migrations" - The count of cpu migrations as unsigned long
* long. It is produced by the cpu_migrations
* perf event.
+ * "perf.page_faults_min" - The count of minor page faults as unsigned
long
+ * long. It is produced by the page_faults_min
+ * 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 3fb7032..4f24fa6 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -9554,6 +9554,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom,
VIR_PERF_PARAM_PAGE_FAULTS, VIR_TYPED_PARAM_BOOLEAN,
VIR_PERF_PARAM_CONTEXT_SWITCHES, VIR_TYPED_PARAM_BOOLEAN,
VIR_PERF_PARAM_CPU_MIGRATIONS, VIR_TYPED_PARAM_BOOLEAN,
+ VIR_PERF_PARAM_PAGE_FAULTS_MIN, VIR_TYPED_PARAM_BOOLEAN,
NULL) < 0)
return -1;
diff --git a/src/util/virperf.c b/src/util/virperf.c
index 4559845..c839b04 100644
--- a/src/util/virperf.c
+++ b/src/util/virperf.c
@@ -45,7 +45,8 @@ VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST,
"bus_cycles", "stalled_cycles_frontend",
"stalled_cycles_backend", "ref_cpu_cycles",
"cpu_clock", "task_clock", "page_faults",
- "context_switches", "cpu_migrations");
+ "context_switches", "cpu_migrations",
+ "page_faults_min");
struct virPerfEvent {
int type;
@@ -129,6 +130,9 @@ static struct virPerfEventAttr attrs[] = {
{.type = VIR_PERF_EVENT_CPU_MIGRATIONS,
.attrType = PERF_TYPE_SOFTWARE,
.attrConfig = PERF_COUNT_SW_CPU_MIGRATIONS},
+ {.type = VIR_PERF_EVENT_PAGE_FAULTS_MIN,
+ .attrType = PERF_TYPE_SOFTWARE,
+ .attrConfig = PERF_COUNT_SW_PAGE_FAULTS_MIN},
};
typedef struct virPerfEventAttr *virPerfEventAttrPtr;
diff --git a/src/util/virperf.h b/src/util/virperf.h
index b769ebc..aec352b 100644
--- a/src/util/virperf.h
+++ b/src/util/virperf.h
@@ -52,6 +52,7 @@ typedef enum {
VIR_PERF_EVENT_PAGE_FAULTS, /* Count of page faults */
VIR_PERF_EVENT_CONTEXT_SWITCHES, /* Count of context switches */
VIR_PERF_EVENT_CPU_MIGRATIONS, /* Count of cpu migrations */
+ VIR_PERF_EVENT_PAGE_FAULTS_MIN, /* Count of minor page faults */
VIR_PERF_EVENT_LAST
} virPerfEventType;
diff --git a/tests/genericxml2xmlindata/generic-perf.xml
b/tests/genericxml2xmlindata/generic-perf.xml
index f856318..62ad973 100644
--- a/tests/genericxml2xmlindata/generic-perf.xml
+++ b/tests/genericxml2xmlindata/generic-perf.xml
@@ -31,6 +31,7 @@
<event name='page_faults' enabled='yes'/>
<event name='context_switches' enabled='yes'/>
<event name='cpu_migrations' enabled='yes'/>
+ <event name='page_faults_min' enabled='yes'/>
</perf>
<devices>
</devices>
diff --git a/tools/virsh.pod b/tools/virsh.pod
index a5e8ccd..4eb689e 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -951,6 +951,7 @@ I<--perf> returns the statistics of all enabled perf events:
"perf.page_faults" - the count of page faults
"perf.context_switches" - the count of context switches
"perf.cpu_migrations" - the count of cpu migrations
+"perf.page_faults_min" - the count of minor page faults
See the B<perf> command for more details about each event.
@@ -2326,6 +2327,10 @@ B<Valid perf event names>
cpu_migrations - Provides the count of cpu migrations, that is, where the
process moved from one logical processor to another, by
applications running on the platform
+ page_faults_min - Provides the count of minor page faults, that is, where
+ the page was present in the page cache, and therefore the
+ fault avoided loading it from storage, 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