Blame 0032-ISCSID-Added-the-extraction-of-the-session-boot-info.patch

2c4537
From 487c312c96379e45648c782cee5b0d469cba80d0 Mon Sep 17 00:00:00 2001
c2d5d2
From: Eddie Wai <eddie.wai@broadcom.com>
2c4537
Date: Fri, 23 Aug 2013 14:04:11 -0700
2c4537
Subject: [PATCH] ISCSID: Added the extraction of the session boot info
c2d5d2
c2d5d2
This patch does the work to extract the corresponding
c2d5d2
<boot_root>->ethernetN net params as specified from the kernel
c2d5d2
session boot_nic sysfs entry based on the transport param
c2d5d2
use_boot_info.
c2d5d2
c2d5d2
This is only populated for iscsi_tcp and bnx2i.
c2d5d2
c2d5d2
Signed-off-by: Eddie Wai <eddie.wai@broadcom.com>
c2d5d2
---
c2d5d2
 usr/iscsi_sysfs.c | 40 ++++++++++++++++++++++++++++++++++++++++
2c4537
 usr/transport.c   |  1 +
c2d5d2
 usr/transport.h   |  1 +
2c4537
 3 files changed, 42 insertions(+)
c2d5d2
c2d5d2
diff --git a/usr/iscsi_sysfs.c b/usr/iscsi_sysfs.c
2c4537
index aed10a3..56cb90c 100644
c2d5d2
--- a/usr/iscsi_sysfs.c
c2d5d2
+++ b/usr/iscsi_sysfs.c
c2d5d2
@@ -674,6 +674,43 @@ free_fnode:
c2d5d2
 	return rc;
c2d5d2
 }
c2d5d2
 
c2d5d2
+static int iscsi_sysfs_read_boot(struct iface_rec *iface, char *session)
c2d5d2
+{
c2d5d2
+	char boot_root[BOOT_NAME_MAXLEN], boot_nic[BOOT_NAME_MAXLEN];
c2d5d2
+	char boot_name[BOOT_NAME_MAXLEN], boot_content[BOOT_NAME_MAXLEN];
c2d5d2
+
c2d5d2
+	/* Extract boot info */
c2d5d2
+	strlcpy(boot_name, "boot_target", sizeof(boot_name));
c2d5d2
+	if (sysfs_get_str(session, ISCSI_SESSION_SUBSYS, boot_name,
c2d5d2
+			  boot_content, BOOT_NAME_MAXLEN))
c2d5d2
+		return -1;
c2d5d2
+	strlcpy(boot_name, "boot_nic", sizeof(boot_name));
c2d5d2
+	if (sysfs_get_str(session, ISCSI_SESSION_SUBSYS, boot_name, boot_nic,
c2d5d2
+			  BOOT_NAME_MAXLEN))
c2d5d2
+		return -1;
c2d5d2
+	strlcpy(boot_name, "boot_root", sizeof(boot_name));
c2d5d2
+	if (sysfs_get_str(session, ISCSI_SESSION_SUBSYS, boot_name, boot_root,
c2d5d2
+			  BOOT_NAME_MAXLEN))
c2d5d2
+		return -1;
c2d5d2
+
c2d5d2
+	/* If all boot_root/boot_target/boot_nic exist, then extract the
c2d5d2
+	   info from the boot nic */
c2d5d2
+	if (sysfs_get_str(boot_nic, boot_root, "vlan", boot_content,
c2d5d2
+			  BOOT_NAME_MAXLEN))
c2d5d2
+		log_debug(5, "could not read %s/%s/vlan", boot_root, boot_nic);
c2d5d2
+	else
c2d5d2
+		iface->vlan_id = atoi(boot_content);
c2d5d2
+
c2d5d2
+	if (sysfs_get_str(boot_nic, boot_root, "subnet-mask",
c2d5d2
+			  iface->subnet_mask, NI_MAXHOST))
c2d5d2
+		log_debug(5, "could not read %s/%s/subnet", boot_root,
c2d5d2
+			  boot_nic);
c2d5d2
+
c2d5d2
+	log_debug(5, "sysfs read boot returns %s/%s/ vlan = %d subnet = %s",
c2d5d2
+		  boot_root, boot_nic, iface->vlan_id, iface->subnet_mask);
c2d5d2
+	return 0;
c2d5d2
+}
c2d5d2
+
c2d5d2
 /*
c2d5d2
  * Read in iface settings based on host and session values. If
c2d5d2
  * session is not passed in, then the ifacename will not be set. And
c2d5d2
@@ -802,6 +839,9 @@ static int iscsi_sysfs_read_iface(struct iface_rec *iface, int host_no,
c2d5d2
 		}
c2d5d2
 	}
c2d5d2
 
2c4537
+	if (session && t->template->use_boot_info)
c2d5d2
+		iscsi_sysfs_read_boot(iface, session);
c2d5d2
+
c2d5d2
 	if (!iface_kern_id)
c2d5d2
 		goto done;
c2d5d2
 
c2d5d2
diff --git a/usr/transport.c b/usr/transport.c
2c4537
index 52b7674..2f38519 100644
c2d5d2
--- a/usr/transport.c
c2d5d2
+++ b/usr/transport.c
2c4537
@@ -77,6 +77,7 @@ struct iscsi_transport_template cxgb4i = {
c2d5d2
 struct iscsi_transport_template bnx2i = {
c2d5d2
 	.name		= "bnx2i",
c2d5d2
 	.set_host_ip	= 1,
c2d5d2
+	.use_boot_info	= 1,
c2d5d2
 	.ep_connect	= ktransport_ep_connect,
c2d5d2
 	.ep_poll	= ktransport_ep_poll,
c2d5d2
 	.ep_disconnect	= ktransport_ep_disconnect,
c2d5d2
diff --git a/usr/transport.h b/usr/transport.h
c2d5d2
index 5dcf872..388e4b1 100644
c2d5d2
--- a/usr/transport.h
c2d5d2
+++ b/usr/transport.h
c2d5d2
@@ -31,6 +31,7 @@ struct iscsi_transport_template {
c2d5d2
 	 * the host's ip address.
c2d5d2
 	 */
c2d5d2
 	uint8_t set_host_ip;
c2d5d2
+	uint8_t use_boot_info;
c2d5d2
 	int (*ep_connect) (struct iscsi_conn *conn, int non_blocking);
c2d5d2
 	int (*ep_poll) (struct iscsi_conn *conn, int timeout_ms);
c2d5d2
 	void (*ep_disconnect) (struct iscsi_conn *conn);
c2d5d2
-- 
2c4537
1.8.3.1
c2d5d2