From nobody Sat Feb 7 09:36:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1574775376; cv=none; d=zohomail.com; s=zohoarc; b=PMBO4H+oN9gll36cMoce1Z601Oh9dJVcEGlZBOMmygI1NwTF+0H63g0Ox5ZudrjE7bu+bUBgdWYF+9J3Yppp0d/d/hvNenMKmKuAiWi7Nktc99RTT9LzfPHjXHEBlgQN99oGAFqhyXC7Ytx5rvZTBgyJmYMfc032xPq3kRtyNoU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574775376; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vvSSey/tlOw2zSGflLhg3k+gLOxb+cRnE0vHB4btnFI=; b=FTPg3srHZhT0hrBc9gk11T/NCQLq/2MQKgrj35WhBitV+jDpRfD4+i29LXEqjyQBfMnpXBC8LnVx1ZruT5JjI2GXhf6Y2WIkUjnGQDGFoR71MVxwRO2Cqcwc3oxNiIFzBuKCePtk3cs9IpGr/WgbysjsWJTOLDATW7+UgQRmmgY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1574775376909329.8971385237553; Tue, 26 Nov 2019 05:36:16 -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-27-bJS-wBY1Oh-4lSOFCpGbZg-1; Tue, 26 Nov 2019 08:36:13 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A1197800C7B; Tue, 26 Nov 2019 13:36:05 +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 763031001B3F; Tue, 26 Nov 2019 13:36:05 +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 20FC418034EC; Tue, 26 Nov 2019 13:36:05 +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 xAQDYnit004753 for ; Tue, 26 Nov 2019 08:34:49 -0500 Received: by smtp.corp.redhat.com (Postfix) id 898EBD95EB; Tue, 26 Nov 2019 13:34:49 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8546EED16E for ; Tue, 26 Nov 2019 13:34:49 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (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 6C6751022E93 for ; Tue, 26 Nov 2019 13:34:49 +0000 (UTC) Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-207-1sazi78MMu6vs2EDan2d-Q-1; Tue, 26 Nov 2019 08:34:47 -0500 Received: by mail-qk1-f193.google.com with SMTP id m16so16035145qki.11; Tue, 26 Nov 2019 05:34:47 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c6:afb:97a3:bc66:755b:2f57]) by smtp.gmail.com with ESMTPSA id i41sm5931229qti.42.2019.11.26.05.34.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 05:34:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574775375; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=vvSSey/tlOw2zSGflLhg3k+gLOxb+cRnE0vHB4btnFI=; b=QPNWzpgo/n+lOPdppOMhg1hxaHPMbx3eZThjLugMxAMtrsa5VSeARU6/dmSnma6Ht7PaQs V5FGMJL4cQ5MQjyXH8swmgYgQJnDo7wOcrV/keW8+tkD0P578S+sz6sxLZhe9wzEf2oSIX oMMDhLW1i8IFMgzmp9xVqghotltl1Oc= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=IPmq3/DqMF2AtS3mGIUjgNXOWgyeHwADGwCdMmD7jxg=; b=Gr0WjIyeZmzVis6j+uZBPYPyztXfRE/8rsA4hoJwtEBEBmGkYYpdxR/rIKlv182fMP IOxfWVaonFvTV+AoiLfLYQIASVKvnlXs7644N6tylI1PTNvdEw/05OxweeoWe2pHNdD2 saXtju1zwiLbpDyHiIqu+ceCCkWo+7xnN7MMDFy1PuvMwJRaUf+FVFcFPdYaKt0sfsYO VLGoXi9qkvxTHA50eZu5kC/ZazPc+y9t7+IxEr3GTNvlqmu+IQ1hXq8vELck3IP5Jrc2 hDU5mvP4BPHOhy6gDoBpTZfNA1GXIrjpt+eOy7eEVPzeBo3qTjzuKVJLuS4bp4qdapzv Eknw== X-Gm-Message-State: APjAAAUhnatzAURwZ4xVDEj82AqyegFc1KhyBeS9iKRNk6fy8WvjW2yz y5DqcNy2pXSHGncTTAiSy0o6y56M X-Google-Smtp-Source: APXvYqya5xhhNPuMmtH+bBC4VvpacxtAvEhSu/6UyfaryzvPT0ZcfWs2RMtBU+bdxvofa2jaDbACPQ== X-Received: by 2002:a05:620a:1472:: with SMTP id j18mr27810270qkl.184.1574775286487; Tue, 26 Nov 2019 05:34:46 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Tue, 26 Nov 2019 10:34:00 -0300 Message-Id: <20191126133401.1242133-6-danielhb413@gmail.com> In-Reply-To: <20191126133401.1242133-1-danielhb413@gmail.com> References: <20191126133401.1242133-1-danielhb413@gmail.com> MIME-Version: 1.0 X-MC-Unique: 1sazi78MMu6vs2EDan2d-Q-1 X-MC-Unique: bJS-wBY1Oh-4lSOFCpGbZg-1 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id xAQDYnit004753 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , darkstego@gmail.com, laine@laine.org Subject: [libvirt] [PATCH v3 5/6] utils: PCI multifunction detection helpers 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.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This patch introduces two helpers that will be used in the next patch. One is virpci.c:virPCIDeviceIsMultifunction(), and the other is virhostdev.c:virHostdevIsPCIMultifunctionDevice(). Signed-off-by: Daniel Henrique Barboza --- src/libvirt_private.syms | 2 ++ src/util/virhostdev.c | 24 ++++++++++++++++++++++++ src/util/virhostdev.h | 3 +++ src/util/virpci.c | 17 +++++++++++++++++ src/util/virpci.h | 2 ++ 5 files changed, 48 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 8fe0bf9365..345c9747e8 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2137,6 +2137,7 @@ virHostCPUStatsAssign; # util/virhostdev.h virHostdevFindUSBDevice; virHostdevIsMdevDevice; +virHostdevIsPCIMultifunctionDevice; virHostdevIsSCSIDevice; virHostdevIsVFIODevice; virHostdevManagerGetDefault; @@ -2717,6 +2718,7 @@ virPCIDeviceGetUnbindFromStub; virPCIDeviceGetUsedBy; virPCIDeviceHasPCIExpressLink; virPCIDeviceIsAssignable; +virPCIDeviceIsMultifunction; virPCIDeviceIsPCIExpress; virPCIDeviceListAdd; virPCIDeviceListAddCopy; diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 2e7885112f..803daaa995 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -2251,3 +2251,27 @@ virHostdevUpdateActiveDomainDevices(virHostdevManage= rPtr mgr, =20 return 0; } + +bool +virHostdevIsPCIMultifunctionDevice(virDomainHostdevDefPtr hostdev) +{ + g_autoptr(virPCIDevice) pciDev =3D NULL; + virDomainHostdevSubsysPCIPtr pcisrc =3D &hostdev->source.subsys.u.pci; + + if (hostdev->mode !=3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || + hostdev->source.subsys.type !=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PC= I) + return false; + + /* Libvirt should be able to perform all the operations in + * virPCIDeviceNew() even if it's running unprivileged, so if this + * fails, the device apparently doesn't currently exist on the host. + * Since we can't speculate, assume this device is not multifunction. + */ + pciDev =3D virPCIDeviceNew(pcisrc->addr.domain, pcisrc->addr.bus, + pcisrc->addr.slot, pcisrc->addr.function); + + if (!pciDev) + return false; + + return virPCIDeviceIsMultifunction(pciDev); +} diff --git a/src/util/virhostdev.h b/src/util/virhostdev.h index 2d61c21e9d..c5a1fdcf5e 100644 --- a/src/util/virhostdev.h +++ b/src/util/virhostdev.h @@ -194,6 +194,9 @@ bool virHostdevIsMdevDevice(const virDomainHostdevDef *hostdev) ATTRIBUTE_NONNULL(1); bool +virHostdevIsPCIMultifunctionDevice(virDomainHostdevDefPtr hostdev) + ATTRIBUTE_NONNULL(1); +bool virHostdevIsVFIODevice(const virDomainHostdevDef *hostdev) ATTRIBUTE_NONNULL(1); =20 diff --git a/src/util/virpci.c b/src/util/virpci.c index 9bea5a20d0..840cca77fc 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -2818,6 +2818,23 @@ int virPCIGetHeaderType(virPCIDevicePtr dev, int *hd= rType) } =20 =20 +bool +virPCIDeviceIsMultifunction(virPCIDevicePtr dev) +{ + int fd; + uint8_t type; + + if ((fd =3D virPCIDeviceConfigOpen(dev)) < 0) + return -1; + + type =3D virPCIDeviceRead8(dev, fd, PCI_HEADER_TYPE); + + virPCIDeviceConfigClose(dev, fd); + + return type & PCI_HEADER_TYPE_MULTI; +} + + void virPCIEDeviceInfoFree(virPCIEDeviceInfoPtr dev) { diff --git a/src/util/virpci.h b/src/util/virpci.h index cfb4581edf..8f37636809 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -266,6 +266,8 @@ int virPCIDeviceGetLinkCapSta(virPCIDevicePtr dev, =20 int virPCIGetHeaderType(virPCIDevicePtr dev, int *hdrType); =20 +bool virPCIDeviceIsMultifunction(virPCIDevicePtr dev); + void virPCIEDeviceInfoFree(virPCIEDeviceInfoPtr dev); =20 ssize_t virPCIGetMdevTypes(const char *sysfspath, --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list