From 8110c6a5678c2775903787e9fad963b140e34cc5 Mon Sep 17 00:00:00 2001 From: Nitesh Konkar Date: Thu, 23 Feb 2017 20:25:34 +0530 Subject: [PATCH] perf: add cpu_migrations software perf event support This patch adds support and documentation for the cpu_migrations perf event. Signed-off-by: Nitesh Konkar --- docs/formatdomain.html.in | 8 ++++++++ docs/schemas/domaincommon.rng | 1 + include/libvirt/libvirt-domain.h | 9 +++++++++ src/libvirt-domain.c | 4 ++++ 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 9182b3dbe7..d407a786c4 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1951,6 +1951,7 @@ <event name='task_clock' enabled='no'/> <event name='page_faults' enabled='no'/> <event name='context_switches' enabled='no'/> + <event name='cpu_migrations' enabled='no'/> </perf> ... @@ -2056,6 +2057,13 @@ the platform perf.context_switches + + cpu_migrations + the count of cpu migrations, that is, where the process + moved from one logical processor to another, by + applications running on the platform + perf.cpu_migrations +

Devices

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 1a4b6cb631..a14b18a681 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -437,6 +437,7 @@ task_clock page_faults context_switches + cpu_migrations diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index f7e4cd2dce..7e24f50635 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -2230,6 +2230,15 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats); */ # define VIR_PERF_PARAM_CONTEXT_SWITCHES "context_switches" +/** + * VIR_PERF_PARAM_CPU_MIGRATIONS: + * + * Macro for typed parameter name that represents cpu_migrations + * perf event which can be used to measure the count of cpu + * migrations by applications running on the platform. It corresponds + * to the "perf.cpu_migrations" field in the *Stats APIs. + */ +# define VIR_PERF_PARAM_CPU_MIGRATIONS "cpu_migrations" int virDomainGetPerfEvents(virDomainPtr dom, virTypedParameterPtr *params, diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 4004350ba2..05b09f94ed 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11259,6 +11259,10 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * "perf.context_switches" - The count of context switches as unsigned long * long. It is produced by the context_switches * perf event. + * "perf.cpu_migrations" - The count of cpu migrations, from one logical + * processor to another, as unsigned long + * long. It is produced by the cpu_migrations + * 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 30acb45f9b..88116cf7da 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9571,6 +9571,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom, VIR_PERF_PARAM_TASK_CLOCK, VIR_TYPED_PARAM_BOOLEAN, 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, NULL) < 0) return -1; diff --git a/src/util/virperf.c b/src/util/virperf.c index ba81e089d0..0127c828af 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -45,7 +45,7 @@ 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"); + "context_switches", "cpu_migrations"); struct virPerfEvent { int type; @@ -126,6 +126,9 @@ static struct virPerfEventAttr attrs[] = { {.type = VIR_PERF_EVENT_CONTEXT_SWITCHES, .attrType = PERF_TYPE_SOFTWARE, .attrConfig = PERF_COUNT_SW_CONTEXT_SWITCHES}, + {.type = VIR_PERF_EVENT_CPU_MIGRATIONS, + .attrType = PERF_TYPE_SOFTWARE, + .attrConfig = PERF_COUNT_SW_CPU_MIGRATIONS}, }; typedef struct virPerfEventAttr *virPerfEventAttrPtr; diff --git a/src/util/virperf.h b/src/util/virperf.h index 2adc549d90..90ae007295 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -51,6 +51,7 @@ typedef enum { VIR_PERF_EVENT_TASK_CLOCK, /* Count of task clock time*/ 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_LAST } virPerfEventType; diff --git a/tests/genericxml2xmlindata/generic-perf.xml b/tests/genericxml2xmlindata/generic-perf.xml index 29a227392d..f8563189fa 100644 --- a/tests/genericxml2xmlindata/generic-perf.xml +++ b/tests/genericxml2xmlindata/generic-perf.xml @@ -30,6 +30,7 @@ + diff --git a/tools/virsh.pod b/tools/virsh.pod index 2347b53dfb..6ae21590dd 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -968,6 +968,7 @@ I<--perf> returns the statistics of all enabled perf events: "perf.task_clock" - the count of task clock time "perf.page_faults" - the count of page faults "perf.context_switches" - the count of context switches + "perf.cpu_migrations" - the count of cpu migrations See the B command for more details about each event. @@ -2345,6 +2346,8 @@ B applications running on the platform. context_switches - Provides the count of context switches by applications running on the platform. + cpu_migrations - Provides the count cpu migrations by + applications running on the platform. B: The statistics can be retrieved using the B command using the I<--perf> flag.