8:55 a.m.
This patch adds support and documentation
for the page_faults_maj perf event.
Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com>
---
docs/formatdomain.html.in | 9 +++++++++
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 | 5 ++++-
src/util/virperf.h | 1 +
tests/genericxml2xmlindata/generic-perf.xml | 1 +
tools/virsh.pod | 3 +++
9 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 0d2834b..3d94441 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -1942,6 +1942,7 @@
<event name='context_switches' enabled='no'/>
<event name='cpu_migrations' enabled='no'/>
<event name='page_faults_min' enabled='no'/>
+ <event name='page_faults_maj' enabled='no'/>
</perf>
...
</pre>
@@ -2062,6 +2063,14 @@
applications running on the platform</td>
<td><code>perf.page_faults_min</code></td>
</tr>
+ <tr>
+ <td><code>page_faults_maj</code></td>
+ <td>the count of major page faults, that is, where the
+ page was not present in the page cache, and
+ therefore had to be fetched from storage, by
+ applications running on the platform</td>
+ <td><code>perf.page_faults_maj</code></td>
+ </tr>
</table>
<h3><a name="elementsDevices">Devices</a></h3>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index b8914d5..82327c6 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -439,6 +439,7 @@
<value>context_switches</value>
<value>cpu_migrations</value>
<value>page_faults_min</value>
+ <value>page_faults_maj</value>
</choice>
</attribute>
<attribute name="enabled">
diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
index b7e6c71..f6e5c5a 100644
--- a/include/libvirt/libvirt-domain.h
+++ b/include/libvirt/libvirt-domain.h
@@ -2250,6 +2250,16 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats);
*/
# define VIR_PERF_PARAM_PAGE_FAULTS_MIN "page_faults_min"
+/**
+ * VIR_PERF_PARAM_PAGE_FAULTS_MAJ:
+ *
+ * Macro for typed parameter name that represents page_faults_maj
+ * perf event which can be used to measure the count of major page
+ * faults by applications running on the platform. It corresponds
+ * to the "perf.page_faults_maj" field in the *Stats APIs.
+ */
+# define VIR_PERF_PARAM_PAGE_FAULTS_MAJ "page_faults_maj"
+
int virDomainGetPerfEvents(virDomainPtr dom,
virTypedParameterPtr *params,
int *nparams,
diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index 2e95532..21f91de 100644
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -11266,6 +11266,9 @@ virConnectGetDomainCapabilities(virConnectPtr conn,
* "perf.page_faults_min" - The count of minor page faults as unsigned
* long long. It is produced by the
* page_faults_min perf event.
+ * "perf.page_faults_maj" - The count of major page faults as unsigned
+ * long long. It is produced by the
+ * page_faults_maj 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 8523e1f..5448119 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -9575,6 +9575,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom,
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,
+ VIR_PERF_PARAM_PAGE_FAULTS_MAJ, VIR_TYPED_PARAM_BOOLEAN,
NULL) < 0)
return -1;
diff --git a/src/util/virperf.c b/src/util/virperf.c
index 9e41df9..b3dd5c7 100644
--- a/src/util/virperf.c
+++ b/src/util/virperf.c
@@ -46,7 +46,7 @@ VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST,
"stalled_cycles_backend", "ref_cpu_cycles",
"cpu_clock", "task_clock", "page_faults",
"context_switches", "cpu_migrations",
- "page_faults_min");
+ "page_faults_min", "page_faults_maj");
struct virPerfEvent {
int type;
@@ -133,6 +133,9 @@ static struct virPerfEventAttr attrs[] = {
{.type = VIR_PERF_EVENT_PAGE_FAULTS_MIN,
.attrType = PERF_TYPE_SOFTWARE,
.attrConfig = PERF_COUNT_SW_PAGE_FAULTS_MIN},
+ {.type = VIR_PERF_EVENT_PAGE_FAULTS_MAJ,
+ .attrType = PERF_TYPE_SOFTWARE,
+ .attrConfig = PERF_COUNT_SW_PAGE_FAULTS_MAJ},
};
typedef struct virPerfEventAttr *virPerfEventAttrPtr;
diff --git a/src/util/virperf.h b/src/util/virperf.h
index aa90273..49d4ba7 100644
--- a/src/util/virperf.h
+++ b/src/util/virperf.h
@@ -53,6 +53,7 @@ typedef enum {
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_PAGE_FAULTS_MAJ, /* Count of major page faults */
VIR_PERF_EVENT_LAST
} virPerfEventType;
diff --git a/tests/genericxml2xmlindata/generic-perf.xml
b/tests/genericxml2xmlindata/generic-perf.xml
index 62ad973..a5b6dfb 100644
--- a/tests/genericxml2xmlindata/generic-perf.xml
+++ b/tests/genericxml2xmlindata/generic-perf.xml
@@ -32,6 +32,7 @@
<event name='context_switches' enabled='yes'/>
<event name='cpu_migrations' enabled='yes'/>
<event name='page_faults_min' enabled='yes'/>
+ <event name='page_faults_maj' enabled='yes'/>
</perf>
<devices>
</devices>
diff --git a/tools/virsh.pod b/tools/virsh.pod
index 6194aaf..18282f8 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -970,6 +970,7 @@ I<--perf> returns the statistics of all enabled perf events:
"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
+ "perf.page_faults_maj" - the count of major page faults
See the B<perf> command for more details about each event.
@@ -2351,6 +2352,8 @@ B<Valid perf event names>
applications running on the platform
page_faults_min - Provides the count minor page faults
by applications running on the platform
+ page_faults_maj - Provides the count major page faults
+ 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