Skip to contentSkip to conversation

s390: dasd device identifiers.

PATCH In review Martin Schwidefsky 3 participants 4 messages Apr 24, 2006 – Apr 26, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 13/13 s390: dasd device identifiers.

From: Horst Hummel <[email protected]>

[patch 13/13] s390: dasd device identifiers.

Generate new sysfs-attribute 'uid' that contains an device specific unique identifier. This can be used to identity multiple ALIASES of the same physical device (PAV). In addition the sysfs-attributes 'vendor' (containing the manufacturer of the device) and 'alias' (identify alias or base device) is added.
This is first part of PAV support in LPAR (also valid on zVM).

---

 drivers/s390/block/dasd_devmap.c |  101 +++++++++++++++++++++++++++++++++++++++
 drivers/s390/block/dasd_eckd.c   |   51 ++++++++++++++++++-
 drivers/s390/block/dasd_eckd.h   |   46 ++++++++++-------
 drivers/s390/block/dasd_int.h    |   12 ++++
 4 files changed, 190 insertions(+), 20 deletions(-)
drivers/s390/block/dasd_devmap.c +101 -0
diff -urpN linux-2.6/drivers/s390/block/dasd_devmap.c linux-2.6-patched/drivers/s390/block/dasd_devmap.c
@@ -45,6 +45,7 @@ struct dasd_devmap {
         unsigned int devindex;
         unsigned short features;
 	struct dasd_device *device;
+	struct dasd_uid uid;
 };
 
 /*
@@ -716,6 +717,68 @@ dasd_discipline_show(struct device *dev,
 
 static DEVICE_ATTR(discipline, 0444, dasd_discipline_show, NULL);
 
+static ssize_t
+dasd_alias_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+	struct dasd_devmap *devmap;
+	int alias;
+
+	devmap = dasd_find_busid(dev->bus_id);
+	spin_lock(&dasd_devmap_lock);
+	if (!IS_ERR(devmap))
+		alias = devmap->uid.alias;
+	else
+		alias = 0;
+	spin_unlock(&dasd_devmap_lock);
+
+	return sprintf(buf, alias ? "1\n" : "0\n");
+}
+
+static DEVICE_ATTR(alias, 0444, dasd_alias_show, NULL);
+
+static ssize_t
+dasd_vendor_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+	struct dasd_devmap *devmap;
+	char *vendor;
+
+	devmap = dasd_find_busid(dev->bus_id);
+	spin_lock(&dasd_devmap_lock);
+	if (!IS_ERR(devmap) && strlen(devmap->uid.vendor) > 0)
+		vendor = devmap->uid.vendor;
+	else
+		vendor = "";
+	spin_unlock(&dasd_devmap_lock);
+
+	return snprintf(buf, PAGE_SIZE, "%s\n", vendor);
+}
+
+static DEVICE_ATTR(vendor, 0444, dasd_vendor_show, NULL);
+
+#define UID_STRLEN ( /* vendor */ 3 + 1 + /* serial    */ 14 + 1 +\
+		     /* SSID   */ 4 + 1 + /* unit addr */ 2 + 1)
+
+static ssize_t
+dasd_uid_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+	struct dasd_devmap *devmap;
+	char uid[UID_STRLEN];
+
+	devmap = dasd_find_busid(dev->bus_id);
+	spin_lock(&dasd_devmap_lock);
+	if (!IS_ERR(devmap) && strlen(devmap->uid.vendor) > 0)
+		snprintf(uid, sizeof(uid), "%s.%s.%04x.%02x",
+			 devmap->uid.vendor, devmap->uid.serial,
+			 devmap->uid.ssid, devmap->uid.unit_addr);
+	else
+		uid[0] = 0;
+	spin_unlock(&dasd_devmap_lock);
+
+	return snprintf(buf, PAGE_SIZE, "%s\n", uid);
+}
+
+static DEVICE_ATTR(uid, 0444, dasd_uid_show, NULL);
+
 /*
  * extended error-reporting
  */
