From d216e9ad772176a39e74d99c44093b85ad1c9a1a Mon Sep 17 00:00:00 2001 From: Nitesh Konkar Date: Thu, 23 Feb 2017 20:25:35 +0530 Subject: [PATCH] perf: add page_faults_min software perf event support This patch adds support and documentation for the page_faults_min perf event. Signed-off-by: Nitesh Konkar --- 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 | 6 +++++- src/util/virperf.h | 1 + tests/genericxml2xmlindata/generic-perf.xml | 1 + tools/virsh.pod | 3 +++ 9 files changed, 34 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index d407a786c4..4ee3464d62 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1952,6 +1952,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> ... @@ -2064,6 +2065,14 @@ applications running on the platform perf.cpu_migrations + + page_faults_min + 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 + perf.page_faults_min +

Devices

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index a14b18a681..b8914d5f4d 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -438,6 +438,7 @@ page_faults context_switches cpu_migrations + page_faults_min diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 7e24f50635..b7e6c712e2 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -2240,6 +2240,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 05b09f94ed..f0e4f8fe37 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11263,6 +11263,9 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * processor to another, 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 88116cf7da..02bd7caa3b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9572,6 +9572,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 0127c828af..9e41df9c51 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 90ae007295..aa90273a22 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -52,6 +52,7 @@ typedef enum { VIR_PERF_EVENT_PAGE_FAULTS, /* Count of total 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 f8563189fa..62ad973168 100644 --- a/tests/genericxml2xmlindata/generic-perf.xml +++ b/tests/genericxml2xmlindata/generic-perf.xml @@ -31,6 +31,7 @@ + diff --git a/tools/virsh.pod b/tools/virsh.pod index 6ae21590dd..5c0876b1b2 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -969,6 +969,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 command for more details about each event. @@ -2348,6 +2349,8 @@ B by applications running on the platform. cpu_migrations - Provides the count cpu migrations by applications running on the platform. + page_faults_min - Provides the count minor page faults + by applications running on the platform. B: The statistics can be retrieved using the B command using the I<--perf> flag.