X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fpath_id%2Fpath_id.c;h=683f78d26e2d1374f5c95fde3afc1e19ca493240;hb=693b6344e193f5aeca21df5f1c98fd32148006ac;hp=4531b5e29a76b3ed70c961ef941d01d1b1aa7ff4;hpb=ffd0afe8a996f8716e5fa9b58bbd313d98007a2f;p=elogind.git

diff --git a/extras/path_id/path_id.c b/extras/path_id/path_id.c
index 4531b5e29..683f78d26 100644
--- a/extras/path_id/path_id.c
+++ b/extras/path_id/path_id.c
@@ -1,8 +1,10 @@
 /*
- * compose persisistent device path
+ * compose persistent device path
  *
  * Copyright (C) 2009 Kay Sievers <kay.sievers@vrfy.org>
  *
+ * Logic based on Hannes Reinecke's shell script.
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
@@ -28,10 +30,10 @@
 #include <dirent.h>
 #include <getopt.h>
 
-#include <libudev.h>
-#include <../../udev/udev.h>
+#include "libudev.h"
+#include "libudev-private.h"
 
-int debug;
+static int debug;
 
 static void log_fn(struct udev *udev, int priority,
 		   const char *file, int line, const char *fn,
@@ -73,6 +75,21 @@ static int path_prepend(char **path, const char *fmt, ...)
 	return 0;
 }
 
+/*
+** Linux only supports 32 bit luns.
+** See drivers/scsi/scsi_scan.c::scsilun_to_int() for more details.
+*/
+static int format_lun_number(struct udev_device *dev, char **path)
+{
+	unsigned long lun = strtoul(udev_device_get_sysnum(dev), NULL, 10);
+
+	/* address method 0, peripheral device addressing with bus id of zero */
+	if (lun < 256)
+		return path_prepend(path, "lun-%d", lun);
+	/* handle all other lun addressing methods by using a variant of the original lun format */
+	return path_prepend(path, "lun-0x%04x%04x00000000", (lun & 0xffff), (lun >> 16) & 0xffff);
+}
+
 static struct udev_device *skip_subsystem(struct udev_device *dev, const char *subsys)
 {
 	struct udev_device *parent = dev;
@@ -89,95 +106,197 @@ static struct udev_device *skip_subsystem(struct udev_device *dev, const char *s
 	return dev;
 }
 
-/* find smallest number of instances of <syspath>/<name><number> */
-static int base_number(const char *syspath, const char *name)
+static struct udev_device *handle_scsi_fibre_channel(struct udev_device *parent, char **path)
 {
-	char *base;
-	char *pos;
-	DIR *dir;
-	struct dirent *dent;
-	size_t len;
-	int number = -1;
-
-	base = strdup(syspath);
-	if (base == NULL)
-		goto out;
-
-	pos = strrchr(base, '/');
-	if (pos == NULL)
-		goto out;
-	pos[0] = '\0';
-
-	len = strlen(name);
-	dir = opendir(base);
-	if (dir == NULL)
+	struct udev *udev  = udev_device_get_udev(parent);
+	struct udev_device *targetdev;
+	struct udev_device *fcdev = NULL;
+	const char *port;
+	char *lun = NULL;;
+
+	targetdev = udev_device_get_parent_with_subsystem_devtype(parent, "scsi", "scsi_target");
+	if (targetdev == NULL)
+		return NULL;
+
+	fcdev = udev_device_new_from_subsystem_sysname(udev, "fc_transport", udev_device_get_sysname(targetdev));
+	if (fcdev == NULL)
+		return NULL;
+	port = udev_device_get_sysattr_value(fcdev, "port_name");
+	if (port == NULL) {
+		parent = NULL;
 		goto out;
-	for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
-		char *rest;
-		int i;
-
-		if (dent->d_name[0] == '.')
-			continue;
-		if (dent->d_type != DT_DIR && dent->d_type != DT_LNK)
-			continue;
-		if (strncmp(dent->d_name, name, len) != 0)
-			continue;
-		i = strtoul(&dent->d_name[len], &rest, 10);
-		if (rest[0] != '\0')
-			continue;
-		if (number == -1 || i < number)
-			number = i;
 	}
-	closedir(dir);
-out:
-	free(base);
-	return number;
-}
 
-static struct udev_device *handle_fc(struct udev_device *parent, char **path)
-{
-	path_prepend(path, "fc-PATH_ID_NOT_IMPLEMENTED");
+	format_lun_number(parent, &lun);
+	path_prepend(path, "fc-%s-%s", port, lun);
+	if (lun)
+		free(lun);
+out:
+	udev_device_unref(fcdev);
 	return parent;
 }
 
-static struct udev_device *handle_sas(struct udev_device *parent, char **path)
+static struct udev_device *handle_scsi_sas(struct udev_device *parent, char **path)
 {
-	path_prepend(path, "sas-PATH_ID_NOT_IMPLEMENTED");
+	struct udev *udev  = udev_device_get_udev(parent);
+	struct udev_device *targetdev;
+	struct udev_device *target_parent;
+	struct udev_device *sasdev;
+	const char *sas_address;
+	char *lun = NULL;
+
+	targetdev = udev_device_get_parent_with_subsystem_devtype(parent, "scsi", "scsi_target");
+	if (targetdev == NULL)
+		return NULL;
+
+	target_parent = udev_device_get_parent(targetdev);
+	if (target_parent == NULL)
+		return NULL;
+
+	sasdev = udev_device_new_from_subsystem_sysname(udev, "sas_device", 
+				udev_device_get_sysname(target_parent));
+	if (sasdev == NULL)
+		return NULL;
+
+	sas_address = udev_device_get_sysattr_value(sasdev, "sas_address");
+	if (sas_address == NULL) {
+		parent = NULL;
+		goto out;
+	}
+
+	format_lun_number(parent, &lun);
+	path_prepend(path, "sas-%s-%s", sas_address, lun);
+	if (lun)
+		free(lun);
+out:
+	udev_device_unref(sasdev);
 	return parent;
 }
 
-static struct udev_device *handle_iscsi(struct udev_device *parent, char **path)
+static struct udev_device *handle_scsi_iscsi(struct udev_device *parent, char **path)
 {
-	path_prepend(path, "ip-PATH_ID_NOT_IMPLEMENTED");
+	struct udev *udev  = udev_device_get_udev(parent);
+	struct udev_device *transportdev;
+	struct udev_device *sessiondev = NULL;
+	const char *target;
+	char *connname;
+	struct udev_device *conndev = NULL;
+	const char *addr;
+	const char *port;
+	char *lun = NULL;
+
+	/* find iscsi session */
+	transportdev = parent;
+	for (;;) {
+		transportdev = udev_device_get_parent(transportdev);
+		if (transportdev == NULL)
+			return NULL;
+		if (strncmp(udev_device_get_sysname(transportdev), "session", 7) == 0)
+			break;
+	}
+
+	/* find iscsi session device */
+	sessiondev = udev_device_new_from_subsystem_sysname(udev, "iscsi_session", udev_device_get_sysname(transportdev));
+	if (sessiondev == NULL)
+		return NULL;
+	target = udev_device_get_sysattr_value(sessiondev, "targetname");
+	if (target == NULL) {
+		parent = NULL;
+		goto out;
+	}
+
+	if (asprintf(&connname, "connection%s:0", udev_device_get_sysnum(transportdev)) < 0) {
+		parent = NULL;
+		goto out;
+	}
+	conndev = udev_device_new_from_subsystem_sysname(udev, "iscsi_connection", connname);
+	free(connname);
+	if (conndev == NULL) {
+		parent = NULL;
+		goto out;
+	}
+	addr = udev_device_get_sysattr_value(conndev, "persistent_address");
+	port = udev_device_get_sysattr_value(conndev, "persistent_port");
+	if (addr == NULL || port == NULL) {
+		parent = NULL;
+		goto out;
+	}
+
+	format_lun_number(parent, &lun);
+	path_prepend(path, "ip-%s:%s-iscsi-%s-%s", addr, port, target, lun);
+	if (lun)
+		free(lun);
+out:
+	udev_device_unref(sessiondev);
+	udev_device_unref(conndev);
 	return parent;
 }
 
-static struct udev_device *handle_scsi(struct udev_device *parent, char **path)
+static struct udev_device *handle_scsi_default(struct udev_device *parent, char **path)
 {
 	struct udev_device *hostdev;
 	int host, bus, target, lun;
 	const char *name;
-	int base;
+	char *base;
+	char *pos;
+	DIR *dir;
+	struct dirent *dent;
+	int basenum;
 
 	hostdev = udev_device_get_parent_with_subsystem_devtype(parent, "scsi", "scsi_host");
 	if (hostdev == NULL)
-		return parent;
+		return NULL;
 
 	name = udev_device_get_sysname(parent);
 	if (sscanf(name, "%d:%d:%d:%d", &host, &bus, &target, &lun) != 4)
-		return parent;
+		return NULL;
 
 	/* rebase host offset to get the local relative number */
-	base = base_number(udev_device_get_syspath(hostdev), "host");
-	if (base < 0)
-		return parent;
-	host -= base;
+	basenum = -1;
+	base = strdup(udev_device_get_syspath(hostdev));
+	if (base == NULL)
+		return NULL;
+	pos = strrchr(base, '/');
+	if (pos == NULL) {
+		parent = NULL;
+		goto out;
+	}
+	pos[0] = '\0';
+	dir = opendir(base);
+	if (dir == NULL) {
+		parent = NULL;
+		goto out;
+	}
+	for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
+		char *rest;
+		int i;
+
+		if (dent->d_name[0] == '.')
+			continue;
+		if (dent->d_type != DT_DIR && dent->d_type != DT_LNK)
+			continue;
+		if (strncmp(dent->d_name, "host", 4) != 0)
+			continue;
+		i = strtoul(&dent->d_name[4], &rest, 10);
+		if (rest[0] != '\0')
+			continue;
+		if (basenum == -1 || i < basenum)
+			basenum = i;
+	}
+	closedir(dir);
+	if (basenum == -1) {
+		parent = NULL;
+		goto out;
+	}
+	host -= basenum;
 
 	path_prepend(path, "scsi-%u:%u:%u:%u", host, bus, target, lun);
+out:
+	free(base);
 	return hostdev;
 }
 
