From 71bbe65311b17c6f1c2a79f4fe1a1be636bdbfda Mon Sep 17 00:00:00 2001 From: Nitesh Konkar Date: Tue, 13 Dec 2016 21:31:41 +0530 Subject: [PATCH] perf: add ref_cpu_cycles perf event support This patch adds support and documentation for the ref_cpu_cycles perf event. Signed-off-by: Nitesh Konkar --- docs/formatdomain.html.in | 7 +++++++ docs/news.html.in | 4 ++-- docs/schemas/domaincommon.rng | 1 + include/libvirt/libvirt-domain.h | 11 +++++++++++ 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 | 6 +++++- 10 files changed, 37 insertions(+), 4 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 357cb2d1e3..9646782828 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1932,6 +1932,7 @@ <event name='bus_cycles' enabled='no'/> <event name='stalled_cycles_frontend' enabled='no'/> <event name='stalled_cycles_backend' enabled='no'/> + <event name='ref_cpu_cycles' enabled='no'/> </perf> ... @@ -2004,6 +2005,12 @@ processor pipeline by applications running on the platform perf.stalled_cycles_backend + + ref_cpu_cycles + the count of total cpu cycles not affected by CPU frequency scaling + by applications running on the platform + perf.ref_cpu_cycles +

Devices

diff --git a/docs/news.html.in b/docs/news.html.in index c148f336f4..80ac304cd7 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -37,8 +37,8 @@
  • perf: Add more perf statistics
    Add support to get the count of branch instructions executed, branch misses, bus cycles, stalled frontend - cpu cycles, and stalled backend cpu cycles by applications - running on the platform + cpu cycles, stalled backend cpu cycles, and ref cpu + cycles by applications running on the platform
    • diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index e5b5fb5c7b..4d76315b09 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -432,6 +432,7 @@ bus_cycles stalled_cycles_frontend stalled_cycles_backend + ref_cpu_cycles diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index ad9eef3573..6362947087 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -2177,6 +2177,17 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats); */ # define VIR_PERF_PARAM_STALLED_CYCLES_BACKEND "stalled_cycles_backend" +/** + * VIR_PERF_PARAM_REF_CPU_CYCLES: + * + * Macro for typed parameter name that represents ref_cpu_cycles + * perf event which can be used to measure the count of total cpu + * cycles not affected by CPU frequency scaling by applications + * running on the platform. It corresponds to the + * "perf.ref_cpu_cycles" field in the *Stats APIs. + */ +# define VIR_PERF_PARAM_REF_CPU_CYCLES "ref_cpu_cycles" + int virDomainGetPerfEvents(virDomainPtr dom, virTypedParameterPtr *params, int *nparams, diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index d40760963f..5b3e842058 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11246,6 +11246,10 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * pipeline as unsigned long long. It is * produced by stalled_cycles_backend * perf event. + * "perf.ref_cpu_cycles" - The count of total cpu cycles not affected by + * CPU frequency scaling by applications running + * as unsigned long long. It is produced by the + * ref_cpu_cycles 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 140a785fa0..0bf1856446 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9858,6 +9858,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom, VIR_PERF_PARAM_BUS_CYCLES, VIR_TYPED_PARAM_BOOLEAN, VIR_PERF_PARAM_STALLED_CYCLES_FRONTEND, VIR_TYPED_PARAM_BOOLEAN, VIR_PERF_PARAM_STALLED_CYCLES_BACKEND, VIR_TYPED_PARAM_BOOLEAN, + VIR_PERF_PARAM_REF_CPU_CYCLES, VIR_TYPED_PARAM_BOOLEAN, NULL) < 0) return -1; diff --git a/src/util/virperf.c b/src/util/virperf.c index c9a0e39483..49ec258498 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -43,7 +43,7 @@ VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST, "cache_references", "cache_misses", "branch_instructions", "branch_misses", "bus_cycles", "stalled_cycles_frontend", - "stalled_cycles_backend"); + "stalled_cycles_backend", "ref_cpu_cycles"); struct virPerfEvent { int type; @@ -103,6 +103,9 @@ static struct virPerfEventAttr attrs[] = { {.type = VIR_PERF_EVENT_STALLED_CYCLES_BACKEND, .attrType = PERF_TYPE_HARDWARE, .attrConfig = PERF_COUNT_HW_STALLED_CYCLES_BACKEND}, + {.type = VIR_PERF_EVENT_REF_CPU_CYCLES, + .attrType = PERF_TYPE_HARDWARE, + .attrConfig = PERF_COUNT_HW_REF_CPU_CYCLES}, }; typedef struct virPerfEventAttr *virPerfEventAttrPtr; diff --git a/src/util/virperf.h b/src/util/virperf.h index e5b9ae850c..1f43c92beb 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -46,6 +46,7 @@ typedef enum { VIR_PERF_EVENT_STALLED_CYCLES_BACKEND, /* Count of stalled cpu cycles in the backend of the instruction processor pipeline */ + VIR_PERF_EVENT_REF_CPU_CYCLES, /* Count of ref cpu cycles */ VIR_PERF_EVENT_LAST } virPerfEventType; diff --git a/tests/genericxml2xmlindata/generic-perf.xml b/tests/genericxml2xmlindata/generic-perf.xml index f01d574e6f..437cd65ccc 100644 --- a/tests/genericxml2xmlindata/generic-perf.xml +++ b/tests/genericxml2xmlindata/generic-perf.xml @@ -25,6 +25,7 @@ + diff --git a/tools/virsh.pod b/tools/virsh.pod index fb0758dfa0..940c64611c 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -950,7 +950,8 @@ I<--perf> returns the statistics of all enabled perf events: "perf.branch_misses" - the count of branch misses, "perf.bus_cycles" - the count of bus cycles, "perf.stalled_cycles_frontend" - the count of stalled frontend cpu cycles, -"perf.stalled_cycles_backend" - the count of stalled backend cpu cycles +"perf.stalled_cycles_backend" - the count of stalled backend cpu cycles, +"perf.ref_cpu_cycles" - the count of ref cpu cycles See the B command for more details about each event. @@ -2312,6 +2313,9 @@ B cycles in the backend of the instruction processor pipeline by applications running on the platform. + ref_cpu_cycles - Provides the count of total cpu cycles + not affected by CPU frequency scaling by + applications running on the platform. B: The statistics can be retrieved using the B command using the I<--perf> flag. -- GitLab