[SCSI] scsi_transport_iscsi: Add flash node mgmt support
authorAdheer Chandravanshi <adheer.chandravanshi@qlogic.com>
Fri, 22 Mar 2013 11:41:29 +0000 (07:41 -0400)
committerJames Bottomley <JBottomley@Parallels.com>
Thu, 11 Apr 2013 22:19:35 +0000 (15:19 -0700)
This patch allows iscsiadm to manage iSCSI target information stored on
adapter flash on per host basis.

The sysfs entries will look as cited below:
/sys/bus/iscsi_flashnode/devices/flashnode_sess-<host_no>:<flashnode_id>/<session attrs>
/sys/bus/iscsi_flashnode/devices/flashnode_conn-<host_no>:<flashnode_id>:<conn_id>/<conn attrs>

Signed-off-by: Adheer Chandravanshi <adheer.chandravanshi@qlogic.com>
Signed-off-by: Manish Rangankar <manish.rangankar@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
drivers/scsi/scsi_transport_iscsi.c
include/scsi/iscsi_if.h
include/scsi/scsi_transport_iscsi.h

index 0a74b97..ce06e87 100644 (file)
@@ -25,6 +25,7 @@
 #include <linux/slab.h>
 #include <linux/bsg-lib.h>
 #include <linux/idr.h>
+#include <linux/list.h>
 #include <net/tcp.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_host.h>