-static struct udev_device *handle_scsi_lun(struct udev_device *parent, char **path)
+static struct udev_device *handle_scsi(struct udev_device *parent, char **path)
 {
 	const char *devtype;
 	const char *name;
@@ -195,28 +314,25 @@ static struct udev_device *handle_scsi_lun(struct udev_device *parent, char **pa
 		goto out;
 	}
 
+	/* lousy scsi sysfs does not have a "subsystem" for the transport */
 	name = udev_device_get_syspath(parent);
 
-	/* fibre channel */
 	if (strstr(name, "/rport-") != NULL) {
-		parent = handle_fc(parent, path);
+		parent = handle_scsi_fibre_channel(parent, path);
 		goto out;
 	}
 
-	/* sas */
 	if (strstr(name, "/end_device-") != NULL) {
-		parent = handle_sas(parent, path);
+		parent = handle_scsi_sas(parent, path);
 		goto out;
 	}
 
-	/* iSCSI */
 	if (strstr(name, "/session") != NULL) {
-		parent = handle_iscsi(parent, path);
+		parent = handle_scsi_iscsi(parent, path);
 		goto out;
 	}
 
-	/* default */
-	parent = handle_scsi(parent, path);
+	parent = handle_scsi_default(parent, path);
 out:
 	return parent;
 }
