diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 2d8ba64fe61b18189f30d4f9edd9d3f3cafccbeb..60074893b9b8c8930db65ea6f09f52cb2eec823f 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1947,6 +1947,7 @@ <event name='stalled_cycles_frontend' enabled='no'/> <event name='stalled_cycles_backend' enabled='no'/> <event name='ref_cpu_cycles' enabled='no'/> + <event name='cpu_clock' enabled='no'/> </perf> ... @@ -2025,6 +2026,13 @@ by applications running on the platform perf.ref_cpu_cycles + + cpu_clock + the count of cpu clock time, as measured by a monotonic + high-resolution per-CPU timer, by applications running on + the platform + perf.cpu_clock +

Devices

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index c64544ac473d9c3bd4d04744c8195b06839e58ec..8f528301565870af191826833df0c6d8f54b7a21 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -433,6 +433,7 @@ stalled_cycles_frontend stalled_cycles_backend ref_cpu_cycles + cpu_clock diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index c0f715d66a6970210835fe7d449e84f153222fd8..d594121c7a113c6aafb103a48489ec8aae1ec386 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -2188,6 +2188,17 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats); */ # define VIR_PERF_PARAM_REF_CPU_CYCLES "ref_cpu_cycles" +/** + * VIR_PERF_PARAM_CPU_CLOCK: + * + * Macro for typed parameter name that represents cpu_clock + * perf event which can be used to measure the count of cpu + * clock time by applications running on the platform. It + * corresponds to the "perf.cpu_clock" field in the *Stats + * APIs. + */ +# define VIR_PERF_PARAM_CPU_CLOCK "cpu_clock" + int virDomainGetPerfEvents(virDomainPtr dom, virTypedParameterPtr *params, int *nparams, diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 749297f214515c22fec243819b76de64303c94dc..65573faa716abfadf7fc42a67e6aa6a02a815b49 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11250,6 +11250,8 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * CPU frequency scaling by applications running * as unsigned long long. It is produced by the * 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. * * 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 d4807ba7331aa86119af98ba558ec407cf6eca30..3c3c495640c51d3487a75a2199649030fe3bf373 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9567,6 +9567,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom, 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, + VIR_PERF_PARAM_CPU_CLOCK, VIR_TYPED_PARAM_BOOLEAN, NULL) < 0) return -1; diff --git a/src/util/virperf.c b/src/util/virperf.c index 4493608a0f16e5e66119408905b5f50be8efb015..2d6cbbb0aea144ead75487b35558e7ded1c769ce 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -43,7 +43,8 @@ VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST, "cache_references", "cache_misses", "branch_instructions", "branch_misses", "bus_cycles", "stalled_cycles_frontend", - "stalled_cycles_backend", "ref_cpu_cycles"); + "stalled_cycles_backend", "ref_cpu_cycles", + "cpu_clock"); struct virPerfEvent { int type; @@ -112,6 +113,9 @@ static struct virPerfEventAttr attrs[] = { .attrConfig = 0, # endif }, + {.type = VIR_PERF_EVENT_CPU_CLOCK, + .attrType = PERF_TYPE_SOFTWARE, + .attrConfig = PERF_COUNT_SW_CPU_CLOCK}, }; typedef struct virPerfEventAttr *virPerfEventAttrPtr; diff --git a/src/util/virperf.h b/src/util/virperf.h index 1f43c92beb26acb9eabdfb4725a97545403246fe..8a7270c676f1f60ac029d7422f1ca0b3997921af 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -47,6 +47,7 @@ typedef enum { the backend of the instruction 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_LAST } virPerfEventType; diff --git a/tests/genericxml2xmlindata/generic-perf.xml b/tests/genericxml2xmlindata/generic-perf.xml index 437cd65ccc99dd855e3635dcd88cee92bc7f58e5..3e7834e2a10bfe6e9d5cd2b64e3e5112321a3163 100644 --- a/tests/genericxml2xmlindata/generic-perf.xml +++ b/tests/genericxml2xmlindata/generic-perf.xml @@ -26,6 +26,7 @@ + diff --git a/tools/virsh.pod b/tools/virsh.pod index 6c06ee029adcace57abfd6d66226948d5a22ed15..b67267953140142915cf6afdcbe0a5c8f90997a9 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -964,6 +964,7 @@ I<--perf> returns the statistics of all enabled perf events: "perf.stalled_cycles_backend" - the count of stalled backend cpu cycles "perf.ref_cpu_cycles" - the count of ref cpu cycles + "perf.cpu_clock" - the count of cpu clock time See the B command for more details about each event. @@ -2333,6 +2334,8 @@ B ref_cpu_cycles - Provides the count of total cpu cycles not affected by CPU frequency scaling by applications running on the platform. + cpu_clock - Provides the cpu clock time consumed by + applications running on the platform. B: The statistics can be retrieved using the B command using the I<--perf> flag.