From 7d3473106760f883ae4670ebbaf7e624c2a064f4 Mon Sep 17 00:00:00 2001 From: Nitesh Konkar Date: Tue, 13 Dec 2016 21:31:38 +0530 Subject: [PATCH] perf: add bus_cycles perf event support This patch adds support and documentation for the bus_cycles perf event. Signed-off-by: Nitesh Konkar --- docs/formatdomain.html.in | 6 ++++++ docs/news.html.in | 5 +++-- docs/schemas/domaincommon.rng | 1 + include/libvirt/libvirt-domain.h | 10 ++++++++++ src/libvirt-domain.c | 2 ++ src/qemu/qemu_driver.c | 1 + src/util/virperf.c | 6 +++++- src/util/virperf.h | 1 + tests/genericxml2xmlindata/generic-perf.xml | 1 + tools/virsh.pod | 5 ++++- 10 files changed, 34 insertions(+), 4 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 086af551d4..cd3182bb6f 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1929,6 +1929,7 @@ <event name='cache_misses' enabled='no'/> <event name='branch_instructions' enabled='no'/> <event name='branch_misses' enabled='no'/> + <event name='bus_cycles' enabled='no'/> </perf> ... @@ -1984,6 +1985,11 @@ the count of branch misses by applications running on the platform perf.branch_misses + + bus_cycles + the count of bus cycles by applications running on the platform + perf.bus_cycles +

Devices

diff --git a/docs/news.html.in b/docs/news.html.in index 7f5f8b5a9e..09e4c9544a 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -35,8 +35,9 @@
  • Improvements
    • perf: Add more perf statistics
      - Add support to get the count of branch instructions executed - and branch misses by applications running on the platform + Add support to get the count of branch instructions executed, + branch misses, and bus cycles by applications running on + the platform
    • diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index bf8818dc00..21a7afa47f 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -429,6 +429,7 @@ cache_misses branch_instructions branch_misses + bus_cycles diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 3290b10ea8..6d74238bbd 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -2145,6 +2145,16 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats); */ # define VIR_PERF_PARAM_BRANCH_MISSES "branch_misses" +/** + * VIR_PERF_PARAM_BUS_CYCLES: + * + * Macro for typed parameter name that represents bus_cycles + * perf event which can be used to measure the count of bus cycles + * by applications running on the platform. It corresponds to the + * "perf.bus_cycles" field in the *Stats APIs. + */ +# define VIR_PERF_PARAM_BUS_CYCLES "bus_cycles" + int virDomainGetPerfEvents(virDomainPtr dom, virTypedParameterPtr *params, int *nparams, diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index dd9b800663..8218011267 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11234,6 +11234,8 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * branch_instructions perf event. * "perf.branch_misses" - The count of branch misses as unsigned long * long. It is produced by branch_misses perf event. + * "perf.bus_cycles" - The count of bus cycles as unsigned long + * long. It is produced by bus_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 8dc318a388..ee99d6f805 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9855,6 +9855,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom, VIR_PERF_PARAM_CACHE_MISSES, VIR_TYPED_PARAM_BOOLEAN, VIR_PERF_PARAM_BRANCH_INSTRUCTIONS, VIR_TYPED_PARAM_BOOLEAN, VIR_PERF_PARAM_BRANCH_MISSES, VIR_TYPED_PARAM_BOOLEAN, + VIR_PERF_PARAM_BUS_CYCLES, VIR_TYPED_PARAM_BOOLEAN, NULL) < 0) return -1; diff --git a/src/util/virperf.c b/src/util/virperf.c index 7f630da0f7..31a5585965 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -41,7 +41,8 @@ VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST, "cmt", "mbmt", "mbml", "cpu_cycles", "instructions", "cache_references", "cache_misses", - "branch_instructions", "branch_misses"); + "branch_instructions", "branch_misses", + "bus_cycles"); struct virPerfEvent { int type; @@ -92,6 +93,9 @@ static struct virPerfEventAttr attrs[] = { {.type = VIR_PERF_EVENT_BRANCH_MISSES, .attrType = PERF_TYPE_HARDWARE, .attrConfig = PERF_COUNT_HW_BRANCH_MISSES}, + {.type = VIR_PERF_EVENT_BUS_CYCLES, + .attrType = PERF_TYPE_HARDWARE, + .attrConfig = PERF_COUNT_HW_BUS_CYCLES}, }; typedef struct virPerfEventAttr *virPerfEventAttrPtr; diff --git a/src/util/virperf.h b/src/util/virperf.h index 7049a5b47e..ac6d789518 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -39,6 +39,7 @@ typedef enum { VIR_PERF_EVENT_BRANCH_INSTRUCTIONS, /* Count of branch instructions for applications */ VIR_PERF_EVENT_BRANCH_MISSES, /* Count of branch misses for applications */ + VIR_PERF_EVENT_BUS_CYCLES, /* Count of bus cycles for applications*/ VIR_PERF_EVENT_LAST } virPerfEventType; diff --git a/tests/genericxml2xmlindata/generic-perf.xml b/tests/genericxml2xmlindata/generic-perf.xml index a1e4e1c968..56a6173796 100644 --- a/tests/genericxml2xmlindata/generic-perf.xml +++ b/tests/genericxml2xmlindata/generic-perf.xml @@ -22,6 +22,7 @@ + diff --git a/tools/virsh.pod b/tools/virsh.pod index 74c05c935c..7b3cb74cb4 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -947,7 +947,8 @@ I<--perf> returns the statistics of all enabled perf events: "perf.cache_references" - the count of cache hits, "perf.cache_misses" - the count of caches misses, "perf.branch_instructions" - the count of branch instructions, -"perf.branch_misses" - the count of branch misses +"perf.branch_misses" - the count of branch misses, +"perf.bus_cycles" - the count of bus cycles See the B command for more details about each event. @@ -2299,6 +2300,8 @@ B platform. branch_misses - Provides the count of branch misses executed by applications running on the platform. + bus_cycles - Provides the count of bus cycles executed + by applications running on the platform. B: The statistics can be retrieved using the B command using the I<--perf> flag.