3:41 a.m.
---
src/qemu/qemu_driver.c | 166 ++++++++++++++++++++++++++++++++++++++++++++++--
src/util/cgroup.c | 4 +-
tools/virsh.c | 2 +-
3 files changed, 164 insertions(+), 8 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 2bec617..1480666 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -102,7 +102,7 @@
#define QEMU_NB_NUMA_PARAM 2
#define QEMU_NB_TOTAL_CPU_STAT_PARAM 3
-#define QEMU_NB_PER_CPU_STAT_PARAM 1
+#define QEMU_NB_PER_CPU_STAT_PARAM 2
#if HAVE_LINUX_KVM_H
# include <linux/kvm.h>
@@ -12505,8 +12505,129 @@ qemuDomainGetTotalcpuStats(virCgroupPtr group,
return nparams;
}
+/* get the cpu time from cpuacct cgroup group, saving
+ cpu time value in cpu_time. caller is responsible
+ for freeing memory allocated for cpu_time.
+ return 0 on success, -1 otherwise */
+static int getVcpuPercpuStats(virCgroupPtr group,
+ unsigned long long **cpu_time,
+ unsigned int *num)
+{
+ int ret = -1;
+ unsigned long long *ptime = NULL;
+ char *buf = NULL;
+ char *pos;
+ unsigned long long tmp;
+
+ if (virCgroupGetCpuacctPercpuUsage(group, &buf))
+ goto error;
+
+ pos = buf;
+ *num = 0;
+ while (virStrToLong_ull(pos, &pos, 10, &tmp) == 0)
+ (*num)++;
+
+ if (*num > 0) {
+ int i;
+
+ if (VIR_ALLOC_N(ptime, *num) < 0) {
+ virReportOOMError();
+ goto error;
+ }
+
+ pos = buf;
+ for (i = 0; i < *num; i++)
+ if (virStrToLong_ull(pos, &pos, 10, ptime + i) < 0) {
+ qemuReportError(VIR_ERR_INTERNAL_ERROR,
+ _("cpuacct parse error"));
+ }
+ *cpu_time = ptime;
+ ret = 0;
+ }
+error:
+ VIR_FREE(buf);
+ return ret;
+}
+
+/* This function gets the sums of cpu time consumed by all vcpus.
+ * For example, if there are 4 physical cpus, and 2 vcpus in a domain,
+ * then for each vcpu, the cpuacct.usage_percpu looks like this:
+ * t0 t1 t2 t3
+ * and we have 2 groups of such data:
+ * v\p 0 1 2 3
+ * 0 t00 t01 t02 t03
+ * 1 t10 t11 t12 t13
+ * for each pcpu, the sum is cpu time consumed by all vcpus.
+ * s0 = t00 + t10
+ * s1 = t01 + t11
+ * s2 = t02 + t12
+ * s3 = t03 + t13
+ */
+static int getSumVcpuPercpuStats(virCgroupPtr group,
+ unsigned int nvcpu,
+ unsigned long long **sum_cpu_time,
+ unsigned int *num)
+{
+ unsigned long long **cpu_time;
+ unsigned int *ncpu_time;
+ unsigned int max = 0;
+ unsigned long long *tmp = NULL;
+ int ret = -1;
+ int i, j;
+
+ if ((VIR_ALLOC_N(cpu_time, nvcpu) < 0) ||
+ (VIR_ALLOC_N(ncpu_time, nvcpu) < 0)) {
+ virReportOOMError();
+ goto error;
+ }
+
+ for (i = 0; i < nvcpu; i++) {
+ virCgroupPtr group_vcpu = NULL;
+ ret = virCgroupForVcpu(group, i, &group_vcpu, 0);
+ if (ret < 0) {
+ qemuReportError(VIR_ERR_INTERNAL_ERROR,
+ _("error on creating cgroup cpuacct for vcpu"));
+ goto error;
+ }
+ ret = getVcpuPercpuStats(group_vcpu,
+ &cpu_time[i],
+ &ncpu_time[i]);
+ virCgroupFree(&group_vcpu);
+
+ if (ret < 0)
+ goto error;
+
+ if (max < ncpu_time[i])
+ max = ncpu_time[i];
+ }
+
+ if (max > 0) {
+ if (VIR_ALLOC_N(tmp, max) < 0)
+ goto error;
+
+ for (i = 0; i < nvcpu; i++) {
+ for (j = 0; j < ncpu_time[i]; j++)
+ tmp[j] += cpu_time[i][j];
+ }
+ *sum_cpu_time = tmp;
+ *num = max;
+ ret = 0;
+ }
+
+error:
+ if (cpu_time) {
+ for (i = 0; i < nvcpu; i++)
+ VIR_FREE(cpu_time[i]);
+ }
+
+ VIR_FREE(cpu_time);
+ VIR_FREE(ncpu_time);
+ return ret;
+}
+
static int
qemuDomainGetPercpuStats(virDomainPtr domain,
+ virDomainObjPtr vm,
virCgroupPtr group,
virTypedParameterPtr params,
unsigned int nparams,
@@ -12518,15 +12639,17 @@ qemuDomainGetPercpuStats(virDomainPtr domain,
int i, max_id;
char *pos;
char *buf = NULL;
+ unsigned long long *sum_cpu_time = NULL;
+ unsigned int n = 0;
+ qemuDomainObjPrivatePtr priv = vm->privateData;
virTypedParameterPtr ent;
int param_idx;
+ unsigned long long cpu_time;
/* return the number of supported params */
if (nparams == 0 && ncpus != 0)
return QEMU_NB_PER_CPU_STAT_PARAM; /* only cpu_time is supported */
- /* return percpu cputime in index 0 */
- param_idx = 0;
/* to parse account file, we need "present" cpu map */
map = nodeGetCPUmap(domain->conn, &max_id, "present");
if (!map)
@@ -12550,12 +12673,13 @@ qemuDomainGetPercpuStats(virDomainPtr domain,
pos = buf;
memset(params, 0, nparams * ncpus);
+ /* return percpu cputime in index 0 */
+ param_idx = 0;
+
if (max_id - start_cpu > ncpus - 1)
max_id = start_cpu + ncpus - 1;
for (i = 0; i <= max_id; i++) {
- unsigned long long cpu_time;
-
if (!map[i]) {
cpu_time = 0;
} else if (virStrToLong_ull(pos, &pos, 10, &cpu_time) < 0) {
@@ -12570,6 +12694,36 @@ qemuDomainGetPercpuStats(virDomainPtr domain,
VIR_TYPED_PARAM_ULLONG, cpu_time) < 0)
goto cleanup;
}
+
+ /* return percpu vcputime in index 1 */
+ if (++param_idx >= nparams) {
+ goto cleanup;
+ }
+
+ if (getSumVcpuPercpuStats(group,
+ priv->nvcpupids,
+ &sum_cpu_time,
+ &n) < 0)
+ goto cleanup;
+
+ for (i = 0; i <= max_id && i < n; i++) {
+ if (i < start_cpu)
+ continue;
+
+ if (!map[i])
+ cpu_time = 0;
+ else
+ cpu_time = sum_cpu_time[i];
+ if (virTypedParameterAssign(¶ms[(i - start_cpu) * nparams + param_idx],
+ VIR_DOMAIN_CPU_STATS_VCPUTIME,
+ VIR_TYPED_PARAM_ULLONG,
+ cpu_time) < 0) {
+ VIR_FREE(sum_cpu_time);
+ goto cleanup;
+ }
+ }
+ VIR_FREE(sum_cpu_time);
+
rv = param_idx + 1;
cleanup:
VIR_FREE(buf);
@@ -12625,7 +12779,7 @@ qemuDomainGetCPUStats(virDomainPtr domain,
if (start_cpu == -1)
ret = qemuDomainGetTotalcpuStats(group, params, nparams);
else
- ret = qemuDomainGetPercpuStats(domain, group, params, nparams,
+ ret = qemuDomainGetPercpuStats(domain, vm, group, params, nparams,
start_cpu, ncpus);
cleanup:
virCgroupFree(&group);
diff --git a/src/util/cgroup.c b/src/util/cgroup.c
index ad49bc2..5b32881 100644
--- a/src/util/cgroup.c
+++ b/src/util/cgroup.c
@@ -530,7 +530,9 @@ static int virCgroupMakeGroup(virCgroupPtr parent, virCgroupPtr
group,
continue;
/* We need to control cpu bandwidth for each vcpu now */
- if ((flags & VIR_CGROUP_VCPU) && (i != VIR_CGROUP_CONTROLLER_CPU)) {
+ if ((flags & VIR_CGROUP_VCPU) &&
+ (i != VIR_CGROUP_CONTROLLER_CPU &&
+ i != VIR_CGROUP_CONTROLLER_CPUACCT)) {
/* treat it as unmounted and we can use virCgroupAddTask */
VIR_FREE(group->controllers[i].mountPoint);
continue;
diff --git a/tools/virsh.c b/tools/virsh.c
index b9d05a2..d3fb448 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -5632,7 +5632,7 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd)
pos = i * nparams + j;
vshPrint(ctl, "\t%-12s ", params[pos].field);
if ((STREQ(params[pos].field, VIR_DOMAIN_CPU_STATS_CPUTIME) ||
- STREQ(params[pos].field, VIR_DOMAIN_CPU_STATS_CPUTIME)) &&
+ STREQ(params[pos].field, VIR_DOMAIN_CPU_STATS_VCPUTIME)) &&
params[j].type == VIR_TYPED_PARAM_ULLONG) {
vshPrint(ctl, "%9lld.%09lld seconds\n",
params[pos].value.ul / 1000000000,
--
1.7.4.4