From 20dc690865e73cb08575a82694006634afd0222e Mon Sep 17 00:00:00 2001 From: Nitesh Konkar Date: Thu, 23 Feb 2017 20:25:31 +0530 Subject: [PATCH] perf: add task_clock software perf event support This patch adds support and documentation for the task_clock 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 60074893b9..3e138f1f20 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1948,6 +1948,7 @@ <event name='stalled_cycles_backend' enabled='no'/> <event name='ref_cpu_cycles' enabled='no'/> <event name='cpu_clock' enabled='no'/> + <event name='task_clock' enabled='no'/> </perf> ... @@ -2033,6 +2034,13 @@ the platform perf.cpu_clock + + task_clock + the count of task clock time, as measured by a monotonic + high-resolution CPU timer, specific to the task that + is run by applications running on the platform + perf.task_clock +

Devices

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 8f52830156..64b5bfc8ab 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -434,6 +434,7 @@ stalled_cycles_backend ref_cpu_cycles cpu_clock + task_clock diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index d594121c7a..2495c90393 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -2199,6 +2199,17 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats); */ # define VIR_PERF_PARAM_CPU_CLOCK "cpu_clock" +/** + * VIR_PERF_PARAM_TASK_CLOCK: + * + * Macro for typed parameter name that represents task_clock + * perf event which can be used to measure the count of task + * clock time by applications running on the platform. It + * corresponds to the "perf.task_clock" field in the *Stats + * APIs. + */ +# define VIR_PERF_PARAM_TASK_CLOCK "task_clock" + int virDomainGetPerfEvents(virDomainPtr dom, virTypedParameterPtr *params, int *nparams, diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 65573faa71..6e1fd7eb8c 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11252,6 +11252,8 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * ref_cpu_cycles perf event. * "perf.cpu_clock" - The count of cpu clock time as unsigned long long. * 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. * * 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 3c3c495640..c2ac41f370 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9568,6 +9568,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom, VIR_PERF_PARAM_STALLED_CYCLES_BACKEND, VIR_TYPED_PARAM_BOOLEAN, 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, NULL) < 0) return -1; diff --git a/src/util/virperf.c b/src/util/virperf.c index 2d6cbbb0ae..16301fd2b9 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"); + "cpu_clock", "task_clock"); struct virPerfEvent { int type; @@ -116,6 +116,9 @@ static struct virPerfEventAttr attrs[] = { {.type = VIR_PERF_EVENT_CPU_CLOCK, .attrType = PERF_TYPE_SOFTWARE, .attrConfig = PERF_COUNT_SW_CPU_CLOCK}, + {.type = VIR_PERF_EVENT_TASK_CLOCK, + .attrType = PERF_TYPE_SOFTWARE, + .attrConfig = PERF_COUNT_SW_TASK_CLOCK}, }; typedef struct virPerfEventAttr *virPerfEventAttrPtr; diff --git a/src/util/virperf.h b/src/util/virperf.h index 8a7270c676..bfff8fc2a8 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -48,6 +48,7 @@ typedef enum { processor pipeline */ 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_LAST } virPerfEventType; diff --git a/tests/genericxml2xmlindata/generic-perf.xml b/tests/genericxml2xmlindata/generic-perf.xml index 3e7834e2a1..5ebc0a2b98 100644 --- a/tests/genericxml2xmlindata/generic-perf.xml +++ b/tests/genericxml2xmlindata/generic-perf.xml @@ -27,6 +27,7 @@ + diff --git a/tools/virsh.pod b/tools/virsh.pod index b672679531..b91b9a44d2 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -965,6 +965,7 @@ I<--perf> returns the statistics of all enabled perf events: cpu cycles "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 See the B command for more details about each event. @@ -2336,6 +2337,8 @@ B applications running on the platform. cpu_clock - Provides the cpu clock time consumed by applications running on the platform. + task_clock - Provides the task clock time consumed by + applications running on the platform. B: The statistics can be retrieved using the B command using the I<--perf> flag.