daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
803fb7
From 05004e584a76645dcbcaaa4d5c2d3d3255900770 Mon Sep 17 00:00:00 2001
803fb7
From: Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>
803fb7
Date: Tue, 23 Feb 2016 15:02:02 -0300
803fb7
Subject: [PATCH] udev: path-id: fibre channel NPIV - use fc_vport's port_name
803fb7
803fb7
With the Fibre Channel NPIV (N_Port ID Virtualization) feature,
803fb7
a single physical N_Port (e.g., PCI address) can have multiple
803fb7
N_Port IDs (e.g., different fc_host nodes) - which can connect
803fb7
to the same target LUN (e.g., fc_remote_port's port_name and
803fb7
LUN number).
803fb7
803fb7
Thus, in order to be unique, the device persistent path should
803fb7
include the fc_vport's port_name (only if the fc_vport is used),
803fb7
in addition to the already in use PCI address, fc_remote_port's
803fb7
port_name and LUN number.
803fb7
803fb7
The patch merges the 2 proposals submitted upstream, addressing
803fb7
some problems with both:
803fb7
- #2500 (don't replace the fc_rport's port_name with fc_vport's)
803fb7
- #2665 (don't add a fc_host/fc_vport's port_name if not needed)
803fb7
803fb7
Links
803fb7
- https://github.com/systemd/systemd/pull/2500/
803fb7
- https://github.com/systemd/systemd/pull/2665/
803fb7
803fb7
Built, checked, tested on RHEL Server 7.1 with no regressions.
803fb7
803fb7
With the patch, /dev/disk/by-path symlinks are created correctly,
803fb7
and are unique, backward-compatible with the physical port case:
803fb7
- physical port (no vport field)
803fb7
- virtual ports (w/ vport field)
803fb7
803fb7
    # ls -l /dev/disk/by-path | grep 0001:09:00.0
803fb7
    <...> pci-0001:09:00.0-fc-0x500507680b2255fe-lun-0 -> ../../sdh
803fb7
    <...> pci-0001:09:00.0-fc-0x500507680b2255ff-lun-0 -> ../../sdi
803fb7
    <...> pci-0001:09:00.0-vport-0x5001a4aaf00a6785-fc-0x500507680b2255fe-lun-0 -> ../../sde
803fb7
    <...> pci-0001:09:00.0-vport-0x5001a4aaf00a6785-fc-0x500507680b2255ff-lun-0 -> ../../sdd
803fb7
    <...> pci-0001:09:00.0-vport-0x5001a4ad99d8c2de-fc-0x500507680b2255fe-lun-0 -> ../../sdc
803fb7
    <...> pci-0001:09:00.0-vport-0x5001a4ad99d8c2de-fc-0x500507680b2255ff-lun-0 -> ../../sdb
803fb7
803fb7
Accordingly w/ sysfs:
803fb7
803fb7
    # ls -ld /sys/block/sd* | grep host1
803fb7
    <...> /sys/block/sdb -> ../devices/pci0001:00/<...>/0001:09:00.0/host1/vport-1:0-0/host3/rport-3:0-1/target3:0:0/3:0:0:0/block/sdb
803fb7
    <...> /sys/block/sdc -> ../devices/pci0001:00/<...>/0001:09:00.0/host1/vport-1:0-0/host3/rport-3:0-2/target3:0:1/3:0:1:0/block/sdc
803fb7
    <...> /sys/block/sdd -> ../devices/pci0001:00/<...>/0001:09:00.0/host1/vport-1:0-2/host5/rport-5:0-1/target5:0:0/5:0:0:0/block/sdd
803fb7
    <...> /sys/block/sde -> ../devices/pci0001:00/<...>/0001:09:00.0/host1/vport-1:0-2/host5/rport-5:0-2/target5:0:1/5:0:1:0/block/sde
803fb7
    <...> /sys/block/sdh -> ../devices/pci0001:00/<...>/0001:09:00.0/host1/rport-1:0-3/target1:0:0/1:0:0:0/block/sdh
803fb7
    <...> /sys/block/sdi -> ../devices/pci0001:00/<...>/0001:09:00.0/host1/rport-1:0-4/target1:0:1/1:0:1:0/block/sdi
803fb7
803fb7
The symlinks still include the fc_remote_port's (target) port_name:
803fb7
803fb7
    # grep . /sys/class/fc_remote_ports/rport-{3:0-{1,2},5:0-{1,2},1:0-{3,4}}/port_name
