[libvirt PATCH v2 0/2] Fix failure to find VF netdev names during virtual network start
The first patch resolves https://bugzilla.redhat.com/2025432, the 2nd simplifies lower level code in the same manner. V1 is here: https://listman.redhat.com/archives/libvir-list/2021-December/msg00000.html Change in V2: Rather than adding an extra bool to the arglist of virPCIGetVirtualFunctionsFull() (what I did in V1), just switch to sending the name of the netdev whose phys_port_id we want to match (called physPortNetDevName) (which will always be non-NULL in the cases where we want) rather than the phys_port_id itself (physPortID) (which may or may not be NULL). This way we don't need an extra arg (we can just check for physPortNetDevName != NULL), and the lower level function can call virNetDevGetPhysPortID() as needed. Also added a similar 2nd patch that pushes the call to virNetDevGetPhysPortID() down even further, into virPCIGetNetName(). This simplifies the callers, and concentrates all calls to virNetDevGetPhysPortID() into a single function (virPCIGetNetName(), duh). Laine Stump (2): util: fix erroneous requirement for phys_port_id to get ifname of a VF util: call virNetDevGetPhysPortID() in less places src/util/virnetdev.c | 24 +++----------------- src/util/virpci.c | 52 ++++++++++++++++++++++++++------------------ src/util/virpci.h | 4 ++-- 3 files changed, 36 insertions(+), 44 deletions(-) -- 2.33.1
Commit 795e9e05c3 (libvirt-7.7.0) refactored the code in virpci.c and virnetdev.c that gathered lists of the Virtual Functions (VF) of an SRIOV Physical Function (PF) to simplify the code. Unfortunately the simplification made the assumption, in the new function virPCIGetVirtualFunctionsFull(), that a VF's netdev interface name should only be retrieved if the PF had a valid phys_port_id. That is an incorrect assumption - only a small handful of (now previous-generation) Mellanox SRIOV cards actually use phys_port_id (this is for an odd design where there are multiple physical network ports on a single PCI address); all other SRIOV cards (including new Mellanox cards) have a file in sysfs called phys_port_id, but it can't be read, and so the pfPhysPortID string is NULL. The result of this logic error is that virtual networks that are a pool of VFs to be used for macvtap connections will be unable to start, giving an errror like this: VF 0 of SRIOV PF enp130s0f0 couldn't be added to the interface pool because it isn't bound to a network driver - possibly in use elsewhere This error message is misinformed - the caller of virNetDevGetVirtualFunctionsFull() only *thinks* that the VF isn't bound to a network driver because it doesn't see a netdev name for the VF in the list. But that's only because virNetDevGetVirtualFunctionsFull() didn't even try to get the names! We do need a way for virPCIGetVirtualFunctionsFull() to sometimes retrieve the netdev names and sometimes not. One way of doing that would be to send down the netdev name of the PF whenever we also want to know the netdev names of the VFs, but send a NULL when we don't. This can conveniently be done by just *replacing* pfPhysPortID in the arglist with pfNetDevName - pfPhysPortID is determined by simply calling virNetDevGetPhysPortID(pfNetDevName) so we can just make that call down in virPCIGetVirtualFunctionsFull() (when needed). This solves the regression introduced by commit 795e9e05c3, and also nicely sets us up to (in a subsequent commit) move the call to virNetDevGetPhysPortID() down one layer further to virPCIGetNetName(), where it really belongs! Resolves: https://bugzilla.redhat.com/2025432 Fixes: 795e9e05c3b6b9ef3abe6f6078a6373a136ec23b Signed-off-by: Laine Stump <laine@redhat.com> --- src/util/virnetdev.c | 6 +----- src/util/virpci.c | 16 ++++++++++------ src/util/virpci.h | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 58f7360a0f..861b426c58 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1223,15 +1223,11 @@ virNetDevGetVirtualFunctions(const char *pfname, virPCIVirtualFunctionList **vfs) { g_autofree char *pf_sysfs_device_link = NULL; - g_autofree char *pfPhysPortID = NULL; - - if (virNetDevGetPhysPortID(pfname, &pfPhysPortID) < 0) - return -1; if (virNetDevSysfsFile(&pf_sysfs_device_link, pfname, "device") < 0) return -1; - if (virPCIGetVirtualFunctionsFull(pf_sysfs_device_link, vfs, pfPhysPortID) < 0) + if (virPCIGetVirtualFunctionsFull(pf_sysfs_device_link, vfs, pfname) < 0) return -1; return 0; diff --git a/src/util/virpci.c b/src/util/virpci.c index 2d12e28004..f7afcb6e78 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -2340,8 +2340,8 @@ virPCIGetPhysicalFunction(const char *vf_sysfs_path, * virPCIGetVirtualFunctionsFull: * @sysfs_path: path to physical function sysfs entry * @vfs: filled with the virtual function data - * @pfPhysPortID: Optional physical port id. If provided the network interface - * name of the VFs is queried too. + * @pfNetDevName: Optional netdev name of this PF. If provided, the netdev + * names of the VFs are queried too. * * * Returns virtual functions of a physical function. @@ -2349,7 +2349,7 @@ virPCIGetPhysicalFunction(const char *vf_sysfs_path, int virPCIGetVirtualFunctionsFull(const char *sysfs_path, virPCIVirtualFunctionList **vfs, - const char *pfPhysPortID) + const char *pfNetDevName) { g_autofree char *totalvfs_file = NULL; g_autofree char *totalvfs_str = NULL; @@ -2390,8 +2390,12 @@ virPCIGetVirtualFunctionsFull(const char *sysfs_path, return -1; } - if (pfPhysPortID) { - if (virPCIGetNetName(device_link, 0, pfPhysPortID, &fnc.ifname) < 0) { + if (pfNetDevName) { + g_autofree char *pfPhysPortID = NULL; + + if (virNetDevGetPhysPortID(pfNetDevName, &pfPhysPortID) < 0 || + virPCIGetNetName(device_link, 0, pfPhysPortID, &fnc.ifname) < 0) { + g_free(fnc.addr); return -1; } @@ -2712,7 +2716,7 @@ virPCIGetPhysicalFunction(const char *vf_sysfs_path G_GNUC_UNUSED, int virPCIGetVirtualFunctionsFull(const char *sysfs_path G_GNUC_UNUSED, virPCIVirtualFunctionList **vfs G_GNUC_UNUSED, - const char *pfPhysPortID G_GNUC_UNUSED) + const char *pfNetDevName G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -1; diff --git a/src/util/virpci.h b/src/util/virpci.h index 3346321ec9..7f332fc131 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -230,7 +230,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virPCIVirtualFunctionList, virPCIVirtualFunctionLi int virPCIGetVirtualFunctionsFull(const char *sysfs_path, virPCIVirtualFunctionList **vfs, - const char *pfPhysPortID); + const char *pfNetDevName); int virPCIGetVirtualFunctions(const char *sysfs_path, virPCIVirtualFunctionList **vfs); -- 2.33.1
Whenever virPCIGetNetName() is called, it is either called with physPortID = NULL, or with it set by the caller calling virNetDevGetPhysPortID() soon before virPCIGetNetName(). The physPortID is then used *only* in virPCIGetNetName(). Rather than replicating that same call to virNetDevGetPhysPortID() in all the callers of virPCIGetNetName(), lets just have all those callers send the NetDevName whose physPortID they want down to virPCIGetNetName(), and let virPCIGetNetName() call virNetDevGetPhysPortID(). Signed-off-by: Laine Stump <laine@redhat.com> --- src/util/virnetdev.c | 18 ++--------------- src/util/virpci.c | 48 +++++++++++++++++++++++++------------------- src/util/virpci.h | 2 +- 3 files changed, 30 insertions(+), 38 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 861b426c58..d93b2c6a83 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1297,18 +1297,12 @@ int virNetDevGetPhysicalFunction(const char *ifname, char **pfname) { g_autofree char *physfn_sysfs_path = NULL; - g_autofree char *vfPhysPortID = NULL; - - if (virNetDevGetPhysPortID(ifname, &vfPhysPortID) < 0) - return -1; if (virNetDevSysfsDeviceFile(&physfn_sysfs_path, ifname, "physfn") < 0) return -1; - if (virPCIGetNetName(physfn_sysfs_path, 0, - vfPhysPortID, pfname) < 0) { + if (virPCIGetNetName(physfn_sysfs_path, 0, ifname, pfname) < 0) return -1; - } return 0; } @@ -1336,14 +1330,6 @@ virNetDevPFGetVF(const char *pfname, int vf, char **vfname) { g_autofree char *virtfnName = NULL; g_autofree char *virtfnSysfsPath = NULL; - g_autofree char *pfPhysPortID = NULL; - - /* a VF may have multiple "ports", each one having its own netdev, - * and each netdev having a different phys_port_id. Be sure we get - * the VF netdev with a phys_port_id matchine that of pfname - */ - if (virNetDevGetPhysPortID(pfname, &pfPhysPortID) < 0) - return -1; virtfnName = g_strdup_printf("virtfn%d", vf); @@ -1360,7 +1346,7 @@ virNetDevPFGetVF(const char *pfname, int vf, char **vfname) * isn't bound to a netdev driver, it won't have a netdev name, * and vfname will be NULL). */ - return virPCIGetNetName(virtfnSysfsPath, 0, pfPhysPortID, vfname); + return virPCIGetNetName(virtfnSysfsPath, 0, pfname, vfname); } diff --git a/src/util/virpci.c b/src/util/virpci.c index f7afcb6e78..0d476cd8b4 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -2390,15 +2390,10 @@ virPCIGetVirtualFunctionsFull(const char *sysfs_path, return -1; } - if (pfNetDevName) { - g_autofree char *pfPhysPortID = NULL; - - if (virNetDevGetPhysPortID(pfNetDevName, &pfPhysPortID) < 0 || - virPCIGetNetName(device_link, 0, pfPhysPortID, &fnc.ifname) < 0) { - - g_free(fnc.addr); - return -1; - } + if (pfNetDevName && + virPCIGetNetName(device_link, 0, pfNetDevName, &fnc.ifname) < 0) { + g_free(fnc.addr); + return -1; } VIR_APPEND_ELEMENT(list->functions, list->nfunctions, fnc); @@ -2474,8 +2469,20 @@ virPCIDeviceAddressGetSysfsFile(virPCIDeviceAddress *addr, * @device_link_sysfs_path: sysfs path to the PCI device * @idx: used to choose which netdev when there are several * (ignored if physPortID is set or physPortName is available) - * @physPortID: match this string in the netdev's phys_port_id - * (or NULL to ignore and use phys_port_name or idx instead) + + * @physPortNetDevName: if non-null, attempt to learn the phys_port_id + * of the netdev interface named + * @physPortNetDevName, and find a netdev for + * this PCI device that has the same + * phys_port_id. if @physPortNetDevName is NULL, + * or has no phys_port_id, then use + * phys_port_name or idx to determine which + * netdev to return. (NB: as of today, only mlx + * drivers/cards can have multiple phys_ports for + * a single PCI device; on all other devices + * there is only a single choice of netdev, and + * phys_port_id, phys_port_name, and idx are + * unavailable/unused) * @netname: used to return the name of the netdev * (set to NULL (but returns success) if there is no netdev) * @@ -2484,9 +2491,10 @@ virPCIDeviceAddressGetSysfsFile(virPCIDeviceAddress *addr, int virPCIGetNetName(const char *device_link_sysfs_path, size_t idx, - const char *physPortID, + const char *physPortNetDevName, char **netname) { + g_autofree char *physPortID = NULL; g_autofree char *pcidev_sysfs_net_path = NULL; g_autofree char *firstEntryName = NULL; g_autoptr(DIR) dir = NULL; @@ -2495,6 +2503,11 @@ virPCIGetNetName(const char *device_link_sysfs_path, *netname = NULL; + if (physPortNetDevName && + virNetDevGetPhysPortID(physPortNetDevName, &physPortID) < 0) { + return -1; + } + virBuildPath(&pcidev_sysfs_net_path, device_link_sysfs_path, "net"); if (virDirOpenQuiet(&dir, pcidev_sysfs_net_path) < 0) { @@ -2585,7 +2598,6 @@ virPCIGetVirtualFunctionInfo(const char *vf_sysfs_device_path, g_autofree virPCIDeviceAddress *pf_config_address = NULL; g_autofree char *pf_sysfs_device_path = NULL; g_autofree char *vfname = NULL; - g_autofree char *vfPhysPortID = NULL; if (virPCIGetPhysicalFunction(vf_sysfs_device_path, &pf_config_address) < 0) return -1; @@ -2614,17 +2626,11 @@ virPCIGetVirtualFunctionInfo(const char *vf_sysfs_device_path, if (virPCIGetNetName(vf_sysfs_device_path, 0, NULL, &vfname) < 0) return -1; - if (vfname) { - if (virNetDevGetPhysPortID(vfname, &vfPhysPortID) < 0) - return -1; - } pfNetDevIdx = 0; } - if (virPCIGetNetName(pf_sysfs_device_path, - pfNetDevIdx, vfPhysPortID, pfname) < 0) { + if (virPCIGetNetName(pf_sysfs_device_path, pfNetDevIdx, vfname, pfname) < 0) return -1; - } if (!*pfname) { /* this shouldn't be possible. A VF can't exist unless its @@ -2751,7 +2757,7 @@ virPCIDeviceAddressGetSysfsFile(virPCIDeviceAddress *dev G_GNUC_UNUSED, int virPCIGetNetName(const char *device_link_sysfs_path G_GNUC_UNUSED, size_t idx G_GNUC_UNUSED, - const char *physPortID G_GNUC_UNUSED, + const char *physPortNetDevName G_GNUC_UNUSED, char **netname G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); diff --git a/src/util/virpci.h b/src/util/virpci.h index 7f332fc131..b9b9cd7b34 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -245,7 +245,7 @@ int virPCIDeviceAddressGetSysfsFile(virPCIDeviceAddress *addr, int virPCIGetNetName(const char *device_link_sysfs_path, size_t idx, - const char *physPortID, + const char *physPortNetDevName, char **netname); bool virPCIDeviceAddressIsValid(virPCIDeviceAddress *addr, -- 2.33.1
On 12/5/21 23:54, Laine Stump wrote:
The first patch resolves https://bugzilla.redhat.com/2025432, the 2nd simplifies lower level code in the same manner.
V1 is here: https://listman.redhat.com/archives/libvir-list/2021-December/msg00000.html
Change in V2: Rather than adding an extra bool to the arglist of virPCIGetVirtualFunctionsFull() (what I did in V1), just switch to sending the name of the netdev whose phys_port_id we want to match (called physPortNetDevName) (which will always be non-NULL in the cases where we want) rather than the phys_port_id itself (physPortID) (which may or may not be NULL). This way we don't need an extra arg (we can just check for physPortNetDevName != NULL), and the lower level function can call virNetDevGetPhysPortID() as needed.
Also added a similar 2nd patch that pushes the call to virNetDevGetPhysPortID() down even further, into virPCIGetNetName(). This simplifies the callers, and concentrates all calls to virNetDevGetPhysPortID() into a single function (virPCIGetNetName(), duh).
Laine Stump (2): util: fix erroneous requirement for phys_port_id to get ifname of a VF util: call virNetDevGetPhysPortID() in less places
src/util/virnetdev.c | 24 +++----------------- src/util/virpci.c | 52 ++++++++++++++++++++++++++------------------ src/util/virpci.h | 4 ++-- 3 files changed, 36 insertions(+), 44 deletions(-)
Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Michal
participants (2)
-
Laine Stump -
Michal Prívozník