Merge ~fnordahl/ubuntu/+source/libvirt:bug/1892132-hirsute into ubuntu/+source/libvirt:ubuntu/hirsute-devel

[Frode Nordahl]

Package building in https://launchpad.net/~fnordahl/+archive/ubuntu/lp-1892132

[Frode Nordahl (fnordahl)]

This new MP addresses the feedback received on https://code.launchpad.net/~fnordahl/ubuntu/+source/libvirt/+git/libvirt/+merge/405820

[Christian Ehrhardt  (paelzer)]

Changelog, dep-3 headers, version - this LGTM.
It would be ready to sponsor, but I guess you want to have focal and this one enter the SRU queue at once and there is one little change needed in focal.

+1

review: Approve

[Christian Ehrhardt  (paelzer)]

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading libvirt_7.0.0-2ubuntu2.1.dsc: done.
  Uploading libvirt_7.0.0-2ubuntu2.1.debian.tar.xz: done.
  Uploading libvirt_7.0.0-2ubuntu2.1_source.buildinfo: done.
  Uploading libvirt_7.0.0-2ubuntu2.1_source.changes: done.
Successfully uploaded packages

 * [new tag] upload/7.0.0-2ubuntu2.1 -> upload/7.0.0-2ubuntu2.1

diff --git a/debian/changelog b/debian/changelog
index ce374d0..da90ffb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libvirt (7.0.0-2ubuntu2.1) hirsute; urgency=medium
+
+  * Add support for switchdev NICs that link representor ports to parent PCI
+    device. (LP: #1892132)
+    - d/p/u/lp-1892132-Add-phys_port_name-support-on-virPCIGetNetName.patch
+    - d/p/u/lp-1892132-add-virNetDevGetPhysPortName.patch
+
+ -- Frode Nordahl <[e-mail]>  Fri, 16 Jul 2021 05:16:36 +0000
+
 libvirt (7.0.0-2ubuntu2) hirsute; urgency=medium
 
   * d/p/u/lp-1921754*: add EPYC-Rome-v2 as v1 missed IBRS and thereby fails
diff --git a/debian/patches/series b/debian/patches/series
index eedc4d2..a2b4be8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -40,3 +40,5 @@ ubuntu/lp-1921880-cpu_map-Add-EPYC-Milan-x86-CPU-model.patch
 ubuntu/lp-1921880-cpu_map-Install-x86_EPYC-Milan.xml.patch
 ubuntu/lp-1921880-cpu_map-sync_qemu_i386.py-Add-mapping-for-svme-addr-.patch
 ubuntu/lp-1921880-cpu_map-Fix-spelling-of-svme-addr-chk-feature.patch
+ubuntu/lp-1892132-Add-phys_port_name-support-on-virPCIGetNetName.patch
+ubuntu/lp-1892132-add-virNetDevGetPhysPortName.patch
diff --git a/debian/patches/ubuntu/lp-1892132-Add-phys_port_name-support-on-virPCIGetNetName.patch b/debian/patches/ubuntu/lp-1892132-Add-phys_port_name-support-on-virPCIGetNetName.patch
new file mode 100644
index 0000000..096077e
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1892132-Add-phys_port_name-support-on-virPCIGetNetName.patch
@@ -0,0 +1,133 @@
+Description: To support kernels or dkms builds of mlx5_core driver with
+ https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/commit/?id=123f0f53dd64b67e34142485fe866a8a581f12f1
+Origin: upstream, https://github.com/libvirt/libvirt/commit/5b1c525b1f3608156884aed0dc5e925306c1e260
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1892132
+Last-Update: 2021-08-13
+
+diff --git a/src/util/virpci.c b/src/util/virpci.c
+index 50fd5ef7ea..c685927b60 100644
+--- a/src/util/virpci.c
++++ b/src/util/virpci.c
+@@ -2467,9 +2467,9 @@ virPCIDeviceAddressGetSysfsFile(virPCIDeviceAddressPtr addr,
+  * virPCIGetNetName:
+  * @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)
++ *       (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 idx instead)
++ *       (or NULL to ignore and use phys_port_name or idx instead)
+  * @netname: used to return the name of the netdev
+  *       (set to NULL (but returns success) if there is no netdev)
+  *
+@@ -2501,6 +2501,14 @@ virPCIGetNetName(const char *device_link_sysfs_path,
+     }
+ 
+     while (virDirRead(dir, &entry, pcidev_sysfs_net_path) > 0) {
++        /* save the first entry we find to use as a failsafe
++         * in case we don't match the phys_port_id. This is
++         * needed because some NIC drivers (e.g. i40e)
++         * implement phys_port_id for PFs, but not for VFs
++         */
++        if (!firstEntryName)
++            firstEntryName = g_strdup(entry->d_name);
++
+         /* if the caller sent a physPortID, compare it to the
+          * physportID of this netdev. If not, look for entry[idx].
+          */
+@@ -2511,33 +2519,49 @@ virPCIGetNetName(const char *device_link_sysfs_path,
+                 return -1;
+ 
+             /* if this one doesn't match, keep looking */
+-            if (STRNEQ_NULLABLE(physPortID, thisPhysPortID)) {
+-                /* save the first entry we find to use as a failsafe
+-                 * in case we don't match the phys_port_id. This is
+-                 * needed because some NIC drivers (e.g. i40e)
+-                 * implement phys_port_id for PFs, but not for VFs
+-                 */
+-                if (!firstEntryName)
+-                    firstEntryName = g_strdup(entry->d_name);
+-
++            if (STRNEQ_NULLABLE(physPortID, thisPhysPortID))
+                 continue;
+-            }
++
+         } else {
+-            if (i++ < idx)
+-                continue;
++            /* Most switch devices use phys_port_name instead of
++             * phys_port_id.
++             * NOTE: VFs' representors net devices can be linked to PF's PCI
++             * device, which mean that there'll be multiple net devices
++             * instances and to get a proper net device need to match on
++             * specific regex.
++             * To get PF netdev, for ex., used following regex:
++             * "(p[0-9]+$)|(p[0-9]+s[0-9]+$)"
++             * or to get exact VF's netdev next regex is used:
++             * "pf0vf1$"
++             */
++            g_autofree char *thisPhysPortName = NULL;
++
++            if (virNetDevGetPhysPortName(entry->d_name, &thisPhysPortName) < 0)
++                return -1;
++
++            if (thisPhysPortName) {
++
++                /* if this one doesn't match, keep looking */
++                if (!virStringMatch(thisPhysPortName, VIR_PF_PHYS_PORT_NAME_REGEX))
++                    continue;
++
++            } else {
++
++                if (i++ < idx)
++                    continue;
++            }
+         }
+ 
+         *netname = g_strdup(entry->d_name);
+         return 0;
+     }
+ 
+-    if (!physPortID)
+-        return 0;
+-
+     if (firstEntryName) {
+-        /* we didn't match the provided phys_port_id, but this
+-         * is probably because phys_port_id isn't implemented
+-         * for this NIC driver, so just return the first
++        /* we didn't match the provided phys_port_id / find a
++         * phys_port_name matching VIR_PF_PHYS_PORT_NAME_REGEX / find
++         * as many net devices as the value of idx, but this is
++         * probably because phys_port_id / phys_port_name isn't
++         * implemented for this NIC driver, so just return the first
+          * (probably only) netname we found.
+          */
+         *netname = g_steal_pointer(&firstEntryName);
+@@ -2545,9 +2569,8 @@ virPCIGetNetName(const char *device_link_sysfs_path,
+     }
+ 
+     virReportError(VIR_ERR_INTERNAL_ERROR,
+-                   _("Could not find network device with "
+-                     "phys_port_id '%s' under PCI device at %s"),
+-                   physPortID, device_link_sysfs_path);
++                   _("Could not find any network device under PCI device at %s"),
++                   device_link_sysfs_path);
+     return -1;
+ }
+ 
+diff --git a/src/util/virpci.h b/src/util/virpci.h
+index 43828b0a8a..1a4bf1d751 100644
+--- a/src/util/virpci.h
++++ b/src/util/virpci.h
+@@ -55,6 +55,11 @@ struct _virZPCIDeviceAddress {
+ 
+ #define VIR_PCI_DEVICE_ADDRESS_FMT "%04x:%02x:%02x.%d"
+ 
++/* Represents format of PF's phys_port_name in switchdev mode:
++ * 'p%u' or 'p%us%u'. New line checked since value is readed from sysfs file.
++ */
++#define VIR_PF_PHYS_PORT_NAME_REGEX  "(p[0-9]+$)|(p[0-9]+s[0-9]+$)"
++
+ struct _virPCIDeviceAddress {
+     unsigned int domain;
+     unsigned int bus;
diff --git a/debian/patches/ubuntu/lp-1892132-add-virNetDevGetPhysPortName.patch b/debian/patches/ubuntu/lp-1892132-add-virNetDevGetPhysPortName.patch
new file mode 100644
index 0000000..02e4830
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1892132-add-virNetDevGetPhysPortName.patch
@@ -0,0 +1,115 @@
+Description: To support kernels or dkms builds of mlx5_core driver with
+ https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/commit/?id=123f0f53dd64b67e34142485fe866a8a581f12f1
+Origin: upstream, https://github.com/libvirt/libvirt/commit/97ebb982453bc23759c5f180799d6f2207b81c80
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1892132
+Last-Update: 2021-08-13
+
+diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
+index a73e5f72f1..2485718b48 100644
+--- a/src/util/virnetdev.c
++++ b/src/util/virnetdev.c
+@@ -1147,6 +1147,29 @@ virNetDevGetPCIDevice(const char *devName)
+ # endif
+ 
+ 
++/* A wrapper to get content of file from ifname SYSFS_NET_DIR
++ */
++static int
++virNetDevGetSysfsFileValue(const char *ifname,
++                           const char *fileName,
++                           char **sysfsFileData)
++{
++    g_autofree char *sysfsFile = NULL;
++
++    *sysfsFileData = NULL;
++
++    if (virNetDevSysfsFile(&sysfsFile, ifname, fileName) < 0)
++        return -1;
++
++    /* a failure to read just means the driver doesn't support
++     * <fileName>, so set success now and ignore the return from
++     * virFileReadAllQuiet().
++     */
++
++    ignore_value(virFileReadAllQuiet(sysfsFile, 1024, sysfsFileData));
++    return 0;
++}
++
+ /**
+  * virNetDevGetPhysPortID:
+  *
+@@ -1165,20 +1188,29 @@ int
+ virNetDevGetPhysPortID(const char *ifname,
+                        char **physPortID)
+ {
+-    g_autofree char *physPortIDFile = NULL;
+-
+-    *physPortID = NULL;
+-
+-    if (virNetDevSysfsFile(&physPortIDFile, ifname, "phys_port_id") < 0)
+-        return -1;
++    return virNetDevGetSysfsFileValue(ifname, "phys_port_id", physPortID);
++}
+ 
+-    /* a failure to read just means the driver doesn't support
+-     * phys_port_id, so set success now and ignore the return from
+-     * virFileReadAllQuiet().
+-     */
+ 
+-    ignore_value(virFileReadAllQuiet(physPortIDFile, 1024, physPortID));
+-    return 0;
++/**
++ * virNetDevGetPhysPortName:
++ *
++ * @ifname: name of a netdev
++ *
++ * @physPortName: pointer to char* that will receive @ifname's
++ *                phys_port_name from sysfs (null terminated
++ *                string). Could be NULL if @ifname's net driver doesn't
++ *                support phys_port_name (most netdev drivers
++ *                don't). Caller is responsible for freeing the string
++ *                when finished.
++ *
++ * Returns 0 on success or -1 on failure.
++ */
++int
++virNetDevGetPhysPortName(const char *ifname,
++                         char **physPortName)
++{
++    return virNetDevGetSysfsFileValue(ifname, "phys_port_name", physPortName);
+ }
+ 
+ 
+@@ -1433,6 +1465,17 @@ virNetDevGetPhysPortID(const char *ifname G_GNUC_UNUSED,
+     return 0;
+ }
+ 
++int
++virNetDevGetPhysPortName(const char *ifname G_GNUC_UNUSED,
++                       char **physPortName)
++{
++    /* this actually should never be called, and is just here to
++     * satisfy the linker.
++     */
++    *physPortName = NULL;
++    return 0;
++}
++
+ int
+ virNetDevGetVirtualFunctions(const char *pfname G_GNUC_UNUSED,
+                              char ***vfname G_GNUC_UNUSED,
+diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h
+index f016012718..e9349e7f59 100644
+--- a/src/util/virnetdev.h
++++ b/src/util/virnetdev.h
+@@ -250,6 +250,10 @@ int virNetDevGetPhysPortID(const char *ifname,
+                            char **physPortID)
+     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
+     G_GNUC_WARN_UNUSED_RESULT;
++int virNetDevGetPhysPortName(const char *ifname,
++                           char **physPortName)
++    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
++    G_GNUC_WARN_UNUSED_RESULT;
+ 
+ int virNetDevGetVirtualFunctions(const char *pfname,
+                                  char ***vfname,