From nobody Thu Nov 28 16:55:48 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.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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521099119841208.61601894092337; Thu, 15 Mar 2018 00:31:59 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 875CE7FDDF; Thu, 15 Mar 2018 07:31:58 +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 5339F177C9; Thu, 15 Mar 2018 07:31:58 +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 173764CA9D; Thu, 15 Mar 2018 07:31:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2EHNRYM025574 for ; Wed, 14 Mar 2018 13:23:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 51BF85D962; Wed, 14 Mar 2018 17:23:27 +0000 (UTC) Received: from mx1.redhat.com (ext-mx09.extmail.prod.ext.phx2.redhat.com [10.5.110.38]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4AE154FA23 for ; Wed, 14 Mar 2018 17:23:24 +0000 (UTC) Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 4CF613AA1B for ; Wed, 14 Mar 2018 17:23:23 +0000 (UTC) Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w2EHLktQ100736 for ; Wed, 14 Mar 2018 13:23:23 -0400 Received: from e06smtp14.uk.ibm.com (e06smtp14.uk.ibm.com [195.75.94.110]) by mx0a-001b2d01.pphosted.com with ESMTP id 2gq5b8895a-1 (version=TLSv1.2 cipher=AES256-SHA256 bits=256 verify=NOT) for ; Wed, 14 Mar 2018 13:23:22 -0400 Received: from localhost by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 14 Mar 2018 17:23:20 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp14.uk.ibm.com (192.168.101.144) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 14 Mar 2018 17:23:18 -0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w2EHNHYb56361176 for ; Wed, 14 Mar 2018 17:23:17 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C71D552043 for ; Wed, 14 Mar 2018 16:14:47 +0000 (GMT) Received: from localhost.localdomain (unknown [9.79.182.166]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 167EF5203F for ; Wed, 14 Mar 2018 16:14:46 +0000 (GMT) From: Shivaprasad G Bhat To: libvir-list@redhat.com Date: Wed, 14 Mar 2018 22:53:15 +0530 In-Reply-To: <152104711186.10112.1077788328340024644.stgit@localhost.localdomain> References: <152104711186.10112.1077788328340024644.stgit@localhost.localdomain> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 18031417-0016-0000-0000-000005327994 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18031417-0017-0000-0000-0000286F7F4A Message-Id: <152104819007.10112.2791139597190204989.stgit@localhost.localdomain> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-03-14_09:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=3 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1803140193 X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 207 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 14 Mar 2018 17:23:23 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 14 Mar 2018 17:23:23 +0000 (UTC) for IP:'148.163.156.1' DOMAIN:'mx0a-001b2d01.pphosted.com' HELO:'mx0a-001b2d01.pphosted.com' FROM:'sbhat@linux.vnet.ibm.com' RCPT:'' X-RedHat-Spam-Score: -0.701 (RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2) 148.163.156.1 mx0a-001b2d01.pphosted.com 148.163.156.1 mx0a-001b2d01.pphosted.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.38 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [RFC PATCH 24/28] domain: addr: Introduce virDomainPCIAddressEnsureMultifunctionAddress 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 15 Mar 2018 07:31:59 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Shivaprasad G Bhat --- src/conf/device_conf.h | 6 +++ src/conf/domain_addr.c | 84 ++++++++++++++++++++++++++++++++++++++++++= ++++ src/conf/domain_addr.h | 5 +++ src/libvirt_private.syms | 1 + src/util/virpci.h | 2 + 5 files changed, 98 insertions(+) diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index cdb2040fb8..ae7a651ee0 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -177,6 +177,12 @@ struct _virDomainDeviceInfo { bool isolationGroupLocked; }; =20 +typedef struct _virDomainPCIMultifunctionAddressInfo virDomainPCIMultifunc= tionAddressInfo; +typedef virDomainPCIMultifunctionAddressInfo *virDomainPCIMultifunctionAdd= ressInfoPtr; +struct _virDomainPCIMultifunctionAddressInfo { + virDomainDeviceInfoPtr infos[VIR_PCI_MAX_FUNCTIONS]; +}; + int virDomainDeviceInfoCopy(virDomainDeviceInfoPtr dst, virDomainDeviceInfoPtr src); void virDomainDeviceInfoClear(virDomainDeviceInfoPtr info); diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index c4a0b99628..43227a4b25 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -27,6 +27,7 @@ #include "virlog.h" #include "virstring.h" #include "domain_addr.h" +#include "device_conf.h" =20 #define VIR_FROM_THIS VIR_FROM_DOMAIN =20 @@ -697,6 +698,89 @@ virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPt= r addrs, } =20 =20 +/* + *virDomainPCIAddressEnsureMultifunctionAddress: + * + * + * + */ + +int +virDomainPCIAddressEnsureMultifunctionAddress(virDomainPCIAddressSetPtr ad= drs, + virDomainPCIMultifunctionAdd= ressInfoPtr pcicard) +{ + size_t i; + int ret =3D 0; + virPCIDeviceAddressPtr addr1 =3D NULL, addr2 =3D NULL; + virDomainDeviceInfoPtr dev =3D NULL; + char *addrStr =3D NULL; + + if (!pcicard->infos[0]) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Function-Zero missing on the slot")); + return -1; + } + + /* If the address is given by the user, make sure they belong + * to same slot */ + for (i =3D 0; i < VIR_PCI_MAX_FUNCTIONS; i++) { + dev =3D pcicard->infos[i]; + if (dev && !dev->pciConnectFlags) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Not a PCI Multifunction device.")); + goto cleanup; + } + if (dev && virDeviceInfoPCIAddressPresent(dev)) { + /* Pick one and compare against rest of the user given */ + addr1 =3D addr1 ? addr1 : &dev->addr.pci; + addr2 =3D &dev->addr.pci; + if (!(addrStr =3D virDomainPCIAddressAsString(addr2))) + goto cleanup; + if (!virDomainPCIAddressValidate(addrs, addr2, + addrStr, dev->pciConnectFlags= , true)) + goto cleanup; + if (!(addr1->domain =3D=3D addr2->domain && addr1->bus =3D=3D = addr2->bus && + addr1->slot =3D=3D addr2->slot)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Addresses belong to different PCI slots= ")); + goto cleanup; + } + VIR_FREE(addrStr); + } + } + + /* Reserve all the user given addresses. */ + for (i =3D 0; i < VIR_PCI_MAX_FUNCTIONS; i++) { + dev =3D pcicard->infos[i]; + if (dev && virDeviceInfoPCIAddressPresent(dev)) { + ret =3D virDomainPCIAddressReserveAddrInternal(addrs, &dev->ad= dr.pci, + dev->pciConnectFl= ags, dev->isolationGroup, + dev->aggregateSlo= tIdx, + true); + if (ret < 0) + goto cleanup; + } + } + + /* If the user has not given addresses, start with function zero */ + for (i =3D 0; i < VIR_PCI_MAX_FUNCTIONS; i++) { + dev =3D pcicard->infos[i]; + if (dev && !virDeviceInfoPCIAddressPresent(dev)) { + ret =3D virDomainPCIAddressReserveNextAddr(addrs, dev, dev->pc= iConnectFlags, i); + if (ret < 0) + goto cleanup; + } + } + + /* Set multi on overriding what user has set. */ + pcicard->infos[0]->addr.pci.multi =3D VIR_TRISTATE_SWITCH_ON; + + cleanup: + VIR_FREE(addrStr); + return ret; +} + + void virDomainPCIAddressReleaseAddr(virDomainPCIAddressSetPtr addrs, virPCIDeviceAddressPtr addr) diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h index fa98b67e5c..e80e1e9089 100644 --- a/src/conf/domain_addr.h +++ b/src/conf/domain_addr.h @@ -162,6 +162,11 @@ int virDomainPCIAddressEnsureAddr(virDomainPCIAddressS= etPtr addrs, virDomainPCIConnectFlags flags) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); =20 +int +virDomainPCIAddressEnsureMultifunctionAddress(virDomainPCIAddressSetPtr ad= drs, + virDomainPCIMultifunctionAdd= ressInfoPtr pcicard) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); + void virDomainPCIAddressReleaseAddr(virDomainPCIAddressSetPtr addrs, virPCIDeviceAddressPtr addr) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d1ff2f5f99..3e4d627004 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -114,6 +114,7 @@ virDomainPCIAddressAsString; virDomainPCIAddressBusIsFullyReserved; virDomainPCIAddressBusSetModel; virDomainPCIAddressEnsureAddr; +virDomainPCIAddressEnsureMultifunctionAddress; virDomainPCIAddressReleaseAddr; virDomainPCIAddressReserveAddr; virDomainPCIAddressReserveNextAddr; diff --git a/src/util/virpci.h b/src/util/virpci.h index 5830fb4c12..65e586ed15 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -29,6 +29,8 @@ # include "virobject.h" # include "virutil.h" =20 +# define VIR_PCI_MAX_FUNCTIONS 8 + typedef struct _virPCIDevice virPCIDevice; typedef virPCIDevice *virPCIDevicePtr; typedef struct _virPCIDeviceAddress virPCIDeviceAddress; -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list