RFC: beiscsi: iscsi hook in and handling code
PATCH 4/6 RFC: beiscsi: iscsi hook in and handling code
These files contain code to interface with open-iscsi layer
Signed-off-by Jayamohan Kallickal <[email protected]>
--- drivers/scsi/beiscsi/be.h | 185 ++++++++++++ drivers/scsi/beiscsi/be_iscsi.c | 628 +++++++++++++++++++++++++++++++++++++++ drivers/scsi/beiscsi/be_iscsi.h | 89 ++++++ 3 files changed, 902 insertions(+), 0 deletions(-) create mode 100644 drivers/scsi/beiscsi/be.h create mode 100644 drivers/scsi/beiscsi/be_iscsi.c create mode 100644 drivers/scsi/beiscsi/be_iscsi.h
drivers/scsi/beiscsi/be.h new file +185 -0
@@ -0,0 +1,185 @@ +/* +* Copyright (C) 2005 - 2009 ServerEngines +* All rights reserved. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License version 2 +* as published by the Free Software Foundation. The full GNU General +* Public License is included in this distribution in the file called COPYING. +* +* Contact Information: +* [email protected] +* +* ServerEngines +* 209 N. Fair Oaks Ave +* Sunnyvale, CA 94085 +*/ + +#ifndef BEISCSI_H +#define BEISCSI_H + +#include <linux/pci.h> +#include <linux/if_vlan.h> + +#define FW_VER_LEN 32 + +struct be_dma_mem { +void *va; +dma_addr_t dma; +u32 size; +}; + +struct be_queue_info { +struct be_dma_mem dma_mem; +u16 len; +u16 entry_size;/* Size of an element in the queue */ +u16 id; +u16 tail, head; +bool created; +atomic_t used;/* Number of valid elements in the queue */ +}; + +static inline u32 MODULO (u16 val,u16 limit) +{ +WARN_ON (limit & (limit -1 )); +return val & (limit -1 ); +} + +static inline void index_inc (u16 *index,u16 limit) +{ + *index =MODULO ((*index +1 ), limit); +} + +static inline void *queue_head_node (struct be_queue_info *q) +{ +return q->dma_mem.va + q->head * q->entry_size; +} + +static inline void *queue_tail_node (struct be_queue_info *q) +{ +return q->dma_mem.va + q->tail * q->entry_size; +} + +static inline void queue_head_inc (struct be_queue_info *q) +{ +index_inc (&q->head, q->len); +} + +static inline void queue_tail_inc (struct be_queue_info *q) +{ +index_inc (&q->tail, q->len); +} + +/*ISCSI */ + +#define DEFAULT_MAX_BURST_LENGTH 262144 + +struct be_eq_obj { +struct be_queue_info q; +char desc[32 ]; + +/* Adaptive interrupt coalescing (AIC) info */ +bool enable_aic; +u16 min_eqd;/* in usecs */ +u16 max_eqd;/* in usecs */ +u16 cur_eqd;/* in usecs */ +}; + +struct be_mcc_obj { +struct be_queue_info *q; +struct be_queue_info *cq; +}; + +struct be_ctrl_info { +u8 __iomem *csr; +u8 __iomem *db;/* Door Bell */ +u8 __iomem *pcicfg;/* PCI config space */ +struct pci_dev *pdev; + +/* Mbox used for cmd request/response */ +spinlock_t mbox_lock;/* For serializing mbox cmds to BE card */ +struct be_dma_mem mbox_mem; +/* Mbox mem is adjusted to align to 16 bytes. The allocated addr +* is stored for freeing purpose */ +struct be_dma_mem mbox_mem_alloced; + +/* MCC Rings */ +struct be_mcc_obj mcc_obj; +spinlock_t mcc_lock;/* For serializing mcc cmds to BE card */ +spinlock_t mcc_cq_lock; + +/* MCC Async callback */ +void (*async_cb) (void *adapter,bool link_up); +void *adapter_ctxt; +}; + +#include "be_cmds.h" + +#define PAGE_SHIFT_4K 12 +#define PAGE_SIZE_4K (1 << PAGE_SHIFT_4K) + +/* Returns number of pages spanned by the data starting at the given addr */ +#define PAGES_4K_SPANNED (_address, size) \ + ((u32)((((size_t)(_address) & (PAGE_SIZE_4K - 1)) + \ + (size) + (PAGE_SIZE_4K - 1)) >> PAGE_SHIFT_4K)) + +/* Byte offset into the page corresponding to given address */ +#define OFFSET_IN_PAGE (addr) \ + ((size_t)(addr) & (PAGE_SIZE_4K-1)) + +/* Returns bit offset within a DWORD of a bitfield */ +#define AMAP_BIT_OFFSET (_struct, field) \ + (((size_t)&(((_struct *)0)->field))%32) + +/* Returns the bit mask of the field that is NOT shifted into location. */ +static inline u32 amap_mask (u32 bitsize) +{ +return (bitsize ==32 ?0xFFFFFFFF : (1 << bitsize) -1 ); +} + +static inline void amap_set (void *ptr,u32 dw_offset,u32 mask, +u32 offset,u32 value) +{ +u32 *dw = (u32 *) ptr + dw_offset; + *dw &= ~(mask << offset); + *dw |= (mask & value) << offset; +} + +#define AMAP_SET_BITS (_struct, field, ptr, val) \ + amap_set(ptr, \ + offsetof(_struct, field)/32, \ + amap_mask(sizeof(((_struct *)0)->field)), \ + AMAP_BIT_OFFSET(_struct, field), \ + val) + +static inline u32 amap_get (void *ptr,u32 dw_offset,u32 mask,u32 offset) +{ +u32 *dw = ptr; +return mask & (*(dw + dw_offset) >> offset); +} + +#define AMAP_GET_BITS (_struct, field, ptr) \ + amap_get(ptr, \ + offsetof(_struct, field)/32, \ + amap_mask(sizeof(((_struct *)0)->field)), \ + AMAP_BIT_OFFSET(_struct, field)) + +#define be_dws_cpu_to_le (wrb, len) swap_dws(wrb, len) +#define be_dws_le_to_cpu (wrb, len) swap_dws(wrb, len) +static inline void swap_dws (void *wrb,int len) +{ +#ifdef __BIG_ENDIAN +u32 *dw = wrb; +WARN_ON (len %4 ); +do { + *dw =cpu_to_le32 (*dw); + dw++; + len -=4 ; + }while (len); +#endif /* __BIG_ENDIAN */ +} + +extern void be_cq_notify (struct be_ctrl_info *ctrl,u16 qid,bool arm, +u16 num_popped); + +#endif /* BEISCSI_H */
drivers/scsi/beiscsi/be_iscsi.c new file +628 -0
628 lines not on this page · raw message
drivers/scsi/beiscsi/be_iscsi.h new file +89 -0
89 lines not on this page · raw message
Signature · 1 line
1.6.3
Here are some more quick comments.
Quoted 34 lines · Jayamohan Kallickal
drivers/scsi/beiscsi/be.h new file +1
-0+#endif /* BEISCSI_H */ drivers/scsi/beiscsi/be_iscsi.c new file +27
-0@@ -0,0 +1,628 @@ +/* +* Copyright (C) 2005 - 2009 ServerEngines +* All rights reserved. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License version 2 +* as published by the Free Software Foundation. The full GNU General +* Public License is included in this distribution in the file called COPYING. +* +* Written by: Jayamohan Kallickal ([email protected]) +* +* Contact Information: +* [email protected] +* +* ServerEngines +* 209 N. Fair Oaks Ave +* Sunnyvale, CA 94085 +* +*/ + +#include <scsi/libiscsi.h> +#include <scsi/scsi_transport_iscsi.h> +#include <scsi/scsi_transport.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_host.h> +#include <scsi/scsi.h>
drivers/scsi/beiscsi/be_iscsi.c line 37
Quoted 10 lines
drivers/scsi/beiscsi/be_iscsi.c new file +10
-0+ +#include "be_iscsi.h" + +extern struct iscsi_transport beiscsi_iscsi_transport; + +/* +* beiscsi_session_create: creates a new iscsi session +* cmds_max: max commands supported +* qdepth: max queue depth supported +* initial_cmdsn: initial iscsi CMDSN
should use docbook comments.
Quoted 9 lines
drivers/scsi/beiscsi/be_iscsi.c new file +9
-0+*/ +struct iscsi_cls_session *beiscsi_session_create (struct iscsi_endpoint *ep, +u16 cmds_max, +u16 qdepth, +u32 initial_cmdsn) +{ +struct iscsi_cls_session *cls_session; +struct iscsi_session *sess; +struct Scsi_Host *shost;
drivers/scsi/beiscsi/be_iscsi.c line 56
Quoted 10 lines
drivers/scsi/beiscsi/be_iscsi.c new file +10
-0+struct beiscsi_endpoint *beiscsi_ep; +struct iscsi_task *task; +struct beiscsi_io_task *io_task; +int num_cmd; + +if (!ep) { +SE_DEBUG (DBG_LVL_1 ,"beiscsi_session_create: invalid ep \n" ); +return NULL ; + } + beiscsi_ep = (struct beiscsi_endpoint *)ep->dd_data;
dd_data is a void pointer so I do not think you need the cast.
drivers/scsi/beiscsi/be_iscsi.c line 60
Quoted 4 lines
drivers/scsi/beiscsi/be_iscsi.c new file +4
-0+ shost = beiscsi_ep->phba->shost; + + cls_session = + iscsi_session_setup(&beiscsi_iscsi_transport, shost, cmds_max,
Was there any limit on the number of commands per session? What about per port/scsi_host?
drivers/scsi/beiscsi/be_iscsi.c line 67
Quoted 7 lines
drivers/scsi/beiscsi/be_iscsi.c new file +7
-0+sizeof (struct beiscsi_io_task ), initial_cmdsn, + ISCSI_MAX_TARGET); +if (!cls_session) +return NULL ; + sess = cls_session->dd_data; + + shost->can_queue = sess->cmds_max;
iscsi_tcp does this because it does a host per session. You should not do this because you can have multiple sessions per host/port.
drivers/scsi/beiscsi/be_iscsi.c line 68
Quoted 1 line
drivers/scsi/beiscsi/be_iscsi.c new file +1
-0+for (num_cmd =0 ; num_cmd< sess->cmds_max; num_cmd++) {
space between num_cmd and "<".
drivers/scsi/beiscsi/be_iscsi.c line 72
Quoted 4 lines
drivers/scsi/beiscsi/be_iscsi.c new file +4
-0+ task = sess->cmds[num_cmd]; + io_task = task->dd_data; + task->hdr = (struct iscsi_hdr *)&io_task->cmd_bhs.iscsi_hdr; + task->hdr_max =sizeof (struct be_cmd_bhs );
You want to do this prep work in the iscsi_transport->alloc_pdu callout.
Quoted 22 lines
drivers/scsi/beiscsi/be_iscsi.c new file +22
-0+ } +return cls_session; +} + +/* +* beiscsi_conn_create: create an instance of iscsi connection +* cls_session : ptr to iscsi_cls_session +* cid: iscsi cid +*/ +struct iscsi_cls_conn *beiscsi_conn_create (struct iscsi_cls_session + *cls_session,u32 cid) +{ +struct beiscsi_hba *phba; +struct Scsi_Host *shost; +struct iscsi_cls_conn *cls_conn; +struct beiscsi_conn *beiscsi_conn; +struct iscsi_conn *conn; + +SE_DEBUG (DBG_LVL_8 ,"In beiscsi_conn_create ,cid" +"from iscsi layer=%d\n" , cid); + shost =iscsi_session_to_shost (cls_session); + phba =iscsi_host_priv (shost);
drivers/scsi/beiscsi/be_iscsi.c line 104
Quoted 10 lines
drivers/scsi/beiscsi/be_iscsi.c new file +10
-0+ + cls_conn =iscsi_conn_setup (cls_session,sizeof (*beiscsi_conn), cid); +if (!cls_conn) +return NULL ; + + conn = cls_conn->dd_data; + beiscsi_conn = conn->dd_data; + beiscsi_conn->ep =NULL ; + beiscsi_conn->phba = phba; + beiscsi_conn->exp_statsn =0xDEADBEEF ;
What is that for?
drivers/scsi/beiscsi/be_iscsi.c line 117
Quoted 13 lines
drivers/scsi/beiscsi/be_iscsi.c new file +13
-0+ beiscsi_conn->conn = conn; + +return cls_conn; +} + +/* +* beiscsi_session_destroy: destroy the iscsi session +* cls_session : ptr to iscsi_cls_session +*/ +void beiscsi_session_destroy (struct iscsi_cls_session *cls_session) +{ +iscsi_session_teardown (cls_session); +}
if all you do is call the lib function, then you can just set the iscsi_transport callout to the lib function.
Quoted 50 lines
drivers/scsi/beiscsi/be_iscsi.c new file +50
-0+ +/* +* beiscsi_conn_destroy: destroy the iscsi connection +* cls_conn : ptr to iscsi_cls_conn +*/ +void beiscsi_conn_destroy (struct iscsi_cls_conn *cls_conn) +{ +iscsi_conn_teardown (cls_conn); +} + +/* beiscsi_conn_bind: Binds iscsi session/connection with TCP connection +* @cls_session: pointer to iscsi cls session +* @cls_conn: pointer to iscsi cls conn +* transport_fd: EP handle(64 bit) +* This function binds the TCP Conn with iSCSI Connection and Session. +*/ +int beiscsi_conn_bind (struct iscsi_cls_session *cls_session, +struct iscsi_cls_conn *cls_conn, +u64 transport_fd,int is_leading) +{ +struct iscsi_conn *conn = cls_conn->dd_data; +struct beiscsi_conn *beiscsi_conn = conn->dd_data; +struct Scsi_Host *shost = + (struct Scsi_Host *)iscsi_session_to_shost (cls_session); +struct beiscsi_hba *phba = (struct beiscsi_hba *)iscsi_host_priv (shost); +struct beiscsi_endpoint *beiscsi_ep; +struct iscsi_endpoint *ep; + +SE_DEBUG (DBG_LVL_8 ,"In beiscsi_conn_bind\n" ); + ep =iscsi_lookup_endpoint (transport_fd); +if (!ep) +return -EINVAL ; + + beiscsi_ep = ep->dd_data; + +if (iscsi_conn_bind (cls_session, cls_conn, is_leading)) +return -EINVAL ; + +if (beiscsi_ep->phba != phba) { +SE_DEBUG (DBG_LVL_8 , +"beiscsi_ep->hba=%p not equal to phba=%p \n" , + beiscsi_ep->phba, phba); +return -EEXIST ; + } + + beiscsi_conn->beiscsi_conn_cid = beiscsi_ep->ep_cid; + beiscsi_conn->ep = beiscsi_ep; + beiscsi_ep->conn = beiscsi_conn; +SE_DEBUG (DBG_LVL_8 ,"beiscsi_conn=%p conn=%p ep_cid=%d \n" , + beiscsi_conn, conn, beiscsi_ep->ep_cid);
drivers/scsi/beiscsi/be_iscsi.c line 177
Quoted 10 lines
drivers/scsi/beiscsi/be_iscsi.c new file +10
-0+return beiscsi_bindconn_cid (phba, beiscsi_conn, beiscsi_ep->ep_cid); +} + +/* beiscsi_conn_get_param: get the iscsi parameter +* cls_conn: pointer to iscsi cls conn +* param: parameter type identifier +* buf: buffer pointer +* returns iscsi parameter +*/ +
weird extra space
Quoted 15 lines
drivers/scsi/beiscsi/be_iscsi.c new file +15
-0+int beiscsi_conn_get_param (struct iscsi_cls_conn *cls_conn, +enum iscsi_param param,char *buf) +{ +struct beiscsi_endpoint *beiscsi_ep; +struct iscsi_conn *conn = cls_conn->dd_data; +struct beiscsi_conn *beiscsi_conn = conn->dd_data; +int len =0 ; + + beiscsi_ep = beiscsi_conn->ep; +if (!beiscsi_ep) { +SE_DEBUG (DBG_LVL_1 , +"In beiscsi_conn_get_param , no beiscsi_ep\n" ); +return -1 ; + } +
drivers/scsi/beiscsi/be_iscsi.c line 202
Quoted 10 lines
drivers/scsi/beiscsi/be_iscsi.c new file +10
-0+switch (param) { +case ISCSI_PARAM_CONN_PORT : + len =sprintf (buf,"%hu\n" , beiscsi_ep->dst_tcpport); +break ; +case ISCSI_PARAM_CONN_ADDRESS : + len =sprintf (buf,"%u.%u.%u.%u\n" , + ((unsigned char *)&beiscsi_ep->dst_addr)[0 ], + ((unsigned char *)&beiscsi_ep->dst_addr)[1 ], + ((unsigned char *)&beiscsi_ep->dst_addr)[2 ], + ((unsigned char *)&beiscsi_ep->dst_addr)[3 ]);
There is the NIPQUAD_FMT/NIPQUAD macros or there is the %pI4 macro.
What is up with ipv6?
Quoted 18 lines
drivers/scsi/beiscsi/be_iscsi.c new file +18
-0+break ; +default : +return iscsi_conn_get_param (cls_conn, param, buf); + } + +return len; +} + +/* beiscsi_get_host_param: get the iscsi parameter +* shost: pointer to scsi_host structure +* param: parameter type identifier +* buf: buffer pointer +* returns host parameter +*/ + +int beiscsi_get_host_param (struct Scsi_Host *shost, +enum iscsi_host_param param,char *buf) +{
drivers/scsi/beiscsi/be_iscsi.c line 230
Quoted 10 lines
drivers/scsi/beiscsi/be_iscsi.c new file +10
-0+struct beiscsi_hba *phba = (struct beiscsi_hba *)iscsi_host_priv (shost); +int len =0 ; + +switch (param) { +case ISCSI_HOST_PARAM_HWADDRESS : +be_cmd_get_mac_addr (&phba->ctrl, phba->mac_address); + len =sysfs_format_mac (buf, phba->mac_address,ETH_ALEN ); +break ; +case ISCSI_HOST_PARAM_NETDEV_NAME : + len =sprintf (buf,"beiscsi\n" );
This is for if the driver has to interact with the net layers netdev. beiscsi does not. You should not implement this callback.
Quoted 36 lines
drivers/scsi/beiscsi/be_iscsi.c new file +36
-0+break ; +default : +return iscsi_host_get_param (shost, param, buf); + } +return len; +} + +/* beiscsi_conn_get_stats: get the iscsi stats +* cls_conn: pointer to iscsi cls conn +* stats: pointer to iscsi_stats structure +* returns iscsi stats +*/ +void beiscsi_conn_get_stats (struct iscsi_cls_conn *cls_conn, +struct iscsi_stats *stats) +{ +struct iscsi_conn *conn = cls_conn->dd_data; + +SE_DEBUG (DBG_LVL_8 ,"In beiscsi_conn_get_stats\n" ); + stats->txdata_octets = conn->txdata_octets; + stats->rxdata_octets = conn->rxdata_octets; + stats->dataout_pdus = conn->dataout_pdus_cnt; + stats->scsirsp_pdus = conn->scsirsp_pdus_cnt; + stats->scsicmd_pdus = conn->scsicmd_pdus_cnt; + stats->datain_pdus = conn->datain_pdus_cnt; + stats->tmfrsp_pdus = conn->tmfrsp_pdus_cnt; + stats->tmfcmd_pdus = conn->tmfcmd_pdus_cnt; + stats->r2t_pdus = conn->r2t_pdus_cnt; + stats->digest_err =0 ; + stats->timeout_err =0 ; + stats->custom_length =0 ; +strcpy (stats->custom[0 ].desc,"eh_abort_cnt" ); + stats->custom[0 ].value = conn->eh_abort_cnt; +} + +/* beiscsi_set_params_for_offld : get the parameters for offload +* beiscsi_conn: pointer to beiscsi_conn
drivers/scsi/beiscsi/be_iscsi.c line 276
Quoted 10 lines
drivers/scsi/beiscsi/be_iscsi.c new file +10
-0+* params: pointer to offload_params structure +*/ +static int beiscsi_set_params_for_offld (struct beiscsi_conn *beiscsi_conn, +struct beiscsi_offload_params *params) +{ +struct iscsi_conn *conn = beiscsi_conn->conn; +struct iscsi_session *session = conn->session; + + AMAP_SET_BITS(struct amap_beiscsi_offload_params, max_burst_length, + params, session->max_burst);
I think the tabs/spacing is off.
drivers/scsi/beiscsi/be_iscsi.c line 278
Quoted 2 lines
drivers/scsi/beiscsi/be_iscsi.c new file +2
-0+ AMAP_SET_BITS(struct amap_beiscsi_offload_params, + max_send_data_segment_length, params, 8192);
What is up with the hardcoding and override of userspace?
If that is the value you are going to use you should session the session value so libiscsi knows this and will make pdus accordingly.
drivers/scsi/beiscsi/be_iscsi.c line 282
Quoted 4 lines
drivers/scsi/beiscsi/be_iscsi.c new file +4
-0+ AMAP_SET_BITS(struct amap_beiscsi_offload_params, first_burst_length, + params, session->first_burst); + AMAP_SET_BITS(struct amap_beiscsi_offload_params, first_burst_length, + params, 8192);
What is up with the hardcoding and override of userspace?
Quoted 28 lines
drivers/scsi/beiscsi/be_iscsi.c new file +28
-0+ AMAP_SET_BITS(struct amap_beiscsi_offload_params, erl, params, + session->erl); + AMAP_SET_BITS(struct amap_beiscsi_offload_params, dde, params, + conn->datadgst_en); + AMAP_SET_BITS(struct amap_beiscsi_offload_params, hde, params, + conn->hdrdgst_en); + AMAP_SET_BITS(struct amap_beiscsi_offload_params, ir2t, params, + session->initial_r2t_en); + AMAP_SET_BITS(struct amap_beiscsi_offload_params, imd, params, + session->imm_data_en); + AMAP_SET_BITS(struct amap_beiscsi_offload_params, exp_statsn, params, + (conn->exp_statsn - 1)); +return 0 ; +} + +/* beiscsi_conn_start : offload of session to chip +* cls_conn: pointer to beiscsi_conn +*/ +int beiscsi_conn_start (struct iscsi_cls_conn *cls_conn) +{ +struct iscsi_conn *conn = cls_conn->dd_data; +struct beiscsi_conn *beiscsi_conn = conn->dd_data; +struct beiscsi_endpoint *beiscsi_ep; +struct beiscsi_offload_params params; + +struct iscsi_session *session = conn->session; +struct Scsi_Host *shost =iscsi_session_to_shost (session->cls_session); +struct beiscsi_hba *phba =iscsi_host_priv (shost);
drivers/scsi/beiscsi/be_iscsi.c
Quoted 10 lines
drivers/scsi/beiscsi/be_iscsi.c new file +10
-0+ +memset (¶ms,0x0 ,sizeof (struct beiscsi_offload_params )); +SE_DEBUG (DBG_LVL_8 ,"beiscsi_conn_start \n" ); + beiscsi_ep = beiscsi_conn->ep; +if (!beiscsi_ep) +SE_DEBUG (DBG_LVL_1 ,"In beiscsi_conn_start , no beiscsi_ep\n" ); +free_eh_sgl_handle (phba, beiscsi_conn->plogin_sgl_handle); + beiscsi_conn->login_in_progress =0 ; +iscsi_conn_start (cls_conn); +beiscsi_set_params_for_offld (beiscsi_conn,¶ms);
space between "," and ¶ms.
Quoted 4 lines
drivers/scsi/beiscsi/be_iscsi.c new file +4
-0+beiscsi_offload_connection (beiscsi_conn,¶ms); +return 0 ; +} +
drivers/scsi/beiscsi/be_iscsi.c line 334
Quoted 10 lines
drivers/scsi/beiscsi/be_iscsi.c new file +10
-0+/* +* beiscsi_ep_connect: Ask chip to create TCP Conn +* scsi_host: Pointer to scsi_host structure +* dst_addr: The IP address of Target +* non_blocking: blocking or non-blocking call + +This routines first asks chip to create a connection and then allocates an EP +*/ +struct iscsi_endpoint + *beiscsi_ep_connect(struct Scsi_Host *shost,
Weird extra spaces.
Quoted 51 lines
drivers/scsi/beiscsi/be_iscsi.c new file +51
-0+ struct sockaddr *dst_addr, int non_blocking) +{ +struct beiscsi_hba *phba; +struct beiscsi_endpoint *beiscsi_ep; +struct iscsi_endpoint *ep; +int ret; + +if (shost) + phba =iscsi_host_priv (shost); +else { + ret = -ENXIO ; +SE_DEBUG (DBG_LVL_1 ,"shost is NULL \n" ); +return ERR_PTR (ret); + } + ep =iscsi_create_endpoint (sizeof (struct beiscsi_endpoint )); +if (!ep) { + ret = -ENOMEM ; +return ERR_PTR (ret); + } + + beiscsi_ep = ep->dd_data; + beiscsi_ep->phba = phba; + +if (beiscsi_open_conn (ep,NULL , dst_addr, non_blocking)) { +SE_DEBUG (DBG_LVL_1 ,"Failed in allocate iscsi cid\n" ); + ret = -ENOMEM ; + goto free_ep; + } + +return ep; + +free_ep: +beiscsi_free_ep (ep); +return ERR_PTR (ret); +} + +/* +* beiscsi_ep_poll: Poll to see if connection is established +* ep: endpoint to be used +* timeout_ms: timeout specified in millisecs +* Poll to see if TCP connection established +*/ +int beiscsi_ep_poll (struct iscsi_endpoint *ep,int timeout_ms) +{ +struct beiscsi_endpoint *beiscsi_ep = ep->dd_data; + +if (beiscsi_ep->cid_vld ==1 ) +return 1 ; +else +return 0 ; +}
drivers/scsi/beiscsi/be_iscsi.c line 395
Quoted 10 lines
drivers/scsi/beiscsi/be_iscsi.c new file +10
-0+ +/* +* beiscsi_cleanup_task: For compatibility with open-iscsi +* as now this function is not an option +* +*/ +void beiscsi_cleanup_task (struct iscsi_task *task) +{ + +}
If we send a abort task or lun reset and this completes successfully, where will you clean up allocated resources for the task/tasks that were aborted or affected by the reset?
Quoted 153 lines
drivers/scsi/beiscsi/be_iscsi.c new file +153
-0+ +/* +* beiscsi_ep_disconnect: Tears down the TCP connection +* ep: endpoint to be used +* Tears down the TCP connection +*/ +void beiscsi_ep_disconnect (struct iscsi_endpoint *ep) +{ +struct beiscsi_conn *beiscsi_conn; +struct beiscsi_endpoint *beiscsi_ep; +struct beiscsi_hba *phba; +int flag =0 ; + + beiscsi_ep = ep->dd_data; + phba = beiscsi_ep->phba; +SE_DEBUG (DBG_LVL_8 ,"In beiscsi_ep_disconnect\n" ); + +if (beiscsi_ep->conn) { + beiscsi_conn = beiscsi_ep->conn; +iscsi_suspend_tx (beiscsi_conn->conn); +beiscsi_close_conn (ep, flag); + beiscsi_conn->ep =NULL ; + } + +beiscsi_free_ep (ep); +} + +/* +* beiscsi_put_cid: Free the cid +* phba: The phba for which the cid is being freed +* cid: The cid to free +*/ +static void beiscsi_put_cid (struct beiscsi_hba *phba,unsigned short cid) +{ + phba->avlbl_cids++; + phba->cid_array[phba->cid_free++] = cid; +if (phba->cid_free == phba->params.cxns_per_ctrl) + phba->cid_free =0 ; +} + +/* +* beiscsi_bindconn_cid:Bind the beiscsi_conn with +* phba connection table +* beiscsi_conn:The pointer to beiscsi_conn structure +* phba: The phba instance +* cid: The cid to free +*/ +int beiscsi_bindconn_cid (struct beiscsi_hba *phba, +struct beiscsi_conn *beiscsi_conn,unsigned int cid) +{ +if (phba->conn_table[cid]) { +SE_DEBUG (DBG_LVL_1 , +"Connection table already occupied. Detected clash\n" ); +return -EINVAL ; + }else { +SE_DEBUG (DBG_LVL_8 ,"phba->conn_table[%d]=%p(beiscsi_conn) \n" , + cid, beiscsi_conn); + phba->conn_table[cid] = beiscsi_conn; + } +return 0 ; +} + +/* +* beiscsi_unbind_conn_to_cid:Unbind the beiscsi_conn from +* phba connection table +* phba: The phba instance +* cid: The cid to free +*/ + +static int beiscsi_unbind_conn_to_cid (struct beiscsi_hba *phba, +unsigned int cid) +{ +if (phba->conn_table[cid]) { + phba->conn_table[cid] =NULL ; + }else { +SE_DEBUG (DBG_LVL_8 ,"Connection table Not occupied. \n" ); +return -EINVAL ; + } +return 0 ; +} + +/* +* beiscsi_alloc_ep: Used to allocate a ep +* phba: The phba instance +* +*/ +struct iscsi_endpoint *beiscsi_alloc_ep (struct beiscsi_hba *phba) +{ +struct iscsi_endpoint *ep; +struct beiscsi_endpoint *beiscsi_ep; + + ep =iscsi_create_endpoint (sizeof (struct beiscsi_endpoint )); +if (!ep) { +SE_DEBUG (DBG_LVL_1 ,"Failed in iscsi_create_endpoint\n" ); +return NULL ; + } + + beiscsi_ep = ep->dd_data; + beiscsi_ep->phba = phba; +return ep; +} + +/* +* beiscsi_free_ep: free endpoint +* ep: pointer to iscsi endpoint structure +*/ +void beiscsi_free_ep (struct iscsi_endpoint *ep) +{ +struct beiscsi_endpoint *beiscsi_ep = ep->dd_data; +struct beiscsi_hba *phba = beiscsi_ep->phba; + +beiscsi_put_cid (phba, beiscsi_ep->ep_cid); + beiscsi_ep->phba =NULL ; +iscsi_destroy_endpoint (ep); +} + +/* +* beiscsi_get_cid:Allocate a cid +* phba: The phba instance +*/ + +static int beiscsi_get_cid (struct beiscsi_hba *phba) +{ +unsigned short cid =0xFFFF ; + +if (!phba->avlbl_cids) +return cid; + + cid = phba->cid_array[phba->cid_alloc++]; +if (phba->cid_alloc == phba->params.cxns_per_ctrl) + phba->cid_alloc =0 ; + phba->avlbl_cids--; +return cid;/* The cid returned here is +* 0,2,4 ...or 1,3,5,... +*/ +} + +/* +* beiscsi_open_conn: Ask FW to open a TCP connection +* ep: endpoint to be used +* src_addr: The source IP address +* dst_addr: The Destination IP address +* Asks the FW to open a TCP connection +*/ +int beiscsi_open_conn (struct iscsi_endpoint *ep, +struct sockaddr *src_addr, +struct sockaddr *dst_addr,int non_blocking) +{ +struct beiscsi_endpoint *beiscsi_ep = ep->dd_data; +struct beiscsi_hba *phba = beiscsi_ep->phba; +struct sockaddr_in *daddr_in = (struct sockaddr_in *)dst_addr; +int ret =-1 ; +
drivers/scsi/beiscsi/be_iscsi.c
Quoted 10 lines
drivers/scsi/beiscsi/be_iscsi.c new file +10
-0+ beiscsi_ep->ep_cid =beiscsi_get_cid (phba); +if (beiscsi_ep->ep_cid ==0xFFFF ) { +SE_DEBUG (DBG_LVL_1 ,"No free cid available\n" ); +return ret; + } +SE_DEBUG (DBG_LVL_8 ,"In beiscsi_open_conn, ep_cid=%d " , + beiscsi_ep->ep_cid); + phba->ep_array[beiscsi_ep->ep_cid] = (unsigned long *)ep; +/* Here , the cid values are * 0,2,4 ... or 1,3,5... */ + if (beiscsi_ep->ep_cid>
space between ep_cid and ">"
drivers/scsi/beiscsi/be_iscsi.c line 559
Quoted 1 line
drivers/scsi/beiscsi/be_iscsi.c new file +1
-0+ (phba->fw_config.iscsi_cid_start +
You do not need the extra tab here and in the next line.
drivers/scsi/beiscsi/be_iscsi.c line 560
Quoted 1 line
drivers/scsi/beiscsi/be_iscsi.c new file +1
-0+ phba->params.cxns_per_ctrl)){
space between ")" and "{"
drivers/scsi/beiscsi/be_iscsi.c line 565
Quoted 5 lines
drivers/scsi/beiscsi/be_iscsi.c new file +5
-0+SE_DEBUG (DBG_LVL_1 ,"Failed in allocate iscsi cid\n" ); +return ret; + } + + daddr_in->sin_port =ISCSI_LISTEN_PORT ;
Why are you setting the port to this?
Quoted 14 lines
drivers/scsi/beiscsi/be_iscsi.c new file +14
-0+ beiscsi_ep->cid_vld =0 ; + ret =mgmt_open_connection (phba, daddr_in->sin_addr.s_addr, + daddr_in->sin_port, beiscsi_ep->ep_cid); + + beiscsi_ep->dst_addr = daddr_in->sin_addr.s_addr; + beiscsi_ep->dst_tcpport = daddr_in->sin_port; + +return ret; +} + +/* beiscsi_conn_stop : Invalidate and stop the connection +* cls_conn: pointer to beiscsi_conn +* flag: The type of connection closure +*/
drivers/scsi/beiscsi/be_iscsi.c line 589
Quoted 10 lines
drivers/scsi/beiscsi/be_iscsi.c new file +10
-0+void beiscsi_conn_stop (struct iscsi_cls_conn *cls_conn,int flag) +{ +struct iscsi_conn *conn = cls_conn->dd_data; +struct beiscsi_conn *beiscsi_conn = conn->dd_data; +struct beiscsi_endpoint *beiscsi_ep; +struct iscsi_session *session = conn->session; +struct Scsi_Host *shost =iscsi_session_to_shost (session->cls_session); +struct beiscsi_hba *phba =iscsi_host_priv (shost); +unsigned int status; +
extra newline. Could probably go after the line below instead.
drivers/scsi/beiscsi/be_iscsi.c line 597
Quoted 8 lines
drivers/scsi/beiscsi/be_iscsi.c new file +8
-0+unsigned short savecfg_flag =CMD_ISCSI_SESSION_SAVE_CFG_ON_FLASH ; + beiscsi_ep = beiscsi_conn->ep; +if (!beiscsi_ep) { +SE_DEBUG (DBG_LVL_8 ,"In beiscsi_conn_stop , no beiscsi_ep\n" ); +return ; + } + status =mgmt_invalidate_connection (phba, beiscsi_ep, + beiscsi_ep->ep_cid, (unsigned short )true, savecfg_flag);
Maybe you just want to use 1.
drivers/scsi/beiscsi/be_iscsi.c
Quoted 9 lines
drivers/scsi/beiscsi/be_iscsi.c new file +7
-0+struct iscsi_cls_session *beiscsi_session_create (struct iscsi_endpoint *ep, +uint16_t cmds_max, +uint16_t qdepth, +uint32_t initial_cmdsn); + + +int beiscsi_alloc_pdu (struct iscsi_task *task,u8 opcode);
I like the u8 look but you can also use uint8_t since other iscsi code does and it seems like people do not care much. But use one or the other. Above you are using the uintX_t.