@@ -759,6 +822,9 @@ static DEVICE_ATTR(eer_enabled, 0644, da
 static struct attribute * dasd_attrs[] = {
 	&dev_attr_readonly.attr,
 	&dev_attr_discipline.attr,
+	&dev_attr_alias.attr,
+	&dev_attr_vendor.attr,
+	&dev_attr_uid.attr,
 	&dev_attr_use_diag.attr,
 	&dev_attr_eer_enabled.attr,
 	NULL,
@@ -768,6 +834,41 @@ static struct attribute_group dasd_attr_
 	.attrs = dasd_attrs,
 };
 
+
+/*
+ * Return copy of the device unique identifier.
+ */
+int
+dasd_get_uid(struct ccw_device *cdev, struct dasd_uid *uid)
+{
+	struct dasd_devmap *devmap;
+
+	devmap = dasd_find_busid(cdev->dev.bus_id);
+	if (IS_ERR(devmap))
+		return PTR_ERR(devmap);
+	spin_lock(&dasd_devmap_lock);
+	*uid = devmap->uid;
+	spin_unlock(&dasd_devmap_lock);
+	return 0;
+}
+
+/*
+ * Register the given device unique identifier into devmap struct.
+ */
+int
+dasd_set_uid(struct ccw_device *cdev, struct dasd_uid *uid)
+{
+	struct dasd_devmap *devmap;
+
+	devmap = dasd_find_busid(cdev->dev.bus_id);
+	if (IS_ERR(devmap))
+		return PTR_ERR(devmap);
+	spin_lock(&dasd_devmap_lock);
+	devmap->uid = *uid;
+	spin_unlock(&dasd_devmap_lock);
+	return 0;
+}
+
 /*
  * Return value of the specified feature.
  */
drivers/s390/block/dasd_eckd.c +49 -2

80 lines not on this page · raw message

drivers/s390/block/dasd_eckd.h +28 -18

54 lines not on this page · raw message

drivers/s390/block/dasd_int.h +12 -0
diff -urpN linux-2.6/drivers/s390/block/dasd_int.h linux-2.6-patched/drivers/s390/block/dasd_int.h
@@ -268,6 +268,16 @@ struct dasd_discipline {
 
 extern struct dasd_discipline *dasd_diag_discipline_pointer;
 
+/*
+ * Unique identifier for dasd device.
+ */
+struct dasd_uid {
+	__u8 alias;
+	char vendor[4];
+	char serial[15];
+	__u16 ssid;
+	__u8 unit_addr;
+};
 
 /*
  * Notification numbers for extended error reporting notifications:
@@ -516,6 +526,8 @@ void dasd_devmap_exit(void);
 struct dasd_device *dasd_create_device(struct ccw_device *);
 void dasd_delete_device(struct dasd_device *);
 
+int dasd_get_uid(struct ccw_device *, struct dasd_uid *);
+int dasd_set_uid(struct ccw_device *, struct dasd_uid *);
 int dasd_get_feature(struct ccw_device *, int);
 int dasd_set_feature(struct ccw_device *, int, int);
 
#1 lore raw

drivers/s390/block/dasd_devmap.c struct dasd_devmap { · line 49

Quoted 7 lines · Martin Schwidefsky
drivers/s390/block/dasd_devmap.c +1 -0
@@ -45,6 +45,7 @@ struct dasd_devmap {
         unsigned int devindex;
         unsigned short features;
 	struct dasd_device *device;
+	struct dasd_uid uid;
 };

Someone's missing a TAB key.

Quoted 6 lines
drivers/s390/block/dasd_devmap.c +6 -0
+static ssize_t
+dasd_alias_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+	struct dasd_devmap *devmap;
+	int alias;
+

drivers/s390/block/dasd_devmap.c dasd_discipline_show(struct device *dev, · line 735

Quoted 10 lines
drivers/s390/block/dasd_devmap.c +10 -0
+	devmap = dasd_find_busid(dev->bus_id);
+	spin_lock(&dasd_devmap_lock);
+	if (!IS_ERR(devmap))
+		alias = devmap->uid.alias;
+	else
+		alias = 0;
+	spin_unlock(&dasd_devmap_lock);
+
+	return sprintf(buf, alias ? "1\n" : "0\n");
+}

The locking is suspicious. We take a spinlock just for a single read?

Quoted 6 lines
drivers/s390/block/dasd_devmap.c +6 -0
+/*
+ * Return copy of the device unique identifier.
+ */
+int
+dasd_get_uid(struct ccw_device *cdev, struct dasd_uid *uid)
+{

drivers/s390/block/dasd_devmap.c static struct attribute_group dasd_attr_ · line 853

Quoted 10 lines
drivers/s390/block/dasd_devmap.c +10 -0
+	struct dasd_devmap *devmap;
+
+	devmap = dasd_find_busid(cdev->dev.bus_id);
+	if (IS_ERR(devmap))
+		return PTR_ERR(devmap);
+	spin_lock(&dasd_devmap_lock);
+	*uid = devmap->uid;
+	spin_unlock(&dasd_devmap_lock);
+	return 0;
+}

And for a single write?

#2 lore raw
Quoted 10 lines · Andrew Morton

drivers/s390/block/dasd_devmap.c struct dasd_devmap { · line 49

Quoted 7 lines · Martin Schwidefsky
drivers/s390/block/dasd_devmap.c +1 -0
@@ -45,6 +45,7 @@ struct dasd_devmap {
         unsigned int devindex;
         unsigned short features;
 	struct dasd_device *device;
+	struct dasd_uid uid;
 };

Someone's missing a TAB key.

I have to find some script that checks for the damned tabs.

Quoted 10 lines
Quoted 10 lines
drivers/s390/block/dasd_devmap.c +10 -0
+static ssize_t
+dasd_alias_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+	struct dasd_devmap *devmap;
+	int alias;
+
+	devmap = dasd_find_busid(dev->bus_id);
+	spin_lock(&dasd_devmap_lock);
+	if (!IS_ERR(devmap))
+		alias = devmap->uid.alias;
Quoted 8 lines

drivers/s390/block/dasd_devmap.c dasd_discipline_show(struct device *dev, · line 735

Quoted 6 lines
drivers/s390/block/dasd_devmap.c +6 -0
+	else
+		alias = 0;
+	spin_unlock(&dasd_devmap_lock);
+
+	return sprintf(buf, alias ? "1\n" : "0\n");
+}

The locking is suspicious. We take a spinlock just for a single read?

We could remove the locking for single read/writes, devmap structures are never deleted so it is safe to access a single value after the dasd_find_busid. But it is not so easy for the vendor and serial string, these are not single values so we need some kind of locking. To keep things symmetrical the lock is used for alias as well. There is a bug though, only the pointer to the vendor/serial string is read under the lock, the copy is done outside the lock. If that races with a dasd_set_uid call funny things might happen. The copy needs to be done inside the lock. Horst ?

Signature · 8 lines
blue skies,
  Martin.

Martin Schwidefsky
Linux for zSeries Development & Services
IBM Deutschland Entwicklung GmbH

"Reality continues to ruin my life." - Calvin.
#3 lore raw
In reply to Martin Schwidefsky
Quoted 7 lines · Martin Schwidefsky
drivers/s390/block/dasd_devmap.c +7 -0
+/*
+ * Register the given device unique identifier into devmap struct.
+ */
+int
+dasd_set_uid(struct ccw_device *cdev, struct dasd_uid *uid)
+{
+       struct dasd_devmap *devmap;

drivers/s390/block/dasd_devmap.c static struct attribute_group dasd_attr_ · line 871

Quoted 10 lines
drivers/s390/block/dasd_devmap.c +10 -0
+
+       devmap = dasd_find_busid(cdev->dev.bus_id);
+       if (IS_ERR(devmap))
+               return PTR_ERR(devmap);
+       spin_lock(&dasd_devmap_lock);
+       devmap->uid = *uid;
+       spin_unlock(&dasd_devmap_lock);
+       return 0;
+}
+

EXPORT_SYMBOL(dasd_set_uid) is missing.