@@ -460,6 +461,689 @@ void iscsi_destroy_iface(struct iscsi_iface *iface)
 EXPORT_SYMBOL_GPL(iscsi_destroy_iface);
 
 /*
+ * Interface to display flash node params to sysfs
+ */
+
+#define ISCSI_FLASHNODE_ATTR(_prefix, _name, _mode, _show, _store)     \
+struct device_attribute dev_attr_##_prefix##_##_name =                 \
+       __ATTR(_name, _mode, _show, _store)
+
+/* flash node session attrs show */
+#define iscsi_flashnode_sess_attr_show(type, name, param)              \
+static ssize_t                                                         \
+show_##type##_##name(struct device *dev, struct device_attribute *attr,        \
+                    char *buf)                                         \
+{                                                                      \
+       struct iscsi_bus_flash_session *fnode_sess =                    \
+                                       iscsi_dev_to_flash_session(dev);\
+       struct iscsi_transport *t = fnode_sess->transport;              \
+       return t->get_flashnode_param(fnode_sess, param, buf);          \
+}                                                                      \
+
+
+#define iscsi_flashnode_sess_attr(type, name, param)                   \
+       iscsi_flashnode_sess_attr_show(type, name, param)               \
+static ISCSI_FLASHNODE_ATTR(type, name, S_IRUGO,                       \
+                           show_##type##_##name, NULL);
+
+/* Flash node session attributes */
+
+iscsi_flashnode_sess_attr(fnode, auto_snd_tgt_disable,
+                         ISCSI_FLASHNODE_AUTO_SND_TGT_DISABLE);
+iscsi_flashnode_sess_attr(fnode, discovery_session,
+                         ISCSI_FLASHNODE_DISCOVERY_SESS);
+iscsi_flashnode_sess_attr(fnode, portal_type, ISCSI_FLASHNODE_PORTAL_TYPE);
+iscsi_flashnode_sess_attr(fnode, entry_enable, ISCSI_FLASHNODE_ENTRY_EN);
+iscsi_flashnode_sess_attr(fnode, immediate_data, ISCSI_FLASHNODE_IMM_DATA_EN);
+iscsi_flashnode_sess_attr(fnode, initial_r2t, ISCSI_FLASHNODE_INITIAL_R2T_EN);
+iscsi_flashnode_sess_attr(fnode, data_seq_in_order,
+                         ISCSI_FLASHNODE_DATASEQ_INORDER);
+iscsi_flashnode_sess_attr(fnode, data_pdu_in_order,
+                         ISCSI_FLASHNODE_PDU_INORDER);
+iscsi_flashnode_sess_attr(fnode, chap_auth, ISCSI_FLASHNODE_CHAP_AUTH_EN);
+iscsi_flashnode_sess_attr(fnode, discovery_logout,
+                         ISCSI_FLASHNODE_DISCOVERY_LOGOUT_EN);
+iscsi_flashnode_sess_attr(fnode, bidi_chap, ISCSI_FLASHNODE_BIDI_CHAP_EN);
+iscsi_flashnode_sess_attr(fnode, discovery_auth_optional,
+                         ISCSI_FLASHNODE_DISCOVERY_AUTH_OPTIONAL);
+iscsi_flashnode_sess_attr(fnode, erl, ISCSI_FLASHNODE_ERL);
+iscsi_flashnode_sess_attr(fnode, first_burst_len, ISCSI_FLASHNODE_FIRST_BURST);
+iscsi_flashnode_sess_attr(fnode, def_time2wait, ISCSI_FLASHNODE_DEF_TIME2WAIT);
+iscsi_flashnode_sess_attr(fnode, def_time2retain,
+                         ISCSI_FLASHNODE_DEF_TIME2RETAIN);
+iscsi_flashnode_sess_attr(fnode, max_outstanding_r2t, ISCSI_FLASHNODE_MAX_R2T);
+iscsi_flashnode_sess_attr(fnode, isid, ISCSI_FLASHNODE_ISID);
+iscsi_flashnode_sess_attr(fnode, tsid, ISCSI_FLASHNODE_TSID);
+iscsi_flashnode_sess_attr(fnode, max_burst_len, ISCSI_FLASHNODE_MAX_BURST);
+iscsi_flashnode_sess_attr(fnode, def_taskmgmt_tmo,
+                         ISCSI_FLASHNODE_DEF_TASKMGMT_TMO);
+iscsi_flashnode_sess_attr(fnode, targetalias, ISCSI_FLASHNODE_ALIAS);
+iscsi_flashnode_sess_attr(fnode, targetname, ISCSI_FLASHNODE_NAME);
+iscsi_flashnode_sess_attr(fnode, tpgt, ISCSI_FLASHNODE_TPGT);
+iscsi_flashnode_sess_attr(fnode, discovery_parent_idx,
+                         ISCSI_FLASHNODE_DISCOVERY_PARENT_IDX);
+iscsi_flashnode_sess_attr(fnode, discovery_parent_type,
+                         ISCSI_FLASHNODE_DISCOVERY_PARENT_TYPE);
+iscsi_flashnode_sess_attr(fnode, chap_in_idx, ISCSI_FLASHNODE_CHAP_IN_IDX);
+iscsi_flashnode_sess_attr(fnode, chap_out_idx, ISCSI_FLASHNODE_CHAP_OUT_IDX);
+iscsi_flashnode_sess_attr(fnode, username, ISCSI_FLASHNODE_USERNAME);
+iscsi_flashnode_sess_attr(fnode, username_in, ISCSI_FLASHNODE_USERNAME_IN);
+iscsi_flashnode_sess_attr(fnode, password, ISCSI_FLASHNODE_PASSWORD);
+iscsi_flashnode_sess_attr(fnode, password_in, ISCSI_FLASHNODE_PASSWORD_IN);
+iscsi_flashnode_sess_attr(fnode, is_boot_target, ISCSI_FLASHNODE_IS_BOOT_TGT);
+
+static struct attribute *iscsi_flashnode_sess_attrs[] = {
+       &dev_attr_fnode_auto_snd_tgt_disable.attr,
+       &dev_attr_fnode_discovery_session.attr,
+       &dev_attr_fnode_portal_type.attr,
+       &dev_attr_fnode_entry_enable.attr,
+       &dev_attr_fnode_immediate_data.attr,
+       &dev_attr_fnode_initial_r2t.attr,
+       &dev_attr_fnode_data_seq_in_order.attr,
+       &dev_attr_fnode_data_pdu_in_order.attr,
+       &dev_attr_fnode_chap_auth.attr,
+       &dev_attr_fnode_discovery_logout.attr,
+       &dev_attr_fnode_bidi_chap.attr,
+       &dev_attr_fnode_discovery_auth_optional.attr,
+       &dev_attr_fnode_erl.attr,
+       &dev_attr_fnode_first_burst_len.attr,
+       &dev_attr_fnode_def_time2wait.attr,
+       &dev_attr_fnode_def_time2retain.attr,
+       &dev_attr_fnode_max_outstanding_r2t.attr,
+       &dev_attr_fnode_isid.attr,
+       &dev_attr_fnode_tsid.attr,
+       &dev_attr_fnode_max_burst_len.attr,
+       &dev_attr_fnode_def_taskmgmt_tmo.attr,
+       &dev_attr_fnode_targetalias.attr,
+       &dev_attr_fnode_targetname.attr,
+       &dev_attr_fnode_tpgt.attr,
+       &dev_attr_fnode_discovery_parent_idx.attr,
+       &dev_attr_fnode_discovery_parent_type.attr,
+       &dev_attr_fnode_chap_in_idx.attr,
+       &dev_attr_fnode_chap_out_idx.attr,
+       &dev_attr_fnode_username.attr,
+       &dev_attr_fnode_username_in.attr,
+       &dev_attr_fnode_password.attr,
+       &dev_attr_fnode_password_in.attr,
+       &dev_attr_fnode_is_boot_target.attr,
+       NULL,
+};
+
+static umode_t iscsi_flashnode_sess_attr_is_visible(struct kobject *kobj,
+                                                   struct attribute *attr,
+                                                   int i)
+{
+       struct device *dev = container_of(kobj, struct device, kobj);
+       struct iscsi_bus_flash_session *fnode_sess =
+                                               iscsi_dev_to_flash_session(dev);
+       struct iscsi_transport *t = fnode_sess->transport;
+       int param;
+
+       if (attr == &dev_attr_fnode_auto_snd_tgt_disable.attr) {
+               param = ISCSI_FLASHNODE_AUTO_SND_TGT_DISABLE;
+       } else if (attr == &dev_attr_fnode_discovery_session.attr) {
+               param = ISCSI_FLASHNODE_DISCOVERY_SESS;
+       } else if (attr == &dev_attr_fnode_portal_type.attr) {
+               param = ISCSI_FLASHNODE_PORTAL_TYPE;
+       } else if (attr == &dev_attr_fnode_entry_enable.attr) {
+               param = ISCSI_FLASHNODE_ENTRY_EN;
+       } else if (attr == &dev_attr_fnode_immediate_data.attr) {
+               param = ISCSI_FLASHNODE_IMM_DATA_EN;
+       } else if (attr == &dev_attr_fnode_initial_r2t.attr) {
+               param = ISCSI_FLASHNODE_INITIAL_R2T_EN;
+       } else if (attr == &dev_attr_fnode_data_seq_in_order.attr) {
+               param = ISCSI_FLASHNODE_DATASEQ_INORDER;
+       } else if (attr == &dev_attr_fnode_data_pdu_in_order.attr) {
+               param = ISCSI_FLASHNODE_PDU_INORDER;
+       } else if (attr == &dev_attr_fnode_chap_auth.attr) {
+               param = ISCSI_FLASHNODE_CHAP_AUTH_EN;
+       } else if (attr == &dev_attr_fnode_discovery_logout.attr) {
+               param = ISCSI_FLASHNODE_DISCOVERY_LOGOUT_EN;
+       } else if (attr == &dev_attr_fnode_bidi_chap.attr) {
+               param = ISCSI_FLASHNODE_BIDI_CHAP_EN;
+       } else if (attr == &dev_attr_fnode_discovery_auth_optional.attr) {
+               param = ISCSI_FLASHNODE_DISCOVERY_AUTH_OPTIONAL;
+       } else if (attr == &dev_attr_fnode_erl.attr) {
+               param = ISCSI_FLASHNODE_ERL;
+       } else if (attr == &dev_attr_fnode_first_burst_len.attr) {
+               param = ISCSI_FLASHNODE_FIRST_BURST;
+       } else if (attr == &dev_attr_fnode_def_time2wait.attr) {
+               param = ISCSI_FLASHNODE_DEF_TIME2WAIT;
+       } else if (attr == &dev_attr_fnode_def_time2retain.attr) {
+               param = ISCSI_FLASHNODE_DEF_TIME2RETAIN;
+       } else if (attr == &dev_attr_fnode_max_outstanding_r2t.attr) {
+               param = ISCSI_FLASHNODE_MAX_R2T;
+       } else if (attr == &dev_attr_fnode_isid.attr) {
+               param = ISCSI_FLASHNODE_ISID;
+       } else if (attr == &dev_attr_fnode_tsid.attr) {
+               param = ISCSI_FLASHNODE_TSID;
+       } else if (attr == &dev_attr_fnode_max_burst_len.attr) {
+               param = ISCSI_FLASHNODE_MAX_BURST;
+       } else if (attr == &dev_attr_fnode_def_taskmgmt_tmo.attr) {
+               param = ISCSI_FLASHNODE_DEF_TASKMGMT_TMO;
+       } else if (attr == &dev_attr_fnode_targetalias.attr) {
+               param = ISCSI_FLASHNODE_ALIAS;
+       } else if (attr == &dev_attr_fnode_targetname.attr) {
+               param = ISCSI_FLASHNODE_NAME;
+       } else if (attr == &dev_attr_fnode_tpgt.attr) {
+               param = ISCSI_FLASHNODE_TPGT;
+       } else if (attr == &dev_attr_fnode_discovery_parent_idx.attr) {
+               param = ISCSI_FLASHNODE_DISCOVERY_PARENT_IDX;
+       } else if (attr == &dev_attr_fnode_discovery_parent_type.attr) {
+               param = ISCSI_FLASHNODE_DISCOVERY_PARENT_TYPE;
+       } else if (attr == &dev_attr_fnode_chap_in_idx.attr) {
+               param = ISCSI_FLASHNODE_CHAP_IN_IDX;
+       } else if (attr == &dev_attr_fnode_chap_out_idx.attr) {
+               param = ISCSI_FLASHNODE_CHAP_OUT_IDX;
+       } else if (attr == &dev_attr_fnode_username.attr) {
+               param = ISCSI_FLASHNODE_USERNAME;
+       } else if (attr == &dev_attr_fnode_username_in.attr) {
+               param = ISCSI_FLASHNODE_USERNAME_IN;
+       } else if (attr == &dev_attr_fnode_password.attr) {
+               param = ISCSI_FLASHNODE_PASSWORD;
+       } else if (attr == &dev_attr_fnode_password_in.attr) {
+               param = ISCSI_FLASHNODE_PASSWORD_IN;
+       } else if (attr == &dev_attr_fnode_is_boot_target.attr) {
+               param = ISCSI_FLASHNODE_IS_BOOT_TGT;
+       } else {
+               WARN_ONCE(1, "Invalid flashnode session attr");
+               return 0;
+       }
+
+       return t->attr_is_visible(ISCSI_FLASHNODE_PARAM, param);
+}
+
+static struct attribute_group iscsi_flashnode_sess_attr_group = {
+       .attrs = iscsi_flashnode_sess_attrs,
+       .is_visible = iscsi_flashnode_sess_attr_is_visible,
+};
+
+static const struct attribute_group *iscsi_flashnode_sess_attr_groups[] = {
+       &iscsi_flashnode_sess_attr_group,
+       NULL,
+};
+
+static void iscsi_flashnode_sess_release(struct device *dev)
+{
+       struct iscsi_bus_flash_session *fnode_sess =
+                                               iscsi_dev_to_flash_session(dev);
+
+       kfree(fnode_sess->targetname);
+       kfree(fnode_sess->targetalias);
+       kfree(fnode_sess->portal_type);
+       kfree(fnode_sess);
+}
+
+struct device_type iscsi_flashnode_sess_dev_type = {
+       .name = "iscsi_flashnode_sess_dev_type",
+       .groups = iscsi_flashnode_sess_attr_groups,
+       .release = iscsi_flashnode_sess_release,
+};
+
+/* flash node connection attrs show */
+#define iscsi_flashnode_conn_attr_show(type, name, param)              \
+static ssize_t                                                         \
+show_##type##_##name(struct device *dev, struct device_attribute *attr,        \
+                    char *buf)                                         \
+{                                                                      \
+       struct iscsi_bus_flash_conn *fnode_conn = iscsi_dev_to_flash_conn(dev);\
+       struct iscsi_bus_flash_session *fnode_sess =                    \
+                               iscsi_flash_conn_to_flash_session(fnode_conn);\
+       struct iscsi_transport *t = fnode_conn->transport;              \
+       return t->get_flashnode_param(fnode_sess, param, buf);          \
+}                                                                      \
+
+
+#define iscsi_flashnode_conn_attr(type, name, param)                   \
+       iscsi_flashnode_conn_attr_show(type, name, param)               \
+static ISCSI_FLASHNODE_ATTR(type, name, S_IRUGO,                       \
+                           show_##type##_##name, NULL);
+
+/* Flash node connection attributes */
+
+iscsi_flashnode_conn_attr(fnode, is_fw_assigned_ipv6,
+                         ISCSI_FLASHNODE_IS_FW_ASSIGNED_IPV6);
+iscsi_flashnode_conn_attr(fnode, header_digest, ISCSI_FLASHNODE_HDR_DGST_EN);
+iscsi_flashnode_conn_attr(fnode, data_digest, ISCSI_FLASHNODE_DATA_DGST_EN);
+iscsi_flashnode_conn_attr(fnode, snack_req, ISCSI_FLASHNODE_SNACK_REQ_EN);
+iscsi_flashnode_conn_attr(fnode, tcp_timestamp_stat,
+                         ISCSI_FLASHNODE_TCP_TIMESTAMP_STAT);
+iscsi_flashnode_conn_attr(fnode, tcp_nagle_disable,
+                         ISCSI_FLASHNODE_TCP_NAGLE_DISABLE);
+iscsi_flashnode_conn_attr(fnode, tcp_wsf_disable,
+                         ISCSI_FLASHNODE_TCP_WSF_DISABLE);
+iscsi_flashnode_conn_attr(fnode, tcp_timer_scale,
+                         ISCSI_FLASHNODE_TCP_TIMER_SCALE);
+iscsi_flashnode_conn_attr(fnode, tcp_timestamp_enable,
+                         ISCSI_FLASHNODE_TCP_TIMESTAMP_EN);
+iscsi_flashnode_conn_attr(fnode, fragment_disable,
+                         ISCSI_FLASHNODE_IP_FRAG_DISABLE);
+iscsi_flashnode_conn_attr(fnode, keepalive_tmo, ISCSI_FLASHNODE_KEEPALIVE_TMO);
+iscsi_flashnode_conn_attr(fnode, port, ISCSI_FLASHNODE_PORT);
+iscsi_flashnode_conn_attr(fnode, ipaddress, ISCSI_FLASHNODE_IPADDR);
+iscsi_flashnode_conn_attr(fnode, max_recv_dlength,
+                         ISCSI_FLASHNODE_MAX_RECV_DLENGTH);
+iscsi_flashnode_conn_attr(fnode, max_xmit_dlength,
+                         ISCSI_FLASHNODE_MAX_XMIT_DLENGTH);
+iscsi_flashnode_conn_attr(fnode, local_port, ISCSI_FLASHNODE_LOCAL_PORT);
+iscsi_flashnode_conn_attr(fnode, ipv4_tos, ISCSI_FLASHNODE_IPV4_TOS);
+iscsi_flashnode_conn_attr(fnode, ipv6_traffic_class, ISCSI_FLASHNODE_IPV6_TC);
+iscsi_flashnode_conn_attr(fnode, ipv6_flow_label,
+                         ISCSI_FLASHNODE_IPV6_FLOW_LABEL);
+iscsi_flashnode_conn_attr(fnode, redirect_ipaddr,
+                         ISCSI_FLASHNODE_REDIRECT_IPADDR);
+iscsi_flashnode_conn_attr(fnode, max_segment_size,
+                         ISCSI_FLASHNODE_MAX_SEGMENT_SIZE);
+iscsi_flashnode_conn_attr(fnode, link_local_ipv6,
+                         ISCSI_FLASHNODE_LINK_LOCAL_IPV6);
+iscsi_flashnode_conn_attr(fnode, tcp_xmit_wsf, ISCSI_FLASHNODE_TCP_XMIT_WSF);
+iscsi_flashnode_conn_attr(fnode, tcp_recv_wsf, ISCSI_FLASHNODE_TCP_RECV_WSF);
+iscsi_flashnode_conn_attr(fnode, statsn, ISCSI_FLASHNODE_STATSN);
+iscsi_flashnode_conn_attr(fnode, exp_statsn, ISCSI_FLASHNODE_EXP_STATSN);
+
+static struct attribute *iscsi_flashnode_conn_attrs[] = {
+       &dev_attr_fnode_is_fw_assigned_ipv6.attr,
+       &dev_attr_fnode_header_digest.attr,
+       &dev_attr_fnode_data_digest.attr,
+       &dev_attr_fnode_snack_req.attr,
+       &dev_attr_fnode_tcp_timestamp_stat.attr,
+       &dev_attr_fnode_tcp_nagle_disable.attr,
+       &dev_attr_fnode_tcp_wsf_disable.attr,
+       &dev_attr_fnode_tcp_timer_scale.attr,
+       &dev_attr_fnode_tcp_timestamp_enable.attr,
+       &dev_attr_fnode_fragment_disable.attr,
+       &dev_attr_fnode_max_recv_dlength.attr,
+       &dev_attr_fnode_max_xmit_dlength.attr,
+       &dev_attr_fnode_keepalive_tmo.attr,
+       &dev_attr_fnode_port.attr,
+       &dev_attr_fnode_ipaddress.attr,
+       &dev_attr_fnode_redirect_ipaddr.attr,
+       &dev_attr_fnode_max_segment_size.attr,
+       &dev_attr_fnode_local_port.attr,
+       &dev_attr_fnode_ipv4_tos.attr,
+       &dev_attr_fnode_ipv6_traffic_class.attr,
+       &dev_attr_fnode_ipv6_flow_label.attr,
+       &dev_attr_fnode_link_local_ipv6.attr,
+       &dev_attr_fnode_tcp_xmit_wsf.attr,
+       &dev_attr_fnode_tcp_recv_wsf.attr,
+       &dev_attr_fnode_statsn.attr,
+       &dev_attr_fnode_exp_statsn.attr,
+       NULL,
+};
+
+static umode_t iscsi_flashnode_conn_attr_is_visible(struct kobject *kobj,
+                                                   struct attribute *attr,
+                                                   int i)
+{
+       struct device *dev = container_of(kobj, struct device, kobj);
+       struct iscsi_bus_flash_conn *fnode_conn = iscsi_dev_to_flash_conn(dev);
+       struct iscsi_transport *t = fnode_conn->transport;
+       int param;
+
+       if (attr == &dev_attr_fnode_is_fw_assigned_ipv6.attr) {
+               param = ISCSI_FLASHNODE_IS_FW_ASSIGNED_IPV6;
+       } else if (attr == &dev_attr_fnode_header_digest.attr) {
+               param = ISCSI_FLASHNODE_HDR_DGST_EN;
+       } else if (attr == &dev_attr_fnode_data_digest.attr) {
+               param = ISCSI_FLASHNODE_DATA_DGST_EN;
+       } else if (attr == &dev_attr_fnode_snack_req.attr) {
+               param = ISCSI_FLASHNODE_SNACK_REQ_EN;
+       } else if (attr == &dev_attr_fnode_tcp_timestamp_stat.attr) {
+               param = ISCSI_FLASHNODE_TCP_TIMESTAMP_STAT;
+       } else if (attr == &dev_attr_fnode_tcp_nagle_disable.attr) {
+               param = ISCSI_FLASHNODE_TCP_NAGLE_DISABLE;
+       } else if (attr == &dev_attr_fnode_tcp_wsf_disable.attr) {
+               param = ISCSI_FLASHNODE_TCP_WSF_DISABLE;
+       } else if (attr == &dev_attr_fnode_tcp_timer_scale.attr) {
+               param = ISCSI_FLASHNODE_TCP_TIMER_SCALE;
+       } else if (attr == &dev_attr_fnode_tcp_timestamp_enable.attr) {
+               param = ISCSI_FLASHNODE_TCP_TIMESTAMP_EN;
+       } else if (attr == &dev_attr_fnode_fragment_disable.attr) {
+               param = ISCSI_FLASHNODE_IP_FRAG_DISABLE;
+       } else if (attr == &dev_attr_fnode_max_recv_dlength.attr) {
+               param = ISCSI_FLASHNODE_MAX_RECV_DLENGTH;
+       } else if (attr == &dev_attr_fnode_max_xmit_dlength.attr) {
+               param = ISCSI_FLASHNODE_MAX_XMIT_DLENGTH;
+       } else if (attr == &dev_attr_fnode_keepalive_tmo.attr) {
+               param = ISCSI_FLASHNODE_KEEPALIVE_TMO;
+       } else if (attr == &dev_attr_fnode_port.attr) {
+               param = ISCSI_FLASHNODE_PORT;
+       } else if (attr == &dev_attr_fnode_ipaddress.attr) {
+               param = ISCSI_FLASHNODE_IPADDR;
+       } else if (attr == &dev_attr_fnode_redirect_ipaddr.attr) {
+               param = ISCSI_FLASHNODE_REDIRECT_IPADDR;
+       } else if (attr == &dev_attr_fnode_max_segment_size.attr) {
+               param = ISCSI_FLASHNODE_MAX_SEGMENT_SIZE;
+       } else if (attr == &dev_attr_fnode_local_port.attr) {
+               param = ISCSI_FLASHNODE_LOCAL_PORT;
+       } else if (attr == &dev_attr_fnode_ipv4_tos.attr) {
+               param = ISCSI_FLASHNODE_IPV4_TOS;
+       } else if (attr == &dev_attr_fnode_ipv6_traffic_class.attr) {
+               param = ISCSI_FLASHNODE_IPV6_TC;
+       } else if (attr == &dev_attr_fnode_ipv6_flow_label.attr) {
+               param = ISCSI_FLASHNODE_IPV6_FLOW_LABEL;
+       } else if (attr == &dev_attr_fnode_link_local_ipv6.attr) {
+               param = ISCSI_FLASHNODE_LINK_LOCAL_IPV6;
+       } else if (attr == &dev_attr_fnode_tcp_xmit_wsf.attr) {
+               param = ISCSI_FLASHNODE_TCP_XMIT_WSF;
+       } else if (attr == &dev_attr_fnode_tcp_recv_wsf.attr) {
+               param = ISCSI_FLASHNODE_TCP_RECV_WSF;
+       } else if (attr == &dev_attr_fnode_statsn.attr) {
+               param = ISCSI_FLASHNODE_STATSN;
+       } else if (attr == &dev_attr_fnode_exp_statsn.attr) {
+               param = ISCSI_FLASHNODE_EXP_STATSN;
+       } else {
+               WARN_ONCE(1, "Invalid flashnode connection attr");
+               return 0;
+       }
+
+       return t->attr_is_visible(ISCSI_FLASHNODE_PARAM, param);
+}
+
+static struct attribute_group iscsi_flashnode_conn_attr_group = {
+       .attrs = iscsi_flashnode_conn_attrs,
+       .is_visible = iscsi_flashnode_conn_attr_is_visible,
+};
+
+static const struct attribute_group *iscsi_flashnode_conn_attr_groups[] = {
+       &iscsi_flashnode_conn_attr_group,
+       NULL,
+};
+
+static void iscsi_flashnode_conn_release(struct device *dev)
+{
+       struct iscsi_bus_flash_conn *fnode_conn = iscsi_dev_to_flash_conn(dev);
+
+       kfree(fnode_conn->ipaddress);
+       kfree(fnode_conn->redirect_ipaddr);
+       kfree(fnode_conn->link_local_ipv6_addr);
+       kfree(fnode_conn);
+}
+
+struct device_type iscsi_flashnode_conn_dev_type = {
+       .name = "iscsi_flashnode_conn_dev_type",
+       .groups = iscsi_flashnode_conn_attr_groups,
+       .release = iscsi_flashnode_conn_release,
+};
+
+struct bus_type iscsi_flashnode_bus;
+
+int iscsi_flashnode_bus_match(struct device *dev,
+                                    struct device_driver *drv)
+{
+       if (dev->bus == &iscsi_flashnode_bus)
+               return 1;
+       return 0;
+}
+EXPORT_SYMBOL_GPL(iscsi_flashnode_bus_match);
+
+struct bus_type iscsi_flashnode_bus = {
+       .name = "iscsi_flashnode",
+       .match = &iscsi_flashnode_bus_match,
+};
+
+/**
+ * iscsi_create_flashnode_sess - Add flashnode session entry in sysfs
+ * @shost: pointer to host data
+ * @index: index of flashnode to add in sysfs
+ * @transport: pointer to transport data
+ * @dd_size: total size to allocate
+ *
+ * Adds a sysfs entry for the flashnode session attributes
+ *
+ * Returns:
+ *  pointer to allocated flashnode sess on sucess
+ *  %NULL on failure
+ */
+struct iscsi_bus_flash_session *
+iscsi_create_flashnode_sess(struct Scsi_Host *shost, int index,
+                           struct iscsi_transport *transport,
+                           int dd_size)
+{
+       struct iscsi_bus_flash_session *fnode_sess;
+       int err;
+
+       fnode_sess = kzalloc(sizeof(*fnode_sess) + dd_size, GFP_KERNEL);
+       if (!fnode_sess)
+               return NULL;
+
+       fnode_sess->transport = transport;
+       fnode_sess->target_id = index;
+       fnode_sess->dev.type = &iscsi_flashnode_sess_dev_type;
+       fnode_sess->dev.bus = &iscsi_flashnode_bus;
+       fnode_sess->dev.parent = &shost->shost_gendev;
+       dev_set_name(&fnode_sess->dev, "flashnode_sess-%u:%u",
+                    shost->host_no, index);
+
+       err = device_register(&fnode_sess->dev);
+       if (err)
+               goto free_fnode_sess;
+
+       if (dd_size)
+               fnode_sess->dd_data = &fnode_sess[1];
+
+       return fnode_sess;
+
+free_fnode_sess:
+       kfree(fnode_sess);
+       return NULL;
+}
+EXPORT_SYMBOL_GPL(iscsi_create_flashnode_sess);
+
+/**
+ * iscsi_create_flashnode_conn - Add flashnode conn entry in sysfs
+ * @shost: pointer to host data
+ * @fnode_sess: pointer to the parent flashnode session entry
+ * @transport: pointer to transport data
+ * @dd_size: total size to allocate
+ *
+ * Adds a sysfs entry for the flashnode connection attributes
+ *
+ * Returns:
+ *  pointer to allocated flashnode conn on success
+ *  %NULL on failure
+ */
+struct iscsi_bus_flash_conn *
+iscsi_create_flashnode_conn(struct Scsi_Host *shost,
+                           struct iscsi_bus_flash_session *fnode_sess,
+                           struct iscsi_transport *transport,
+                           int dd_size)
+{
+       struct iscsi_bus_flash_conn *fnode_conn;
+       int err;
+
+       fnode_conn = kzalloc(sizeof(*fnode_conn) + dd_size, GFP_KERNEL);
+       if (!fnode_conn)
+               return NULL;
+
+       fnode_conn->transport = transport;
+       fnode_conn->dev.type = &iscsi_flashnode_conn_dev_type;
+       fnode_conn->dev.bus = &iscsi_flashnode_bus;
+       fnode_conn->dev.parent = &fnode_sess->dev;
+       dev_set_name(&fnode_conn->dev, "flashnode_conn-%u:%u:0",
+                    shost->host_no, fnode_sess->target_id);
+
+       err = device_register(&fnode_conn->dev);
+       if (err)
+               goto free_fnode_conn;
+
+       if (dd_size)
+               fnode_conn->dd_data = &fnode_conn[1];
+
+       return fnode_conn;
+
+free_fnode_conn:
+       kfree(fnode_conn);
+       return NULL;
+}
+EXPORT_SYMBOL_GPL(iscsi_create_flashnode_conn);
+
+/**
+ * iscsi_is_flashnode_conn_dev - verify passed device is to be flashnode conn
+ * @dev: device to verify
+ * @data: pointer to data containing value to use for verification
+ *
+ * Verifies if the passed device is flashnode conn device
+ *
+ * Returns:
+ *  1 on success
+ *  0 on failure
+ */
+int iscsi_is_flashnode_conn_dev(struct device *dev, void *data)
+{
+       return dev->bus == &iscsi_flashnode_bus;
+}
+EXPORT_SYMBOL_GPL(iscsi_is_flashnode_conn_dev);
+
+static int iscsi_destroy_flashnode_conn(struct iscsi_bus_flash_conn *fnode_conn)
+{
+       device_unregister(&fnode_conn->dev);
+       return 0;
+}
+
+static int flashnode_match_index(struct device *dev, void *data)
+{
+       struct iscsi_bus_flash_session *fnode_sess = NULL;
+       int ret = 0;
+
+       if (!iscsi_flashnode_bus_match(dev, NULL))
+               goto exit_match_index;
+
+       fnode_sess = iscsi_dev_to_flash_session(dev);
+       ret = (fnode_sess->target_id == *((int *)data)) ? 1 : 0;
+
+exit_match_index:
+       return ret;
+}
+
+/**
+ * iscsi_get_flashnode_by_index -finds flashnode session entry by index
+ * @shost: pointer to host data
+ * @data: pointer to data containing value to use for comparison
+ * @fn: function pointer that does actual comparison
+ *
+ * Finds the flashnode session object for the passed index
+ *
+ * Returns:
+ *  pointer to found flashnode session object on success
+ *  %NULL on failure
+ */
+static struct iscsi_bus_flash_session *
+iscsi_get_flashnode_by_index(struct Scsi_Host *shost, void *data,
+                            int (*fn)(struct device *dev, void *data))
+{
+       struct iscsi_bus_flash_session *fnode_sess = NULL;
+       struct device *dev;
+
+       dev = device_find_child(&shost->shost_gendev, data, fn);
+       if (dev)
+               fnode_sess = iscsi_dev_to_flash_session(dev);
+
+       return fnode_sess;
+}
+
+/**
+ * iscsi_find_flashnode_sess - finds flashnode session entry
+ * @shost: pointer to host data
+ * @data: pointer to data containing value to use for comparison
+ * @fn: function pointer that does actual comparison
+ *
+ * Finds the flashnode session object comparing the data passed using logic
+ * defined in passed function pointer
+ *
+ * Returns:
+ *  pointer to found flashnode session device object on success
+ *  %NULL on failure
+ */
+struct device *
+iscsi_find_flashnode_sess(struct Scsi_Host *shost, void *data,
+                         int (*fn)(struct device *dev, void *data))
+{
+       struct device *dev;
+
+       dev = device_find_child(&shost->shost_gendev, data, fn);
+       return dev;
+}
+EXPORT_SYMBOL_GPL(iscsi_find_flashnode_sess);
+
+/**
+ * iscsi_find_flashnode_conn - finds flashnode connection entry
+ * @fnode_sess: pointer to parent flashnode session entry
+ * @data: pointer to data containing value to use for comparison
+ * @fn: function pointer that does actual comparison
+ *
+ * Finds the flashnode connection object comparing the data passed using logic
+ * defined in passed function pointer
+ *
+ * Returns:
+ *  pointer to found flashnode connection device object on success
+ *  %NULL on failure
+ */
+struct device *
+iscsi_find_flashnode_conn(struct iscsi_bus_flash_session *fnode_sess,
+                         void *data,
+                         int (*fn)(struct device *dev, void *data))
+{
+       struct device *dev;
+
+       dev = device_find_child(&fnode_sess->dev, data, fn);
+       return dev;
+}
+EXPORT_SYMBOL_GPL(iscsi_find_flashnode_conn);
+
+static int iscsi_iter_destroy_flashnode_conn_fn(struct device *dev, void *data)
+{
+       if (!iscsi_is_flashnode_conn_dev(dev, NULL))
+               return 0;
+
+       return iscsi_destroy_flashnode_conn(iscsi_dev_to_flash_conn(dev));
+}
+
+/**
+ * iscsi_destroy_flashnode_sess - destory flashnode session entry
+ * @fnode_sess: pointer to flashnode session entry to be destroyed
+ *
+ * Deletes the flashnode session entry and all children flashnode connection
+ * entries from sysfs
+ */
+void iscsi_destroy_flashnode_sess(struct iscsi_bus_flash_session *fnode_sess)
+{
+       int err;
+
+       err = device_for_each_child(&fnode_sess->dev, NULL,
+                                   iscsi_iter_destroy_flashnode_conn_fn);
+       if (err)
+               pr_err("Could not delete all connections for %s. Error %d.\n",
+                      fnode_sess->dev.kobj.name, err);
+
+       device_unregister(&fnode_sess->dev);
+}
+EXPORT_SYMBOL_GPL(iscsi_destroy_flashnode_sess);
+
+static int iscsi_iter_destroy_flashnode_fn(struct device *dev, void *data)
+{
+       if (!iscsi_flashnode_bus_match(dev, NULL))
+               return 0;
+
+       iscsi_destroy_flashnode_sess(iscsi_dev_to_flash_session(dev));
+       return 0;
+}
+
+/**
+ * iscsi_destroy_all_flashnode - destory all flashnode session entries
+ * @shost: pointer to host data
+ *
+ * Destroys all the flashnode session entries and all corresponding children
+ * flashnode connection entries from sysfs
+ */
+void iscsi_destroy_all_flashnode(struct Scsi_Host *shost)
+{
+       device_for_each_child(&shost->shost_gendev, NULL,
+                             iscsi_iter_destroy_flashnode_fn);
+}
+EXPORT_SYMBOL_GPL(iscsi_destroy_all_flashnode);
+
+/*
  * BSG support
  */
 /**
@@ -2092,6 +2776,294 @@ static int iscsi_delete_chap(struct iscsi_transport *transport,
        return err;
 }
 
+static const struct {
+       enum iscsi_discovery_parent_type value;
+       char                            *name;
+} iscsi_discovery_parent_names[] = {
+       {ISCSI_DISC_PARENT_UNKNOWN,     "Unknown" },
+       {ISCSI_DISC_PARENT_SENDTGT,     "Sendtarget" },
+       {ISCSI_DISC_PARENT_ISNS,        "isns" },
+};
+
+char *iscsi_get_discovery_parent_name(int parent_type)
+{
+       int i;
+       char *state = "Unknown!";
+
+       for (i = 0; i < ARRAY_SIZE(iscsi_discovery_parent_names); i++) {
+               if (iscsi_discovery_parent_names[i].value & parent_type) {
+                       state = iscsi_discovery_parent_names[i].name;
+                       break;
+               }
+       }
+       return state;
+}
+EXPORT_SYMBOL_GPL(iscsi_get_discovery_parent_name);
+
+static int iscsi_set_flashnode_param(struct iscsi_transport *transport,
+                                    struct iscsi_uevent *ev, uint32_t len)
+{
+       char *data = (char *)ev + sizeof(*ev);
+       struct Scsi_Host *shost;
+       struct iscsi_bus_flash_session *fnode_sess;
+       struct iscsi_bus_flash_conn *fnode_conn;
+       struct device *dev;
+       uint32_t *idx;
+       int err = 0;
+
+       if (!transport->set_flashnode_param) {
+               err = -ENOSYS;
+               goto exit_set_fnode;
+       }
+
+       shost = scsi_host_lookup(ev->u.set_flashnode.host_no);
+       if (!shost) {
+               pr_err("%s could not find host no %u\n",
+                      __func__, ev->u.set_flashnode.host_no);
+               err = -ENODEV;
+               goto put_host;
+       }
+
+       idx = &ev->u.set_flashnode.flashnode_idx;
+       fnode_sess = iscsi_get_flashnode_by_index(shost, idx,
+                                                 flashnode_match_index);
+       if (!fnode_sess) {
+               pr_err("%s could not find flashnode %u for host no %u\n",
+                      __func__, *idx, ev->u.set_flashnode.host_no);
+               err = -ENODEV;
+               goto put_host;
+       }
+
+       dev = iscsi_find_flashnode_conn(fnode_sess, NULL,
+                                       iscsi_is_flashnode_conn_dev);
+       if (!dev) {
+               err = -ENODEV;
+               goto put_host;
+       }
+
+       fnode_conn = iscsi_dev_to_flash_conn(dev);
+       err = transport->set_flashnode_param(fnode_sess, fnode_conn, data, len);
+
+put_host:
+       scsi_host_put(shost);
+
+exit_set_fnode:
+       return err;
+}
+
+static int iscsi_new_flashnode(struct iscsi_transport *transport,
+                              struct iscsi_uevent *ev, uint32_t len)
+{
+       char *data = (char *)ev + sizeof(*ev);
+       struct Scsi_Host *shost;
+       int index;
+       int err = 0;
+
+       if (!transport->new_flashnode) {
+               err = -ENOSYS;
+               goto exit_new_fnode;
+       }
+
+       shost = scsi_host_lookup(ev->u.new_flashnode.host_no);
+       if (!shost) {
+               pr_err("%s could not find host no %u\n",
+                      __func__, ev->u.new_flashnode.host_no);
+               err = -ENODEV;
+               goto put_host;
+       }
+
+       index = transport->new_flashnode(shost, data, len);
+
+       if (index >= 0)
+               ev->r.new_flashnode_ret.flashnode_idx = index;
+       else
+               err = -EIO;
+
+put_host:
+       scsi_host_put(shost);
+
+exit_new_fnode:
+       return err;
+}
+
+static int iscsi_del_flashnode(struct iscsi_transport *transport,
+                              struct iscsi_uevent *ev)
+{
+       struct Scsi_Host *shost;
+       struct iscsi_bus_flash_session *fnode_sess;
+       uint32_t *idx;
+       int err = 0;
+
+       if (!transport->del_flashnode) {
+               err = -ENOSYS;
+               goto exit_del_fnode;
+       }
+
+       shost = scsi_host_lookup(ev->u.del_flashnode.host_no);
+       if (!shost) {
+               pr_err("%s could not find host no %u\n",
+                      __func__, ev->u.del_flashnode.host_no);
+               err = -ENODEV;
+               goto put_host;
+       }
+
+       idx = &ev->u.del_flashnode.flashnode_idx;
+       fnode_sess = iscsi_get_flashnode_by_index(shost, idx,
+                                                 flashnode_match_index);
+       if (!fnode_sess) {
+               pr_err("%s could not find flashnode %u for host no %u\n",
+                      __func__, *idx, ev->u.del_flashnode.host_no);
+               err = -ENODEV;
+               goto put_host;
+       }
+
+       err = transport->del_flashnode(fnode_sess);
+
+put_host:
+       scsi_host_put(shost);
+
+exit_del_fnode:
+       return err;
+}
+
+static int iscsi_login_flashnode(struct iscsi_transport *transport,
+                                struct iscsi_uevent *ev)
+{
+       struct Scsi_Host *shost;
+       struct iscsi_bus_flash_session *fnode_sess;
+       struct iscsi_bus_flash_conn *fnode_conn;
+       struct device *dev;
+       uint32_t *idx;
+       int err = 0;
+
+       if (!transport->login_flashnode) {
+               err = -ENOSYS;
+               goto exit_login_fnode;
+       }
+
+       shost = scsi_host_lookup(ev->u.login_flashnode.host_no);
+       if (!shost) {
+               pr_err("%s could not find host no %u\n",
+                      __func__, ev->u.login_flashnode.host_no);
+               err = -ENODEV;
+               goto put_host;
+       }
+
+       idx = &ev->u.login_flashnode.flashnode_idx;
+       fnode_sess = iscsi_get_flashnode_by_index(shost, idx,
+                                                 flashnode_match_index);
+       if (!fnode_sess) {
+               pr_err("%s could not find flashnode %u for host no %u\n",
+                      __func__, *idx, ev->u.login_flashnode.host_no);
+               err = -ENODEV;
+               goto put_host;
+       }
+
+       dev = iscsi_find_flashnode_conn(fnode_sess, NULL,
+                                       iscsi_is_flashnode_conn_dev);
+       if (!dev) {
+               err = -ENODEV;
+               goto put_host;
+       }
+
+       fnode_conn = iscsi_dev_to_flash_conn(dev);
+       err = transport->login_flashnode(fnode_sess, fnode_conn);
+
+put_host:
+       scsi_host_put(shost);
+
+exit_login_fnode:
+       return err;
+}
+
+static int iscsi_logout_flashnode(struct iscsi_transport *transport,
+                                 struct iscsi_uevent *ev)
+{
+       struct Scsi_Host *shost;
+       struct iscsi_bus_flash_session *fnode_sess;
+       struct iscsi_bus_flash_conn *fnode_conn;
+       struct device *dev;
+       uint32_t *idx;
+       int err = 0;
+
+       if (!transport->logout_flashnode) {
+               err = -ENOSYS;
+               goto exit_logout_fnode;
+       }
+
+       shost = scsi_host_lookup(ev->u.logout_flashnode.host_no);
+       if (!shost) {
+               pr_err("%s could not find host no %u\n",
+                      __func__, ev->u.logout_flashnode.host_no);
+               err = -ENODEV;
+               goto put_host;
+       }
+
+       idx = &ev->u.logout_flashnode.flashnode_idx;
+       fnode_sess = iscsi_get_flashnode_by_index(shost, idx,
+                                                 flashnode_match_index);
+       if (!fnode_sess) {
+               pr_err("%s could not find flashnode %u for host no %u\n",
+                      __func__, *idx, ev->u.logout_flashnode.host_no);
+               err = -ENODEV;
+               goto put_host;
+       }
+
+       dev = iscsi_find_flashnode_conn(fnode_sess, NULL,
+                                       iscsi_is_flashnode_conn_dev);
+       if (!dev) {
+               err = -ENODEV;
+               goto put_host;
+       }
+
+       fnode_conn = iscsi_dev_to_flash_conn(dev);
+
+       err = transport->logout_flashnode(fnode_sess, fnode_conn);
+
+put_host:
+       scsi_host_put(shost);
+
+exit_logout_fnode:
+       return err;
+}
+
+static int iscsi_logout_flashnode_sid(struct iscsi_transport *transport,
+                                     struct iscsi_uevent *ev)
+{
+       struct Scsi_Host *shost;
+       struct iscsi_cls_session *session;
+       int err = 0;
+
+       if (!transport->logout_flashnode_sid) {
+               err = -ENOSYS;
+               goto exit_logout_sid;
+       }
+
+       shost = scsi_host_lookup(ev->u.logout_flashnode_sid.host_no);
+       if (!shost) {
+               pr_err("%s could not find host no %u\n",
+                      __func__, ev->u.logout_flashnode.host_no);
+               err = -ENODEV;
+               goto put_host;
+       }
+
+       session = iscsi_session_lookup(ev->u.logout_flashnode_sid.sid);
+       if (!session) {
+               pr_err("%s could not find session id %u\n",
+                      __func__, ev->u.logout_flashnode_sid.sid);
+               err = -EINVAL;
+               goto put_host;
+       }
+
+       err = transport->logout_flashnode_sid(session);
+
+put_host:
+       scsi_host_put(shost);
+
+exit_logout_sid:
+       return err;
+}
+
 static int
 iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group)
 {
@@ -2246,6 +3218,27 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group)
        case ISCSI_UEVENT_DELETE_CHAP:
                err = iscsi_delete_chap(transport, ev);
                break;
+       case ISCSI_UEVENT_SET_FLASHNODE_PARAMS:
+               err = iscsi_set_flashnode_param(transport, ev,
+                                               nlmsg_attrlen(nlh,
+                                                             sizeof(*ev)));
+               break;
+       case ISCSI_UEVENT_NEW_FLASHNODE:
+               err = iscsi_new_flashnode(transport, ev,
+                                         nlmsg_attrlen(nlh, sizeof(*ev)));
+               break;
+       case ISCSI_UEVENT_DEL_FLASHNODE:
+               err = iscsi_del_flashnode(transport, ev);
+               break;
+       case ISCSI_UEVENT_LOGIN_FLASHNODE:
+               err = iscsi_login_flashnode(transport, ev);
+               break;
+       case ISCSI_UEVENT_LOGOUT_FLASHNODE:
+               err = iscsi_logout_flashnode(transport, ev);
+               break;
+       case ISCSI_UEVENT_LOGOUT_FLASHNODE_SID:
+               err = iscsi_logout_flashnode_sid(transport, ev);
+               break;
        default:
                err = -ENOSYS;
                break;
@@ -2981,10 +3974,14 @@ static __init int iscsi_transport_init(void)
        if (err)
                goto unregister_conn_class;
 
+       err = bus_register(&iscsi_flashnode_bus);
+       if (err)
+               goto unregister_session_class;
+
        nls = netlink_kernel_create(&init_net, NETLINK_ISCSI, &cfg);
        if (!nls) {
                err = -ENOBUFS;
-               goto unregister_session_class;
+               goto unregister_flashnode_bus;
        }
 
        iscsi_eh_timer_workq = create_singlethread_workqueue("iscsi_eh");
@@ -2995,6 +3992,8 @@ static __init int iscsi_transport_init(void)
 
 release_nls:
        netlink_kernel_release(nls);
+unregister_flashnode_bus:
+       bus_unregister(&iscsi_flashnode_bus);
 unregister_session_class:
        transport_class_unregister(&iscsi_session_class);
 unregister_conn_class:
@@ -3014,6 +4013,7 @@ static void __exit iscsi_transport_exit(void)
 {
        destroy_workqueue(iscsi_eh_timer_workq);
        netlink_kernel_release(nls);
+       bus_unregister(&iscsi_flashnode_bus);
        transport_class_unregister(&iscsi_connection_class);
        transport_class_unregister(&iscsi_session_class);
        transport_class_unregister(&iscsi_host_class);
index 917741b..f1b0183 100644 (file)
@@ -63,6 +63,12 @@ enum iscsi_uevent_e {
        ISCSI_UEVENT_PING               = UEVENT_BASE + 22,
        ISCSI_UEVENT_GET_CHAP           = UEVENT_BASE + 23,
        ISCSI_UEVENT_DELETE_CHAP        = UEVENT_BASE + 24,
+       ISCSI_UEVENT_SET_FLASHNODE_PARAMS       = UEVENT_BASE + 25,
+       ISCSI_UEVENT_NEW_FLASHNODE      = UEVENT_BASE + 26,
+       ISCSI_UEVENT_DEL_FLASHNODE      = UEVENT_BASE + 27,
+       ISCSI_UEVENT_LOGIN_FLASHNODE    = UEVENT_BASE + 28,
+       ISCSI_UEVENT_LOGOUT_FLASHNODE   = UEVENT_BASE + 29,
+       ISCSI_UEVENT_LOGOUT_FLASHNODE_SID       = UEVENT_BASE + 30,
 
        /* up events */
        ISCSI_KEVENT_RECV_PDU           = KEVENT_BASE + 1,
@@ -210,6 +216,31 @@ struct iscsi_uevent {
                       uint32_t        host_no;
                       uint16_t        chap_tbl_idx;
                } delete_chap;
+               struct msg_set_flashnode_param {
+                       uint32_t        host_no;
+                       uint32_t        flashnode_idx;
+                       uint32_t        count;
+               } set_flashnode;
+               struct msg_new_flashnode {
+                       uint32_t        host_no;
+                       uint32_t        len;
+               } new_flashnode;
+               struct msg_del_flashnode {
+                       uint32_t        host_no;
+                       uint32_t        flashnode_idx;
+               } del_flashnode;
+               struct msg_login_flashnode {
+                       uint32_t        host_no;
+                       uint32_t        flashnode_idx;
+               } login_flashnode;
+               struct msg_logout_flashnode {
+                       uint32_t        host_no;
+                       uint32_t        flashnode_idx;
+               } logout_flashnode;
+               struct msg_logout_flashnode_sid {
+                       uint32_t        host_no;
+                       uint32_t        sid;
+               } logout_flashnode_sid;
        } u;
        union {
                /* messages k -> u */
@@ -267,6 +298,9 @@ struct iscsi_uevent {
                                                   with each ping request */
                        uint32_t        data_size;
                } ping_comp;
+               struct msg_new_flashnode_ret {
+                       uint32_t        flashnode_idx;
+               } new_flashnode_ret;
        } r;
 } __attribute__ ((aligned (sizeof(uint64_t))));
 