@@ -239,7 +355,9 @@ static struct udev_device *handle_usb(struct udev_device *parent, char **path)
 	const char *port;
 
 	devtype = udev_device_get_devtype(parent);
-	if (devtype == NULL || strcmp(devtype, "usb_interface") != 0)
+	if (devtype == NULL)
+		return parent;
+	if (strcmp(devtype, "usb_interface") != 0 && strcmp(devtype, "usb_device") != 0)
 		return parent;
 
 	str = udev_device_get_sysname(parent);
@@ -255,8 +373,7 @@ static struct udev_device *handle_usb(struct udev_device *parent, char **path)
 
 static struct udev_device *handle_cciss(struct udev_device *parent, char **path)
 {
-	path_prepend(path, "cciss-PATH_ID_NOT_IMPLEMENTED");
-	return parent;
+	return NULL;
 }
 
 static struct udev_device *handle_ccw(struct udev_device *parent, struct udev_device *dev, char **path)
@@ -304,7 +421,7 @@ int main(int argc, char **argv)
 	if (udev == NULL)
 		goto exit;
 
-	logging_init("usb_id");
+	udev_log_init("path_id");
 	udev_set_log_fn(udev, log_fn);
 
 	while (1) {
@@ -324,8 +441,6 @@ int main(int argc, char **argv)
 			printf("Usage: path_id [--debug] [--help] <devpath>\n"
 			       "  --debug    print debug information\n"
 			       "  --help      print this help text\n\n");
-		default:
-			rc = 1;
 			goto exit;
 		}
 	}
@@ -367,7 +482,7 @@ int main(int argc, char **argv)
 		} else if (strcmp(subsys, "scsi_tape") == 0) {
 			handle_scsi_tape(parent, &path_suffix);
 		} else if (strcmp(subsys, "scsi") == 0) {
-			parent = handle_scsi_lun(parent, &path);
+			parent = handle_scsi(parent, &path);
 		} else if (strcmp(subsys, "cciss") == 0) {
 			handle_cciss(parent, &path);
 		} else if (strcmp(subsys, "usb") == 0) {
@@ -384,6 +499,9 @@ int main(int argc, char **argv)
 		} else if (strcmp(subsys, "xen") == 0) {
 			path_prepend(&path, "xen-%s", udev_device_get_sysname(parent));
 			parent = skip_subsystem(parent, "xen");
+		} else if (strcmp(subsys, "virtio") == 0) {
+			path_prepend(&path, "virtio-pci-%s", udev_device_get_sysname(parent));
+			parent = skip_subsystem(parent, "virtio");
 		}
 
 		parent = udev_device_get_parent(parent);
@@ -403,6 +521,6 @@ out:
 	udev_device_unref(dev);
 exit:
 	udev_unref(udev);
-	logging_close();
+	udev_log_close();
 	return rc;
 }