From nobody Sun Feb 8 04:57:25 2026 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.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1554713031852841.3070229766432; Mon, 8 Apr 2019 01:43:51 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 07492267DB; Mon, 8 Apr 2019 08:43:50 +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 CC3316608B; Mon, 8 Apr 2019 08:43:49 +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 7BAA0181D0A0; Mon, 8 Apr 2019 08:43:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x388h1bk009252 for ; Mon, 8 Apr 2019 04:43:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id A26E318033; Mon, 8 Apr 2019 08:43:01 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.188]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 46EAA5C297 for ; Mon, 8 Apr 2019 08:42:58 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id 1167610366F; Mon, 8 Apr 2019 10:42:51 +0200 (CEST) From: Jiri Denemark To: libvir-list@redhat.com Date: Mon, 8 Apr 2019 10:42:27 +0200 Message-Id: <69a7a005521134422d6d52bc42e35bb7b955f3ba.1554711784.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 23/36] cpu_x86: Add support for storing MSR features in CPU map 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: , 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 08 Apr 2019 08:43:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark Reviewed-by: J=C3=A1n Tomko --- src/cpu/cpu_x86.c | 127 +++++++++++++++++++++++++++++---- src/cpu/cpu_x86_data.h | 10 +++ tests/cputestdata/cpu-cpuid.py | 3 +- 3 files changed, 127 insertions(+), 13 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 192e067d38..57837209b4 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -199,6 +199,8 @@ virCPUx86DataItemMatch(const virCPUx86DataItem *item1, { const virCPUx86CPUID *cpuid1; const virCPUx86CPUID *cpuid2; + const virCPUx86MSR *msr1; + const virCPUx86MSR *msr2; =20 switch (item1->type) { case VIR_CPU_X86_DATA_CPUID: @@ -209,6 +211,12 @@ virCPUx86DataItemMatch(const virCPUx86DataItem *item1, cpuid1->ecx =3D=3D cpuid2->ecx && cpuid1->edx =3D=3D cpuid2->edx); =20 + case VIR_CPU_X86_DATA_MSR: + msr1 =3D &item1->data.msr; + msr2 =3D &item2->data.msr; + return (msr1->eax =3D=3D msr2->eax && + msr1->edx =3D=3D msr2->edx); + case VIR_CPU_X86_DATA_NONE: default: return false; @@ -222,6 +230,8 @@ virCPUx86DataItemMatchMasked(const virCPUx86DataItem *i= tem, { const virCPUx86CPUID *cpuid; const virCPUx86CPUID *cpuidMask; + const virCPUx86MSR *msr; + const virCPUx86MSR *msrMask; =20 switch (item->type) { case VIR_CPU_X86_DATA_CPUID: @@ -232,6 +242,12 @@ virCPUx86DataItemMatchMasked(const virCPUx86DataItem *= item, (cpuid->ecx & cpuidMask->ecx) =3D=3D cpuidMask->ecx && (cpuid->edx & cpuidMask->edx) =3D=3D cpuidMask->edx); =20 + case VIR_CPU_X86_DATA_MSR: + msr =3D &item->data.msr; + msrMask =3D &mask->data.msr; + return ((msr->eax & msrMask->eax) =3D=3D msrMask->eax && + (msr->edx & msrMask->edx) =3D=3D msrMask->edx); + case VIR_CPU_X86_DATA_NONE: default: return false; @@ -245,6 +261,8 @@ virCPUx86DataItemSetBits(virCPUx86DataItemPtr item, { virCPUx86CPUIDPtr cpuid; const virCPUx86CPUID *cpuidMask; + virCPUx86MSRPtr msr; + const virCPUx86MSR *msrMask; =20 if (!mask) return; @@ -259,6 +277,13 @@ virCPUx86DataItemSetBits(virCPUx86DataItemPtr item, cpuid->edx |=3D cpuidMask->edx; break; =20 + case VIR_CPU_X86_DATA_MSR: + msr =3D &item->data.msr; + msrMask =3D &mask->data.msr; + msr->eax |=3D msrMask->eax; + msr->edx |=3D msrMask->edx; + break; + case VIR_CPU_X86_DATA_NONE: default: break; @@ -272,6 +297,8 @@ virCPUx86DataItemClearBits(virCPUx86DataItemPtr item, { virCPUx86CPUIDPtr cpuid; const virCPUx86CPUID *cpuidMask; + virCPUx86MSRPtr msr; + const virCPUx86MSR *msrMask; =20 if (!mask) return; @@ -286,6 +313,13 @@ virCPUx86DataItemClearBits(virCPUx86DataItemPtr item, cpuid->edx &=3D ~cpuidMask->edx; break; =20 + case VIR_CPU_X86_DATA_MSR: + msr =3D &item->data.msr; + msrMask =3D &mask->data.msr; + msr->eax &=3D ~msrMask->eax; + msr->edx &=3D ~msrMask->edx; + break; + case VIR_CPU_X86_DATA_NONE: default: break; @@ -299,6 +333,8 @@ virCPUx86DataItemAndBits(virCPUx86DataItemPtr item, { virCPUx86CPUIDPtr cpuid; const virCPUx86CPUID *cpuidMask; + virCPUx86MSRPtr msr; + const virCPUx86MSR *msrMask; =20 if (!mask) return; @@ -313,6 +349,13 @@ virCPUx86DataItemAndBits(virCPUx86DataItemPtr item, cpuid->edx &=3D cpuidMask->edx; break; =20 + case VIR_CPU_X86_DATA_MSR: + msr =3D &item->data.msr; + msrMask =3D &mask->data.msr; + msr->eax &=3D msrMask->eax; + msr->edx &=3D msrMask->edx; + break; + case VIR_CPU_X86_DATA_NONE: default: break; @@ -375,6 +418,14 @@ virCPUx86DataSorter(const void *a, const void *b) =20 break; =20 + case VIR_CPU_X86_DATA_MSR: + if (da->data.msr.index > db->data.msr.index) + return 1; + else if (da->data.msr.index < db->data.msr.index) + return -1; + + break; + case VIR_CPU_X86_DATA_NONE: default: break; @@ -979,6 +1030,31 @@ x86ParseCPUID(xmlXPathContextPtr ctxt, } =20 =20 +static int +x86ParseMSR(xmlXPathContextPtr ctxt, + virCPUx86DataItemPtr item) +{ + virCPUx86MSRPtr msr; + unsigned long index; + unsigned long eax; + unsigned long edx; + + memset(item, 0, sizeof(*item)); + + if (virXPathULongHex("string(@index)", ctxt, &index) < 0 || + virXPathULongHex("string(@eax)", ctxt, &eax) < 0 || + virXPathULongHex("string(@edx)", ctxt, &edx) < 0) + return -1; + + item->type =3D VIR_CPU_X86_DATA_MSR; + msr =3D &item->data.msr; + msr->index =3D index; + msr->eax =3D eax; + msr->edx =3D edx; + return 0; +} + + static int x86FeatureParse(xmlXPathContextPtr ctxt, const char *name, @@ -1011,25 +1087,35 @@ x86FeatureParse(xmlXPathContextPtr ctxt, if (STREQ_NULLABLE(str, "no")) feature->migratable =3D false; =20 - n =3D virXPathNodeSet("./cpuid", ctxt, &nodes); + n =3D virXPathNodeSet("./cpuid|./msr", ctxt, &nodes); if (n < 0) goto cleanup; =20 if (n =3D=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing cpuid for feature %s"), + _("Missing cpuid or msr element in feature %s"), feature->name); goto cleanup; } =20 for (i =3D 0; i < n; i++) { ctxt->node =3D nodes[i]; - if (x86ParseCPUID(ctxt, &item) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid cpuid[%zu] in %s feature"), - i, feature->name); - goto cleanup; + if (virXMLNodeNameEqual(nodes[i], "cpuid")) { + if (x86ParseCPUID(ctxt, &item) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid cpuid[%zu] in %s feature"), + i, feature->name); + goto cleanup; + } + } else { + if (x86ParseMSR(ctxt, &item) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid msr[%zu] in %s feature"), + i, feature->name); + goto cleanup; + } } + if (virCPUx86DataAddItem(&feature->data, &item)) goto cleanup; } @@ -1545,6 +1631,7 @@ virCPUx86DataFormat(const virCPUData *data) virBufferAddLit(&buf, "\n"); while ((item =3D virCPUx86DataNext(&iter))) { virCPUx86CPUIDPtr cpuid; + virCPUx86MSRPtr msr; =20 switch (item->type) { case VIR_CPU_X86_DATA_CPUID: @@ -1557,6 +1644,13 @@ virCPUx86DataFormat(const virCPUData *data) cpuid->eax, cpuid->ebx, cpuid->ecx, cpuid->e= dx); break; =20 + case VIR_CPU_X86_DATA_MSR: + msr =3D &item->data.msr; + virBufferAsprintf(&buf, + " \n", + msr->index, msr->eax, msr->edx); + break; + case VIR_CPU_X86_DATA_NONE: default: break; @@ -1580,7 +1674,7 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt) size_t i; int n; =20 - n =3D virXPathNodeSet("/cpudata/cpuid", ctxt, &nodes); + n =3D virXPathNodeSet("/cpudata/cpuid|/cpudata/msr", ctxt, &nodes); if (n <=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no x86 CPU data found")); @@ -1592,11 +1686,20 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt) =20 for (i =3D 0; i < n; i++) { ctxt->node =3D nodes[i]; - if (x86ParseCPUID(ctxt, &item) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to parse cpuid[%zu]"), i); - goto error; + if (virXMLNodeNameEqual(nodes[i], "cpuid")) { + if (x86ParseCPUID(ctxt, &item) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to parse cpuid[%zu]"), i); + goto error; + } + } else { + if (x86ParseMSR(ctxt, &item) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to parse msr[%zu]"), i); + goto error; + } } + if (virCPUx86DataAdd(cpuData, &item) < 0) goto error; } diff --git a/src/cpu/cpu_x86_data.h b/src/cpu/cpu_x86_data.h index b16860b201..4600870c4c 100644 --- a/src/cpu/cpu_x86_data.h +++ b/src/cpu/cpu_x86_data.h @@ -33,6 +33,14 @@ struct _virCPUx86CPUID { uint32_t edx; }; =20 +typedef struct _virCPUx86MSR virCPUx86MSR; +typedef virCPUx86MSR *virCPUx86MSRPtr; +struct _virCPUx86MSR { + uint32_t index; + uint32_t eax; + uint32_t edx; +}; + # define CPUX86_BASIC 0x0 # define CPUX86_KVM 0x40000000 # define CPUX86_EXTENDED 0x80000000 @@ -72,6 +80,7 @@ struct _virCPUx86CPUID { typedef enum { VIR_CPU_X86_DATA_NONE =3D 0, VIR_CPU_X86_DATA_CPUID, + VIR_CPU_X86_DATA_MSR, } virCPUx86DataType; =20 typedef struct _virCPUx86DataItem virCPUx86DataItem; @@ -80,6 +89,7 @@ struct _virCPUx86DataItem { virCPUx86DataType type; union { virCPUx86CPUID cpuid; + virCPUx86MSR msr; } data; }; =20 diff --git a/tests/cputestdata/cpu-cpuid.py b/tests/cputestdata/cpu-cpuid.py index f532475702..f549003124 100755 --- a/tests/cputestdata/cpu-cpuid.py +++ b/tests/cputestdata/cpu-cpuid.py @@ -307,7 +307,8 @@ def parseMap(): =20 cpuMap =3D {} for feature in data["cpus"]["feature"]: - cpuMap[feature["@name"]] =3D parseFeature(feature["cpuid"]) + if "cpuid" in feature: + cpuMap[feature["@name"]] =3D parseFeature(feature["cpuid"]) =20 return cpuMap =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list