@@ -274,6 +308,7 @@ enum iscsi_param_type {
        ISCSI_PARAM,            /* iscsi_param (session, conn, target, LU) */
        ISCSI_HOST_PARAM,       /* iscsi_host_param */
        ISCSI_NET_PARAM,        /* iscsi_net_param */
+       ISCSI_FLASHNODE_PARAM,  /* iscsi_flashnode_param */
 };
 
 struct iscsi_iface_param_info {
@@ -469,6 +504,84 @@ enum iscsi_host_param {
        ISCSI_HOST_PARAM_MAX,
 };
 
+/* iSCSI Flash Target params */
+enum iscsi_flashnode_param {
+       ISCSI_FLASHNODE_IS_FW_ASSIGNED_IPV6,
+       ISCSI_FLASHNODE_PORTAL_TYPE,
+       ISCSI_FLASHNODE_AUTO_SND_TGT_DISABLE,
+       ISCSI_FLASHNODE_DISCOVERY_SESS,
+       ISCSI_FLASHNODE_ENTRY_EN,
+       ISCSI_FLASHNODE_HDR_DGST_EN,
+       ISCSI_FLASHNODE_DATA_DGST_EN,
+       ISCSI_FLASHNODE_IMM_DATA_EN,
+       ISCSI_FLASHNODE_INITIAL_R2T_EN,
+       ISCSI_FLASHNODE_DATASEQ_INORDER,
+       ISCSI_FLASHNODE_PDU_INORDER,
+       ISCSI_FLASHNODE_CHAP_AUTH_EN,
+       ISCSI_FLASHNODE_SNACK_REQ_EN,
+       ISCSI_FLASHNODE_DISCOVERY_LOGOUT_EN,
+       ISCSI_FLASHNODE_BIDI_CHAP_EN,
+       /* make authentication for discovery sessions optional */
+       ISCSI_FLASHNODE_DISCOVERY_AUTH_OPTIONAL,
+       ISCSI_FLASHNODE_ERL,
+       ISCSI_FLASHNODE_TCP_TIMESTAMP_STAT,
+       ISCSI_FLASHNODE_TCP_NAGLE_DISABLE,
+       ISCSI_FLASHNODE_TCP_WSF_DISABLE,
+       ISCSI_FLASHNODE_TCP_TIMER_SCALE,
+       ISCSI_FLASHNODE_TCP_TIMESTAMP_EN,
+       ISCSI_FLASHNODE_IP_FRAG_DISABLE,
+       ISCSI_FLASHNODE_MAX_RECV_DLENGTH,
+       ISCSI_FLASHNODE_MAX_XMIT_DLENGTH,
+       ISCSI_FLASHNODE_FIRST_BURST,
+       ISCSI_FLASHNODE_DEF_TIME2WAIT,
+       ISCSI_FLASHNODE_DEF_TIME2RETAIN,
+       ISCSI_FLASHNODE_MAX_R2T,
+       ISCSI_FLASHNODE_KEEPALIVE_TMO,
+       ISCSI_FLASHNODE_ISID,
+       ISCSI_FLASHNODE_TSID,
+       ISCSI_FLASHNODE_PORT,
+       ISCSI_FLASHNODE_MAX_BURST,
+       ISCSI_FLASHNODE_DEF_TASKMGMT_TMO,
+       ISCSI_FLASHNODE_IPADDR,
+       ISCSI_FLASHNODE_ALIAS,
+       ISCSI_FLASHNODE_REDIRECT_IPADDR,
+       ISCSI_FLASHNODE_MAX_SEGMENT_SIZE,
+       ISCSI_FLASHNODE_LOCAL_PORT,
+       ISCSI_FLASHNODE_IPV4_TOS,
+       ISCSI_FLASHNODE_IPV6_TC,
+       ISCSI_FLASHNODE_IPV6_FLOW_LABEL,
+       ISCSI_FLASHNODE_NAME,
+       ISCSI_FLASHNODE_TPGT,
+       ISCSI_FLASHNODE_LINK_LOCAL_IPV6,
+       ISCSI_FLASHNODE_DISCOVERY_PARENT_IDX,
+       ISCSI_FLASHNODE_DISCOVERY_PARENT_TYPE,
+       ISCSI_FLASHNODE_TCP_XMIT_WSF,
+       ISCSI_FLASHNODE_TCP_RECV_WSF,
+       ISCSI_FLASHNODE_CHAP_IN_IDX,
+       ISCSI_FLASHNODE_CHAP_OUT_IDX,
+       ISCSI_FLASHNODE_USERNAME,
+       ISCSI_FLASHNODE_USERNAME_IN,
+       ISCSI_FLASHNODE_PASSWORD,
+       ISCSI_FLASHNODE_PASSWORD_IN,
+       ISCSI_FLASHNODE_STATSN,
+       ISCSI_FLASHNODE_EXP_STATSN,
+       ISCSI_FLASHNODE_IS_BOOT_TGT,
+
+       ISCSI_FLASHNODE_MAX,
+};
+
+struct iscsi_flashnode_param_info {
+       uint32_t len;           /* Actual length of the param */
+       uint16_t param;         /* iscsi param value */
+       uint8_t value[0];       /* length sized value follows */
+} __packed;
+
+enum iscsi_discovery_parent_type {
+       ISCSI_DISC_PARENT_UNKNOWN       = 0x1,
+       ISCSI_DISC_PARENT_SENDTGT       = 0x2,
+       ISCSI_DISC_PARENT_ISNS          = 0x3,
+};
+
 /* iSCSI port Speed */
 enum iscsi_port_speed {
        ISCSI_PORT_SPEED_UNKNOWN        = 0x1,
index 53f0b36..4a58cca 100644 (file)
@@ -39,6 +39,8 @@ struct iscsi_task;
 struct sockaddr;
 struct iscsi_iface;
 struct bsg_job;
+struct iscsi_bus_flash_session;
+struct iscsi_bus_flash_conn;
 
 /**
  * struct iscsi_transport - iSCSI Transport template
@@ -150,6 +152,19 @@ struct iscsi_transport {
        int (*get_chap) (struct Scsi_Host *shost, uint16_t chap_tbl_idx,
                         uint32_t *num_entries, char *buf);
        int (*delete_chap) (struct Scsi_Host *shost, uint16_t chap_tbl_idx);
+       int (*get_flashnode_param) (struct iscsi_bus_flash_session *fnode_sess,
+                                   int param, char *buf);
+       int (*set_flashnode_param) (struct iscsi_bus_flash_session *fnode_sess,
+                                   struct iscsi_bus_flash_conn *fnode_conn,
+                                   void *data, int len);
+       int (*new_flashnode) (struct Scsi_Host *shost, const char *buf,
+                             int len);
+       int (*del_flashnode) (struct iscsi_bus_flash_session *fnode_sess);
+       int (*login_flashnode) (struct iscsi_bus_flash_session *fnode_sess,
+                               struct iscsi_bus_flash_conn *fnode_conn);
+       int (*logout_flashnode) (struct iscsi_bus_flash_session *fnode_sess,
+                                struct iscsi_bus_flash_conn *fnode_conn);
+       int (*logout_flashnode_sid) (struct iscsi_cls_session *cls_sess);
 };
 
 /*
@@ -286,6 +301,112 @@ struct iscsi_iface {
 #define iscsi_iface_to_shost(_iface) \
        dev_to_shost(_iface->dev.parent)
 
+
+struct iscsi_bus_flash_conn {
+       struct list_head conn_list;     /* item in connlist */
+       void *dd_data;                  /* LLD private data */
+       struct iscsi_transport *transport;
+       struct device dev;              /* sysfs transport/container device */
+       /* iscsi connection parameters */
+       uint32_t                exp_statsn;
+       uint32_t                statsn;
+       unsigned                max_recv_dlength; /* initiator_max_recv_dsl*/
+       unsigned                max_xmit_dlength; /* target_max_recv_dsl */
+       unsigned                max_segment_size;
+       unsigned                tcp_xmit_wsf;
+       unsigned                tcp_recv_wsf;
+       int                     hdrdgst_en;
+       int                     datadgst_en;
+       int                     port;
+       char                    *ipaddress;
+       char                    *link_local_ipv6_addr;
+       char                    *redirect_ipaddr;
+       uint16_t                keepalive_timeout;
+       uint16_t                local_port;
+       uint8_t                 snack_req_en;
+       /* tcp timestamp negotiation status */
+       uint8_t                 tcp_timestamp_stat;
+       uint8_t                 tcp_nagle_disable;
+       /* tcp window scale factor */
+       uint8_t                 tcp_wsf_disable;
+       uint8_t                 tcp_timer_scale;
+       uint8_t                 tcp_timestamp_en;
+       uint8_t                 ipv4_tos;
+       uint8_t                 ipv6_traffic_class;
+       uint8_t                 ipv6_flow_label;
+       uint8_t                 fragment_disable;
+       /* Link local IPv6 address is assigned by firmware or driver */
+       uint8_t                 is_fw_assigned_ipv6;
+};
+
+#define iscsi_dev_to_flash_conn(_dev) \
+       container_of(_dev, struct iscsi_bus_flash_conn, dev)
+
+#define iscsi_flash_conn_to_flash_session(_conn) \
+       iscsi_dev_to_flash_session(_conn->dev.parent)
+
+#define ISID_SIZE 6
+
+struct iscsi_bus_flash_session {
+       struct list_head sess_list;             /* item in session_list */
+       struct iscsi_transport *transport;
+       unsigned int target_id;
+       int flash_state;        /* persistent or non-persistent */
+       void *dd_data;                          /* LLD private data */
+       struct device dev;      /* sysfs transport/container device */
+       /* iscsi session parameters */
+       unsigned                first_burst;
+       unsigned                max_burst;
+       unsigned short          max_r2t;
+       int                     default_taskmgmt_timeout;
+       int                     initial_r2t_en;
+       int                     imm_data_en;
+       int                     time2wait;
+       int                     time2retain;
+       int                     pdu_inorder_en;
+       int                     dataseq_inorder_en;
+       int                     erl;
+       int                     tpgt;
+       char                    *username;
+       char                    *username_in;
+       char                    *password;
+       char                    *password_in;
+       char                    *targetname;
+       char                    *targetalias;
+       char                    *portal_type;
+       uint16_t                tsid;
+       uint16_t                chap_in_idx;
+       uint16_t                chap_out_idx;
+       /* index of iSCSI discovery session if the entry is
+        * discovered by iSCSI discovery session
+        */
+       uint16_t                discovery_parent_idx;
+       /* indicates if discovery was done through iSNS discovery service
+        * or through sendTarget */
+       uint16_t                discovery_parent_type;
+       /* Firmware auto sendtarget discovery disable */
+       uint8_t                 auto_snd_tgt_disable;
+       uint8_t                 discovery_sess;
+       /* indicates if this flashnode entry is enabled or disabled */
+       uint8_t                 entry_state;
+       uint8_t                 chap_auth_en;
+       /* enables firmware to auto logout the discovery session on discovery
+        * completion
+        */
+       uint8_t                 discovery_logout_en;
+       uint8_t                 bidi_chap_en;
+       /* makes authentication for discovery session optional */
+       uint8_t                 discovery_auth_optional;
+       uint8_t                 isid[ISID_SIZE];
+       uint8_t                 is_boot_target;
+};
+
+#define iscsi_dev_to_flash_session(_dev) \
+       container_of(_dev, struct iscsi_bus_flash_session, dev)
+
+#define iscsi_flash_session_to_shost(_session) \
+       dev_to_shost(_session->dev.parent)
+
 /*
  * session and connection functions that can be used by HW iSCSI LLDs
  */
@@ -330,4 +451,34 @@ extern char *iscsi_get_port_speed_name(struct Scsi_Host *shost);
 extern char *iscsi_get_port_state_name(struct Scsi_Host *shost);
 extern int iscsi_is_session_dev(const struct device *dev);
 
+extern char *iscsi_get_discovery_parent_name(int parent_type);
+extern struct device *
+iscsi_find_flashnode(struct Scsi_Host *shost, void *data,
+                    int (*fn)(struct device *dev, void *data));
+
+extern struct iscsi_bus_flash_session *
+iscsi_create_flashnode_sess(struct Scsi_Host *shost, int index,
+                           struct iscsi_transport *transport, int dd_size);
+
+extern struct iscsi_bus_flash_conn *
+iscsi_create_flashnode_conn(struct Scsi_Host *shost,
+                           struct iscsi_bus_flash_session *fnode_sess,
+                           struct iscsi_transport *transport, int dd_size);
+
+extern void
+iscsi_destroy_flashnode_sess(struct iscsi_bus_flash_session *fnode_sess);
+
+extern void iscsi_destroy_all_flashnode(struct Scsi_Host *shost);
+extern int iscsi_flashnode_bus_match(struct device *dev,
+                                    struct device_driver *drv);
+extern int iscsi_is_flashnode_conn_dev(struct device *dev, void *data);
+
+extern struct device *
+iscsi_find_flashnode_sess(struct Scsi_Host *shost, void *data,
+                         int (*fn)(struct device *dev, void *data));
+
+extern struct device *
+iscsi_find_flashnode_conn(struct iscsi_bus_flash_session *fnode_sess,
+                         void *data,
+                         int (*fn)(struct device *dev, void *data));
 #endif