Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ata path_id #243

Closed
yodayox opened this issue Nov 28, 2022 · 1 comment
Closed

ata path_id #243

yodayox opened this issue Nov 28, 2022 · 1 comment

Comments

@yodayox
Copy link

yodayox commented Nov 28, 2022

dropped on the way log time ago and nobody seems to care about..
https://forums.gentoo.org/viewtopic-t-1053170.html
so restored by.. me, as follow:
--- a/src/udev/udev-builtin-path_id.c 2022-06-14 02:44:42.000000000 +0300
+++ b/src/udev/udev-builtin-path_id.c 2022-11-27 11:58:38.190434094 +0200
@@ -390,6 +390,55 @@
return hostdev;
}

+static struct udev_device *handle_scsi_ata(struct udev_device *parent, char **path, char **compat_path) {

  •    struct udev_device *targetdev, *target_parent;
    
  •    struct udev_device *atadev = NULL;
    
  •    struct udev *udev = udev_device_get_udev(parent); 
    
  •    const char *port_no, *sysname, *name;
    
  •    unsigned host, bus, target, lun;
    
  •    assert(parent);
    
  •    assert(path);
    
  •    name = udev_device_get_sysname(parent);
    
  •    if (sscanf(name, "%u:%u:%u:%u", &host, &bus, &target, &lun) != 4)
    
  •            return NULL;
    
  •    targetdev = udev_device_get_parent_with_subsystem_devtype(parent, "scsi", "scsi_host");
    
  •            if (targetdev == NULL)
    
  •            return NULL;
    
  •    target_parent = udev_device_get_parent(targetdev);
    
  •            if (target_parent == NULL)
    
  •            return NULL;
    
  •    sysname = udev_device_get_sysname(target_parent);
    
  •            if (sysname == NULL)
    
  •            return NULL;
    
  •    atadev = udev_device_new_from_subsystem_sysname(udev, "ata_port", udev_device_get_sysname(target_parent));
    
  •            if (atadev == NULL)
    
  •            return NULL;
    
  •    port_no = udev_device_get_sysattr_value(atadev, "port_no");
    
  •            if (port_no == NULL)
    
  •            return NULL;
    
  •    if (bus != 0)
    
  •            /* Devices behind port multiplier have a bus != 0 */
    
  •            path_prepend(path, "ata-%s.%u.0", port_no, bus);
    
  •    else
    
  •            /* Master/slave are distinguished by target id */
    
  •            path_prepend(path, "ata-%s.%u", port_no, target);
    
  •    /* old compatible persistent link for ATA devices */
    
  •    if (compat_path)
    
  •            path_prepend(compat_path, "ata-%s", port_no);
    
  •    return parent;
    

+}
+
static struct udev_device *handle_scsi_hyperv(struct udev_device *parent, char **path) {
struct udev_device *hostdev;
struct udev_device *vmbusdev;
@@ -426,7 +475,7 @@
return parent;
}

-static struct udev_device *handle_scsi(struct udev_device *parent, char **path, bool *supported_parent) {
+static struct udev_device *handle_scsi(struct udev_device *parent, char **path, char **compat_path, bool *supported_parent) {
const char *devtype;
const char *name;
const char *id;
@@ -465,19 +514,8 @@
goto out;
}

  •    /*
    
  •     * We do not support the ATA transport class, it uses global counters
    
  •     * to name the ata devices which numbers spread across multiple
    
  •     * controllers.
    
  •     *
    
  •     * The real link numbers are not exported. Also, possible chains of ports
    
  •     * behind port multipliers cannot be composed that way.
    
  •     *
    
  •     * Until all that is solved at the kernel level, there are no by-path/
    
  •     * links for ATA devices.
    
  •     */
       if (strstr(name, "/ata") != NULL) {
    
  •            parent = NULL;
    
  •            parent = handle_scsi_ata(parent, path, compat_path);
               goto out;
       }
    

@@ -581,6 +619,7 @@
char *path = NULL;
bool supported_transport = false;
bool supported_parent = false;

  •    _cleanup_free_ char *compat_path = NULL;
    
       /* S390 ccw bus */
       parent = udev_device_get_parent_with_subsystem_devtype(dev, "ccw", NULL);
    

@@ -600,7 +639,7 @@
} else if (streq(subsys, "scsi_tape")) {
handle_scsi_tape(parent, &path);
} else if (streq(subsys, "scsi")) {

  •                    parent = handle_scsi(parent, &path, &supported_parent);
    
  •                    parent = handle_scsi(parent, &path, &compat_path, &supported_parent);
                       supported_transport = true;
               } else if (streq(subsys, "cciss")) {
                       parent = handle_cciss(parent, &path);
    

@@ -616,23 +655,33 @@
parent = skip_subsystem(parent, "serio");
} else if (streq(subsys, "pci")) {
path_prepend(&path, "pci-%s", udev_device_get_sysname(parent));

  •                    if (compat_path)
    
  •                            path_prepend(&compat_path, "pci-%s", udev_device_get_sysname(parent));
                       parent = skip_subsystem(parent, "pci");
                       supported_parent = true;
               } else if (streq(subsys, "platform")) {
                       path_prepend(&path, "platform-%s", udev_device_get_sysname(parent));
    
  •                    if (compat_path)
    
  •                            path_prepend(&compat_path, "platform-%s", udev_device_get_sysname(parent));
                       parent = skip_subsystem(parent, "platform");
                       supported_transport = true;
                       supported_parent = true;
               } else if (streq(subsys, "acpi")) {
                       path_prepend(&path, "acpi-%s", udev_device_get_sysname(parent));
    
  •                    if (compat_path)
    
  •                            path_prepend(&compat_path, "acpi-%s", udev_device_get_sysname(parent));
                       parent = skip_subsystem(parent, "acpi");
                       supported_parent = true;
               } else if (streq(subsys, "xen")) {
                       path_prepend(&path, "xen-%s", udev_device_get_sysname(parent));
    
  •                    if (compat_path)
    
  •                            path_prepend(&compat_path, "xen-%s", udev_device_get_sysname(parent));
                       parent = skip_subsystem(parent, "xen");
                       supported_parent = true;
               } else if (streq(subsys, "scm")) {
                       path_prepend(&path, "scm-%s", udev_device_get_sysname(parent));
    
  •                    if (compat_path)
    
  •                            path_prepend(&compat_path, "scm-%s", udev_device_get_sysname(parent));
                       parent = skip_subsystem(parent, "scm");
                       supported_transport = true;
                       supported_parent = true;
    

@@ -694,10 +743,16 @@

             udev_builtin_add_property(dev, test, "ID_PATH", path);
             udev_builtin_add_property(dev, test, "ID_PATH_TAG", tag);
  •            free(path);
    
  •            return EXIT_SUCCESS;
       }
    
  •    return EXIT_FAILURE;
    
  •    /*
    
  •     * Compatible link generation for ATA devices
    
  •     * we assign compat_link to the env variable
    
  •     * ID_PATH_ATA_COMPAT
    
  •     */
    
  •    if (compat_path)
    
  •            udev_builtin_add_property(dev, test, "ID_PATH_ATA_COMPAT", compat_path);
    
  •    return 0;
    

}

const struct udev_builtin udev_builtin_path_id = {

in order to be shipped in next version of eudev

@bbonev
Copy link
Member

bbonev commented Nov 28, 2022

Duplicate of #242

@bbonev bbonev marked this as a duplicate of #242 Nov 28, 2022
@bbonev bbonev closed this as completed Nov 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants