[PATCH 1/3] lsblk: add parent kernel name column

[PATCH 1/3] lsblk: add parent kernel name column

[Milan Broz]

For raw output used in scripts it is sometimes necessary
to reconstruct tree of devices.

Parent kernel name (PKNAME) provides needed information
to do that easily.

Signed-off-by: Milan Broz <mbroz@redhat.com>
---
 misc-utils/lsblk.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index 26dfaf9..1118e7e 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -97,6 +97,7 @@ enum {
 	COL_DZERO,
 	COL_WWN,
 	COL_RAND,
+	COL_PKNAME,
 };
 
 /* column names */
@@ -111,6 +112,7 @@ struct colinfo {
 static struct colinfo infos[] = {
 	[COL_NAME]   = { "NAME",    0.25, TT_FL_TREE | TT_FL_NOEXTREMES, N_("device name") },
 	[COL_KNAME]  = { "KNAME",   0.3, 0, N_("internal kernel device name") },
+	[COL_PKNAME] = { "PKNAME",   0.3, 0, N_("internal parent kernel device name") },
 	[COL_MAJMIN] = { "MAJ:MIN", 6, 0, N_("major:minor device number") },
 	[COL_FSTYPE] = { "FSTYPE",  0.1, TT_FL_TRUNC, N_("filesystem type") },
 	[COL_TARGET] = { "MOUNTPOINT", 0.10, TT_FL_TRUNC, N_("where the device is mounted") },
@@ -144,7 +146,6 @@ static struct colinfo infos[] = {
 	[COL_DMAX]   = { "DISC-MAX", 6, TT_FL_RIGHT, N_("discard max bytes") },
 	[COL_DZERO]  = { "DISC-ZERO", 1, TT_FL_RIGHT, N_("discard zeroes data") },
 	[COL_WWN]    = { "WWN",     18, 0, N_("unique storage identifier") },
-
 };
 
 struct lsblk {
@@ -600,6 +601,10 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line
 	case COL_KNAME:
 		tt_line_set_data(ln, col, xstrdup(cxt->name));
 		break;
+	case COL_PKNAME:
+		if (cxt->parent)
+			tt_line_set_data(ln, col, xstrdup(cxt->parent->name));
+		break;
 	case COL_OWNER:
 	{
 		struct passwd *pw = st_rc ? NULL : getpwuid(cxt->st.st_uid);
-- 
1.7.10.4

[PATCH 2/3] lsblk: add SCSI H:C:T:L attribute

[Milan Broz]

For block devices it is sometimes useful to print SCSI device ID"
Host:Channel:Target:LUN.

Patch adds column name HCTL which can be used in lsblk.

Signed-off-by: Milan Broz <mbroz@redhat.com>
---
 misc-utils/lsblk.c |   32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index 1118e7e..7101eed 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -98,6 +98,7 @@ enum {
 	COL_WWN,
 	COL_RAND,
 	COL_PKNAME,
+	COL_HCTL,
 };
 
 /* column names */
@@ -146,6 +147,7 @@ static struct colinfo infos[] = {
 	[COL_DMAX]   = { "DISC-MAX", 6, TT_FL_RIGHT, N_("discard max bytes") },
 	[COL_DZERO]  = { "DISC-ZERO", 1, TT_FL_RIGHT, N_("discard zeroes data") },
 	[COL_WWN]    = { "WWN",     18, 0, N_("unique storage identifier") },
+	[COL_HCTL]   = { "HCTL", 10, 0, N_("Host:Channel:Target:Lun for SCSI") },
 };
 
 struct lsblk {
@@ -573,6 +575,27 @@ static char *get_type(struct blkdev_cxt *cxt)
 	return res;
 }
 
+/* H:C:T:L - Host:Channel:Target:LUN */
+static int get_hctl(struct blkdev_cxt *cxt, int *h, int *c, int *t, int *l)
+{
+	char buf[PATH_MAX], *hctl;
+	ssize_t len;
+
+	len = sysfs_readlink(&cxt->sysfs, "device", buf, sizeof(buf));
+	if (len < 0)
+		return 0;
+
+	buf[len] = '\0';
+	hctl = strrchr(buf, '/') + 1;
+	if (!hctl)
+		return 0;
+
+	if (sscanf(hctl, "%d:%d:%d:%d", h, c, t, l) != 4)
+		return 0;
+
+	return 1;
+}
+
 #define is_parsable(_l)	(((_l)->tt->flags & TT_FL_RAW) || \
 			 ((_l)->tt->flags & TT_FL_EXPORT))
 
@@ -771,6 +794,15 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line
 		if (p)
 			tt_line_set_data(ln, col, p);
 		break;
+	case COL_HCTL:
+	{
+		int h, c, t, l;
+		if (get_hctl(cxt, &h, &c, &t, &l)) {
+			snprintf(buf, sizeof(buf), "%d:%d:%d:%d", h, c, t, l);
+			tt_line_set_data(ln, col, xstrdup(buf));
+		}
+		break;
+	}
 	case COL_DALIGN:
 		p = sysfs_strdup(&cxt->sysfs, "discard_alignment");
 		if (cxt->discard && p)
-- 
1.7.10.4

[PATCH 3/3] lsblk: add SCSI transport type attribute

[Milan Broz]

Patch adds "SCSI transport layer" similar attribute to "lsscsi -t".

This is useful for script where you want to distinguish e.g. FC, iSCSI
or USB devices from local disks.

Detection logic is quite simplified in comparison to lsscsi but it
should provide the same output (except detailed transport attributes).

Signed-off-by: Milan Broz <mbroz@redhat.com>
---
 misc-utils/lsblk.c |  131 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 131 insertions(+)

diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index 7101eed..547723c 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -99,6 +99,7 @@ enum {
 	COL_RAND,
 	COL_PKNAME,
 	COL_HCTL,
+	COL_TRANSPORT,
 };
 
 /* column names */
@@ -148,6 +149,7 @@ static struct colinfo infos[] = {
 	[COL_DZERO]  = { "DISC-ZERO", 1, TT_FL_RIGHT, N_("discard zeroes data") },
 	[COL_WWN]    = { "WWN",     18, 0, N_("unique storage identifier") },
 	[COL_HCTL]   = { "HCTL", 10, 0, N_("Host:Channel:Target:Lun for SCSI") },
+	[COL_TRANSPORT] = { "TRAN", 6, 0, N_("device transport type") },
 };
 
 struct lsblk {
@@ -596,6 +598,130 @@ static int get_hctl(struct blkdev_cxt *cxt, int *h, int *c, int *t, int *l)
 	return 1;
 }
 
+static char *_sysfs_host_string(const char *type, int host, const char *attr)
+{
+	char path[PATH_MAX], tmp[64] = {0};
+	int fd, r;
+
+	if (snprintf(path, sizeof(path), "/sys/class/%s_host/host%d/%s",
+			type, host, attr) < 0)
+		return NULL;
+	if ((fd = open(path, O_RDONLY)) < 0)
+                return NULL;
+	r = read(fd, tmp, sizeof(tmp));
+	close(fd);
+
+	if (r <= 0)
+		return NULL;
+
+	return xstrdup(tmp);
+}
+
+static int _sysfs_host_exists(const char *type, int host)
+{
+	char buf[PATH_MAX];
+	struct stat st;
+
+	if (snprintf(buf, sizeof(buf), "/sys/class/%s_host/host%d",
+		     type, host) < 0)
+		return 0;
+
+	if (!stat(buf, &st) && S_ISDIR(st.st_mode))
+		return 1;
+
+	return 0;
+}
+
+static int _sysfs_scsi_attr_exists(const char *attr, int h, int c, int t, int l)
+{
+	char buf[PATH_MAX];
+	struct stat st;
+
+	if (snprintf(buf, sizeof(buf), "/sys/bus/scsi/devices/%d:%d:%d:%d/%s",
+		     h, c, t, l, attr) < 0)
+		return 0;
+
+	if (!stat(buf, &st))
+		return 1;
+
+	return 0;
+}
+
+static int _sysfs_scsi_path_contains(const char *pattern, int h, int c, int t, int l)
+{
+	char buf[PATH_MAX], linkc[PATH_MAX];
+	struct stat st;
+
+	if (snprintf(buf, sizeof(buf), "/sys/bus/scsi/devices/%d:%d:%d:%d",
+		     h, c, t, l) < 0)
+		return 0;
+
+	if (stat(buf, &st) || readlink(buf, linkc, sizeof(linkc)) <= 0)
+		return 0;
+
+	if (strstr(linkc, pattern))
+		return 1;
+
+	return 0;
+}
+
+/* Thanks to lsscsi code for idea of detection logic used here */
+static char *get_transport(struct blkdev_cxt *cxt)
+{
+	int host, channel, target, lun;
+	char *attr;
+
+	if (!get_hctl(cxt, &host, &channel, &target, &lun))
+		return NULL;
+
+	/* SPI - Serial Peripheral Interface */
+	if (_sysfs_host_exists("spi", host))
+		return xstrdup("spi");
+
+	/* FC/FCoE - Fibre Channel / Fibre Channel over Ethernet */
+	if (_sysfs_host_exists("fc", host)) {
+		if (!(attr = _sysfs_host_string("fc", host, "symbolic_name")))
+			return NULL;
+		if (strstr(attr, " over "))
+			return xstrdup("fcoe");
+		return xstrdup("fc");
+	}
+
+	/* SAS - Serial Attached SCSI */
+	if (_sysfs_host_exists("sas", host))
+		return xstrdup("sas");
+
+	if (_sysfs_scsi_attr_exists("sas_device", host, channel, target, lun))
+		return xstrdup("sas");
+
+	/* SBP - Serial Bus Protocol (FireWire) */
+	if (_sysfs_scsi_attr_exists("ieee1394_id", host, channel, target, lun))
+		return xstrdup("sbp");
+
+	/* iSCSI */
+	if (_sysfs_host_exists("iscsi", host))
+		return xstrdup("iscsi");
+
+	/* USB - Universal Serial Bus */
+	if (_sysfs_scsi_path_contains("usb", host, channel, target, lun))
+		return xstrdup("usb");
+
+	/* ATA, SATA */
+	if (_sysfs_host_exists("scsi", host)) {
+		if (!(attr = _sysfs_host_string("scsi", host, "proc_name")))
+			return NULL;
+		if (!strncmp(attr, "ahci", 4) ||
+		    !strncmp(attr, "sata", 4))
+			return xstrdup("sata");
+
+		if (strstr(attr, "ata"))
+			return xstrdup("ata");
+		return NULL;
+	}
+
+	return NULL;
+}
+
 #define is_parsable(_l)	(((_l)->tt->flags & TT_FL_RAW) || \
 			 ((_l)->tt->flags & TT_FL_EXPORT))
 
@@ -803,6 +929,11 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line
 		}
 		break;
 	}
+	case COL_TRANSPORT:
+		p = get_transport(cxt);
+		if (p)
+			tt_line_set_data(ln, col, p);
+		break;
 	case COL_DALIGN:
 		p = sysfs_strdup(&cxt->sysfs, "discard_alignment");
 		if (cxt->discard && p)
-- 
1.7.10.4

Re: [PATCH 1/3] lsblk: add parent kernel name column

[Karel Zak]

On Fri, Oct 19, 2012 at 02:10:39PM +0200, Milan Broz wrote:
> For raw output used in scripts it is sometimes necessary
> to reconstruct tree of devices.

 All three patches applied. Thanks.

    Karel

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com