From 6ef2c7e00f68342b7ecd65647ff0e90c65ef8c73 Mon Sep 17 00:00:00 2001 From: Nitesh Konkar Date: Thu, 23 Feb 2017 20:25:32 +0530 Subject: [PATCH] perf: add page_faults software perf event support This patch adds support and documentation for the page_faults perf event. Signed-off-by: Nitesh Konkar --- docs/formatdomain.html.in | 8 ++++++++ docs/schemas/domaincommon.rng | 1 + include/libvirt/libvirt-domain.h | 11 +++++++++++ src/libvirt-domain.c | 2 ++ 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, 32 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 3e138f1f20..a6e4c9ddf1 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1949,6 +1949,7 @@ <event name='ref_cpu_cycles' enabled='no'/> <event name='cpu_clock' enabled='no'/> <event name='task_clock' enabled='no'/> + <event name='page_faults' enabled='no'/> </perf> ... @@ -2041,6 +2042,13 @@ is run by applications running on the platform perf.task_clock + + page_faults + the count of page faults by applications running on the + platform. This includes minor, major, invalid and other + types of page faults + perf.page_faults +

Devices

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 64b5bfc8ab..856a2f731e 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -435,6 +435,7 @@ ref_cpu_cycles cpu_clock task_clock + page_faults diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 2495c90393..1a6cb19b0a 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -2210,6 +2210,17 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats); */ # define VIR_PERF_PARAM_TASK_CLOCK "task_clock" +/** +* VIR_PERF_PARAM_PAGE_FAULTS: +* +* Macro for typed parameter name that represents page_faults +* perf event which can be used to measure the count of page +* faults by applications running on the platform. It corresponds +* to the "perf.page_faults" field in the *Stats APIs. +*/ +# define VIR_PERF_PARAM_PAGE_FAULTS "page_faults" + + int virDomainGetPerfEvents(virDomainPtr dom, virTypedParameterPtr *params, int *nparams, diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 6e1fd7eb8c..b3dfd1b3a5 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11254,6 +11254,8 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * It is produced by the cpu_clock perf event. * "perf.task_clock" - The count of task clock time as unsigned long long. * It is produced by the task_clock perf event. + * "perf.page_faults" - The count of page faults as unsigned long long. + * It is produced by the page_faults 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 c2ac41f370..83e9377dce 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9569,6 +9569,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom, VIR_PERF_PARAM_REF_CPU_CYCLES, VIR_TYPED_PARAM_BOOLEAN, VIR_PERF_PARAM_CPU_CLOCK, VIR_TYPED_PARAM_BOOLEAN, VIR_PERF_PARAM_TASK_CLOCK, VIR_TYPED_PARAM_BOOLEAN, + VIR_PERF_PARAM_PAGE_FAULTS, VIR_TYPED_PARAM_BOOLEAN, NULL) < 0) return -1; diff --git a/src/util/virperf.c b/src/util/virperf.c index 16301fd2b9..4ae13af19d 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -44,7 +44,7 @@ VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST, "branch_instructions", "branch_misses", "bus_cycles", "stalled_cycles_frontend", "stalled_cycles_backend", "ref_cpu_cycles", - "cpu_clock", "task_clock"); + "cpu_clock", "task_clock", "page_faults"); struct virPerfEvent { int type; @@ -119,6 +119,9 @@ static struct virPerfEventAttr attrs[] = { {.type = VIR_PERF_EVENT_TASK_CLOCK, .attrType = PERF_TYPE_SOFTWARE, .attrConfig = PERF_COUNT_SW_TASK_CLOCK}, + {.type = VIR_PERF_EVENT_PAGE_FAULTS, + .attrType = PERF_TYPE_SOFTWARE, + .attrConfig = PERF_COUNT_SW_PAGE_FAULTS}, }; typedef struct virPerfEventAttr *virPerfEventAttrPtr; diff --git a/src/util/virperf.h b/src/util/virperf.h index bfff8fc2a8..182a9ec8b8 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -49,6 +49,7 @@ typedef enum { VIR_PERF_EVENT_REF_CPU_CYCLES, /* Count of ref cpu cycles */ VIR_PERF_EVENT_CPU_CLOCK, /* Count of cpu clock time*/ VIR_PERF_EVENT_TASK_CLOCK, /* Count of task clock time*/ + VIR_PERF_EVENT_PAGE_FAULTS, /* Count of total page faults */ VIR_PERF_EVENT_LAST } virPerfEventType; diff --git a/tests/genericxml2xmlindata/generic-perf.xml b/tests/genericxml2xmlindata/generic-perf.xml index 5ebc0a2b98..3f27887212 100644 --- a/tests/genericxml2xmlindata/generic-perf.xml +++ b/tests/genericxml2xmlindata/generic-perf.xml @@ -28,6 +28,7 @@ + diff --git a/tools/virsh.pod b/tools/virsh.pod index b91b9a44d2..0f825c3d46 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -966,6 +966,7 @@ I<--perf> returns the statistics of all enabled perf events: "perf.ref_cpu_cycles" - the count of ref cpu cycles "perf.cpu_clock" - the count of cpu clock time "perf.task_clock" - the count of task clock time + "perf.page_faults" - the count of page faults See the B command for more details about each event. @@ -2339,6 +2340,8 @@ B applications running on the platform. task_clock - Provides the task clock time consumed by applications running on the platform. + page_faults - Provides the count of page faults by + applications running on the platform. B: The statistics can be retrieved using the B command using the I<--perf> flag. -- 2.47.2