From nobody Sat May 4 23:04:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1491466661248501.0667569146419; Thu, 6 Apr 2017 01:17:41 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 57FB6C054917; Thu, 6 Apr 2017 08:17:39 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DEF8AA1263; Thu, 6 Apr 2017 08:17:38 +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 5370718521C6; Thu, 6 Apr 2017 08:17:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v368HZnp005764 for ; Thu, 6 Apr 2017 04:17:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id B9215A4093; Thu, 6 Apr 2017 08:17:35 +0000 (UTC) Received: from mx1.redhat.com (ext-mx04.extmail.prod.ext.phx2.redhat.com [10.5.110.28]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B052581886; Thu, 6 Apr 2017 08:17:34 +0000 (UTC) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 30FAD80481; Thu, 6 Apr 2017 08:17:32 +0000 (UTC) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP; 06 Apr 2017 01:17:31 -0700 Received: from s2600wt.sh.intel.com ([10.239.48.158]) by orsmga001.jf.intel.com with ESMTP; 06 Apr 2017 01:17:30 -0700 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 57FB6C054917 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=intel.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 57FB6C054917 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 30FAD80481 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=intel.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=liyong.qiao@intel.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 30FAD80481 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,283,1488873600"; d="scan'208";a="1116118018" From: Eli Qiao To: libvir-list@redhat.com Date: Thu, 6 Apr 2017 16:20:06 +0800 Message-Id: <1491466806-12431-1-git-send-email-liyong.qiao@intel.com> X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 203 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 06 Apr 2017 08:17:32 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 06 Apr 2017 08:17:32 +0000 (UTC) for IP:'134.134.136.31' DOMAIN:'mga06.intel.com' HELO:'mga06.intel.com' FROM:'liyong.qiao@intel.com' RCPT:'' X-RedHat-Spam-Score: -1.902 (BAYES_50, DCC_REPUT_00_12, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, SPF_PASS) 134.134.136.31 mga06.intel.com 134.134.136.31 mga06.intel.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.28 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: mkletzan@redhat.com, liyong.qiao@intel.com Subject: [libvirt] [PATCH] Expose resource control capabilites on cache bank 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 06 Apr 2017 08:17:40 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This patch is based on Martin's cache branch. This patch amends the cache bank capability as follow: Along with vircaps2xmltest case updated. Signed-off-by: Eli Qiao --- src/conf/capabilities.c | 112 +++++++++++++++++++= ++-- src/conf/capabilities.h | 13 ++- tests/vircaps2xmldata/vircaps-x86_64-caches.xml | 2 + tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml | 2 + tests/vircaps2xmltest.c | 11 +++ 5 files changed, 132 insertions(+), 8 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 416dd1a..75c0bec 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -52,6 +52,7 @@ #define VIR_FROM_THIS VIR_FROM_CAPABILITIES =20 #define SYSFS_SYSTEM_PATH "/sys/devices/system/" +#define SYSFS_RESCTRL_PATH "/sys/fs/resctrl/" =20 VIR_LOG_INIT("conf.capabilities") =20 @@ -873,6 +874,7 @@ virCapabilitiesFormatCaches(virBufferPtr buf, virCapsHostCacheBankPtr *caches) { size_t i =3D 0; + size_t j =3D 0; =20 if (!ncaches) return 0; @@ -900,6 +902,18 @@ virCapabilitiesFormatCaches(virBufferPtr buf, bank->size >> (kilos * 10), kilos ? "KiB" : "B", cpus_str); + virBufferAdjustIndent(buf, 2); + for (j =3D 0; j < bank->ncontrol; j++) { + bool min_kilos =3D !(bank->controls[j]->min % 1024); + virBufferAsprintf(buf, + "\n", + bank->controls[j]->min >> (min_kilos * 10), + min_kilos ? "KiB" : "B", + virCacheTypeToString(bank->controls[j]->type= ), + bank->controls[j]->nclos); + } + virBufferAdjustIndent(buf, -2); =20 VIR_FREE(cpus_str); } @@ -1516,10 +1530,93 @@ virCapsHostCacheBankFree(virCapsHostCacheBankPtr pt= r) if (!ptr) return; =20 + size_t i; virBitmapFree(ptr->cpus); + for (i =3D 0; i < ptr->ncontrol; i++) + VIR_FREE(ptr->controls[i]); + VIR_FREE(ptr->controls); VIR_FREE(ptr); } =20 +/* test which kinds of cache control supported + * -1: don't support + * 0: cat + * 1: cdp + */ +static int +virCapabilitiesGetCacheControlType(virCapsHostCacheBankPtr bank) +{ + int ret =3D -1; + char *path =3D NULL; + if (virAsprintf(&path, SYSFS_RESCTRL_PATH "info/L%u", bank->level) < 0) + return -1; + + if (virFileExists(path)) { + ret =3D 0; + } else { + VIR_FREE(path); + if (virAsprintf(&path, SYSFS_RESCTRL_PATH "info/L%uCODE", bank->le= vel) < 0) + return -1; + if (virFileExists(path)) + ret =3D 1; + } + + VIR_FREE(path); + return ret; +} + +static int +virCapabilitiesGetCacheControl(virCapsHostCacheBankPtr bank, const char* t= ype) +{ + int ret =3D -1; + char *path =3D NULL; + char *cbm_mask =3D NULL; + virCapsHostCacheControlPtr control; + + if (VIR_ALLOC(control) < 0) + goto cleanup; + + if (virFileReadValueUint(&control->nclos, + SYSFS_RESCTRL_PATH "info/L%u%s/num_closids", + bank->level, + type) < 0) + goto cleanup; + + if (virFileReadValueString(&cbm_mask, + SYSFS_RESCTRL_PATH + "info/L%u%s/cbm_mask", + bank->level, + type) < 0) + goto cleanup; + + virStringTrimOptionalNewline(cbm_mask); + + control->min =3D bank->size / (strlen(cbm_mask) * 4); + + if (STREQ("", type)) + control->type =3D VIR_CACHE_TYPE_UNIFIED; + else if (STREQ("CODE", type)) + control->type =3D VIR_CACHE_TYPE_INSTRUCTION; + else if (STREQ("DATA", type)) + control->type =3D VIR_CACHE_TYPE_DATA; + else + goto cleanup; + + if (VIR_APPEND_ELEMENT(bank->controls, + bank->ncontrol, + control) < 0) + goto error; + + ret =3D 0; + + cleanup: + VIR_FREE(path); + return ret; + error: + VIR_FREE(control); + return -1; +} + int virCapabilitiesInitCaches(virCapsPtr caps) { @@ -1533,11 +1630,6 @@ virCapabilitiesInitCaches(virCapsPtr caps) struct dirent *ent =3D NULL; virCapsHostCacheBankPtr bank =3D NULL; =20 - /* Minimum level to expose in capabilities. Can be lowered or removed= (with - * the appropriate code below), but should not be increased, because w= e'd - * lose information. */ - const int cache_min_level =3D 3; - /* offline CPUs don't provide cache info */ if (virFileReadValueBitmap(&cpus, SYSFS_SYSTEM_PATH "cpu/online") < 0) return -1; @@ -1595,12 +1687,19 @@ virCapabilitiesInitCaches(virCapsPtr caps) pos, ent->d_name) < 0) goto cleanup; =20 - if (bank->level < cache_min_level) { + if ((ret =3D virCapabilitiesGetCacheControlType(bank)) < 0) { virCapsHostCacheBankFree(bank); bank =3D NULL; continue; } =20 + if (ret =3D=3D 0) { + virCapabilitiesGetCacheControl(bank, ""); + } else if (ret =3D=3D 1) { + virCapabilitiesGetCacheControl(bank, "CODE"); + virCapabilitiesGetCacheControl(bank, "DATA"); + } + for (tmp_c =3D type; *tmp_c !=3D '\0'; tmp_c++) *tmp_c =3D c_tolower(*tmp_c); =20 @@ -1617,6 +1716,7 @@ virCapabilitiesInitCaches(virCapsPtr caps) if (virCapsHostCacheBankEquals(bank, caps->host.caches[i])) break; } + if (i =3D=3D caps->host.ncaches) { if (VIR_APPEND_ELEMENT(caps->host.caches, caps->host.ncaches, diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index e099ccc..13effdd 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -139,15 +139,22 @@ struct _virCapsHostSecModel { }; =20 typedef enum { - VIR_CACHE_TYPE_DATA, - VIR_CACHE_TYPE_INSTRUCTION, VIR_CACHE_TYPE_UNIFIED, + VIR_CACHE_TYPE_INSTRUCTION, + VIR_CACHE_TYPE_DATA, =20 VIR_CACHE_TYPE_LAST } virCacheType; =20 VIR_ENUM_DECL(virCache); =20 +typedef struct _virCapsHostCacheControl virCapsHostCacheControl; +typedef virCapsHostCacheControl *virCapsHostCacheControlPtr; +struct _virCapsHostCacheControl { + unsigned long long min; /* B */ + virCacheType type; /* Data, Instruction or Unified */ + unsigned int nclos; /* number class of id */ +}; typedef struct _virCapsHostCacheBank virCapsHostCacheBank; typedef virCapsHostCacheBank *virCapsHostCacheBankPtr; struct _virCapsHostCacheBank { @@ -156,6 +163,8 @@ struct _virCapsHostCacheBank { unsigned long long size; /* B */ virCacheType type; /* Data, Instruction or Unified */ virBitmapPtr cpus; /* All CPUs that share this bank */ + size_t ncontrol; + virCapsHostCacheControlPtr *controls; }; =20 typedef struct _virCapsHost virCapsHost; diff --git a/tests/vircaps2xmldata/vircaps-x86_64-caches.xml b/tests/vircap= s2xmldata/vircaps-x86_64-caches.xml index f2da28e..61269ea 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-caches.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-caches.xml @@ -30,6 +30,8 @@ + + =20 diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml b/tests/virca= ps2xmldata/vircaps-x86_64-resctrl.xml index c30ea87..df27b94 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml @@ -42,7 +42,9 @@ + + =20 diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c index f590249..93f776a 100644 --- a/tests/vircaps2xmltest.c +++ b/tests/vircaps2xmltest.c @@ -47,6 +47,7 @@ test_virCapabilities(const void *opaque) char *capsXML =3D NULL; char *path =3D NULL; char *dir =3D NULL; + char *resctrl_dir =3D NULL; int ret =3D -1; =20 /* @@ -58,6 +59,15 @@ test_virCapabilities(const void *opaque) data->resctrl ? "/system" : "") < 0) goto cleanup; =20 + if (data->resctrl) { + if (virAsprintf(&resctrl_dir, "%s/vircaps2xmldata/linux-%s%s", + abs_srcdir, data->filename, + "/resctrl") < 0) + goto cleanup; + virFileMockAddPrefix("/sys/fs/resctrl", resctrl_dir); + } + + virFileMockAddPrefix("/sys/devices/system", dir); caps =3D virCapabilitiesNew(data->arch, data->offlineMigrate, data->li= veMigrate); =20 @@ -84,6 +94,7 @@ test_virCapabilities(const void *opaque) =20 cleanup: VIR_FREE(dir); + VIR_FREE(resctrl_dir); VIR_FREE(path); VIR_FREE(capsXML); virObjectUnref(caps); --=20 1.9.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list