803fb7
    /sys/class/fc_remote_ports/rport-3:0-1/port_name:0x500507680b2255ff
803fb7
    /sys/class/fc_remote_ports/rport-3:0-2/port_name:0x500507680b2255fe
803fb7
    /sys/class/fc_remote_ports/rport-5:0-1/port_name:0x500507680b2255ff
803fb7
    /sys/class/fc_remote_ports/rport-5:0-2/port_name:0x500507680b2255fe
803fb7
    /sys/class/fc_remote_ports/rport-1:0-3/port_name:0x500507680b2255fe
803fb7
    /sys/class/fc_remote_ports/rport-1:0-4/port_name:0x500507680b2255ff
803fb7
803fb7
And now include the fc_vport's (virtual host) port_name *if* it's from a fc_vport:
803fb7
803fb7
    # grep . /sys/class/fc_host/host1/port_name /sys/class/fc_vports/vport-1:0-{0,2}/port_name
803fb7
    /sys/class/fc_host/host1/port_name:0x10000090fa8f0ebc
803fb7
    /sys/class/fc_vports/vport-1:0-0/port_name:0x5001a4ad99d8c2de
803fb7
    /sys/class/fc_vports/vport-1:0-2/port_name:0x5001a4aaf00a6785
803fb7
803fb7
Signed-off-by: Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>
803fb7
Reported-by: Srikanth B. Aithal <bssrikanth@in.ibm.com>
803fb7
803fb7
Cherry-picked from: 6a3d3f9e5970cf982ac37c65d0b856146b675a12
803fb7
Resolves: #1266934
803fb7
---
803fb7
 src/udev/udev-builtin-path_id.c | 30 ++++++++++++++++++++++++++++++
803fb7
 1 file changed, 30 insertions(+)
803fb7
803fb7
diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
803fb7
index 9ca608468..3b72922d4 100644
803fb7
--- a/src/udev/udev-builtin-path_id.c
803fb7
+++ b/src/udev/udev-builtin-path_id.c
803fb7
@@ -92,7 +92,11 @@ static struct udev_device *skip_subsystem(struct udev_device *dev, const char *s
803fb7
 static struct udev_device *handle_scsi_fibre_channel(struct udev_device *parent, char **path) {
803fb7
         struct udev *udev  = udev_device_get_udev(parent);
803fb7
         struct udev_device *targetdev;
803fb7
+        struct udev_device *rportdev;
803fb7
+        struct udev_device *hostdev;
803fb7
+        struct udev_device *vportdev;
803fb7
         struct udev_device *fcdev = NULL;
803fb7
+        struct udev_device *fc_vportdev = NULL;
803fb7
         const char *port;
803fb7
         char *lun = NULL;
803fb7
 
803fb7
@@ -113,6 +117,32 @@ static struct udev_device *handle_scsi_fibre_channel(struct udev_device *parent,
803fb7
         path_prepend(path, "fc-%s-%s", port, lun);
803fb7
         if (lun)
803fb7
                 free(lun);
803fb7
+
803fb7
+        /* NPIV */
803fb7
+        rportdev = udev_device_get_parent(targetdev);
803fb7
+        if (rportdev == NULL)
803fb7
+                goto out;
803fb7
+
803fb7
+        hostdev = udev_device_get_parent(rportdev);
803fb7
+        if (hostdev == NULL)
803fb7
+                goto out;
803fb7
+
803fb7
+        vportdev = udev_device_get_parent(hostdev);
803fb7
+        if (vportdev == NULL)
803fb7
+                goto out;
803fb7
+
803fb7
+        fc_vportdev = udev_device_new_from_subsystem_sysname(udev, "fc_vports", udev_device_get_sysname(vportdev));
803fb7
+        if (fc_vportdev == NULL)
803fb7
+                goto out;
803fb7
+
803fb7
+        port = udev_device_get_sysattr_value(fc_vportdev, "port_name");
803fb7
+        if (port == NULL)
803fb7
+                goto out_npiv;
803fb7
+
803fb7
+        path_prepend(path, "vport-%s", port);
803fb7
+
803fb7
+out_npiv:
803fb7
+        udev_device_unref(fc_vportdev);
803fb7
 out:
803fb7
         udev_device_unref(fcdev);
803fb7
         return parent;