Merge remote-tracking branch 'origin/fix-vm2-nvme-aliasing-on-ubu20' into build

Author: JordanKeo45

tools/id_disk_custom_alias

@@ -7,7 +7,9 @@ from typing import List, Tuple, Optional, Dict
 import pyudev
 import sys
 import os
+import re
 
+context = pyudev.Context()
 
 def set_env_var(key, value):
     print(f"{key}={value}")
@@ -51,21 +53,19 @@ def get_device_from_devpath(devpath: str) -> pyudev.Device:
     Given a DEVPATH (e.g. '/devices/.../tty/ttyUSB0'),
     return the corresponding pyudev Device.
     """
-    context = pyudev.Context()
     sys_path = os.path.join("/sys", devpath.lstrip("/"))
     return pyudev.Devices.from_sys_path(context, sys_path)
 
 
-def iter_kernel_ancestors(device: pyudev.Device, include_self: bool = False):
-    """
-    Yield sys_name (kernel name) for the device and its parents.
-
-    sys_name is what udev matches with KERNELS=="...".
-    """
-    dev = device if include_self else device.parent
-    while dev is not None:
-        yield dev
-        dev = dev.parent
+def get_pcieport_parent_sys_name(device: pyudev.Device) -> Optional[str]:
+    try:
+        pcieport_parent = next(
+            d for d in device.ancestors if d.driver == "pcieport"
+        )
+        return pcieport_parent.sys_name
+    except StopIteration:
+        # no pcieport parent found
+        return None
 
 
 def main():
@@ -86,22 +86,23 @@ def main():
     if not devpath:
         set_env_var("CUSTOM_ALIAS_ERR", "device path not provided!")
         return
-
+    
     device = get_device_from_devpath(devpath)
-
-    try:
-        pcieport_parent = next(
-            d for d in iter_kernel_ancestors(device) if d.driver == "pcieport"
-        )
-    except StopIteration:
-        # no pcieport parent found
-        return
-
-    if pcieport_parent.sys_name not in alias_parents:
+    pcieport_parent_sys_name = get_pcieport_parent_sys_name(device)
+    if pcieport_parent_sys_name is None:
+        # special case for NVMe:
+        # try stripping down to nvme subsystem device
+        nvme_block_name: str = device.sys_name
+        m = re.match(r"(nvme\d+)n\d+", nvme_block_name)
+        if m:
+            nvme_device = pyudev.Devices.from_name(context, "nvme", m.group(1))
+            pcieport_parent_sys_name = get_pcieport_parent_sys_name(nvme_device)
+
+    if pcieport_parent_sys_name not in alias_parents:
         # not mapped
         return
 
-    alias = alias_parents[pcieport_parent.sys_name]
+    alias = alias_parents[pcieport_parent_sys_name]
 
     set_env_var("ID_VDEV", alias)
     set_env_var("ID_VDEV_PATH", os.path.join("disk/by-vdev", alias))

tools/lsdev

@@ -457,7 +457,7 @@ def build_server(options):
 		bay["dev-by-path"] = regex.group(3) # third capture group
 		bay["bay-id"] = str(CARD) + "-" + str(DRIVE)
 		# if symlink exists in /dev/disk/by-path/ then bay is occupied
-		if os.path.islink(bay["dev-by-path"]):
+		if os.path.exists(bay["dev-by-path"]):
 			bay["occupied"] = True
 			bay["dev"] = os.path.realpath(bay["dev-by-path"])
 			bay["partitions"] = count_partitions(bay["dev"])

udev/68-0-custom-aliases.rules

@@ -9,10 +9,16 @@
 # Josh Boudreau <jboudreau@45drives.com>
 
 SUBSYSTEMS=="pci", DRIVERS=="nvme", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk|partition", IMPORT{program}="/opt/45drives/tools/id_disk_custom_alias %p"
+# for when nvme block dev is virtual ?
+SUBSYSTEMS=="nvme-subsystem", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk|partition", IMPORT{program}="/opt/45drives/tools/id_disk_custom_alias %p"
 
 # skip running vdev_id
 ACTION=="add|change", ENV{SUBSYSTEM}=="block", ENV{ID_VDEV}=="?*", ENV{ID_VDEV_PATH}=="?*", ENV{ID_VDEV_ALT_PATH}=="?*", ENV{DISK_HANDLED_BY_CUSTOM_ALIASES}="1"
 
-ENV{DISK_HANDLED_BY_CUSTOM_ALIASES}=="1", KERNEL=="?*", ENV{SUBSYSTEM}=="block", ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="?*", ENV{ID_VDEV}=="?*", RUN+="/opt/45drives/ubm/patch_vdev_id_conf $env{ID_VDEV} $env{ID_PATH}"
+ENV{DISK_HANDLED_BY_CUSTOM_ALIASES}!="1", GOTO="68-0-custom-aliases-end"
+KERNEL=="?*", ENV{SUBSYSTEM}=="block", ENV{DEVTYPE}=="disk", ENV{ID_VDEV}=="?*", ENV{ID_PATH}=="?*", RUN+="/opt/45drives/ubm/patch_vdev_id_conf $env{ID_VDEV} $env{ID_PATH}", GOTO="68-0-custom-aliases-end"
+# bit of a hack but if ID_PATH is missing, fallback to patching to '/dev/disk/by-path/../../nvme0n1', etc
+KERNEL=="?*", ENV{SUBSYSTEM}=="block", ENV{DEVTYPE}=="disk", ENV{ID_VDEV}=="?*", RUN+="/opt/45drives/ubm/patch_vdev_id_conf $env{ID_VDEV} ../../%k", GOTO="68-0-custom-aliases-end"
+LABEL="68-0-custom-aliases-end"
 
 # let 68-vdev.rules handle the rest