From nobody Fri May 3 11:26:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=selectel.ru ARC-Seal: i=1; a=rsa-sha256; t=1611931380; cv=none; d=zohomail.com; s=zohoarc; b=lXc+yT9dPGJtMONd6Agh+4ugrMUczlZdGRjmbeMvhIljljzeKGSAXWZccRoGmfWQDGgFvY+wkAD48ONoP+QtWyQDXKKUt1zCHEb6YzES4t56cT/+vSDKCZnNEumeUwsC7U8Y4h0ehx2jbaI8lMmaLHWZfGBW5iOfFcT04VlSwo8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611931380; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=feM412Hwo2YifkhfIcEUUrFia4SWt8O8JdlzvICEKmM=; b=IVSu2PuJF5LBqQYDaXzdrI6Nw65X1mjA9bGbCo4QSMYVg47cwOic81uunXq6/Bl9HsR5OarE15qJY3uomPhRZn84Gx3vB7irEj6pV6bce2V3nZSzt/z/KFzbxEjLbdrjhoHhaZ0h6eR38xLeXo8k8TYVFBl3wFLZTqBg+W7lZmI= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1611931379688946.1890182112493; Fri, 29 Jan 2021 06:42:59 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-424-TKS1vNWLNRS4wcC1ltVgqw-1; Fri, 29 Jan 2021 09:42:56 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DD2E61842140; Fri, 29 Jan 2021 14:42:50 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BB86B179B3; Fri, 29 Jan 2021 14:42:50 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7F2579989; Fri, 29 Jan 2021 14:42:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10TEYHN2029621 for ; Fri, 29 Jan 2021 09:34:17 -0500 Received: by smtp.corp.redhat.com (Postfix) id E67DC110E9D; Fri, 29 Jan 2021 14:34:16 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E119A110EA1 for ; Fri, 29 Jan 2021 14:34:14 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 88AE1811E85 for ; Fri, 29 Jan 2021 14:34:14 +0000 (UTC) Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-33-viT6Ijx-O2WMQxqQDst24Q-1; Fri, 29 Jan 2021 09:34:12 -0500 Received: by mail-lj1-f178.google.com with SMTP id v15so7698700ljk.13 for ; Fri, 29 Jan 2021 06:34:11 -0800 (PST) Received: from some-laptop.eq.selectel.org (89-110-38-38.static.avangarddsl.ru. [89.110.38.38]) by smtp.gmail.com with ESMTPSA id 70sm2032470lfb.165.2021.01.29.06.34.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jan 2021 06:34:09 -0800 (PST) X-MC-Unique: TKS1vNWLNRS4wcC1ltVgqw-1 X-MC-Unique: viT6Ijx-O2WMQxqQDst24Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=feM412Hwo2YifkhfIcEUUrFia4SWt8O8JdlzvICEKmM=; b=hYz+UhLVD94nfnehj03YCArHB16Y3f17TY8YYnq/nzJ7Qivzmk5A6P0U3AWcP1ROVs P0kSIP6Zc6/6/AgAxS0mEPw44C61JJTxOVFYSIuo5mdOVxocgf+J+dkD4BYA+GDTyeHs STmlAj+9AsZShJroBFmHSfV4w4Cqmcy09d71LvUJKm0Vk20WykHb8oI2Fc5o4M0h8Euh vy07GVKE5kXuqph+U4rw3nFKFSQH7zzzVq3E7xmQvCkHbv29zNS4cZnDiTekX11o/Hec FQaIxKTiqddmHiBXT0B8ClnsTOfNxBIWO98EektOyFEWZHV7ynB0xopq08QaQIWlQ1eH 66+A== X-Gm-Message-State: AOAM532l60KiXAX4El8zllyiwELAwprYJgsH7n45SnTJSCAUgn0VMfT2 /LksVlizQdTeTKUfhnUrxjs7zBPy/QeU+g== X-Google-Smtp-Source: ABdhPJwXhKRQXTP1zewVcW5brBt8ZkWN0B7+XWwk2Lu9YuvmyrP6z3emFSM1wa4VLvrK6doj54T9Ig== X-Received: by 2002:a2e:9c89:: with SMTP id x9mr2588061lji.469.1611930849949; Fri, 29 Jan 2021 06:34:09 -0800 (PST) From: Aleksei Zakharov To: libvir-list@redhat.com Subject: [PATCH] qemu: add delay time cpu stats Date: Fri, 29 Jan 2021 17:34:02 +0300 Message-Id: <20210129143402.630-1-zaharov@selectel.ru> X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com X-Mailman-Approved-At: Fri, 29 Jan 2021 09:42:49 -0500 Cc: zakharov.a.g@yandex.ru, Aleksei Zakharov X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 2 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This commit adds delay time (steal time inside guest) to libvirt domain CPU stats. It's more convenient to work with this statistic in a context of libvirt domain. Any monitoring software may use this information. As an example: the next step is to add support to libvirt-go and expose metrics with libvirt-exporter. Signed-off-by: Aleksei Zakharov --- include/libvirt/libvirt-domain.h | 6 ++++ src/qemu/qemu_driver.c | 56 ++++++++++++++++++++++++++++++++ tools/virsh-domain.c | 3 +- 3 files changed, 64 insertions(+), 1 deletion(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-dom= ain.h index de2456812c..b3f9f375a5 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -1350,6 +1350,12 @@ int virDomainGetState (vir= DomainPtr domain, */ # define VIR_DOMAIN_CPU_STATS_SYSTEMTIME "system_time" =20 +/** + * VIR_DOMAIN_CPU_STATS_DELAYTIME: + * cpu time waiting on runqueue in nanoseconds, as a ullong + */ +# define VIR_DOMAIN_CPU_STATS_DELAYTIME "delay_time" + /** * VIR_DOMAIN_CPU_STATS_VCPUTIME: * vcpu usage in nanoseconds (cpu_time excluding hypervisor time), diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6193376544..41839a0239 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16674,6 +16674,36 @@ qemuDomainGetMetadata(virDomainPtr dom, return ret; } =20 +static int +virSchedstatGetDelay(virDomainObjPtr dom, unsigned long long *delay) +{ + char *proc =3D NULL; + FILE* schedstat; + unsigned long long curr_delay, oncpu =3D 0; + pid_t pid =3D dom->pid; + for (size_t i =3D 0; i < virDomainDefGetVcpusMax(dom->def); i++) { + pid_t vcpupid =3D qemuDomainGetVcpuPid(dom, i); + if (vcpupid) { + if (asprintf(&proc, "/proc/%d/task/%d/schedstat", + pid, vcpupid) < 0) + return -1; + } else { + if (asprintf(&proc, "/proc/%d/schedstat", pid) < 0) + return -1; + } + schedstat =3D fopen(proc, "r"); + VIR_FREE(proc); + if (!schedstat || + fscanf(schedstat, "%llu %llu", + &oncpu, &curr_delay) < 2) { + return -1; + } + + *delay +=3D curr_delay; + } + return 0; +} + =20 static int qemuDomainGetCPUStats(virDomainPtr domain, @@ -16687,6 +16717,7 @@ qemuDomainGetCPUStats(virDomainPtr domain, int ret =3D -1; qemuDomainObjPrivatePtr priv; virBitmapPtr guestvcpus =3D NULL; + unsigned long long delay =3D 0; =20 virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1); =20 @@ -16712,8 +16743,19 @@ qemuDomainGetCPUStats(virDomainPtr domain, goto cleanup; =20 if (start_cpu =3D=3D -1) + { ret =3D virCgroupGetDomainTotalCpuStats(priv->cgroup, params, nparams); + if (nparams > 3) { + if (virSchedstatGetDelay(vm,&delay) < 0) + return -1; + if (virTypedParameterAssign(¶ms[3], + VIR_DOMAIN_CPU_STATS_DELAYTIME, + VIR_TYPED_PARAM_ULLONG, delay) < 0) + return -1; + } + ret++; + } else ret =3D virCgroupGetPercpuStats(priv->cgroup, params, nparams, start_cpu, ncpus, guestvcpus); @@ -17845,6 +17887,17 @@ qemuDomainGetStatsMemoryBandwidth(virQEMUDriverPtr= driver, return ret; } =20 +static int +qemuDomainGetStatsCpuDelay(virDomainObjPtr dom, + virTypedParamListPtr params) +{ + unsigned long long delay_time =3D 0; + int err =3D 0; + err =3D virSchedstatGetDelay(dom, &delay_time); + if (!err && virTypedParamListAddULLong(params, delay_time, "cpu.delay"= ) < 0) + return -1; + return 0; +} =20 static int qemuDomainGetStatsCpuCache(virQEMUDriverPtr driver, @@ -17950,6 +18003,9 @@ qemuDomainGetStatsCpu(virQEMUDriverPtr driver, if (qemuDomainGetStatsCpuCache(driver, dom, params) < 0) return -1; =20 + if (qemuDomainGetStatsCpuDelay(dom, params) < 0) + return -1; + return 0; } =20 diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 2bb136333f..a1780da1a5 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -8085,7 +8085,8 @@ vshCPUStatsPrintField(vshControl *ctl, if ((STREQ(param->field, VIR_DOMAIN_CPU_STATS_CPUTIME) || STREQ(param->field, VIR_DOMAIN_CPU_STATS_VCPUTIME) || STREQ(param->field, VIR_DOMAIN_CPU_STATS_USERTIME) || - STREQ(param->field, VIR_DOMAIN_CPU_STATS_SYSTEMTIME)) && + STREQ(param->field, VIR_DOMAIN_CPU_STATS_SYSTEMTIME) || + STREQ(param->field, VIR_DOMAIN_CPU_STATS_DELAYTIME)) && param->type =3D=3D VIR_TYPED_PARAM_ULLONG) { vshPrint(ctl, "%9lld.%09lld seconds\n", param->value.ul / 1000000000, --=20 2.17.1