libmultipath: add get_uid fallback code for NVMe devices
authorBenjamin Marzinski <bmarzins@redhat.com>
Sat, 30 Mar 2019 06:06:00 +0000 (01:06 -0500)
committerChristophe Varoqui <christophe.varoqui@opensvc.com>
Thu, 18 Apr 2019 11:03:43 +0000 (13:03 +0200)
If multipath can't get the uid for NVMe devices from udev, it can get it
directly from sysfs.

Reviewed-by: Martin Wilck <mwilck@suse.com>
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
libmultipath/discovery.c

index 28c00e5..bece67c 100644 (file)
@@ -1754,8 +1754,8 @@ get_vpd_uid(struct path * pp)
        return get_vpd_sysfs(parent, 0x83, pp->wwid, WWID_SIZE);
 }
 
-static ssize_t scsi_uid_fallback(struct path *pp, int path_state,
-                            const char **origin, ssize_t old_len)
+static ssize_t uid_fallback(struct path *pp, int path_state,
+                           const char **origin, ssize_t old_len)
 {
        ssize_t len = old_len;
        int retrigger;
@@ -1764,17 +1764,36 @@ static ssize_t scsi_uid_fallback(struct path *pp, int path_state,
        conf = get_multipath_config();
        retrigger = conf->retrigger_tries;
        put_multipath_config(conf);
-       if (pp->retriggers >= retrigger &&
-           !strcmp(pp->uid_attribute, DEFAULT_UID_ATTRIBUTE)) {
-               len = get_vpd_uid(pp);
-               *origin = "sysfs";
-               pp->uid_attribute = NULL;
-               if (len < 0 && path_state == PATH_UP) {
-                       condlog(1, "%s: failed to get sysfs uid: %s",
-                               pp->dev, strerror(-len));
-                       len = get_vpd_sgio(pp->fd, 0x83, pp->wwid,
-                                          WWID_SIZE);
-                       *origin = "sgio";
+       if (pp->retriggers >= retrigger) {
+               if (pp->bus == SYSFS_BUS_SCSI &&
+                   !strcmp(pp->uid_attribute, DEFAULT_UID_ATTRIBUTE)) {
+                       len = get_vpd_uid(pp);
+                       *origin = "sysfs";
+                       pp->uid_attribute = NULL;
+                       if (len < 0 && path_state == PATH_UP) {
+                               condlog(1, "%s: failed to get sysfs uid: %s",
+                                       pp->dev, strerror(-len));
+                               len = get_vpd_sgio(pp->fd, 0x83, pp->wwid,
+                                                  WWID_SIZE);
+                               *origin = "sgio";
+                       }
+               } else if (pp->bus == SYSFS_BUS_NVME) {
+                       char value[256];
+                       len = sysfs_attr_get_value(pp->udev, "wwid", value,
+                                                  sizeof(value));
+                       if (len <= 0)
+                               return -1;
+                       len = strlcpy(pp->wwid, value, WWID_SIZE);
+                       if (len >= WWID_SIZE) {
+                               len = fix_broken_nvme_wwid(pp, value,
+                                                          WWID_SIZE);
+                               if (len > 0)
+                                       return len;
+                               condlog(0, "%s: wwid overflow", pp->dev);
+                               len = WWID_SIZE;
+                       }
+                       *origin = "sysfs";
+                       pp->uid_attribute = NULL;
                }
        }
        return len;
@@ -1827,8 +1846,8 @@ get_uid (struct path * pp, int path_state, struct udev_device *udev)
                        len = get_vpd_uid(pp);
                        origin = "sysfs";
                }
-               if (len <= 0 && pp->bus == SYSFS_BUS_SCSI)
-                       len = scsi_uid_fallback(pp, path_state, &origin, len);
+               if (len <= 0)
+                       len = uid_fallback(pp, path_state, &origin, len);
        }
        if ( len < 0 ) {
                condlog(1, "%s: failed to get %s uid: %s",