iscsi features bugfixes
Subsystems (5)
The following patches were made against scsi-misc. They contain fixes and features including:
- Features:
1. Export sysfs values needed for OF/BIOS assisted iscsi boot.
2. Export sysfs values needed to be able to bind sessions to a hba/port/NIC/netdev. This is needed for software iscsi so it can bind a session to a netdevice and qla4xxx so it can bind sessions to a specific port, and will be used for broadcom management.
3. Add a host level set param event that works like the session level one, so for qla4xxx we can set port values like ip address or initiator name.
4. Not a feature, but some cleanups that are needed for bidi, but are nice cleanups on their own.
- Fixes
1. The send state machine was calculating the header wrong when partially sending headers.
2. The cmdsn allocation could allocation and pdu transmit code were racing which caused targets to drop sessions.
3. The xmitmutex use and transmit code were starving the mgmt queue, so noops would timeout waiting to be sent or queued
4. FDs were being leaked
5. Padding was assumed to be in the same skb as the data/header. This is the simple fix. We are working on merging Olaf's recv path rewrite for the next patchset.
PATCH 1/19 Check iscsi interface skb allocation return value
From: Mike Christie <[email protected]>
Let's not oops when we cannot allocate a skb! Add a check for if alloc_skb fails.
--- drivers/scsi/scsi_transport_iscsi.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-)
drivers/scsi/scsi_transport_iscsi.c +4 -6
@@ -609,12 +609,10 @@ iscsi_if_send_reply(int pid, int seq, inint t = done ?NLMSG_DONE : type; skb =alloc_skb (len,GFP_ATOMIC ); -/* -* FIXME: -* user is supposed to react on iferror == -ENOMEM; -* see iscsi_if_rx(). -*/ -BUG_ON (!skb); +if (!skb) { +printk (KERN_ERR "Could not allocate skb to send reply.\n" ); +return -ENOMEM ; + } nlh =__nlmsg_put (skb, pid, seq, t, (len -sizeof (*nlh)),0 ); nlh->nlmsg_flags = flags;
Signature · 1 line
1.4.1.1
PATCH 2/19 iscsi class: export hw address
From: Mike Christie <[email protected]>
Add hw address sysfs file.
--- drivers/scsi/scsi_transport_iscsi.c | 35 +++++++++++++++++++++++++++++++++-- include/scsi/iscsi_if.h | 8 ++++++++ include/scsi/scsi_transport_iscsi.h | 5 ++++- 3 files changed, 45 insertions(+), 3 deletions(-)
drivers/scsi/scsi_transport_iscsi.c +33 -2
@@ -32,7 +32,7 @@ #include <scsi/iscsi_if.h>#define ISCSI_SESSION_ATTRS 11#define ISCSI_CONN_ATTRS 11 -#define ISCSI_HOST_ATTRS 0 +#define ISCSI_HOST_ATTRS 1#define ISCSI_TRANSPORT_VERSION "2.0-724"struct iscsi_internal {
@@ -1197,6 +1197,25 @@ static ISCSI_CLASS_ATTR(priv_sess, field NULL)iscsi_priv_session_attr (recovery_tmo,"%d" ); +/* +* iSCSI host attrs +*/ +#define iscsi_host_attr_show (param) \ +static ssize_t \ +show_host_param_##param(struct class_device *cdev, char *buf) \ +{ \ + struct Scsi_Host *shost = transport_class_to_shost(cdev); \ + struct iscsi_internal *priv = to_iscsi_internal(shost->transportt); \ + return priv->iscsi_transport->get_host_param(shost, param, buf); \ +} + +#define iscsi_host_attr (field, param) \ + iscsi_host_attr_show(param) \ +static ISCSI_CLASS_ATTR(host, field, S_IRUGO, show_host_param_##param, \ + NULL); + +iscsi_host_attr (hwaddress,ISCSI_HOST_PARAM_HWADDRESS ); +#define SETUP_PRIV_SESSION_RD_ATTR (field) \ do { \ priv->session_attrs[count] = &class_device_attr_priv_sess_##field; \
@@ -1220,6 +1239,14 @@ do { \ } \ } while (0) +#define SETUP_HOST_RD_ATTR (field, param_flag) \ +do { \ + if (tt->host_param_mask & param_flag) { \ + priv->host_attrs[count] = &class_device_attr_host_##field; \ + count++; \ + } \ +} while (0) +static int iscsi_session_match (struct attribute_container *cont,struct device *dev) {
@@ -1321,9 +1348,13 @@ iscsi_register_transport(struct iscsi_tr priv->t.host_attrs.ac.class = &iscsi_host_class.class; priv->t.host_attrs.ac.match = iscsi_host_match; priv->t.host_size =sizeof (struct iscsi_host ); - priv->host_attrs[0 ] =NULL ;transport_container_register (&priv->t.host_attrs); +SETUP_HOST_RD_ATTR (hwaddress,ISCSI_HOST_HWADDRESS ); +BUG_ON (count >ISCSI_HOST_ATTRS ); + priv->host_attrs[count] =NULL ; + count =0 ; +/* connection parameters */ priv->conn_cont.ac.attrs = &priv->conn_attrs[0 ]; priv->conn_cont.ac.class = &iscsi_connection_class.class;
include/scsi/iscsi_if.h +8 -0
@@ -250,6 +250,14 @@ #define ISCSI_SESS_RECOVERY_TMO (1 << I#define ISCSI_CONN_PORT (1 << ISCSI_PARAM_CONN_PORT)#define ISCSI_CONN_ADDRESS (1 << ISCSI_PARAM_CONN_ADDRESS) +/* iSCSI HBA params */ +enum iscsi_host_param { +ISCSI_HOST_PARAM_HWADDRESS , +ISCSI_HOST_PARAM_MAX , +}; + +#define ISCSI_HOST_HWADDRESS (1 << ISCSI_HOST_PARAM_HWADDRESS) +#define iscsi_ptr (_handle) ((void*)(unsigned long)_handle)#define iscsi_handle (_ptr) ((uint64_t)(unsigned long)_ptr)#define hostdata_session (_hostdata) (iscsi_ptr(*(unsigned long *)_hostdata))
include/scsi/scsi_transport_iscsi.h +4 -1
@@ -79,7 +79,8 @@ struct iscsi_transport {char *name;unsigned int caps;/* LLD sets this to indicate what values it can export to sysfs */ -unsigned int param_mask; +uint64_t param_mask; +uint64_t host_param_mask;struct scsi_host_template *host_template;/* LLD connection data size */ int conndata_size;
@@ -105,6 +106,8 @@ struct iscsi_transport { enum iscsi_param param, char *buf);int (*get_session_param) (struct iscsi_cls_session *session,enum iscsi_param param,char *buf); +int (*get_host_param) (struct Scsi_Host *shost, +enum iscsi_host_param param,char *buf);int (*send_pdu) (struct iscsi_cls_conn *conn,struct iscsi_hdr *hdr,char *data,uint32_t data_size); void (*get_stats) (struct iscsi_cls_conn *conn,
Signature · 1 line
1.4.1.1
PATCH 3/19 qla4xxx: export mac as hw address
From: Mike Christie <[email protected]>
Export mac as hw address.
--- drivers/scsi/qla4xxx/ql4_os.c | 39 +++++++++++++++++++++++++++++++++++---- 1 files changed, 35 insertions(+), 4 deletions(-)
drivers/scsi/qla4xxx/ql4_os.c +35 -4
@@ -60,6 +60,8 @@ static int qla4xxx_conn_get_param(struct enum iscsi_param param, char *buf);static int qla4xxx_sess_get_param (struct iscsi_cls_session *sess,enum iscsi_param param,char *buf); +static int qla4xxx_host_get_param (struct Scsi_Host *shost, +enum iscsi_host_param param,char *buf);static void qla4xxx_conn_stop (struct iscsi_cls_conn *conn,int flag);static int qla4xxx_conn_start (struct iscsi_cls_conn *conn);static void qla4xxx_recovery_timedout (struct iscsi_cls_session *session);
@@ -99,16 +101,16 @@ static struct scsi_host_template qla4xxxstatic struct iscsi_transport qla4xxx_iscsi_transport = { .owner =THIS_MODULE , .name =DRIVER_NAME , - .param_mask =ISCSI_CONN_PORT | -ISCSI_CONN_ADDRESS | -ISCSI_TARGET_NAME | -ISCSI_TPGT , + .param_mask =ISCSI_CONN_PORT |ISCSI_CONN_ADDRESS | +ISCSI_TARGET_NAME |ISCSI_TPGT , + .host_param_mask =ISCSI_HOST_HWADDRESS , .sessiondata_size =sizeof (struct ddb_entry ), .host_template = &qla4xxx_driver_template, .tgt_dscvr = qla4xxx_tgt_dscvr, .get_conn_param = qla4xxx_conn_get_param, .get_session_param = qla4xxx_sess_get_param, + .get_host_param = qla4xxx_host_get_param, .start_conn = qla4xxx_conn_start, .stop_conn = qla4xxx_conn_stop, .session_recovery_timedout = qla4xxx_recovery_timedout,
@@ -165,6 +167,35 @@ static void qla4xxx_conn_stop(struct iscprintk (KERN_ERR "iscsi: invalid stop flag %d\n" , flag); } +static ssize_t format_addr (char *buf,const unsigned char *addr,int len) +{ +int i; +char *cp = buf; + +for (i =0 ; i < len; i++) + cp +=sprintf (cp,"%02x%c" , addr[i], + i == (len -1 ) ?'\n' :':' ); +return cp - buf; +} + + +static int qla4xxx_host_get_param (struct Scsi_Host *shost, +enum iscsi_host_param param,char *buf) +{ +struct scsi_qla_host *ha =to_qla_host (shost); +int len; + +switch (param) { +case ISCSI_HOST_PARAM_HWADDRESS : + len =format_addr (buf, ha->my_mac,MAC_ADDR_LEN ); +break ; +default : +return -ENOSYS ; + } + +return len; +} +static int qla4xxx_sess_get_param (struct iscsi_cls_session *sess,enum iscsi_param param,char *buf) {
Signature · 1 line
1.4.1.1
PATCH 4/19 iscsi class, qla4xxx: have class lookup host for drivers
From: Mike Christie <[email protected]>
We are going to be adding more host level sysfs attrs and set_params, so this patch has them take a scsi_host instead of either a scsi_host or host no.
--- drivers/scsi/qla4xxx/ql4_os.c | 19 ++++++------------- drivers/scsi/scsi_transport_iscsi.c | 17 ++++++++++++++--- include/scsi/scsi_transport_iscsi.h | 2 +- 3 files changed, 21 insertions(+), 17 deletions(-)
drivers/scsi/qla4xxx/ql4_os.c +6 -13
@@ -54,8 +54,9 @@ static void qla4xxx_config_dma_addressin/* * iSCSI template entry points */ -static int qla4xxx_tgt_dscvr (enum iscsi_tgt_dscvr type,uint32_t host_no, -uint32_t enable,struct sockaddr *dst_addr); +static int qla4xxx_tgt_dscvr (struct Scsi_Host *shost, +enum iscsi_tgt_dscvr type,uint32_t enable, +struct sockaddr *dst_addr);static int qla4xxx_conn_get_param (struct iscsi_cls_conn *conn,enum iscsi_param param,char *buf); static int qla4xxx_sess_get_param(struct iscsi_cls_session *sess,
@@ -243,21 +244,15 @@ static int qla4xxx_conn_get_param(structreturn len; } -static int qla4xxx_tgt_dscvr (enum iscsi_tgt_dscvr type,uint32_t host_no, -uint32_t enable,struct sockaddr *dst_addr) +static int qla4xxx_tgt_dscvr (struct Scsi_Host *shost, +enum iscsi_tgt_dscvr type,uint32_t enable, +struct sockaddr *dst_addr) {struct scsi_qla_host *ha; -struct Scsi_Host *shost;struct sockaddr_in *addr;struct sockaddr_in6 *addr6;int ret =0 ; - shost =scsi_host_lookup (host_no); -if (IS_ERR (shost)) { -printk (KERN_ERR "Could not find host no %u\n" , host_no); -return -ENODEV ; - } - ha = (struct scsi_qla_host *) shost->hostdata;switch (type) {
@@ -281,8 +276,6 @@ static int qla4xxx_tgt_dscvr(enum iscsi_default : ret = -ENOSYS ; } - -scsi_host_put (shost);return ret; }
drivers/scsi/scsi_transport_iscsi.c +14 -3
@@ -945,15 +945,26 @@ static int iscsi_tgt_dscvr(struct iscsi_transport *transport, struct iscsi_uevent *ev) { + struct Scsi_Host *shost;struct sockaddr *dst_addr; +int err;if (!transport->tgt_dscvr)return -EINVAL ; + shost =scsi_host_lookup (ev->u.tgt_dscvr.host_no); +if (IS_ERR (shost)) { +printk (KERN_ERR "target discovery could not find host no %u\n" , + ev->u.tgt_dscvr.host_no); +return -ENODEV ; + } + + dst_addr = (struct sockaddr *)((char *)ev +sizeof (*ev)); -return transport->tgt_dscvr (ev->u.tgt_dscvr.type, - ev->u.tgt_dscvr.host_no, - ev->u.tgt_dscvr.enable, dst_addr); + err = transport->tgt_dscvr (shost, ev->u.tgt_dscvr.type, + ev->u.tgt_dscvr.enable, dst_addr); +scsi_host_put (shost); +return err; } static int
include/scsi/scsi_transport_iscsi.h +1 -1
@@ -127,7 +127,7 @@ struct iscsi_transport { uint64_t *ep_handle);int (*ep_poll) (uint64_t ep_handle,int timeout_ms);void (*ep_disconnect) (uint64_t ep_handle); -int (*tgt_dscvr) (enum iscsi_tgt_dscvr type,uint32_t host_no, +int (*tgt_dscvr) (struct Scsi_Host *shost,enum iscsi_tgt_dscvr type,uint32_t enable,struct sockaddr *dst_addr); };
Signature · 1 line
1.4.1.1
PATCH 5/19 iscsi class: add iscsi host set param event
From: Mike Christie <[email protected]>
The iscsi class uses the set_param event to set session and connection params. This patch adds a set_host_param so we can set host level values.
--- drivers/scsi/scsi_transport_iscsi.c | 29 ++++++++++++++++++++++++++++- include/scsi/iscsi_if.h | 6 ++++++ include/scsi/scsi_transport_iscsi.h | 3 +++ 3 files changed, 37 insertions(+), 1 deletions(-)
drivers/scsi/scsi_transport_iscsi.c +28 -1
@@ -968,6 +968,30 @@ iscsi_tgt_dscvr(struct iscsi_transport * }static int +iscsi_set_host_param (struct iscsi_transport *transport, +struct iscsi_uevent *ev) +{ +char *data = (char *)ev +sizeof (*ev); +struct Scsi_Host *shost; +int err; + +if (!transport->set_host_param) +return -ENOSYS ; + + shost =scsi_host_lookup (ev->u.set_host_param.host_no); +if (IS_ERR (shost)) { +printk (KERN_ERR "set_host_param could not find host no %u\n" , + ev->u.set_host_param.host_no); +return -ENODEV ; + } + + err = transport->set_host_param (shost, ev->u.set_host_param.param, + data, ev->u.set_host_param.len); +scsi_host_put (shost); +return err; +} + +static int iscsi_if_recv_msg (struct sk_buff *skb,struct nlmsghdr *nlh) {int err =0 ;
@@ -1058,8 +1082,11 @@ iscsi_if_recv_msg(struct sk_buff *skb, scase ISCSI_UEVENT_TGT_DSCVR : err =iscsi_tgt_dscvr (transport, ev);break ; +case ISCSI_UEVENT_SET_HOST_PARAM : + err =iscsi_set_host_param (transport, ev); +break ;default : - err = -EINVAL ; + err = -ENOSYS ;break ; }
include/scsi/iscsi_if.h +6 -0
@@ -48,6 +48,7 @@ enum iscsi_uevent_e {ISCSI_UEVENT_TRANSPORT_EP_DISCONNECT =UEVENT_BASE +14 ,ISCSI_UEVENT_TGT_DSCVR =UEVENT_BASE +15 , +ISCSI_UEVENT_SET_HOST_PARAM =UEVENT_BASE +16 ,/* up events */ ISCSI_KEVENT_RECV_PDU = KEVENT_BASE + 1,
@@ -136,6 +137,11 @@ struct iscsi_uevent {*/ uint32_t enable; } tgt_dscvr; +struct msg_set_host_param { +uint32_t host_no; +uint32_t param;/* enum iscsi_host_param */ +uint32_t len; + } set_host_param; } u;union {/* messages k -> u */
include/scsi/scsi_transport_iscsi.h +3 -0
@@ -108,6 +108,9 @@ struct iscsi_transport { enum iscsi_param param, char *buf);int (*get_host_param) (struct Scsi_Host *shost,enum iscsi_host_param param,char *buf); +int (*set_host_param) (struct Scsi_Host *shost, +enum iscsi_host_param param,char *buf, +int buflen);int (*send_pdu) (struct iscsi_cls_conn *conn,struct iscsi_hdr *hdr,char *data,uint32_t data_size); void (*get_stats) (struct iscsi_cls_conn *conn,
Signature · 1 line
1.4.1.1
PATCH 6/19 libiscsi, iscsi_tcp, ib_iser : add sw iscsi host get/set params helpers
From: Mike Christie <[email protected]>
iscsid and udev need to key off the hw address being used so add some helpers for iser and iscsi tcp.
Also convert them.
--- drivers/infiniband/ulp/iser/iscsi_iser.c | 4 +++ drivers/scsi/iscsi_tcp.c | 4 +++ drivers/scsi/libiscsi.c | 40 ++++++++++++++++++++++++++++++ include/scsi/libiscsi.h | 13 +++++++++- 4 files changed, 60 insertions(+), 1 deletions(-)
drivers/infiniband/ulp/iser/iscsi_iser.c +4 -0
@@ -576,6 +576,7 @@ static struct iscsi_transport iscsi_iserISCSI_PERSISTENT_ADDRESS |ISCSI_TARGET_NAME | ISCSI_TPGT, + .host_param_mask = ISCSI_HOST_HWADDRESS, .host_template = &iscsi_iser_sht, .conndata_size = sizeof(struct iscsi_conn), .max_lun = ISCSI_ISER_MAX_LUN,
@@ -592,6 +593,9 @@ static struct iscsi_transport iscsi_iser .get_session_param = iscsi_session_get_param, .start_conn = iscsi_iser_conn_start, .stop_conn = iscsi_conn_stop, +/* iscsi host params */ + .get_host_param = iscsi_host_get_param, + .set_host_param = iscsi_host_set_param,/* IO */ .send_pdu = iscsi_conn_send_pdu, .get_stats = iscsi_iser_conn_get_stats,
drivers/scsi/iscsi_tcp.c +4 -0
@@ -2181,6 +2181,7 @@ static struct iscsi_transport iscsi_tcp_ISCSI_PERSISTENT_ADDRESS |ISCSI_TARGET_NAME | ISCSI_TPGT, + .host_param_mask = ISCSI_HOST_HWADDRESS, .host_template = &iscsi_sht, .conndata_size = sizeof(struct iscsi_conn), .max_conn = 1,
@@ -2197,6 +2198,9 @@ static struct iscsi_transport iscsi_tcp_ .get_session_param = iscsi_session_get_param, .start_conn = iscsi_conn_start, .stop_conn = iscsi_tcp_conn_stop, +/* iscsi host params */ + .get_host_param = iscsi_host_get_param, + .set_host_param = iscsi_host_set_param,/* IO */ .send_pdu = iscsi_conn_send_pdu, .get_stats = iscsi_conn_get_stats,
drivers/scsi/libiscsi.c +40 -0
@@ -1462,6 +1462,7 @@ void iscsi_session_teardown(struct iscsiiscsi_pool_free (&session->cmdpool, (void **)session->cmds);kfree (session->targetname); +kfree (session->hwaddress);iscsi_destroy_session (cls_session);scsi_host_put (shost);
@@ -1990,6 +1991,45 @@ int iscsi_conn_get_param(struct iscsi_cl }EXPORT_SYMBOL_GPL (iscsi_conn_get_param); +int iscsi_host_get_param (struct Scsi_Host *shost,enum iscsi_host_param param, +char *buf) +{ +struct iscsi_session *session =iscsi_hostdata (shost->hostdata); +int len; + +switch (param) { +case ISCSI_HOST_PARAM_HWADDRESS : +if (!session->hwaddress) + len =sprintf (buf,"%s\n" ,"default" ); +else + len =sprintf (buf,"%s\n" , session->hwaddress); +break ; +default : +return -ENOSYS ; + } + +return len; +} +EXPORT_SYMBOL_GPL (iscsi_host_get_param); + +int iscsi_host_set_param (struct Scsi_Host *shost,enum iscsi_host_param param, +char *buf,int buflen) +{ +struct iscsi_session *session =iscsi_hostdata (shost->hostdata); + +switch (param) { +case ISCSI_HOST_PARAM_HWADDRESS : +if (!session->hwaddress) + session->hwaddress =kstrdup (buf,GFP_KERNEL ); +break ; +default : +return -ENOSYS ; + } + +return 0 ; +} +EXPORT_SYMBOL_GPL (iscsi_host_set_param); +MODULE_AUTHOR ("Mike Christie" );MODULE_DESCRIPTION ("iSCSI library functions" );MODULE_LICENSE ("GPL" );
include/scsi/libiscsi.h +12 -1
@@ -224,7 +224,8 @@ struct iscsi_session {int erl;int tpgt;char *targetname; - +/* hw address being used for iscsi connection */ +char *hwaddress;/* control data */ struct iscsi_transport *tt;struct Scsi_Host *host;
@@ -255,6 +256,16 @@ extern int iscsi_eh_host_reset(struct scextern int iscsi_queuecommand (struct scsi_cmnd *sc,void (*done)(struct scsi_cmnd *)); + +/* +* iSCSI host helpers. +*/ +extern int iscsi_host_set_param (struct Scsi_Host *shost, +enum iscsi_host_param param,char *buf, +int buflen); +extern int iscsi_host_get_param (struct Scsi_Host *shost, +enum iscsi_host_param param,char *buf); +/* * session management */
Signature · 1 line
1.4.1.1
PATCH 7/19 iscsi class, qla4xxx, iscsi_tcp, ib_iser: export/set initiator name
From: Mike Christie <[email protected]>
For iscsi root boot, software iscsi needs to know what the BIOS/OF initiator used for the initiator name so this puts it in sysfs for userspace to be able to pick up.
For hw iscsi, it is nice to see what the card is using.
This patch adds the new param, and hooks in qla4xxx, iscsi_tcp, and ib_iser.
--- drivers/infiniband/ulp/iser/iscsi_iser.c | 3 ++- drivers/scsi/iscsi_tcp.c | 3 ++- drivers/scsi/libiscsi.c | 12 ++++++++++++ drivers/scsi/qla4xxx/ql4_os.c | 6 +++++- drivers/scsi/scsi_transport_iscsi.c | 4 +++- include/scsi/iscsi_if.h | 2 ++ include/scsi/libiscsi.h | 1 + 7 files changed, 27 insertions(+), 4 deletions(-)
drivers/infiniband/ulp/iser/iscsi_iser.c +2 -1
@@ -576,7 +576,8 @@ static struct iscsi_transport iscsi_iserISCSI_PERSISTENT_ADDRESS |ISCSI_TARGET_NAME | ISCSI_TPGT, - .host_param_mask = ISCSI_HOST_HWADDRESS, + .host_param_mask =ISCSI_HOST_HWADDRESS | + ISCSI_HOST_INITIATOR_NAME, .host_template = &iscsi_iser_sht, .conndata_size = sizeof(struct iscsi_conn), .max_lun = ISCSI_ISER_MAX_LUN,
drivers/scsi/iscsi_tcp.c +2 -1
@@ -2181,7 +2181,8 @@ static struct iscsi_transport iscsi_tcp_ISCSI_PERSISTENT_ADDRESS |ISCSI_TARGET_NAME | ISCSI_TPGT, - .host_param_mask = ISCSI_HOST_HWADDRESS, + .host_param_mask =ISCSI_HOST_HWADDRESS | + ISCSI_HOST_INITIATOR_NAME, .host_template = &iscsi_sht, .conndata_size = sizeof(struct iscsi_conn), .max_conn = 1,
drivers/scsi/libiscsi.c +12 -0
@@ -1463,6 +1463,7 @@ void iscsi_session_teardown(struct iscsikfree (session->targetname);kfree (session->hwaddress); +kfree (session->initiatorname);iscsi_destroy_session (cls_session);scsi_host_put (shost);
@@ -2004,6 +2005,13 @@ int iscsi_host_get_param(struct Scsi_Hoselse len =sprintf (buf,"%s\n" , session->hwaddress);break ; +case ISCSI_HOST_PARAM_INITIATOR_NAME : +if (!session->initiatorname) + len =sprintf (buf,"%s\n" ,"unknown" ); +else + len =sprintf (buf,"%s\n" , session->initiatorname); +break ; +default :return -ENOSYS ; }
@@ -2022,6 +2030,10 @@ int iscsi_host_set_param(struct Scsi_Hosif (!session->hwaddress) session->hwaddress =kstrdup (buf,GFP_KERNEL );break ; +case ISCSI_HOST_PARAM_INITIATOR_NAME : +if (!session->initiatorname) + session->initiatorname =kstrdup (buf,GFP_KERNEL ); +break ;default :return -ENOSYS ; }
drivers/scsi/qla4xxx/ql4_os.c +5 -1
@@ -104,7 +104,8 @@ static struct iscsi_transport qla4xxx_is .name = DRIVER_NAME, .param_mask =ISCSI_CONN_PORT |ISCSI_CONN_ADDRESS | ISCSI_TARGET_NAME | ISCSI_TPGT, - .host_param_mask = ISCSI_HOST_HWADDRESS, + .host_param_mask =ISCSI_HOST_HWADDRESS | + ISCSI_HOST_INITIATOR_NAME, .sessiondata_size = sizeof(struct ddb_entry), .host_template = &qla4xxx_driver_template,
@@ -190,6 +191,9 @@ static int qla4xxx_host_get_param(structcase ISCSI_HOST_PARAM_HWADDRESS : len =format_addr (buf, ha->my_mac,MAC_ADDR_LEN );break ; +case ISCSI_HOST_PARAM_INITIATOR_NAME : + len =sprintf (buf, ha->name_string); +break ;default :return -ENOSYS ; }
drivers/scsi/scsi_transport_iscsi.c +3 -1
@@ -32,7 +32,7 @@ #include <scsi/iscsi_if.h>#define ISCSI_SESSION_ATTRS 11#define ISCSI_CONN_ATTRS 11 -#define ISCSI_HOST_ATTRS 1 +#define ISCSI_HOST_ATTRS 2#define ISCSI_TRANSPORT_VERSION "2.0-724"struct iscsi_internal {
@@ -1253,6 +1253,7 @@ static ISCSI_CLASS_ATTR(host, field, S_I NULL);iscsi_host_attr (hwaddress,ISCSI_HOST_PARAM_HWADDRESS ); +iscsi_host_attr (initiatorname,ISCSI_HOST_PARAM_INITIATOR_NAME );#define SETUP_PRIV_SESSION_RD_ATTR (field) \ do { \
@@ -1389,6 +1390,7 @@ iscsi_register_transport(struct iscsi_trtransport_container_register (&priv->t.host_attrs);SETUP_HOST_RD_ATTR (hwaddress,ISCSI_HOST_HWADDRESS ); +SETUP_HOST_RD_ATTR (initiatorname,ISCSI_HOST_INITIATOR_NAME );BUG_ON (count >ISCSI_HOST_ATTRS ); priv->host_attrs[count] =NULL ; count =0 ;
include/scsi/iscsi_if.h +2 -0
@@ -259,10 +259,12 @@ #define ISCSI_CONN_ADDRESS (1 << ISCSI_/* iSCSI HBA params */ enum iscsi_host_param {ISCSI_HOST_PARAM_HWADDRESS , +ISCSI_HOST_PARAM_INITIATOR_NAME ,ISCSI_HOST_PARAM_MAX , };#define ISCSI_HOST_HWADDRESS (1 << ISCSI_HOST_PARAM_HWADDRESS) +#define ISCSI_HOST_INITIATOR_NAME (1 << ISCSI_HOST_PARAM_INITIATOR_NAME)#define iscsi_ptr (_handle) ((void*)(unsigned long)_handle)#define iscsi_handle (_ptr) ((uint64_t)(unsigned long)_ptr)
include/scsi/libiscsi.h +1 -0
@@ -224,6 +224,7 @@ struct iscsi_session {int erl;int tpgt;char *targetname; +char *initiatorname;/* hw address being used for iscsi connection */ char *hwaddress;/* control data */
Signature · 1 line
1.4.1.1
PATCH 8/19 iscsi: Some fixes in preparation for bidirectional support - exp_datasn
From: Mike Christie <[email protected]>
This patch fixes handling of expected datasn/r2tsn as received from target. It is done according to: T10 rfc3720 section 3.2.2.3. Data Sequencing.
. unify expected datasn/r2tsn into one counter
. calculate than check expected datasn/r2tsn. On error print a message
and fail the request. (TODO use iscsi retransmits)
. remove the FIXME ;)
. avoid zero length memset
--- drivers/scsi/iscsi_tcp.c | 18 +++++++++++------- drivers/scsi/iscsi_tcp.h | 2 +- drivers/scsi/libiscsi.c | 5 +++-- include/scsi/libiscsi.h | 1 - 4 files changed, 15 insertions(+), 11 deletions(-)
drivers/scsi/iscsi_tcp.c +11 -7
@@ -229,10 +229,13 @@ iscsi_data_rsp(struct iscsi_conn *conn,if (tcp_conn->in.datalen ==0 )return 0 ; -if (ctask->datasn != datasn) +if (tcp_ctask->exp_datasn != datasn) { +debug_tcp ("%s: ctask->exp_datasn(%d) != rhdr->datasn(%d)\n" , + __FUNCTION__, tcp_ctask->exp_datasn, datasn);return ISCSI_ERR_DATASN ; + } - ctask->datasn++; + tcp_ctask->exp_datasn++; tcp_ctask->data_offset =be32_to_cpu (rhdr->offset);if (tcp_ctask->data_offset + tcp_conn->in.datalen > ctask->total_length)
@@ -365,15 +368,16 @@ iscsi_r2t_rsp(struct iscsi_conn *conn, sreturn ISCSI_ERR_DATALEN ; } -if (tcp_ctask->exp_r2tsn && tcp_ctask->exp_r2tsn != r2tsn) +if (tcp_ctask->exp_datasn != r2tsn){ +debug_tcp ("%s: ctask->exp_datasn(%d) != rhdr->r2tsn(%d)\n" , + __FUNCTION__, tcp_ctask->exp_datasn, r2tsn);return ISCSI_ERR_R2TSN ; + } rc =iscsi_check_assign_cmdsn (session, (struct iscsi_nopin *)rhdr);if (rc)return rc; -/* FIXME: use R2TSN to detect missing R2T */ -/* fill-in new R2T associated with the task */ spin_lock (&session->lock); if (!ctask->sc || ctask->mtask ||
@@ -414,7 +418,7 @@ iscsi_r2t_rsp(struct iscsi_conn *conn, siscsi_solicit_data_init (conn, ctask, r2t); - tcp_ctask->exp_r2tsn = r2tsn +1 ; + tcp_ctask->exp_datasn = r2tsn +1 ;__kfifo_put (tcp_ctask->r2tqueue, (void *)&r2t,sizeof (void *)); tcp_ctask->xmstate |=XMSTATE_SOL_HDR ;list_move_tail (&ctask->running, &conn->xmitqueue);
@@ -1284,10 +1288,10 @@ iscsi_tcp_cmd_init(struct iscsi_cmd_task tcp_ctask->sent =0 ; tcp_ctask->sg_count =0 ; + tcp_ctask->exp_datasn =0 ;if (sc->sc_data_direction ==DMA_TO_DEVICE ) { tcp_ctask->xmstate =XMSTATE_W_HDR ; - tcp_ctask->exp_r2tsn =0 ;BUG_ON (ctask->total_length ==0 );if (sc->use_sg) {
drivers/scsi/iscsi_tcp.h +1 -1
@@ -152,7 +152,7 @@ struct iscsi_tcp_cmd_task {struct scatterlist *sg;/* per-cmd SG list */ struct scatterlist *bad_sg;/* assert statement */ int sg_count;/* SG's to process */ -uint32_t exp_r2tsn; +uint32_t exp_datasn;/* expected target's R2TSN/DataSN */ int data_offset;struct iscsi_r2t_info *r2t;/* in progress R2T */ struct iscsi_queue r2tpool;
drivers/scsi/libiscsi.c +3 -2
@@ -120,7 +120,9 @@ static void iscsi_prep_scsi_cmd_pdu(stru session->cmdsn++; hdr->exp_statsn =cpu_to_be32 (conn->exp_statsn);memcpy (hdr->cdb, sc->cmnd, sc->cmd_len); -memset (&hdr->cdb[sc->cmd_len],0 ,MAX_COMMAND_SIZE - sc->cmd_len); +if (sc->cmd_len <MAX_COMMAND_SIZE ) +memset (&hdr->cdb[sc->cmd_len],0 , +MAX_COMMAND_SIZE - sc->cmd_len); ctask->data_count =0 ;if (sc->sc_data_direction ==DMA_TO_DEVICE ) {
@@ -165,7 +167,6 @@ static void iscsi_prep_scsi_cmd_pdu(stru/* No unsolicit Data-Out's */ ctask->hdr->flags |=ISCSI_FLAG_CMD_FINAL ; }else { - ctask->datasn =0 ; hdr->flags |=ISCSI_FLAG_CMD_FINAL ;zero_data (hdr->dlength);
include/scsi/libiscsi.h +0 -1
@@ -99,7 +99,6 @@ struct iscsi_cmd_task {*/ struct iscsi_cmd *hdr;int itt;/* this ITT */ -int datasn;/* DataSN */ uint32_t unsol_datasn;int imm_count;/* imm-data (bytes) */
Signature · 1 line
1.4.1.1
PATCH 9/19 iscsi: Some fixes in preparation for bidirectional support - total_length
From: Mike Christie <[email protected]>
- Remove shadow of request length from struct iscsi_cmd_task.
- change all users to use scsi_cmnd->request_bufflen directly
(With bidi we will use scsi-ml API to retrieve in/out length)
--- drivers/infiniband/ulp/iser/iscsi_iser.c | 4 ++-- drivers/scsi/iscsi_tcp.c | 21 ++++++++++++--------- drivers/scsi/libiscsi.c | 9 ++++----- include/scsi/libiscsi.h | 21 ++++++++++----------- 4 files changed, 28 insertions(+), 27 deletions(-)
drivers/infiniband/ulp/iser/iscsi_iser.c +2 -2
@@ -140,10 +140,10 @@ iscsi_iser_cmd_init(struct iscsi_cmd_tas iser_ctask->iser_conn = iser_conn;if (sc->sc_data_direction ==DMA_TO_DEVICE ) { -BUG_ON (ctask->total_length ==0 ); +BUG_ON (sc->request_bufflen ==0 );debug_scsi ("cmd [itt %x total %d imm %d unsol_data %d\n" , - ctask->itt, ctask->total_length, ctask->imm_count, + ctask->itt, sc->request_bufflen, ctask->imm_count, ctask->unsol_count); }
drivers/scsi/iscsi_tcp.c +12 -9
@@ -216,6 +216,7 @@ iscsi_data_rsp(struct iscsi_conn *conn,struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;struct iscsi_data_rsp *rhdr = (struct iscsi_data_rsp *)tcp_conn->in.hdr;struct iscsi_session *session = conn->session; +struct scsi_cmnd *sc = ctask->sc;int datasn =be32_to_cpu (rhdr->datasn); rc =iscsi_check_assign_cmdsn (session, (struct iscsi_nopin *)rhdr);
@@ -238,12 +239,14 @@ iscsi_data_rsp(struct iscsi_conn *conn, tcp_ctask->exp_datasn++; tcp_ctask->data_offset =be32_to_cpu (rhdr->offset); -if (tcp_ctask->data_offset + tcp_conn->in.datalen > ctask->total_length) +if (tcp_ctask->data_offset + tcp_conn->in.datalen > sc->request_bufflen) { +debug_tcp ("%s: data_offset(%d) + data_len(%d) > total_length_in(%d)\n" , + __FUNCTION__, tcp_ctask->data_offset, + tcp_conn->in.datalen, sc->request_bufflen);return ISCSI_ERR_DATA_OFFSET ; + }if (rhdr->flags &ISCSI_FLAG_DATA_STATUS ) { -struct scsi_cmnd *sc = ctask->sc; - conn->exp_statsn =be32_to_cpu (rhdr->statsn) +1 ;if (rhdr->flags &ISCSI_FLAG_DATA_UNDERFLOW ) {int res_count =be32_to_cpu (rhdr->residual_count);
@@ -405,11 +408,11 @@ iscsi_r2t_rsp(struct iscsi_conn *conn, s r2t->data_length, session->max_burst); r2t->data_offset =be32_to_cpu (rhdr->data_offset); -if (r2t->data_offset + r2t->data_length > ctask->total_length) { +if (r2t->data_offset + r2t->data_length > ctask->sc->request_bufflen) {spin_unlock (&session->lock);printk (KERN_ERR "iscsi_tcp: invalid R2T with data len %u at " "offset %u and total length %d\n" , r2t->data_length, - r2t->data_offset, ctask->total_length); + r2t->data_offset, ctask->sc->request_bufflen);return ISCSI_ERR_DATALEN ; }
@@ -604,7 +607,7 @@ iscsi_ctask_copy(struct iscsi_tcp_conn * {struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;int buf_left = buf_size - (tcp_conn->data_copied + offset); -int size =min (tcp_conn->in.copy, buf_left); +unsigned size =min (tcp_conn->in.copy, buf_left);int rc; size =min (size, ctask->data_count);
@@ -613,7 +616,7 @@ iscsi_ctask_copy(struct iscsi_tcp_conn * size, tcp_conn->in.offset, tcp_conn->in.copied);BUG_ON (size <=0 ); -BUG_ON (tcp_ctask->sent + size > ctask->total_length); +BUG_ON (tcp_ctask->sent + size > ctask->sc->request_bufflen); rc =skb_copy_bits (tcp_conn->in.skb, tcp_conn->in.offset, (char *)buf + (offset + tcp_conn->data_copied), size);
@@ -1292,7 +1295,7 @@ iscsi_tcp_cmd_init(struct iscsi_cmd_taskif (sc->sc_data_direction ==DMA_TO_DEVICE ) { tcp_ctask->xmstate =XMSTATE_W_HDR ; -BUG_ON (ctask->total_length ==0 ); +BUG_ON (sc->request_bufflen ==0 );if (sc->use_sg) {struct scatterlist *sg = sc->request_buffer;
@@ -1309,7 +1312,7 @@ iscsi_tcp_cmd_init(struct iscsi_cmd_task }debug_scsi ("cmd [itt 0x%x total %d imm_data %d " "unsol count %d, unsol offset %d]\n" , - ctask->itt, ctask->total_length, ctask->imm_count, + ctask->itt, sc->request_bufflen, ctask->imm_count, ctask->unsol_count, ctask->unsol_offset); }else tcp_ctask->xmstate =XMSTATE_R_HDR ;
drivers/scsi/libiscsi.c +4 -5
@@ -147,19 +147,19 @@ static void iscsi_prep_scsi_cmd_pdu(stru ctask->unsol_datasn =0 ;if (session->imm_data_en) { -if (ctask->total_length >= session->first_burst) +if (sc->request_bufflen >= session->first_burst) ctask->imm_count =min (session->first_burst, conn->max_xmit_dlength);else - ctask->imm_count =min (ctask->total_length, + ctask->imm_count =min (sc->request_bufflen, conn->max_xmit_dlength);hton24 (ctask->hdr->dlength, ctask->imm_count); }else zero_data (ctask->hdr->dlength);if (!session->initial_r2t_en) { - ctask->unsol_count =min (session->first_burst, - ctask->total_length) - ctask->imm_count; + ctask->unsol_count =min ((session->first_burst), + (sc->request_bufflen)) - ctask->imm_count; ctask->unsol_offset = ctask->imm_count; }
@@ -815,7 +815,6 @@ int iscsi_queuecommand(struct scsi_cmnd ctask->conn = conn; ctask->sc = sc;INIT_LIST_HEAD (&ctask->running); - ctask->total_length = sc->request_bufflen;iscsi_prep_scsi_cmd_pdu (ctask); session->tt->init_cmd_task (ctask);
include/scsi/libiscsi.h +10 -11
@@ -80,7 +80,7 @@ struct iscsi_mgmt_task {*/ struct iscsi_hdr *hdr;char *data;/* mgmt payload */ -int data_count;/* counts data to be sent */ +unsigned data_count;/* counts data to be sent */ uint32_t itt;/* this ITT */ void *dd_data;/* driver/transport data */ struct list_head running;
@@ -101,13 +101,12 @@ struct iscsi_cmd_task {int itt;/* this ITT */ uint32_t unsol_datasn; -int imm_count;/* imm-data (bytes) */ -int unsol_count;/* unsolicited (bytes)*/ +unsigned imm_count;/* imm-data (bytes) */ +unsigned unsol_count;/* unsolicited (bytes)*/ /* offset in unsolicited stream (bytes); */ -int unsol_offset; -int data_count;/* remaining Data-Out */ +unsigned unsol_offset; +unsigned data_count;/* remaining Data-Out */ struct scsi_cmnd *sc;/* associated SCSI cmd*/ -int total_length;struct iscsi_conn *conn;/* used connection */ struct iscsi_mgmt_task *mtask;/* tmf mtask in progr */
@@ -173,8 +172,8 @@ struct iscsi_conn {int tmabort_state;/* see TMABORT_INITIAL, etc.*/ /* negotiated params */ -int max_recv_dlength;/* initiator_max_recv_dsl*/ -int max_xmit_dlength;/* target_max_recv_dsl */ +unsigned max_recv_dlength;/* initiator_max_recv_dsl*/ +unsigned max_xmit_dlength;/* target_max_recv_dsl */ int hdrdgst_en;int datadgst_en;int ifmarker_en;
@@ -212,10 +211,10 @@ struct iscsi_session {/* configuration */ int initial_r2t_en; -int max_r2t; +unsigned max_r2t;int imm_data_en; -int first_burst; -int max_burst; +unsigned first_burst; +unsigned max_burst;int time2wait;int time2retain;int pdu_inorder_en;
Signature · 1 line
1.4.1.1
PATCH 10/19 iscsi class, iscsi_tcp, ib_iser: add sysfs chap file
From: Mike Christie <[email protected]>
The attached patches add sysfs files for the chap settings to the iscsi transport class, iscsi_tcp and ib_iser. This is needed for software iscsi because there are times when iscsid can die and it will need to reread the values it was using. And it is needed by qla4xxx for basic management opertaions. This patch does not hook in qla4xxx yet, because I am not sure the mbx command to use.
--- drivers/infiniband/ulp/iser/iscsi_iser.c | 5 ++-- drivers/scsi/iscsi_tcp.c | 5 ++-- drivers/scsi/libiscsi.c | 40 ++++++++++++++++++++++++++++++ drivers/scsi/scsi_transport_iscsi.c | 39 +++++++++++++++++++---------- include/scsi/iscsi_if.h | 9 +++++++ include/scsi/libiscsi.h | 4 +++ 6 files changed, 84 insertions(+), 18 deletions(-)
drivers/infiniband/ulp/iser/iscsi_iser.c +3 -2
@@ -574,8 +574,9 @@ static struct iscsi_transport iscsi_iserISCSI_EXP_STATSN |ISCSI_PERSISTENT_PORT |ISCSI_PERSISTENT_ADDRESS | -ISCSI_TARGET_NAME | - ISCSI_TPGT, +ISCSI_TARGET_NAME |ISCSI_TPGT | +ISCSI_USERNAME |ISCSI_PASSWORD | + ISCSI_USERNAME_IN | ISCSI_PASSWORD_IN, .host_param_mask =ISCSI_HOST_HWADDRESS | ISCSI_HOST_INITIATOR_NAME, .host_template = &iscsi_iser_sht,
drivers/scsi/iscsi_tcp.c +3 -2
@@ -2186,8 +2186,9 @@ static struct iscsi_transport iscsi_tcp_ISCSI_EXP_STATSN |ISCSI_PERSISTENT_PORT |ISCSI_PERSISTENT_ADDRESS | -ISCSI_TARGET_NAME | - ISCSI_TPGT, +ISCSI_TARGET_NAME |ISCSI_TPGT | +ISCSI_USERNAME |ISCSI_PASSWORD | + ISCSI_USERNAME_IN | ISCSI_PASSWORD_IN, .host_param_mask =ISCSI_HOST_HWADDRESS | ISCSI_HOST_INITIATOR_NAME, .host_template = &iscsi_sht,
drivers/scsi/libiscsi.c +40 -0
@@ -1461,6 +1461,10 @@ void iscsi_session_teardown(struct iscsiiscsi_pool_free (&session->mgmtpool, (void **)session->mgmt_cmds);iscsi_pool_free (&session->cmdpool, (void **)session->cmds); +kfree (session->password); +kfree (session->password_in); +kfree (session->username); +kfree (session->username_in);kfree (session->targetname);kfree (session->hwaddress);kfree (session->initiatorname);
@@ -1869,6 +1873,30 @@ int iscsi_set_param(struct iscsi_cls_concase ISCSI_PARAM_EXP_STATSN :sscanf (buf,"%u" , &conn->exp_statsn);break ; +case ISCSI_PARAM_USERNAME : +kfree (session->username); + session->username =kstrdup (buf,GFP_KERNEL ); +if (!session->username) +return -ENOMEM ; +break ; +case ISCSI_PARAM_USERNAME_IN : +kfree (session->username_in); + session->username_in =kstrdup (buf,GFP_KERNEL ); +if (!session->username_in) +return -ENOMEM ; +break ; +case ISCSI_PARAM_PASSWORD : +kfree (session->password); + session->password =kstrdup (buf,GFP_KERNEL ); +if (!session->password) +return -ENOMEM ; +break ; +case ISCSI_PARAM_PASSWORD_IN : +kfree (session->password_in); + session->password_in =kstrdup (buf,GFP_KERNEL ); +if (!session->password_in) +return -ENOMEM ; +break ;case ISCSI_PARAM_TARGET_NAME :/* this should not change between logins */ if (session->targetname)
@@ -1942,6 +1970,18 @@ int iscsi_session_get_param(struct iscsicase ISCSI_PARAM_TPGT : len =sprintf (buf,"%d\n" , session->tpgt);break ; +case ISCSI_PARAM_USERNAME : + len =sprintf (buf,"%s\n" , session->username); +break ; +case ISCSI_PARAM_USERNAME_IN : + len =sprintf (buf,"%s\n" , session->username_in); +break ; +case ISCSI_PARAM_PASSWORD : + len =sprintf (buf,"%s\n" , session->password); +break ; +case ISCSI_PARAM_PASSWORD_IN : + len =sprintf (buf,"%s\n" , session->password_in); +break ;default :return -ENOSYS ; }
drivers/scsi/scsi_transport_iscsi.c +25 -14
@@ -30,7 +30,7 @@ #include <scsi/scsi_transport.h>#include <scsi/scsi_transport_iscsi.h> #include <scsi/iscsi_if.h> -#define ISCSI_SESSION_ATTRS 11 +#define ISCSI_SESSION_ATTRS 15#define ISCSI_CONN_ATTRS 11#define ISCSI_HOST_ATTRS 2#define ISCSI_TRANSPORT_VERSION "2.0-724"
@@ -1196,30 +1196,37 @@ #define iscsi_cdev_to_session(_cdev) \/* * iSCSI session attrs */ -#define iscsi_session_attr_show (param) \ +#define iscsi_session_attr_show (param, perm) \ static ssize_t \ show_session_param_##param(struct class_device *cdev, char *buf) \ { \ struct iscsi_cls_session *session = iscsi_cdev_to_session(cdev); \ struct iscsi_transport *t = session->transport; \ + \ + if (perm && !capable(CAP_SYS_ADMIN)) \ + return -EACCES; \ return t->get_session_param(session, param, buf); \ } -#define iscsi_session_attr (field, param) \ - iscsi_session_attr_show(param) \ +#define iscsi_session_attr (field, param, perm) \ + iscsi_session_attr_show(param, perm) \ static ISCSI_CLASS_ATTR(sess, field, S_IRUGO, show_session_param_##param, \ NULL); -iscsi_session_attr (targetname,ISCSI_PARAM_TARGET_NAME ); -iscsi_session_attr (initial_r2t,ISCSI_PARAM_INITIAL_R2T_EN ); -iscsi_session_attr (max_outstanding_r2t,ISCSI_PARAM_MAX_R2T ); -iscsi_session_attr (immediate_data,ISCSI_PARAM_IMM_DATA_EN ); -iscsi_session_attr (first_burst_len,ISCSI_PARAM_FIRST_BURST ); -iscsi_session_attr (max_burst_len,ISCSI_PARAM_MAX_BURST ); -iscsi_session_attr (data_pdu_in_order,ISCSI_PARAM_PDU_INORDER_EN ); -iscsi_session_attr (data_seq_in_order,ISCSI_PARAM_DATASEQ_INORDER_EN ); -iscsi_session_attr (erl,ISCSI_PARAM_ERL ); -iscsi_session_attr (tpgt,ISCSI_PARAM_TPGT ); +iscsi_session_attr (targetname,ISCSI_PARAM_TARGET_NAME ,0 ); +iscsi_session_attr (initial_r2t,ISCSI_PARAM_INITIAL_R2T_EN ,0 ); +iscsi_session_attr (max_outstanding_r2t,ISCSI_PARAM_MAX_R2T ,0 ); +iscsi_session_attr (immediate_data,ISCSI_PARAM_IMM_DATA_EN ,0 ); +iscsi_session_attr (first_burst_len,ISCSI_PARAM_FIRST_BURST ,0 ); +iscsi_session_attr (max_burst_len,ISCSI_PARAM_MAX_BURST ,0 ); +iscsi_session_attr (data_pdu_in_order,ISCSI_PARAM_PDU_INORDER_EN ,0 ); +iscsi_session_attr (data_seq_in_order,ISCSI_PARAM_DATASEQ_INORDER_EN ,0 ); +iscsi_session_attr (erl,ISCSI_PARAM_ERL ,0 ); +iscsi_session_attr (tpgt,ISCSI_PARAM_TPGT ,0 ); +iscsi_session_attr (username,ISCSI_PARAM_USERNAME ,1 ); +iscsi_session_attr (username_in,ISCSI_PARAM_USERNAME_IN ,1 ); +iscsi_session_attr (password,ISCSI_PARAM_PASSWORD ,1 ); +iscsi_session_attr (password_in,ISCSI_PARAM_PASSWORD_IN ,1 );#define iscsi_priv_session_attr_show (field, format) \ static ssize_t \
@@ -1433,6 +1440,10 @@ iscsi_register_transport(struct iscsi_trSETUP_SESSION_RD_ATTR (erl,ISCSI_ERL );SETUP_SESSION_RD_ATTR (targetname,ISCSI_TARGET_NAME );SETUP_SESSION_RD_ATTR (tpgt,ISCSI_TPGT ); +SETUP_SESSION_RD_ATTR (password,ISCSI_USERNAME ); +SETUP_SESSION_RD_ATTR (password_in,ISCSI_USERNAME_IN ); +SETUP_SESSION_RD_ATTR (username,ISCSI_PASSWORD ); +SETUP_SESSION_RD_ATTR (username_in,ISCSI_PASSWORD_IN );SETUP_PRIV_SESSION_RD_ATTR (recovery_tmo);BUG_ON (count >ISCSI_SESSION_ATTRS );
include/scsi/iscsi_if.h +9 -0
@@ -229,6 +229,11 @@ enum iscsi_param {ISCSI_PARAM_CONN_PORT ,ISCSI_PARAM_CONN_ADDRESS , +ISCSI_PARAM_USERNAME , +ISCSI_PARAM_USERNAME_IN , +ISCSI_PARAM_PASSWORD , +ISCSI_PARAM_PASSWORD_IN , +/* must always be last */ ISCSI_PARAM_MAX, };
@@ -255,6 +260,10 @@ #define ISCSI_PERSISTENT_PORT (1 << ISC#define ISCSI_SESS_RECOVERY_TMO (1 << ISCSI_PARAM_SESS_RECOVERY_TMO)#define ISCSI_CONN_PORT (1 << ISCSI_PARAM_CONN_PORT)#define ISCSI_CONN_ADDRESS (1 << ISCSI_PARAM_CONN_ADDRESS) +#define ISCSI_USERNAME (1 << ISCSI_PARAM_USERNAME) +#define ISCSI_USERNAME_IN (1 << ISCSI_PARAM_USERNAME_IN) +#define ISCSI_PASSWORD (1 << ISCSI_PARAM_PASSWORD) +#define ISCSI_PASSWORD_IN (1 << ISCSI_PARAM_PASSWORD_IN)/* iSCSI HBA params */ enum iscsi_host_param {
include/scsi/libiscsi.h +4 -0
@@ -221,6 +221,10 @@ struct iscsi_session {int dataseq_inorder_en;int erl;int tpgt; +char *username; +char *username_in; +char *password; +char *password_in;char *targetname;char *initiatorname;/* hw address being used for iscsi connection */
Signature · 1 line
1.4.1.1
PATCH 11/19 iscsi tcp: fix iscsi xmit state machine
From: Mike Christie <[email protected]>
If iscsi_tcp partially sends a header, it would recalculate the header size and readd the size of the digest (if header digests are used).This would cause us to send sizeof(digest) extra bytes when we sent the rest of the header.
--- drivers/scsi/iscsi_tcp.c | 258 ++++++++++++++++++++++++++-------------------- drivers/scsi/iscsi_tcp.h | 6 + drivers/scsi/libiscsi.c | 2 3 files changed, 150 insertions(+), 116 deletions(-)
drivers/scsi/iscsi_tcp.c +145 -113
@@ -109,7 +109,7 @@ iscsi_hdr_digest(struct iscsi_conn *connstruct iscsi_tcp_conn *tcp_conn = conn->dd_data;crypto_hash_digest (&tcp_conn->tx_hash, &buf->sg, buf->sg.length, crc); - buf->sg.length = tcp_conn->hdr_size; + buf->sg.length +=sizeof (u32); } static inline int
@@ -423,7 +423,7 @@ iscsi_r2t_rsp(struct iscsi_conn *conn, s tcp_ctask->exp_datasn = r2tsn +1 ;__kfifo_put (tcp_ctask->r2tqueue, (void *)&r2t,sizeof (void *)); - tcp_ctask->xmstate |=XMSTATE_SOL_HDR ; + tcp_ctask->xmstate |=XMSTATE_SOL_HDR_INIT ;list_move_tail (&ctask->running, &conn->xmitqueue);scsi_queue_work (session->host, &conn->xmitwork);
@@ -1284,41 +1284,10 @@ static void iscsi_set_padding(struct iscstatic void iscsi_tcp_cmd_init (struct iscsi_cmd_task *ctask) { -struct scsi_cmnd *sc = ctask->sc;struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;BUG_ON (__kfifo_len (tcp_ctask->r2tqueue)); - - tcp_ctask->sent =0 ; - tcp_ctask->sg_count =0 ; - tcp_ctask->exp_datasn =0 ; - -if (sc->sc_data_direction ==DMA_TO_DEVICE ) { - tcp_ctask->xmstate =XMSTATE_W_HDR ; -BUG_ON (sc->request_bufflen ==0 ); - -if (sc->use_sg) { -struct scatterlist *sg = sc->request_buffer; - -iscsi_buf_init_sg (&tcp_ctask->sendbuf, sg); - tcp_ctask->sg = sg +1 ; - tcp_ctask->bad_sg = sg + sc->use_sg; - }else { -iscsi_buf_init_iov (&tcp_ctask->sendbuf, - sc->request_buffer, - sc->request_bufflen); - tcp_ctask->sg =NULL ; - tcp_ctask->bad_sg =NULL ; - } -debug_scsi ("cmd [itt 0x%x total %d imm_data %d " -"unsol count %d, unsol offset %d]\n" , - ctask->itt, sc->request_bufflen, ctask->imm_count, - ctask->unsol_count, ctask->unsol_offset); - }else - tcp_ctask->xmstate =XMSTATE_R_HDR ; - -iscsi_buf_init_iov (&tcp_ctask->headbuf, (char *)ctask->hdr, -sizeof (struct iscsi_hdr )); + tcp_ctask->xmstate =XMSTATE_CMD_HDR_INIT ; }/**
@@ -1331,9 +1300,11 @@ iscsi_tcp_cmd_init(struct iscsi_cmd_task* call it again later, or recover. '0' return code means successful * xmit. * -* Management xmit state machine consists of two states: -* IN_PROGRESS_IMM_HEAD - PDU Header xmit in progress -* IN_PROGRESS_IMM_DATA - PDU Data xmit in progress +* Management xmit state machine consists of these states: +* XMSTATE_IMM_HDR_INIT - calculate digest of PDU Header +* XMSTATE_IMM_HDR - PDU Header xmit in progress +* XMSTATE_IMM_DATA - PDU Data xmit in progress +* XMSTATE_IDLE - management PDU is done **/ static int iscsi_tcp_mtask_xmit (struct iscsi_conn *conn,struct iscsi_mgmt_task *mtask)
@@ -1344,23 +1315,34 @@ iscsi_tcp_mtask_xmit(struct iscsi_conn *debug_scsi ("mtask deq [cid %d state %x itt 0x%x]\n" , conn->id, tcp_mtask->xmstate, mtask->itt); -if (tcp_mtask->xmstate &XMSTATE_IMM_HDR ) { - tcp_mtask->xmstate &= ~XMSTATE_IMM_HDR ; -if (mtask->data_count) +if (tcp_mtask->xmstate &XMSTATE_IMM_HDR_INIT ) { +iscsi_buf_init_iov (&tcp_mtask->headbuf, (char *)mtask->hdr, +sizeof (struct iscsi_hdr )); + +if (mtask->data_count) { tcp_mtask->xmstate |=XMSTATE_IMM_DATA ; +iscsi_buf_init_iov (&tcp_mtask->sendbuf, + (char *)mtask->data, + mtask->data_count); + } +if (conn->c_stage !=ISCSI_CONN_INITIAL_STAGE && conn->stop_stage !=STOP_CONN_RECOVER && conn->hdrdgst_en)iscsi_hdr_digest (conn, &tcp_mtask->headbuf, (u8 *)tcp_mtask->hdrext); + + tcp_mtask->sent =0 ; + tcp_mtask->xmstate &= ~XMSTATE_IMM_HDR_INIT ; + tcp_mtask->xmstate |=XMSTATE_IMM_HDR ; + } + +if (tcp_mtask->xmstate &XMSTATE_IMM_HDR ) { rc =iscsi_sendhdr (conn, &tcp_mtask->headbuf, mtask->data_count); -if (rc) { - tcp_mtask->xmstate |=XMSTATE_IMM_HDR ; -if (mtask->data_count) - tcp_mtask->xmstate &= ~XMSTATE_IMM_DATA ; +if (rc)return rc; - } + tcp_mtask->xmstate &= ~XMSTATE_IMM_HDR ; }if (tcp_mtask->xmstate &XMSTATE_IMM_DATA ) {
@@ -1394,55 +1376,75 @@ iscsi_tcp_mtask_xmit(struct iscsi_conn *return 0 ; } -static inline int -iscsi_send_read_hdr (struct iscsi_conn *conn, -struct iscsi_tcp_cmd_task *tcp_ctask) +static int +iscsi_send_cmd_hdr (struct iscsi_conn *conn,struct iscsi_cmd_task *ctask) { -int rc; +struct scsi_cmnd *sc = ctask->sc; +struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data; +int rc =0 ; - tcp_ctask->xmstate &= ~XMSTATE_R_HDR ; -if (conn->hdrdgst_en) -iscsi_hdr_digest (conn, &tcp_ctask->headbuf, - (u8 *)tcp_ctask->hdrext); - rc =iscsi_sendhdr (conn, &tcp_ctask->headbuf,0 ); -if (!rc) { -BUG_ON (tcp_ctask->xmstate !=XMSTATE_IDLE ); -return 0 ;/* wait for Data-In */ - } - tcp_ctask->xmstate |=XMSTATE_R_HDR ; -return rc; -} +if (tcp_ctask->xmstate &XMSTATE_CMD_HDR_INIT ) { + tcp_ctask->sent =0 ; + tcp_ctask->sg_count =0 ; + tcp_ctask->exp_datasn =0 ; + +if (sc->sc_data_direction ==DMA_TO_DEVICE ) { +if (sc->use_sg) { +struct scatterlist *sg = sc->request_buffer; + +iscsi_buf_init_sg (&tcp_ctask->sendbuf, sg); + tcp_ctask->sg = sg +1 ; + tcp_ctask->bad_sg = sg + sc->use_sg; + }else { +iscsi_buf_init_iov (&tcp_ctask->sendbuf, + sc->request_buffer, + sc->request_bufflen); + tcp_ctask->sg =NULL ; + tcp_ctask->bad_sg =NULL ; + } -static inline int -iscsi_send_write_hdr (struct iscsi_conn *conn, -struct iscsi_cmd_task *ctask) -{ -struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data; -int rc; +debug_scsi ("cmd [itt 0x%x total %d imm_data %d " +"unsol count %d, unsol offset %d]\n" , + ctask->itt, sc->request_bufflen, + ctask->imm_count, ctask->unsol_count, + ctask->unsol_offset); + } - tcp_ctask->xmstate &= ~XMSTATE_W_HDR ; -if (conn->hdrdgst_en) -iscsi_hdr_digest (conn, &tcp_ctask->headbuf, - (u8 *)tcp_ctask->hdrext); - rc =iscsi_sendhdr (conn, &tcp_ctask->headbuf, ctask->imm_count); -if (rc) { - tcp_ctask->xmstate |=XMSTATE_W_HDR ; -return rc; +iscsi_buf_init_iov (&tcp_ctask->headbuf, (char *)ctask->hdr, +sizeof (struct iscsi_hdr )); + +if (conn->hdrdgst_en) +iscsi_hdr_digest (conn, &tcp_ctask->headbuf, + (u8 *)tcp_ctask->hdrext); + tcp_ctask->xmstate &= ~XMSTATE_CMD_HDR_INIT ; + tcp_ctask->xmstate |=XMSTATE_CMD_HDR_XMIT ; } -if (ctask->imm_count) { - tcp_ctask->xmstate |=XMSTATE_IMM_DATA ; -iscsi_set_padding (tcp_ctask, ctask->imm_count); +if (tcp_ctask->xmstate &XMSTATE_CMD_HDR_XMIT ) { + rc =iscsi_sendhdr (conn, &tcp_ctask->headbuf, ctask->imm_count); +if (rc) +return rc; + tcp_ctask->xmstate &= ~XMSTATE_CMD_HDR_XMIT ; + +if (sc->sc_data_direction !=DMA_TO_DEVICE ) +return 0 ; + +if (ctask->imm_count) { + tcp_ctask->xmstate |=XMSTATE_IMM_DATA ; +iscsi_set_padding (tcp_ctask, ctask->imm_count); -if (ctask->conn->datadgst_en) { -iscsi_data_digest_init (ctask->conn->dd_data, tcp_ctask); - tcp_ctask->immdigest =0 ; +if (ctask->conn->datadgst_en) { +iscsi_data_digest_init (ctask->conn->dd_data, + tcp_ctask); + tcp_ctask->immdigest =0 ; + } } - } -if (ctask->unsol_count) - tcp_ctask->xmstate |=XMSTATE_UNS_HDR |XMSTATE_UNS_INIT ; -return 0 ; +if (ctask->unsol_count) + tcp_ctask->xmstate |= +XMSTATE_UNS_HDR |XMSTATE_UNS_INIT ; + } +return rc; } static int
@@ -1631,9 +1633,7 @@ static int iscsi_send_sol_pdu(struct iscstruct iscsi_data_task *dtask;int left, rc; -if (tcp_ctask->xmstate &XMSTATE_SOL_HDR ) { - tcp_ctask->xmstate &= ~XMSTATE_SOL_HDR ; - tcp_ctask->xmstate |=XMSTATE_SOL_DATA ; +if (tcp_ctask->xmstate &XMSTATE_SOL_HDR_INIT ) {if (!tcp_ctask->r2t) {spin_lock_bh (&session->lock); __kfifo_get(tcp_ctask->r2tqueue, (void*)&tcp_ctask->r2t,
@@ -1647,12 +1647,19 @@ send_hdr:if (conn->hdrdgst_en)iscsi_hdr_digest (conn, &r2t->headbuf, (u8 *)dtask->hdrext); + tcp_ctask->xmstate &= ~XMSTATE_SOL_HDR_INIT ; + tcp_ctask->xmstate |=XMSTATE_SOL_HDR ; + } + +if (tcp_ctask->xmstate &XMSTATE_SOL_HDR ) { + r2t = tcp_ctask->r2t; + dtask = &r2t->dtask; + rc =iscsi_sendhdr (conn, &r2t->headbuf, r2t->data_count); -if (rc) { - tcp_ctask->xmstate &= ~XMSTATE_SOL_DATA ; - tcp_ctask->xmstate |=XMSTATE_SOL_HDR ; +if (rc)return rc; - } + tcp_ctask->xmstate &= ~XMSTATE_SOL_HDR ; + tcp_ctask->xmstate |=XMSTATE_SOL_DATA ;if (conn->datadgst_en) {iscsi_data_digest_init (conn->dd_data, tcp_ctask);
@@ -1684,8 +1691,6 @@ send_hdr: left = r2t->data_length - r2t->sent;if (left) {iscsi_solicit_data_cont (conn, ctask, r2t, left); - tcp_ctask->xmstate |=XMSTATE_SOL_DATA ; - tcp_ctask->xmstate &= ~XMSTATE_SOL_HDR ; goto send_hdr; }
@@ -1700,8 +1705,6 @@ send_hdr:if (__kfifo_get (tcp_ctask->r2tqueue, (void *)&r2t,sizeof (void *))) { tcp_ctask->r2t = r2t; - tcp_ctask->xmstate |=XMSTATE_SOL_DATA ; - tcp_ctask->xmstate &= ~XMSTATE_SOL_HDR ;spin_unlock_bh (&session->lock); goto send_hdr; }
@@ -1710,6 +1713,46 @@ send_hdr:return 0 ; } +/** +* iscsi_tcp_ctask_xmit - xmit normal PDU task +* @conn: iscsi connection +* @ctask: iscsi command task +* +* Notes: +* The function can return -EAGAIN in which case caller must +* call it again later, or recover. '0' return code means successful +* xmit. +* The function is devided to logical helpers (above) for the different +* xmit stages. +* +*iscsi_send_cmd_hdr() +* XMSTATE_CMD_HDR_INIT - prepare Header and Data buffers Calculate +* Header Digest +* XMSTATE_CMD_HDR_XMIT - Transmit header in progress +* +*iscsi_send_padding +* XMSTATE_W_PAD - Prepare and send pading +* XMSTATE_W_RESEND_PAD - retry send pading +* +*iscsi_send_digest +* XMSTATE_W_RESEND_DATA_DIGEST - Finalize and send Data Digest +* XMSTATE_W_RESEND_DATA_DIGEST - retry sending digest +* +*iscsi_send_unsol_hdr +* XMSTATE_UNS_INIT - prepare un-solicit data header and digest +* XMSTATE_UNS_HDR - send un-solicit header +* +*iscsi_send_unsol_pdu +* XMSTATE_UNS_DATA - send un-solicit data in progress +* +*iscsi_send_sol_pdu +* XMSTATE_SOL_HDR_INIT - solicit data header and digest initialize +* XMSTATE_SOL_HDR - send solicit header +* XMSTATE_SOL_DATA - send solicit data +* +*iscsi_tcp_ctask_xmit +* XMSTATE_IMM_DATA - xmit managment data (??) +**/ static int iscsi_tcp_ctask_xmit (struct iscsi_conn *conn,struct iscsi_cmd_task *ctask) {
@@ -1725,14 +1768,11 @@ iscsi_tcp_ctask_xmit(struct iscsi_conn *if (ctask->mtask)return rc; -if (tcp_ctask->xmstate &XMSTATE_R_HDR ) -return iscsi_send_read_hdr (conn, tcp_ctask); - -if (tcp_ctask->xmstate &XMSTATE_W_HDR ) { - rc =iscsi_send_write_hdr (conn, ctask); -if (rc) -return rc; - } + rc =iscsi_send_cmd_hdr (conn, ctask); +if (rc) +return rc; +if (ctask->sc->sc_data_direction !=DMA_TO_DEVICE ) +return 0 ;if (tcp_ctask->xmstate &XMSTATE_IMM_DATA ) { rc = iscsi_send_data(ctask, &tcp_ctask->sendbuf, &tcp_ctask->sg,
@@ -1913,15 +1953,7 @@ iscsi_tcp_mgmt_init(struct iscsi_conn *c char *data, uint32_t data_size) {struct iscsi_tcp_mgmt_task *tcp_mtask = mtask->dd_data; - -iscsi_buf_init_iov (&tcp_mtask->headbuf, (char *)mtask->hdr, -sizeof (struct iscsi_hdr )); - tcp_mtask->xmstate =XMSTATE_IMM_HDR ; - tcp_mtask->sent =0 ; - -if (mtask->data_count) -iscsi_buf_init_iov (&tcp_mtask->sendbuf, (char *)mtask->data, - mtask->data_count); + tcp_mtask->xmstate =XMSTATE_IMM_HDR_INIT ; } static int
drivers/scsi/iscsi_tcp.h +4 -2
@@ -32,8 +32,8 @@ #define IN_PROGRESS_DDIGEST_RECV 0x3/* xmit state machine */ #define XMSTATE_IDLE 0x0 -#define XMSTATE_R_HDR 0x1 -#define XMSTATE_W_HDR 0x2 +#define XMSTATE_CMD_HDR_INIT 0x1 +#define XMSTATE_CMD_HDR_XMIT 0x2#define XMSTATE_IMM_HDR 0x4#define XMSTATE_IMM_DATA 0x8#define XMSTATE_UNS_INIT 0x10
@@ -44,6 +44,8 @@ #define XMSTATE_SOL_DATA 0x100#define XMSTATE_W_PAD 0x200#define XMSTATE_W_RESEND_PAD 0x400#define XMSTATE_W_RESEND_DATA_DIGEST 0x800 +#define XMSTATE_IMM_HDR_INIT 0x1000 +#define XMSTATE_SOL_HDR_INIT 0x2000#define ISCSI_PAD_LEN 4#define ISCSI_SG_TABLESIZE SG_ALL
drivers/scsi/libiscsi.c +1 -1
@@ -125,6 +125,7 @@ static void iscsi_prep_scsi_cmd_pdu(stru MAX_COMMAND_SIZE - sc->cmd_len); ctask->data_count =0 ; + ctask->imm_count =0 ;if (sc->sc_data_direction ==DMA_TO_DEVICE ) { hdr->flags |=ISCSI_FLAG_CMD_WRITE ;/*
@@ -141,7 +142,6 @@ static void iscsi_prep_scsi_cmd_pdu(stru* * pad_count bytes to be sent as zero-padding */ - ctask->imm_count =0 ; ctask->unsol_count =0 ; ctask->unsol_offset =0 ; ctask->unsol_datasn =0 ;
Signature · 1 line
1.4.1.1
PATCH 12/19 libiscsi: fix iscsi cmdsn allocation
From: Mike Christie <[email protected]>
The cmdsn allocation and pdu transmit code can race, and we can end up sending a pdu with cmdsn 10 before a pdu with 5. The target will then fail the connection/session. This patch fixes the problem by delaying the cmdsn allocation until we are about to send the pdu.
This also removes the xmitmutex. We were using the connection xmitmutex during error handling to handle races with mtask and ctask cleanup and completion. For ctasks we now have nice refcounting and for the mtask, if we hit the case where the mtask timesout and it is floating around somewhere in the driver, we end up dropping the session. And to handle session level cleanup, we use the xmit suspend bit along with scsi_flush_queue and the session lock to make sure that the xmit thread is not possibly transmitting a task while we are trying to kill it.
--- drivers/infiniband/ulp/iser/iscsi_iser.c | 18 - drivers/scsi/iscsi_tcp.c | 33 -- drivers/scsi/libiscsi.c | 491 ++++++++++++++---------------- include/scsi/libiscsi.h | 11 - include/scsi/scsi_transport_iscsi.h | 3 5 files changed, 250 insertions(+), 306 deletions(-)
drivers/infiniband/ulp/iser/iscsi_iser.c +8 -10
@@ -134,19 +134,9 @@ iscsi_iser_cmd_init(struct iscsi_cmd_tas {struct iscsi_iser_conn *iser_conn = ctask->conn->dd_data;struct iscsi_iser_cmd_task *iser_ctask = ctask->dd_data; -struct scsi_cmnd *sc = ctask->sc; iser_ctask->command_sent =0 ; iser_ctask->iser_conn = iser_conn; - -if (sc->sc_data_direction ==DMA_TO_DEVICE ) { -BUG_ON (sc->request_bufflen ==0 ); - -debug_scsi ("cmd [itt %x total %d imm %d unsol_data %d\n" , - ctask->itt, sc->request_bufflen, ctask->imm_count, - ctask->unsol_count); - } -iser_ctask_rdma_init (iser_ctask); }
@@ -219,6 +209,14 @@ iscsi_iser_ctask_xmit(struct iscsi_connstruct iscsi_iser_cmd_task *iser_ctask = ctask->dd_data;int error =0 ; +if (ctask->sc->sc_data_direction ==DMA_TO_DEVICE ) { +BUG_ON (ctask->sc->request_bufflen ==0 ); + +debug_scsi ("cmd [itt %x total %d imm %d unsol_data %d\n" , + ctask->itt, ctask->sc->request_bufflen, + ctask->imm_count, ctask->unsol_count); + } +debug_scsi ("ctask deq [cid %d itt 0x%x]\n" , conn->id, ctask->itt);
drivers/scsi/iscsi_tcp.c +6 -27
@@ -34,7 +34,6 @@ #include <linux/crypto.h>#include <linux/delay.h> #include <linux/kfifo.h> #include <linux/scatterlist.h> -#include <linux/mutex.h> #include <net/tcp.h> #include <scsi/scsi_cmnd.h> #include <scsi/scsi_host.h>
@@ -211,7 +210,6 @@ iscsi_tcp_cleanup_ctask(struct iscsi_constatic int iscsi_data_rsp (struct iscsi_conn *conn,struct iscsi_cmd_task *ctask) { -int rc;struct iscsi_tcp_conn *tcp_conn = conn->dd_data;struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;struct iscsi_data_rsp *rhdr = (struct iscsi_data_rsp *)tcp_conn->in.hdr;
@@ -219,9 +217,7 @@ iscsi_data_rsp(struct iscsi_conn *conn,struct scsi_cmnd *sc = ctask->sc;int datasn =be32_to_cpu (rhdr->datasn); - rc =iscsi_check_assign_cmdsn (session, (struct iscsi_nopin *)rhdr); -if (rc) -return rc; +iscsi_update_cmdsn (session, (struct iscsi_nopin *)rhdr);/* * setup Data-In byte counter (gets decremented..) */
@@ -377,12 +373,10 @@ iscsi_r2t_rsp(struct iscsi_conn *conn, sreturn ISCSI_ERR_R2TSN ; } - rc =iscsi_check_assign_cmdsn (session, (struct iscsi_nopin *)rhdr); -if (rc) -return rc; -/* fill-in new R2T associated with the task */ spin_lock (&session->lock); +iscsi_update_cmdsn (session, (struct iscsi_nopin *)rhdr); +if (!ctask->sc || ctask->mtask || session->state !=ISCSI_STATE_LOGGED_IN ) { printk(KERN_INFO "iscsi_tcp: dropping R2T itt %d in "
@@ -1762,12 +1756,6 @@ iscsi_tcp_ctask_xmit(struct iscsi_conn *debug_scsi ("ctask deq [cid %d xmstate %x itt 0x%x]\n" , conn->id, tcp_ctask->xmstate, ctask->itt); -/* -* serialize with TMF AbortTask -*/ -if (ctask->mtask) -return rc; - rc =iscsi_send_cmd_hdr (conn, ctask);if (rc)return rc;
@@ -1949,8 +1937,7 @@ iscsi_tcp_conn_bind(struct iscsi_cls_ses/* called with host lock */ static void -iscsi_tcp_mgmt_init (struct iscsi_conn *conn,struct iscsi_mgmt_task *mtask, -char *data,uint32_t data_size) +iscsi_tcp_mgmt_init (struct iscsi_conn *conn,struct iscsi_mgmt_task *mtask) {struct iscsi_tcp_mgmt_task *tcp_mtask = mtask->dd_data; tcp_mtask->xmstate =XMSTATE_IMM_HDR_INIT ;
@@ -2073,22 +2060,15 @@ iscsi_tcp_conn_get_param(struct iscsi_clswitch (param) {case ISCSI_PARAM_CONN_PORT : -mutex_lock (&conn->xmitmutex); -if (!tcp_conn->sock) { -mutex_unlock (&conn->xmitmutex); +if (!tcp_conn->sock)return -EINVAL ; - } inet =inet_sk (tcp_conn->sock->sk); len =sprintf (buf,"%hu\n" ,be16_to_cpu (inet->dport)); -mutex_unlock (&conn->xmitmutex);break ;case ISCSI_PARAM_CONN_ADDRESS : -mutex_lock (&conn->xmitmutex); -if (!tcp_conn->sock) { -mutex_unlock (&conn->xmitmutex); +if (!tcp_conn->sock)return -EINVAL ; - } sk = tcp_conn->sock->sk;if (sk->sk_family ==PF_INET ) {
@@ -2099,7 +2079,6 @@ iscsi_tcp_conn_get_param(struct iscsi_cl np =inet6_sk (sk); len =sprintf (buf,NIP6_FMT "\n" ,NIP6 (np->daddr)); } -mutex_unlock (&conn->xmitmutex);break ;default :return iscsi_conn_get_param (cls_conn, param, buf);
drivers/scsi/libiscsi.c +233 -258
865 lines not on this page · raw message
include/scsi/libiscsi.h +2 -9
@@ -90,6 +90,7 @@ enum {ISCSI_TASK_COMPLETED ,ISCSI_TASK_PENDING ,ISCSI_TASK_RUNNING , + ISCSI_TASK_ABORTING, }; struct iscsi_cmd_task {
@@ -150,18 +151,11 @@ struct iscsi_conn {struct iscsi_cmd_task *ctask;/* xmit ctask in progress */ /* xmit */ -struct kfifo *immqueue;/* immediate xmit queue */ struct kfifo *mgmtqueue;/* mgmt (control) xmit queue */ struct list_head mgmt_run_list;/* list of control tasks */ struct list_head xmitqueue;/* data-path cmd queue */ struct list_head run_list;/* list of cmds in progress */ struct work_struct xmitwork;/* per-conn. xmit workqueue */ -/* -* serializes connection xmit, access to kfifos: -* xmitqueue, immqueue, mgmtqueue -*/ -struct mutex xmitmutex; -unsigned long suspend_tx;/* suspend Tx */ unsigned long suspend_rx;/* suspend Rx */
@@ -303,8 +297,7 @@ extern int iscsi_conn_get_param(struct i/* * pdu and task processing */ -extern int iscsi_check_assign_cmdsn (struct iscsi_session *, -struct iscsi_nopin *); +extern void iscsi_update_cmdsn (struct iscsi_session *,struct iscsi_nopin *);extern void iscsi_prep_unsolicit_data_pdu (struct iscsi_cmd_task *,struct iscsi_data *hdr); extern int iscsi_conn_send_pdu(struct iscsi_cls_conn *, struct iscsi_hdr *,
include/scsi/scsi_transport_iscsi.h +1 -2
@@ -117,8 +117,7 @@ struct iscsi_transport { struct iscsi_stats *stats);void (*init_cmd_task) (struct iscsi_cmd_task *ctask);void (*init_mgmt_task) (struct iscsi_conn *conn, -struct iscsi_mgmt_task *mtask, -char *data,uint32_t data_size); +struct iscsi_mgmt_task *mtask);int (*xmit_cmd_task) (struct iscsi_conn *conn,struct iscsi_cmd_task *ctask); void (*cleanup_cmd_task) (struct iscsi_conn *conn,
Signature · 1 line
1.4.1.1
PATCH 13/19 libiscsi: make can_queue configurable
From: Mike Christie <[email protected]>
This patch allows us to set can_queue and cmds_per_lun from userspace when we create the session/host. From there we can set it on a per target basis. The patch fully converts iscsi_tcp, but only hooks up ib_iser for cmd_per_lun since it currently has a lots of preallocations based on can_queue.
--- drivers/infiniband/ulp/iser/iscsi_iser.c | 11 +++++++++-- drivers/infiniband/ulp/iser/iscsi_iser.h | 4 ++-- drivers/infiniband/ulp/iser/iser_verbs.c | 4 ++-- drivers/scsi/iscsi_tcp.c | 5 +++-- drivers/scsi/libiscsi.c | 28 +++++++++++++++++++++++++++- drivers/scsi/scsi_transport_iscsi.c | 2 ++ include/scsi/iscsi_if.h | 2 ++ include/scsi/libiscsi.h | 7 +++---- include/scsi/scsi_transport_iscsi.h | 3 ++- 9 files changed, 52 insertions(+), 14 deletions(-)
drivers/infiniband/ulp/iser/iscsi_iser.c +9 -2
@@ -373,7 +373,8 @@ static struct iscsi_transport iscsi_iserstatic struct iscsi_cls_session *iscsi_iser_session_create (struct iscsi_transport *iscsit,struct scsi_transport_template *scsit, -uint32_t initial_cmdsn,uint32_t *hostno) +uint16_t cmds_max,uint16_t qdepth, +uint32_t initial_cmdsn,uint32_t *hostno) {struct iscsi_cls_session *cls_session;struct iscsi_session *session;
@@ -384,7 +385,13 @@ iscsi_iser_session_create(struct iscsi_tstruct iscsi_iser_cmd_task *iser_ctask;struct iser_desc *desc; +/* +* we do not support setting can_queue cmd_per_lun from userspace yet +* because we preallocate so many resources +*/ cls_session =iscsi_session_setup (iscsit, scsit, +ISCSI_DEF_XMIT_CMDS_MAX , +ISCSI_MAX_CMD_PER_LUN ,sizeof (struct iscsi_iser_cmd_task ),sizeof (struct iser_desc ), initial_cmdsn, &hn);
@@ -543,7 +550,7 @@ iscsi_iser_ep_disconnect(__u64 ep_handlestatic struct scsi_host_template iscsi_iser_sht = { .name ="iSCSI Initiator over iSER, v." DRV_VER , .queuecommand = iscsi_queuecommand, - .can_queue =ISCSI_XMIT_CMDS_MAX -1 , + .can_queue =ISCSI_DEF_XMIT_CMDS_MAX -1 , .sg_tablesize =ISCSI_ISER_SG_TABLESIZE , .max_sectors =1024 , .cmd_per_lun =ISCSI_MAX_CMD_PER_LUN ,
drivers/infiniband/ulp/iser/iscsi_iser.h +2 -2
@@ -98,7 +98,7 @@ #define ISER_MAX_RX_MISC_PDUS 4 /* NOOP#define ISER_MAX_TX_MISC_PDUS 6/* NOOP_OUT(2), TEXT(1), * * SCSI_TMFUNC(2), LOGOUT(1) */ -#define ISER_QP_MAX_RECV_DTOS (ISCSI_XMIT_CMDS_MAX + \ +#define ISER_QP_MAX_RECV_DTOS (ISCSI_DEF_XMIT_CMDS_MAX + \ ISER_MAX_RX_MISC_PDUS + \ ISER_MAX_TX_MISC_PDUS)
@@ -110,7 +110,7 @@ #define ISER_QP_MAX_RECV_DTOS (ISCSI_XM#define ISER_INFLIGHT_DATAOUTS 8 -#define ISER_QP_MAX_REQ_DTOS (ISCSI_XMIT_CMDS_MAX * \ +#define ISER_QP_MAX_REQ_DTOS (ISCSI_DEF_XMIT_CMDS_MAX * \ (1 + ISER_INFLIGHT_DATAOUTS) + \ ISER_MAX_TX_MISC_PDUS + \ ISER_MAX_RX_MISC_PDUS)
drivers/infiniband/ulp/iser/iser_verbs.c +2 -2
@@ -155,8 +155,8 @@ static int iser_create_ib_conn_res(struc params.max_pages_per_fmr =ISCSI_ISER_SG_TABLESIZE +1 ;/* make the pool size twice the max number of SCSI commands * * the ML is expected to queue, watermark for unmap at 50% */ - params.pool_size =ISCSI_XMIT_CMDS_MAX *2 ; - params.dirty_watermark =ISCSI_XMIT_CMDS_MAX ; + params.pool_size =ISCSI_DEF_XMIT_CMDS_MAX *2 ; + params.dirty_watermark =ISCSI_DEF_XMIT_CMDS_MAX ; params.cache =0 ; params.flush_function =NULL ; params.access = (IB_ACCESS_LOCAL_WRITE |
drivers/scsi/iscsi_tcp.c +3 -2
@@ -2114,6 +2114,7 @@ iscsi_conn_get_stats(struct iscsi_cls_costatic struct iscsi_cls_session *iscsi_tcp_session_create (struct iscsi_transport *iscsit,struct scsi_transport_template *scsit, +uint16_t cmds_max,uint16_t qdepth,uint32_t initial_cmdsn,uint32_t *hostno) {struct iscsi_cls_session *cls_session;
@@ -2121,7 +2122,7 @@ iscsi_tcp_session_create(struct iscsi_truint32_t hn;int cmd_i; - cls_session =iscsi_session_setup (iscsit, scsit, + cls_session =iscsi_session_setup (iscsit, scsit, cmds_max, qdepth,sizeof (struct iscsi_tcp_cmd_task ),sizeof (struct iscsi_tcp_mgmt_task ), initial_cmdsn, &hn);
@@ -2164,7 +2165,7 @@ static struct scsi_host_template iscsi_s .name = "iSCSI Initiator over TCP/IP", .queuecommand = iscsi_queuecommand, .change_queue_depth = iscsi_change_queue_depth, - .can_queue = ISCSI_XMIT_CMDS_MAX - 1, + .can_queue = ISCSI_DEF_XMIT_CMDS_MAX - 1, .sg_tablesize = ISCSI_SG_TABLESIZE, .max_sectors = 0xFFFF, .cmd_per_lun = ISCSI_DEF_CMD_PER_LUN,
drivers/scsi/libiscsi.c +27 -1
@@ -1330,6 +1330,10 @@ #define hostdata_session(_hostdata) (isc* iscsi_session_setup - create iscsi cls session and host and session * @scsit: scsi transport template * @iscsit: iscsi transport template +* @cmds_max: scsi host can queue +* @qdepth: scsi host cmds per lun +* @cmd_task_size: LLD ctask private data size +* @mgmt_task_size: LLD mtask private data size * @initial_cmdsn: initial CmdSN * @hostno: host no allocated *
@@ -1339,6 +1343,7 @@ #define hostdata_session(_hostdata) (iscstruct iscsi_cls_session *iscsi_session_setup (struct iscsi_transport *iscsit,struct scsi_transport_template *scsit, +uint16_t cmds_max,uint16_t qdepth,int cmd_task_size,int mgmt_task_size,uint32_t initial_cmdsn,uint32_t *hostno) {
@@ -1347,11 +1352,32 @@ iscsi_session_setup(struct iscsi_transpostruct iscsi_cls_session *cls_session;int cmd_i; +if (qdepth >ISCSI_MAX_CMD_PER_LUN || qdepth <1 ) { +if (qdepth !=0 ) +printk (KERN_ERR "iscsi: invalid queue depth of %d. " +"Queue depth must be between 1 and %d.\n" , + qdepth,ISCSI_MAX_CMD_PER_LUN ); + qdepth =ISCSI_DEF_CMD_PER_LUN ; + } + +if (cmds_max <2 || (cmds_max & (cmds_max -1 )) || + cmds_max >=ISCSI_MGMT_ITT_OFFSET ) { +if (cmds_max !=0 ) +printk (KERN_ERR "iscsi: invalid can_queue of %d. " +"can_queue must be a power of 2 and between " +"2 and %d - setting to %d.\n" , cmds_max, +ISCSI_MGMT_ITT_OFFSET ,ISCSI_DEF_XMIT_CMDS_MAX ); + cmds_max =ISCSI_DEF_XMIT_CMDS_MAX ; + } + shost =scsi_host_alloc (iscsit->host_template,hostdata_privsize (sizeof (*session)));if (!shost)return NULL ; +/* the iscsi layer takes one task for reserve */ + shost->can_queue = cmds_max -1 ; + shost->cmd_per_lun = qdepth; shost->max_id =1 ; shost->max_channel =0 ; shost->max_lun = iscsit->max_lun;
@@ -1365,7 +1391,7 @@ iscsi_session_setup(struct iscsi_transpo session->host = shost; session->state =ISCSI_STATE_FREE ; session->mgmtpool_max =ISCSI_MGMT_CMDS_MAX ; - session->cmds_max =ISCSI_XMIT_CMDS_MAX ; + session->cmds_max = cmds_max; session->cmdsn = initial_cmdsn; session->exp_cmdsn = initial_cmdsn +1 ; session->max_cmdsn = initial_cmdsn +1 ;
drivers/scsi/scsi_transport_iscsi.c +2 -0
@@ -814,6 +814,8 @@ iscsi_if_create_session(struct iscsi_intuint32_t hostno; session = transport->create_session (transport, &priv->t, + ev->u.c_session.cmds_max, + ev->u.c_session.queue_depth, ev->u.c_session.initial_cmdsn, &hostno);if (!session)
include/scsi/iscsi_if.h +2 -0
@@ -72,6 +72,8 @@ struct iscsi_uevent {/* messages u -> k */ struct msg_create_session {uint32_t initial_cmdsn; +uint16_t cmds_max; +uint16_t queue_depth; } c_session;struct msg_destroy_session {uint32_t sid;
include/scsi/libiscsi.h +3 -4
@@ -48,9 +48,8 @@ #else #define debug_scsi(fmt...)#endif -#define ISCSI_XMIT_CMDS_MAX 128/* must be power of 2 */ -#define ISCSI_MGMT_CMDS_MAX 32/* must be power of 2 */ -#define ISCSI_CONN_MAX 1 +#define ISCSI_DEF_XMIT_CMDS_MAX 128/* must be power of 2 */ +#define ISCSI_MGMT_CMDS_MAX 16/* must be power of 2 */ #define ISCSI_MGMT_ITT_OFFSET 0xa00
@@ -268,7 +267,7 @@ extern int iscsi_host_get_param(struct S*/ extern struct iscsi_cls_session *iscsi_session_setup (struct iscsi_transport *,struct scsi_transport_template *, -int ,int ,uint32_t ,uint32_t *); +uint16_t ,uint16_t ,int ,int ,uint32_t ,uint32_t *);extern void iscsi_session_teardown (struct iscsi_cls_session *);extern struct iscsi_session *class_to_transport_session (struct iscsi_cls_session *);extern void iscsi_session_recovery_timedout (struct iscsi_cls_session *);
include/scsi/scsi_transport_iscsi.h +2 -1
@@ -90,7 +90,8 @@ struct iscsi_transport {unsigned int max_conn;unsigned int max_cmd_len;struct iscsi_cls_session *(*create_session) (struct iscsi_transport *it, -struct scsi_transport_template *t,uint32_t sn,uint32_t *hn); +struct scsi_transport_template *t,uint16_t ,uint16_t , +uint32_t sn,uint32_t *hn);void (*destroy_session) (struct iscsi_cls_session *session);struct iscsi_cls_conn *(*create_conn) (struct iscsi_cls_session *sess,uint32_t cid);
Signature · 1 line
1.4.1.1
PATCH 14/19 iscsi_tcp: fix handling of data buffer padding
From: Mike Christie <[email protected]>
If we got the padding, data and header in different skbs, we were not handling the padding correctly because we attributed it to the data's skb. This resulted in the initiator reading from pad bytes + skb offset instead of the correct offset.
If you could not connect with the open solaris target, this will fix the lock up problem you were hitting.
--- drivers/scsi/iscsi_tcp.c | 61 ++++++++++++++++++++++++++++++++-------------- drivers/scsi/iscsi_tcp.h | 1 + 2 files changed, 43 insertions(+), 19 deletions(-)
drivers/scsi/iscsi_tcp.c +42 -19
@@ -896,11 +896,27 @@ more: } } -if (tcp_conn->in_progress ==IN_PROGRESS_DDIGEST_RECV ) { +if (tcp_conn->in_progress ==IN_PROGRESS_DDIGEST_RECV && + tcp_conn->in.copy) {uint32_t recv_digest;debug_tcp ("extra data_recv offset %d copy %d\n" , tcp_conn->in.offset, tcp_conn->in.copy); + +if (!tcp_conn->data_copied) { +if (tcp_conn->in.padding) { +debug_tcp ("padding -> %d\n" , + tcp_conn->in.padding); +memset (pad,0 , tcp_conn->in.padding); +sg_init_one (&sg, pad, tcp_conn->in.padding); +crypto_hash_update (&tcp_conn->rx_hash, + &sg, sg.length); + } +crypto_hash_final (&tcp_conn->rx_hash, + (u8 *) &tcp_conn->in.datadgst); +debug_tcp ("rx digest 0x%x\n" , tcp_conn->in.datadgst); + } + rc =iscsi_tcp_copy (conn,sizeof (uint32_t ));if (rc) {if (rc == -EAGAIN )
@@ -925,8 +941,7 @@ more: }if (tcp_conn->in_progress ==IN_PROGRESS_DATA_RECV && - tcp_conn->in.copy) { - + tcp_conn->in.copy) {debug_tcp ("data_recv offset %d copy %d\n" , tcp_conn->in.offset, tcp_conn->in.copy);
@@ -937,24 +952,32 @@ more:iscsi_conn_failure (conn,ISCSI_ERR_CONN_FAILED );return 0 ; } - tcp_conn->in.copy -= tcp_conn->in.padding; - tcp_conn->in.offset += tcp_conn->in.padding; -if (conn->datadgst_en) { -if (tcp_conn->in.padding) { -debug_tcp ("padding -> %d\n" , - tcp_conn->in.padding); -memset (pad,0 , tcp_conn->in.padding); -sg_init_one (&sg, pad, tcp_conn->in.padding); -crypto_hash_update (&tcp_conn->rx_hash, - &sg, sg.length); - } -crypto_hash_final (&tcp_conn->rx_hash, - (u8 *) &tcp_conn->in.datadgst); -debug_tcp ("rx digest 0x%x\n" , tcp_conn->in.datadgst); + +if (tcp_conn->in.padding) + tcp_conn->in_progress =IN_PROGRESS_PAD_RECV ; +else if (conn->datadgst_en) tcp_conn->in_progress =IN_PROGRESS_DDIGEST_RECV ; - tcp_conn->data_copied =0 ; - }else +else + tcp_conn->in_progress =IN_PROGRESS_WAIT_HEADER ; + tcp_conn->data_copied =0 ; + } + +if (tcp_conn->in_progress ==IN_PROGRESS_PAD_RECV && + tcp_conn->in.copy) { +int copylen =min (tcp_conn->in.padding - tcp_conn->data_copied, + tcp_conn->in.copy); + + tcp_conn->in.copy -= copylen; + tcp_conn->in.offset += copylen; + tcp_conn->data_copied += copylen; + +if (tcp_conn->data_copied != tcp_conn->in.padding) + tcp_conn->in_progress =IN_PROGRESS_PAD_RECV ; +else if (conn->datadgst_en) + tcp_conn->in_progress =IN_PROGRESS_DDIGEST_RECV ; +else tcp_conn->in_progress =IN_PROGRESS_WAIT_HEADER ; + tcp_conn->data_copied =0 ; } debug_tcp("f, processed %d from out of %d padding %d\n",
drivers/scsi/iscsi_tcp.h +1 -0
@@ -29,6 +29,7 @@ #define IN_PROGRESS_WAIT_HEADER 0x0#define IN_PROGRESS_HEADER_GATHER 0x1#define IN_PROGRESS_DATA_RECV 0x2#define IN_PROGRESS_DDIGEST_RECV 0x3 +#define IN_PROGRESS_PAD_RECV 0x4/* xmit state machine */ #define XMSTATE_IDLE 0x0
Signature · 1 line
1.4.1.1
PATCH 15/19 iscsi_tcp: remove DMA alignment restriction
From: Mike Christie <[email protected]>
Add a slave_configure function to iSCSI TCP to remove any DMA alignment restriction. This permits the use of direct IO from arbitrary addresses.
--- drivers/scsi/iscsi_tcp.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
drivers/scsi/iscsi_tcp.c +8 -0
@@ -36,6 +36,7 @@ #include <linux/kfifo.h>#include <linux/scatterlist.h> #include <net/tcp.h> #include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> #include <scsi/scsi_host.h> #include <scsi/scsi.h> #include <scsi/scsi_transport_iscsi.h>
@@ -2184,6 +2185,12 @@ static void iscsi_tcp_session_destroy(stiscsi_session_teardown (cls_session); } +static int iscsi_tcp_slave_configure (struct scsi_device *sdev) +{ +blk_queue_dma_alignment (sdev->request_queue,0 ); +return 0 ; +} +static struct scsi_host_template iscsi_sht = { .name ="iSCSI Initiator over TCP/IP" , .queuecommand = iscsi_queuecommand,
@@ -2195,6 +2202,7 @@ static struct scsi_host_template iscsi_s .eh_abort_handler = iscsi_eh_abort, .eh_host_reset_handler = iscsi_eh_host_reset, .use_clustering = DISABLE_CLUSTERING, + .slave_configure = iscsi_tcp_slave_configure, .proc_name = "iscsi_tcp", .this_id = -1, };
Signature · 1 line
1.4.1.1
PATCH 16/19 qla4xxx: add iscsi_transport capps for fw capacilities
From: Mike Christie <[email protected]>
Userspace will want to know what the driver/FW/HW capabilites when it comes to some operations like if the hardware can do discovery or if it can store iscsi info like what target was used for boot. This patch adds some new caps so userspace can tell if the driver supports hardware/fw based sendtargets discovery and if the hardware has some flash which may be holding or can contain some iscsi target info.
--- drivers/scsi/qla4xxx/ql4_os.c | 1 + include/scsi/iscsi_if.h | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-)
drivers/scsi/qla4xxx/ql4_os.c +1 -0
@@ -102,6 +102,7 @@ static struct scsi_host_template qla4xxxstatic struct iscsi_transport qla4xxx_iscsi_transport = { .owner =THIS_MODULE , .name =DRIVER_NAME , + .caps =CAP_FW_DB |CAP_SENDTARGETS_OFFLOAD , .param_mask =ISCSI_CONN_PORT |ISCSI_CONN_ADDRESS |ISCSI_TARGET_NAME |ISCSI_TPGT , .host_param_mask = ISCSI_HOST_HWADDRESS |
include/scsi/iscsi_if.h +2 -0
@@ -299,6 +299,8 @@ #define CAP_DATADGST 0x20#define CAP_MULTI_CONN 0x40#define CAP_TEXT_NEGO 0x80#define CAP_MARKERS 0x100 +#define CAP_FW_DB 0x200 +#define CAP_SENDTARGETS_OFFLOAD 0x400/* * These flags describes reason of stop_conn() call
Signature · 1 line
1.4.1.1
PATCH 17/19 iscsi_tcp: fix fd leak
From: Mike Christie <[email protected]>
This patch should fix the file descriptor leak problem. A quick look through the kernel shows that users of sockfd_lookup use sockfd_put to release their handle. We were using sock_release which from the comments and code look like it does not release the get() on the file from the lookup.
--- drivers/scsi/iscsi_tcp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/scsi/iscsi_tcp.c +2 -1
@@ -29,6 +29,7 @@#include <linux/types.h> #include <linux/list.h> #include <linux/inet.h> +#include <linux/file.h> #include <linux/blkdev.h> #include <linux/crypto.h> #include <linux/delay.h>
@@ -1878,7 +1879,7 @@ iscsi_tcp_release_conn(struct iscsi_conniscsi_conn_restore_callbacks (tcp_conn);sock_put (tcp_conn->sock->sk); -sock_release (tcp_conn->sock); +sockfd_put (tcp_conn->sock); tcp_conn->sock =NULL ; conn->recv_lock =NULL ; }
Signature · 1 line
1.4.1.1
PATCH 18/19 iscsi class, qla4xxx, iscsi_tcp: export local address
From: Mike Christie <[email protected]>
This patch exports the local address for the session. For qla4xxx this is the ip of the hba's port. For software this is the src addr of the socket.
--- drivers/scsi/iscsi_tcp.c | 127 +++++++++++++++++++++++++++-------- drivers/scsi/qla4xxx/ql4_os.c | 8 ++ drivers/scsi/scsi_transport_iscsi.c | 4 + include/scsi/iscsi_if.h | 2 + include/scsi/libiscsi.h | 8 ++ 5 files changed, 118 insertions(+), 31 deletions(-)
drivers/scsi/iscsi_tcp.c +98 -29
@@ -1870,18 +1870,22 @@ tcp_conn_alloc_fail:static void iscsi_tcp_release_conn (struct iscsi_conn *conn) { +struct iscsi_session *session = conn->session;struct iscsi_tcp_conn *tcp_conn = conn->dd_data; +struct socket *sock = tcp_conn->sock; -if (!tcp_conn->sock) +if (!sock)return ; -sock_hold (tcp_conn->sock->sk); +sock_hold (sock->sk);iscsi_conn_restore_callbacks (tcp_conn); -sock_put (tcp_conn->sock->sk); +sock_put (sock->sk); -sockfd_put (tcp_conn->sock); +spin_lock_bh (&session->lock); tcp_conn->sock =NULL ; conn->recv_lock =NULL ; +spin_unlock_bh (&session->lock); +sockfd_put (sock); } static void
@@ -1912,6 +1916,46 @@ iscsi_tcp_conn_stop(struct iscsi_cls_con tcp_conn->hdr_size =sizeof (struct iscsi_hdr ); } +static int iscsi_tcp_get_addr (struct iscsi_conn *conn,struct socket *sock, +char *buf,int *port, +int (*getname)(struct socket *,struct sockaddr *, +int *addrlen)) +{ +struct sockaddr_storage *addr; +struct sockaddr_in6 *sin6; +struct sockaddr_in *sin; +int rc =0 , len; + + addr =kmalloc (GFP_KERNEL ,sizeof (*addr)); +if (!addr) +return -ENOMEM ; + +if (getname (sock, (struct sockaddr *) addr, &len)) { + rc = -ENODEV ; + goto free_addr; + } + +switch (addr->ss_family) { +case AF_INET : + sin = (struct sockaddr_in *)addr; +spin_lock_bh (&conn->session->lock); +sprintf (buf,NIPQUAD_FMT ,NIPQUAD (sin->sin_addr.s_addr)); + *port =be16_to_cpu (sin->sin_port); +spin_unlock_bh (&conn->session->lock); +break ; +case AF_INET6 : + sin6 = (struct sockaddr_in6 *)addr; +spin_lock_bh (&conn->session->lock); +sprintf (buf,NIP6_FMT ,NIP6 (sin6->sin6_addr)); + *port =be16_to_cpu (sin6->sin6_port); +spin_unlock_bh (&conn->session->lock); +break ; + } +free_addr: +kfree (addr); +return rc; +} + static int iscsi_tcp_conn_bind(struct iscsi_cls_session *cls_session, struct iscsi_cls_conn *cls_conn, uint64_t transport_eph,
@@ -1929,10 +1973,24 @@ iscsi_tcp_conn_bind(struct iscsi_cls_sesprintk (KERN_ERR "iscsi_tcp: sockfd_lookup failed %d\n" , err);return -EEXIST ; } +/* +* copy these values now because if we drop the session +* userspace may still want to query the values since we will +* be using them for the reconnect +*/ + err =iscsi_tcp_get_addr (conn, sock, conn->portal_address, + &conn->portal_port, kernel_getpeername); +if (err) + goto free_socket; + + err =iscsi_tcp_get_addr (conn, sock, conn->local_address, + &conn->local_port, kernel_getsockname); +if (err) + goto free_socket; err =iscsi_conn_bind (cls_session, cls_conn, is_leading);if (err) -return err; + goto free_socket;/* bind iSCSI connection and socket */ tcp_conn->sock = sock;
@@ -1956,8 +2014,11 @@ iscsi_tcp_conn_bind(struct iscsi_cls_ses* set receive state machine into initial state */ tcp_conn->in_progress =IN_PROGRESS_WAIT_HEADER ; -return 0 ; + +free_socket: +sockfd_put (sock); +return err; }/* called with host lock */
@@ -2077,33 +2138,18 @@ iscsi_tcp_conn_get_param(struct iscsi_cl enum iscsi_param param, char *buf) { struct iscsi_conn *conn = cls_conn->dd_data; -struct iscsi_tcp_conn *tcp_conn = conn->dd_data; -struct inet_sock *inet; -struct ipv6_pinfo *np; -struct sock *sk;int len;switch (param) {case ISCSI_PARAM_CONN_PORT : -if (!tcp_conn->sock) -return -EINVAL ; - - inet =inet_sk (tcp_conn->sock->sk); - len =sprintf (buf,"%hu\n" ,be16_to_cpu (inet->dport)); +spin_lock_bh (&conn->session->lock); + len =sprintf (buf,"%hu\n" , conn->portal_port); +spin_unlock_bh (&conn->session->lock);break ;case ISCSI_PARAM_CONN_ADDRESS : -if (!tcp_conn->sock) -return -EINVAL ; - - sk = tcp_conn->sock->sk; -if (sk->sk_family ==PF_INET ) { - inet =inet_sk (sk); - len =sprintf (buf,NIPQUAD_FMT "\n" , -NIPQUAD (inet->daddr)); - }else { - np =inet6_sk (sk); - len =sprintf (buf,NIP6_FMT "\n" ,NIP6 (np->daddr)); - } +spin_lock_bh (&conn->session->lock); + len =sprintf (buf,"%s\n" , conn->portal_address); +spin_unlock_bh (&conn->session->lock);break ;default :return iscsi_conn_get_param (cls_conn, param, buf);
@@ -2112,6 +2158,29 @@ iscsi_tcp_conn_get_param(struct iscsi_clreturn len; } +static int +iscsi_tcp_host_get_param (struct Scsi_Host *shost,enum iscsi_host_param param, +char *buf) +{ +struct iscsi_session *session =iscsi_hostdata (shost->hostdata); +int len; + +switch (param) { +case ISCSI_HOST_PARAM_IPADDRESS : +spin_lock_bh (&session->lock); +if (!session->leadconn) + len = -ENODEV ; +else + len =sprintf (buf,"%s\n" , + session->leadconn->local_address); +spin_unlock_bh (&session->lock); +break ; +default : +return iscsi_host_get_param (shost, param, buf); + } +return len; +} +static void iscsi_conn_get_stats (struct iscsi_cls_conn *cls_conn,struct iscsi_stats *stats) {
@@ -2233,7 +2302,7 @@ static struct iscsi_transport iscsi_tcp_ISCSI_TARGET_NAME |ISCSI_TPGT |ISCSI_USERNAME |ISCSI_PASSWORD | ISCSI_USERNAME_IN | ISCSI_PASSWORD_IN, - .host_param_mask =ISCSI_HOST_HWADDRESS | + .host_param_mask =ISCSI_HOST_HWADDRESS |ISCSI_HOST_IPADDRESS | ISCSI_HOST_INITIATOR_NAME, .host_template = &iscsi_sht, .conndata_size = sizeof(struct iscsi_conn),
@@ -2252,7 +2321,7 @@ static struct iscsi_transport iscsi_tcp_ .start_conn = iscsi_conn_start, .stop_conn = iscsi_tcp_conn_stop,/* iscsi host params */ - .get_host_param = iscsi_host_get_param, + .get_host_param = iscsi_tcp_host_get_param, .set_host_param = iscsi_host_set_param,/* IO */ .send_pdu = iscsi_conn_send_pdu,
drivers/scsi/qla4xxx/ql4_os.c +7 -1
@@ -106,6 +106,7 @@ static struct iscsi_transport qla4xxx_is .param_mask = ISCSI_CONN_PORT | ISCSI_CONN_ADDRESS | ISCSI_TARGET_NAME | ISCSI_TPGT, .host_param_mask =ISCSI_HOST_HWADDRESS | +ISCSI_HOST_IPADDRESS | ISCSI_HOST_INITIATOR_NAME, .sessiondata_size = sizeof(struct ddb_entry), .host_template = &qla4xxx_driver_template,
@@ -192,8 +193,13 @@ static int qla4xxx_host_get_param(structcase ISCSI_HOST_PARAM_HWADDRESS : len =format_addr (buf, ha->my_mac,MAC_ADDR_LEN );break ; +case ISCSI_HOST_PARAM_IPADDRESS : + len =sprintf (buf,"%d.%d.%d.%d\n" , ha->ip_address[0 ], + ha->ip_address[1 ], ha->ip_address[2 ], + ha->ip_address[3 ]); +break ;case ISCSI_HOST_PARAM_INITIATOR_NAME : - len =sprintf (buf, ha->name_string); + len =sprintf (buf,"%s\n" , ha->name_string);break ;default :return -ENOSYS ;
drivers/scsi/scsi_transport_iscsi.c +3 -1
@@ -32,7 +32,7 @@ #include <scsi/iscsi_if.h>#define ISCSI_SESSION_ATTRS 15#define ISCSI_CONN_ATTRS 11 -#define ISCSI_HOST_ATTRS 2 +#define ISCSI_HOST_ATTRS 3#define ISCSI_TRANSPORT_VERSION "2.0-724"struct iscsi_internal {
@@ -1261,6 +1261,7 @@ #define iscsi_host_attr(field, param) static ISCSI_CLASS_ATTR(host, field, S_IRUGO, show_host_param_##param, \ NULL); +iscsi_host_attr (ipaddress,ISCSI_HOST_PARAM_IPADDRESS );iscsi_host_attr (hwaddress,ISCSI_HOST_PARAM_HWADDRESS );iscsi_host_attr (initiatorname,ISCSI_HOST_PARAM_INITIATOR_NAME );
@@ -1398,6 +1399,7 @@ iscsi_register_transport(struct iscsi_tr priv->t.host_size =sizeof (struct iscsi_host );transport_container_register (&priv->t.host_attrs); +SETUP_HOST_RD_ATTR (ipaddress,ISCSI_HOST_IPADDRESS );SETUP_HOST_RD_ATTR (hwaddress,ISCSI_HOST_HWADDRESS );SETUP_HOST_RD_ATTR (initiatorname,ISCSI_HOST_INITIATOR_NAME );BUG_ON (count >ISCSI_HOST_ATTRS );
include/scsi/iscsi_if.h +2 -0
@@ -271,11 +271,13 @@ #define ISCSI_PASSWORD_IN (1 << ISCSI_Penum iscsi_host_param {ISCSI_HOST_PARAM_HWADDRESS ,ISCSI_HOST_PARAM_INITIATOR_NAME , +ISCSI_HOST_PARAM_IPADDRESS ,ISCSI_HOST_PARAM_MAX , };#define ISCSI_HOST_HWADDRESS (1 << ISCSI_HOST_PARAM_HWADDRESS)#define ISCSI_HOST_INITIATOR_NAME (1 << ISCSI_HOST_PARAM_INITIATOR_NAME) +#define ISCSI_HOST_IPADDRESS (1 << ISCSI_HOST_PARAM_IPADDRESS)#define iscsi_ptr (_handle) ((void*)(unsigned long)_handle)#define iscsi_handle (_ptr) ((uint64_t)(unsigned long)_ptr)
include/scsi/libiscsi.h +8 -0
@@ -72,6 +72,8 @@ #define ISCSI_CID_MASK (0xffff << ISCS#define ISCSI_AGE_SHIFT 28#define ISCSI_AGE_MASK (0xf << ISCSI_AGE_SHIFT) +#define ISCSI_ADDRESS_BUF_LEN 64 +struct iscsi_mgmt_task {/* * Becuae LLDs allocate their hdr differently, this is a pointer to
@@ -174,6 +176,12 @@ struct iscsi_conn {/* values userspace uses to id a conn */ int persistent_port;char *persistent_address; +/* remote portal currently connected to */ +int portal_port; +char portal_address[ISCSI_ADDRESS_BUF_LEN ]; +/* local address */ +int local_port; +char local_address[ISCSI_ADDRESS_BUF_LEN ];/* MIB-statistics */ uint64_t txdata_octets;
Signature · 1 line
1.4.1.1
PATCH 19/19 iscsi class, iscsi_tcp, iser, qla4xxx: add netdevname sysfs attr
From: Mike Christie <[email protected]>
iSCSI must support software iscsi (iscsi_tcp, iser), hardware iscsi (qla4xxx), and partial offload (broadcom). To be able to allow each stack or driver or port (virtual or physical) to be able to log into the same target portal we use the initiator tuple [[HWADDRESS | NETDEVNAME], INITIATOR_NAME] and the target tuple [TARGETNAME, CONN_ADDRESS, CONN_PORT] to id a session. This patch adds the netdev name, which is used by software iscsi when it binds a session to a netdevice using the SO_BINDTODEVICE sock opt. It cannot use HWADDRESS because if someone did vlans then the same netdevice will have the same mac and the initiator,target id will not be unique.
--- drivers/infiniband/ulp/iser/iscsi_iser.c | 1 + drivers/scsi/iscsi_tcp.c | 3 ++- drivers/scsi/libiscsi.c | 11 +++++++++++ drivers/scsi/qla4xxx/ql4_os.c | 3 ++- drivers/scsi/scsi_transport_iscsi.c | 6 ++++-- include/scsi/iscsi_if.h | 3 +++ include/scsi/libiscsi.h | 3 ++- 7 files changed, 25 insertions(+), 5 deletions(-)
drivers/infiniband/ulp/iser/iscsi_iser.c +1 -0
@@ -583,6 +583,7 @@ static struct iscsi_transport iscsi_iserISCSI_USERNAME |ISCSI_PASSWORD | ISCSI_USERNAME_IN | ISCSI_PASSWORD_IN, .host_param_mask =ISCSI_HOST_HWADDRESS | +ISCSI_HOST_NETDEV_NAME | ISCSI_HOST_INITIATOR_NAME, .host_template = &iscsi_iser_sht, .conndata_size = sizeof(struct iscsi_conn),
drivers/scsi/iscsi_tcp.c +2 -1
@@ -2303,7 +2303,8 @@ static struct iscsi_transport iscsi_tcp_ISCSI_USERNAME |ISCSI_PASSWORD | ISCSI_USERNAME_IN | ISCSI_PASSWORD_IN, .host_param_mask =ISCSI_HOST_HWADDRESS |ISCSI_HOST_IPADDRESS | - ISCSI_HOST_INITIATOR_NAME, +ISCSI_HOST_INITIATOR_NAME | + ISCSI_HOST_NETDEV_NAME, .host_template = &iscsi_sht, .conndata_size = sizeof(struct iscsi_conn), .max_conn = 1,
drivers/scsi/libiscsi.c +11 -0
@@ -1483,6 +1483,7 @@ void iscsi_session_teardown(struct iscsikfree (session->username);kfree (session->username_in);kfree (session->targetname); +kfree (session->netdev);kfree (session->hwaddress);kfree (session->initiatorname);
@@ -2040,6 +2041,12 @@ int iscsi_host_get_param(struct Scsi_Hosint len;switch (param) { +case ISCSI_HOST_PARAM_NETDEV_NAME : +if (!session->netdev) + len =sprintf (buf,"%s\n" ,"default" ); +else + len =sprintf (buf,"%s\n" , session->netdev); +break ;case ISCSI_HOST_PARAM_HWADDRESS :if (!session->hwaddress) len =sprintf (buf,"%s\n" ,"default" );
@@ -2067,6 +2074,10 @@ int iscsi_host_set_param(struct Scsi_Hosstruct iscsi_session *session =iscsi_hostdata (shost->hostdata);switch (param) { +case ISCSI_HOST_PARAM_NETDEV_NAME : +if (!session->netdev) + session->netdev =kstrdup (buf,GFP_KERNEL ); +break ;case ISCSI_HOST_PARAM_HWADDRESS :if (!session->hwaddress) session->hwaddress =kstrdup (buf,GFP_KERNEL );
drivers/scsi/qla4xxx/ql4_os.c +2 -1
@@ -102,7 +102,8 @@ static struct scsi_host_template qla4xxxstatic struct iscsi_transport qla4xxx_iscsi_transport = { .owner =THIS_MODULE , .name =DRIVER_NAME , - .caps =CAP_FW_DB |CAP_SENDTARGETS_OFFLOAD , + .caps =CAP_FW_DB |CAP_SENDTARGETS_OFFLOAD | +CAP_DATA_PATH_OFFLOAD , .param_mask =ISCSI_CONN_PORT |ISCSI_CONN_ADDRESS |ISCSI_TARGET_NAME |ISCSI_TPGT , .host_param_mask = ISCSI_HOST_HWADDRESS |
drivers/scsi/scsi_transport_iscsi.c +4 -2
@@ -32,7 +32,7 @@ #include <scsi/iscsi_if.h>#define ISCSI_SESSION_ATTRS 15#define ISCSI_CONN_ATTRS 11 -#define ISCSI_HOST_ATTRS 3 +#define ISCSI_HOST_ATTRS 4#define ISCSI_TRANSPORT_VERSION "2.0-724"struct iscsi_internal {
@@ -1261,8 +1261,9 @@ #define iscsi_host_attr(field, param) static ISCSI_CLASS_ATTR(host, field, S_IRUGO, show_host_param_##param, \ NULL); -iscsi_host_attr (ipaddress,ISCSI_HOST_PARAM_IPADDRESS ); +iscsi_host_attr (netdev,ISCSI_HOST_PARAM_NETDEV_NAME );iscsi_host_attr (hwaddress,ISCSI_HOST_PARAM_HWADDRESS ); +iscsi_host_attr (ipaddress,ISCSI_HOST_PARAM_IPADDRESS );iscsi_host_attr (initiatorname,ISCSI_HOST_PARAM_INITIATOR_NAME );#define SETUP_PRIV_SESSION_RD_ATTR (field) \
@@ -1399,6 +1400,7 @@ iscsi_register_transport(struct iscsi_tr priv->t.host_size =sizeof (struct iscsi_host );transport_container_register (&priv->t.host_attrs); +SETUP_HOST_RD_ATTR (netdev,ISCSI_HOST_NETDEV_NAME );SETUP_HOST_RD_ATTR (ipaddress,ISCSI_HOST_IPADDRESS );SETUP_HOST_RD_ATTR (hwaddress,ISCSI_HOST_HWADDRESS );SETUP_HOST_RD_ATTR (initiatorname,ISCSI_HOST_INITIATOR_NAME );
include/scsi/iscsi_if.h +3 -0
@@ -271,12 +271,14 @@ #define ISCSI_PASSWORD_IN (1 << ISCSI_Penum iscsi_host_param {ISCSI_HOST_PARAM_HWADDRESS ,ISCSI_HOST_PARAM_INITIATOR_NAME , +ISCSI_HOST_PARAM_NETDEV_NAME ,ISCSI_HOST_PARAM_IPADDRESS ,ISCSI_HOST_PARAM_MAX , };#define ISCSI_HOST_HWADDRESS (1 << ISCSI_HOST_PARAM_HWADDRESS)#define ISCSI_HOST_INITIATOR_NAME (1 << ISCSI_HOST_PARAM_INITIATOR_NAME) +#define ISCSI_HOST_NETDEV_NAME (1 << ISCSI_HOST_PARAM_NETDEV_NAME)#define ISCSI_HOST_IPADDRESS (1 << ISCSI_HOST_PARAM_IPADDRESS)#define iscsi_ptr (_handle) ((void*)(unsigned long)_handle)
@@ -303,6 +305,7 @@ #define CAP_TEXT_NEGO 0x80#define CAP_MARKERS 0x100#define CAP_FW_DB 0x200#define CAP_SENDTARGETS_OFFLOAD 0x400 +#define CAP_DATA_PATH_OFFLOAD 0x800/* * These flags describes reason of stop_conn() call
include/scsi/libiscsi.h +2 -1
@@ -228,8 +228,9 @@ struct iscsi_session {char *password_in;char *targetname;char *initiatorname; -/* hw address being used for iscsi connection */ +/* hw address or netdev iscsi connection is bound to */ char *hwaddress; +char *netdev;/* control data */ struct iscsi_transport *tt;struct Scsi_Host *host;
Signature · 1 line
1.4.1.1