mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-18 13:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2021-07-11 20:13:46 -07:00
parent 626851afcb 6abef3d29c
commit 6e432da586
7 changed files with 286 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
iscsi-scst/kernel/isert-scst/iser.h
+29 -27
View File
@@ -66,6 +66,8 @@ struct isert_portal {
/* protected by dev_list_mutex */
struct list_head conn_list; /* head of conns list */
enum isert_portal_state state;
struct work_struct work;
struct workqueue_struct *reinit_id_wq;
int refcnt;
};
@@ -88,13 +90,13 @@ enum isert_wr_op {
};
struct isert_device;
struct isert_connection;
struct isert_conn;
struct isert_wr {
enum isert_wr_op wr_op;
struct isert_buf *buf;
struct isert_connection *conn;
struct isert_conn *conn;
struct isert_cmnd *pdu;
struct isert_device *isert_dev;
@@ -168,7 +170,7 @@ struct isert_cq {
#define ISERT_CONNECTION_CLOSE 5
#define ISERT_IN_PORTAL_LIST 6
struct isert_connection {
struct isert_conn {
struct iscsi_conn iscsi ____cacheline_aligned;
int repost_threshold ____cacheline_aligned;
@@ -224,13 +226,16 @@ struct isert_connection {
struct work_struct close_work;
struct work_struct drain_work;
struct work_struct discon_work;
struct work_struct free_work;
struct work_struct release_work;
struct isert_wr drain_wr_sq;
struct isert_wr drain_wr_rq;
struct kref kref;
struct isert_portal *portal;
void *priv_data; /* for connection tracking */
wait_queue_head_t rem_wait;
atomic_t dev_removed;
};
struct isert_device {
@@ -286,33 +291,30 @@ extern struct kmem_cache *isert_cmnd_cache;
extern struct kmem_cache *isert_conn_cache;
/* iser portal */
struct isert_portal *isert_portal_create(void);
int isert_portal_listen(struct isert_portal *portal,
struct sockaddr *sa,
size_t addr_len);
struct isert_portal *isert_portal_create(struct sockaddr *sa, size_t addr_len);
void isert_portal_release(struct isert_portal *portal);
void isert_portal_list_release_all(void);
struct isert_portal *isert_portal_start(struct sockaddr *sa, size_t addr_len);
/* iser connection */
int isert_post_recv(struct isert_connection *isert_conn,
int isert_post_recv(struct isert_conn *isert_conn,
struct isert_wr *first_wr, int num_wr);
int isert_post_send(struct isert_connection *isert_conn,
int isert_post_send(struct isert_conn *isert_conn,
struct isert_wr *first_wr, int num_wr);
int isert_alloc_conn_resources(struct isert_connection *isert_conn);
void isert_free_conn_resources(struct isert_connection *isert_conn);
void isert_conn_free(struct isert_connection *isert_conn);
void isert_conn_disconnect(struct isert_connection *isert_conn);
void isert_post_drain(struct isert_connection *isert_conn);
void isert_sched_conn_free(struct isert_connection *isert_conn);
int isert_alloc_conn_resources(struct isert_conn *isert_conn);
void isert_free_conn_resources(struct isert_conn *isert_conn);
void isert_put_conn(struct isert_conn *isert_conn);
void isert_conn_disconnect(struct isert_conn *isert_conn);
void isert_post_drain(struct isert_conn *isert_conn);
void isert_sched_conn_free(struct isert_conn *isert_conn);
static inline struct isert_connection *isert_conn_zalloc(void)
static inline struct isert_conn *isert_conn_zalloc(void)
{
return kmem_cache_zalloc(isert_conn_cache, GFP_KERNEL);
}
static inline void isert_conn_kfree(struct isert_connection *isert_conn)
static inline void isert_conn_kfree(struct isert_conn *isert_conn)
{
kmem_cache_free(isert_conn_cache, isert_conn);
}
@@ -322,12 +324,12 @@ int isert_buf_alloc_data_buf(struct ib_device *ib_dev,
struct isert_buf *isert_buf, size_t size,
enum dma_data_direction dma_dir);
void isert_wr_set_fields(struct isert_wr *wr,
struct isert_connection *isert_conn,
struct isert_conn *isert_conn,
struct isert_cmnd *pdu);
int isert_wr_init(struct isert_wr *wr,
enum isert_wr_op wr_op,
struct isert_buf *isert_buf,
struct isert_connection *isert_conn,
struct isert_conn *isert_conn,
struct isert_cmnd *pdu,
struct ib_sge *sge,
int sg_offset,
@@ -357,23 +359,23 @@ static inline void isert_pdu_kfree(struct isert_cmnd *cmnd)
kmem_cache_free(isert_cmnd_cache, cmnd);
}
struct isert_cmnd *isert_rx_pdu_alloc(struct isert_connection *isert_conn,
struct isert_cmnd *isert_rx_pdu_alloc(struct isert_conn *isert_conn,
size_t size);
struct isert_cmnd *isert_tx_pdu_alloc(struct isert_connection *isert_conn,
struct isert_cmnd *isert_tx_pdu_alloc(struct isert_conn *isert_conn,
size_t size);
void isert_tx_pdu_init(struct isert_cmnd *isert_pdu,
struct isert_connection *isert_conn);
int isert_pdu_send(struct isert_connection *isert_conn,
struct isert_conn *isert_conn);
int isert_pdu_send(struct isert_conn *isert_conn,
struct isert_cmnd *tx_pdu);
int isert_prepare_rdma(struct isert_cmnd *isert_pdu,
struct isert_connection *isert_conn,
struct isert_conn *isert_conn,
enum isert_wr_op op);
int isert_pdu_post_rdma_write(struct isert_connection *isert_conn,
int isert_pdu_post_rdma_write(struct isert_conn *isert_conn,
struct isert_cmnd *isert_cmd,
struct isert_cmnd *isert_rsp,
int wr_cnt);
int isert_pdu_post_rdma_read(struct isert_connection *isert_conn,
int isert_pdu_post_rdma_read(struct isert_conn *isert_conn,
struct isert_cmnd *isert_cmd,
int wr_cnt);
iscsi-scst/kernel/isert-scst/iser_buf.c
+2 -2
View File
@@ -197,7 +197,7 @@ void isert_buf_release(struct isert_buf *isert_buf)
}
void isert_wr_set_fields(struct isert_wr *wr,
struct isert_connection *isert_conn,
struct isert_conn *isert_conn,
struct isert_cmnd *pdu)
{
struct isert_device *isert_dev = isert_conn->isert_dev;
@@ -210,7 +210,7 @@ void isert_wr_set_fields(struct isert_wr *wr,
int isert_wr_init(struct isert_wr *wr,
enum isert_wr_op wr_op,
struct isert_buf *isert_buf,
struct isert_connection *isert_conn,
struct isert_conn *isert_conn,
struct isert_cmnd *pdu,
struct ib_sge *sge,
int sg_offset,
iscsi-scst/kernel/isert-scst/iser_datamover.c
+29 -29
View File
@@ -63,8 +63,8 @@ int isert_get_peer_addr(struct iscsi_conn *iscsi_conn, struct sockaddr *sa,
size_t *addr_len)
{
int ret;
struct isert_connection *isert_conn = container_of(iscsi_conn,
struct isert_connection, iscsi);
struct isert_conn *isert_conn = container_of(iscsi_conn,
struct isert_conn, iscsi);
struct sockaddr *peer_sa = (struct sockaddr *)&isert_conn->peer_addr;
ret = isert_get_addr_size(peer_sa, addr_len);
@@ -80,8 +80,8 @@ int isert_get_target_addr(struct iscsi_conn *iscsi_conn, struct sockaddr *sa,
size_t *addr_len)
{
int ret;
struct isert_connection *isert_conn = container_of(iscsi_conn,
struct isert_connection, iscsi);
struct isert_conn *isert_conn = container_of(iscsi_conn,
struct isert_conn, iscsi);
struct sockaddr *self_sa = (struct sockaddr *)&isert_conn->self_addr;
ret = isert_get_addr_size(self_sa, addr_len);
@@ -106,17 +106,17 @@ int isert_portal_remove(struct isert_portal *portal)
void isert_free_connection(struct iscsi_conn *iscsi_conn)
{
struct isert_connection *isert_conn = container_of(iscsi_conn,
struct isert_connection, iscsi);
struct isert_conn *isert_conn = container_of(iscsi_conn,
struct isert_conn, iscsi);
isert_post_drain(isert_conn);
isert_conn_free(isert_conn);
isert_put_conn(isert_conn);
}
struct iscsi_cmnd *isert_alloc_login_rsp_pdu(struct iscsi_conn *iscsi_conn)
{
struct isert_connection *isert_conn = container_of(iscsi_conn,
struct isert_connection, iscsi);
struct isert_conn *isert_conn = container_of(iscsi_conn,
struct isert_conn, iscsi);
struct isert_cmnd *isert_pdu = isert_conn->login_rsp_pdu;
isert_tx_pdu_init(isert_pdu, isert_conn);
@@ -126,8 +126,8 @@ struct iscsi_cmnd *isert_alloc_login_rsp_pdu(struct iscsi_conn *iscsi_conn)
static struct iscsi_cmnd *isert_alloc_scsi_pdu(struct iscsi_conn *iscsi_conn,
int fake)
{
struct isert_connection *isert_conn = container_of(iscsi_conn,
struct isert_connection, iscsi);
struct isert_conn *isert_conn = container_of(iscsi_conn,
struct isert_conn, iscsi);
struct isert_cmnd *isert_pdu;
again:
@@ -159,8 +159,8 @@ void isert_release_tx_pdu(struct iscsi_cmnd *iscsi_pdu)
{
struct isert_cmnd *isert_pdu = container_of(iscsi_pdu,
struct isert_cmnd, iscsi);
struct isert_connection *isert_conn = container_of(iscsi_pdu->conn,
struct isert_connection, iscsi);
struct isert_conn *isert_conn = container_of(iscsi_pdu->conn,
struct isert_conn, iscsi);
isert_tx_pdu_init_iscsi(isert_pdu);
@@ -180,8 +180,8 @@ void isert_release_rx_pdu(struct iscsi_cmnd *iscsi_pdu)
/* if last transition into FF (Fully Featured) state */
int isert_login_rsp_tx(struct iscsi_cmnd *login_rsp, int last, int discovery)
{
struct isert_connection *isert_conn = container_of(login_rsp->conn,
struct isert_connection, iscsi);
struct isert_conn *isert_conn = container_of(login_rsp->conn,
struct isert_conn, iscsi);
int err;
if (last && !discovery) {
@@ -210,8 +210,8 @@ int isert_set_session_params(struct iscsi_conn *iscsi_conn,
struct iscsi_sess_params *sess_params,
struct iscsi_tgt_params *tgt_params)
{
struct isert_connection *isert_conn = container_of(iscsi_conn,
struct isert_connection, iscsi);
struct isert_conn *isert_conn = container_of(iscsi_conn,
struct isert_conn, iscsi);
isert_conn->queue_depth = tgt_params->queued_cmnds;
@@ -228,8 +228,8 @@ int isert_pdu_tx(struct iscsi_cmnd *iscsi_cmnd)
{
struct isert_cmnd *isert_cmnd = container_of(iscsi_cmnd,
struct isert_cmnd, iscsi);
struct isert_connection *isert_conn = container_of(iscsi_cmnd->conn,
struct isert_connection, iscsi);
struct isert_conn *isert_conn = container_of(iscsi_cmnd->conn,
struct isert_conn, iscsi);
int err;
isert_tx_pdu_convert_from_iscsi(isert_cmnd, iscsi_cmnd);
@@ -242,8 +242,8 @@ int isert_request_data_out(struct iscsi_cmnd *iscsi_cmnd)
{
struct isert_cmnd *isert_cmnd = container_of(iscsi_cmnd,
struct isert_cmnd, iscsi);
struct isert_connection *isert_conn = container_of(iscsi_cmnd->conn,
struct isert_connection, iscsi);
struct isert_conn *isert_conn = container_of(iscsi_cmnd->conn,
struct isert_conn, iscsi);
int ret;
ret = isert_prepare_rdma(isert_cmnd, isert_conn, ISER_WR_RDMA_READ);
@@ -260,8 +260,8 @@ int isert_send_data_in(struct iscsi_cmnd *iscsi_cmnd,
{
struct isert_cmnd *isert_cmnd = container_of(iscsi_cmnd,
struct isert_cmnd, iscsi);
struct isert_connection *isert_conn = container_of(iscsi_cmnd->conn,
struct isert_connection, iscsi);
struct isert_conn *isert_conn = container_of(iscsi_cmnd->conn,
struct isert_conn, iscsi);
struct isert_cmnd *isert_rsp = container_of(iscsi_rsp,
struct isert_cmnd, iscsi);
int ret;
@@ -278,8 +278,8 @@ int isert_send_data_in(struct iscsi_cmnd *iscsi_cmnd,
int isert_close_connection(struct iscsi_conn *iscsi_conn)
{
struct isert_connection *isert_conn = container_of(iscsi_conn,
struct isert_connection, iscsi);
struct isert_conn *isert_conn = container_of(iscsi_conn,
struct isert_conn, iscsi);
isert_conn_disconnect(isert_conn);
@@ -293,16 +293,16 @@ int isert_task_abort(struct iscsi_cmnd *cmnd)
void *isert_get_priv(struct iscsi_conn *iscsi_conn)
{
struct isert_connection *isert_conn = container_of(iscsi_conn,
struct isert_connection, iscsi);
struct isert_conn *isert_conn = container_of(iscsi_conn,
struct isert_conn, iscsi);
return isert_conn->priv_data;
}
void isert_set_priv(struct iscsi_conn *iscsi_conn, void *priv)
{
struct isert_connection *isert_conn = container_of(iscsi_conn,
struct isert_connection, iscsi);
struct isert_conn *isert_conn = container_of(iscsi_conn,
struct isert_conn, iscsi);
isert_conn->priv_data = priv;
}
iscsi-scst/kernel/isert-scst/iser_global.c
+1 -1
View File
@@ -152,7 +152,7 @@ int isert_global_init(void)
return -ENOMEM;
}
isert_conn_cache = KMEM_CACHE(isert_connection,
isert_conn_cache = KMEM_CACHE(isert_conn,
SCST_SLAB_FLAGS|SLAB_HWCACHE_ALIGN);
if (!isert_conn_cache) {
destroy_workqueue(isert_glob.conn_wq);
iscsi-scst/kernel/isert-scst/iser_pdu.c
+18 -18
View File
@@ -43,7 +43,7 @@
#include "iser_datamover.h"
static inline int isert_pdu_rx_buf_init(struct isert_cmnd *isert_pdu,
struct isert_connection *isert_conn)
struct isert_conn *isert_conn)
{
struct isert_buf *isert_buf = &isert_pdu->buf;
@@ -53,7 +53,7 @@ static inline int isert_pdu_rx_buf_init(struct isert_cmnd *isert_pdu,
}
static inline int isert_pdu_tx_buf_init(struct isert_cmnd *isert_pdu,
struct isert_connection *isert_conn)
struct isert_conn *isert_conn)
{
struct isert_buf *isert_buf = &isert_pdu->buf;
@@ -78,7 +78,7 @@ static inline void isert_pdu_set_hdr_plain(struct isert_cmnd *isert_pdu)
* it should be parsed to setup isert_cmnd + iscsi_cmnd in full
*/
static int isert_rx_pdu_init(struct isert_cmnd *isert_pdu,
struct isert_connection *isert_conn)
struct isert_conn *isert_conn)
{
struct iscsi_cmnd *iscsi_cmnd = &isert_pdu->iscsi;
int err = isert_pdu_rx_buf_init(isert_pdu, isert_conn);
@@ -105,7 +105,7 @@ void isert_tx_pdu_init_iscsi(struct isert_cmnd *isert_pdu)
* of the iscsi pdu struct
*/
void isert_tx_pdu_init(struct isert_cmnd *isert_pdu,
struct isert_connection *isert_conn)
struct isert_conn *isert_conn)
{
struct iscsi_cmnd *iscsi_cmnd = &isert_pdu->iscsi;
struct isert_buf *isert_buf = &isert_pdu->buf;
@@ -142,7 +142,7 @@ void isert_tx_pdu_convert_from_iscsi(struct isert_cmnd *isert_cmnd,
return;
}
static inline int isert_pdu_prepare_send(struct isert_connection *isert_conn,
static inline int isert_pdu_prepare_send(struct isert_conn *isert_conn,
struct isert_cmnd *tx_pdu)
{
struct isert_device *isert_dev = isert_conn->isert_dev;
@@ -168,7 +168,7 @@ static inline int isert_pdu_prepare_send(struct isert_connection *isert_conn,
}
static int isert_alloc_for_rdma(struct isert_cmnd *pdu, int sge_cnt,
struct isert_connection *isert_conn)
struct isert_conn *isert_conn)
{
struct isert_wr *wr;
struct ib_sge *sg_pool;
@@ -234,7 +234,7 @@ static inline void isert_link_send_pdu_wrs(struct isert_cmnd *from_pdu,
}
int isert_prepare_rdma(struct isert_cmnd *isert_pdu,
struct isert_connection *isert_conn,
struct isert_conn *isert_conn,
enum isert_wr_op op)
{
struct isert_buf *isert_buf = &isert_pdu->rdma_buf;
@@ -323,7 +323,7 @@ void isert_pdu_free(struct isert_cmnd *pdu)
isert_pdu_kfree(pdu);
}
struct isert_cmnd *isert_rx_pdu_alloc(struct isert_connection *isert_conn,
struct isert_cmnd *isert_rx_pdu_alloc(struct isert_conn *isert_conn,
size_t size)
{
struct isert_cmnd *pdu = NULL;
@@ -371,7 +371,7 @@ out:
return pdu;
}
struct isert_cmnd *isert_tx_pdu_alloc(struct isert_connection *isert_conn,
struct isert_cmnd *isert_tx_pdu_alloc(struct isert_conn *isert_conn,
size_t size)
{
struct isert_cmnd *pdu = NULL;
@@ -437,7 +437,7 @@ static inline void isert_link_recv_pdu_wrs(struct isert_cmnd *from_pdu,
isert_link_recv_wrs(&from_pdu->wr[0], &to_pdu->wr[0]);
}
int isert_alloc_conn_resources(struct isert_connection *isert_conn)
int isert_alloc_conn_resources(struct isert_conn *isert_conn)
{
struct isert_cmnd *pdu, *prev_pdu = NULL, *first_pdu = NULL;
/* RFC states that minimum receive data size is 512 */
@@ -496,8 +496,8 @@ clean_pdus:
static int isert_reinit_rx_pdu(struct isert_cmnd *pdu)
{
struct isert_connection *isert_conn = container_of(pdu->iscsi.conn,
struct isert_connection, iscsi);
struct isert_conn *isert_conn = container_of(pdu->iscsi.conn,
struct isert_conn, iscsi);
pdu->is_rstag_valid = 0;
pdu->is_wstag_valid = 0;
@@ -510,8 +510,8 @@ static int isert_reinit_rx_pdu(struct isert_cmnd *pdu)
int isert_rx_pdu_done(struct isert_cmnd *pdu)
{
int err;
struct isert_connection *isert_conn = container_of(pdu->iscsi.conn,
struct isert_connection, iscsi);
struct isert_conn *isert_conn = container_of(pdu->iscsi.conn,
struct isert_conn, iscsi);
TRACE_ENTRY();
@@ -539,7 +539,7 @@ out:
return err;
}
void isert_free_conn_resources(struct isert_connection *isert_conn)
void isert_free_conn_resources(struct isert_conn *isert_conn)
{
struct isert_cmnd *pdu;
@@ -577,7 +577,7 @@ void isert_free_conn_resources(struct isert_connection *isert_conn)
TRACE_EXIT();
}
int isert_pdu_send(struct isert_connection *isert_conn,
int isert_pdu_send(struct isert_conn *isert_conn,
struct isert_cmnd *tx_pdu)
{
int err;
@@ -607,7 +607,7 @@ int isert_pdu_send(struct isert_connection *isert_conn,
return err;
}
int isert_pdu_post_rdma_write(struct isert_connection *isert_conn,
int isert_pdu_post_rdma_write(struct isert_conn *isert_conn,
struct isert_cmnd *isert_cmd,
struct isert_cmnd *isert_rsp,
int wr_cnt)
@@ -634,7 +634,7 @@ int isert_pdu_post_rdma_write(struct isert_connection *isert_conn,
return err;
}
int isert_pdu_post_rdma_read(struct isert_connection *isert_conn,
int isert_pdu_post_rdma_read(struct isert_conn *isert_conn,
struct isert_cmnd *isert_cmd, int wr_cnt)
{
int err;
iscsi-scst/kernel/isert-scst/iser_rdma.c
+205 -159
View File
@@ -54,6 +54,8 @@
static DEFINE_MUTEX(dev_list_mutex);
static void isert_portal_free(struct isert_portal *portal);
static struct rdma_cm_id *
isert_setup_id(struct isert_portal *portal);
static int isert_num_recv_posted_on_err(struct ib_recv_wr *first_ib_wr,
BAD_WR_MODIFIER struct ib_recv_wr *bad_wr)
@@ -67,7 +69,7 @@ static int isert_num_recv_posted_on_err(struct ib_recv_wr *first_ib_wr,
return num_posted;
}
int isert_post_recv(struct isert_connection *isert_conn,
int isert_post_recv(struct isert_conn *isert_conn,
struct isert_wr *first_wr,
int num_wr)
{
@@ -110,7 +112,7 @@ static int isert_num_send_posted_on_err(struct ib_send_wr *first_ib_wr,
return num_posted;
}
int isert_post_send(struct isert_connection *isert_conn,
int isert_post_send(struct isert_conn *isert_conn,
struct isert_wr *first_wr,
int num_wr)
{
@@ -145,7 +147,7 @@ int isert_post_send(struct isert_connection *isert_conn,
return err;
}
static void isert_post_drain_sq(struct isert_connection *isert_conn)
static void isert_post_drain_sq(struct isert_conn *isert_conn)
{
BAD_WR_MODIFIER struct ib_send_wr *bad_wr;
struct isert_wr *drain_wr_sq = &isert_conn->drain_wr_sq;
@@ -177,7 +179,7 @@ static void isert_post_drain_sq(struct isert_connection *isert_conn)
}
}
static void isert_post_drain_rq(struct isert_connection *isert_conn)
static void isert_post_drain_rq(struct isert_conn *isert_conn)
{
BAD_WR_MODIFIER struct ib_recv_wr *bad_wr;
struct isert_wr *drain_wr_rq = &isert_conn->drain_wr_rq;
@@ -197,7 +199,7 @@ static void isert_post_drain_rq(struct isert_connection *isert_conn)
}
}
void isert_post_drain(struct isert_connection *isert_conn)
void isert_post_drain(struct isert_conn *isert_conn)
{
if (!test_and_set_bit(ISERT_DRAIN_POSTED, &isert_conn->flags)) {
mutex_lock(&isert_conn->state_mutex);
@@ -208,7 +210,7 @@ void isert_post_drain(struct isert_connection *isert_conn)
}
}
void isert_conn_disconnect(struct isert_connection *isert_conn)
void isert_conn_disconnect(struct isert_conn *isert_conn)
{
int err;
@@ -468,7 +470,7 @@ static void isert_rdma_wr_completion_handler(struct isert_wr *wr)
static void isert_handle_wc(struct ib_wc *wc)
{
struct isert_wr *wr = _u64_to_ptr(wc->wr_id);
struct isert_connection *isert_conn;
struct isert_conn *isert_conn;
TRACE_ENTRY();
@@ -585,17 +587,17 @@ static void isert_discon_do_work(struct work_struct *work)
#endif
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
struct isert_connection *isert_conn = ctx;
struct isert_conn *isert_conn = ctx;
#else
struct isert_connection *isert_conn =
container_of(work, struct isert_connection, discon_work);
struct isert_conn *isert_conn =
container_of(work, struct isert_conn, discon_work);
#endif
/* notify upper layer */
isert_connection_closed(&isert_conn->iscsi);
}
static void isert_sched_discon(struct isert_connection *isert_conn)
static void isert_sched_discon(struct isert_conn *isert_conn)
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
INIT_WORK(&isert_conn->discon_work, isert_discon_do_work, isert_conn);
@@ -612,16 +614,16 @@ static void isert_conn_drained_do_work(struct work_struct *work)
#endif
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
struct isert_connection *isert_conn = ctx;
struct isert_conn *isert_conn = ctx;
#else
struct isert_connection *isert_conn =
container_of(work, struct isert_connection, drain_work);
struct isert_conn *isert_conn =
container_of(work, struct isert_conn, drain_work);
#endif
isert_conn_free(isert_conn);
isert_put_conn(isert_conn);
}
static void isert_sched_conn_drained(struct isert_connection *isert_conn)
static void isert_sched_conn_drained(struct isert_conn *isert_conn)
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
INIT_WORK(&isert_conn->drain_work, isert_conn_drained_do_work,
@@ -639,19 +641,19 @@ static void isert_conn_closed_do_work(struct work_struct *work)
#endif
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
struct isert_connection *isert_conn = ctx;
struct isert_conn *isert_conn = ctx;
#else
struct isert_connection *isert_conn =
container_of(work, struct isert_connection, close_work);
struct isert_conn *isert_conn =
container_of(work, struct isert_conn, close_work);
#endif
if (!test_bit(ISERT_CONNECTION_ABORTED, &isert_conn->flags))
isert_connection_abort(&isert_conn->iscsi);
isert_conn_free(isert_conn);
isert_put_conn(isert_conn);
}
static void isert_sched_conn_closed(struct isert_connection *isert_conn)
static void isert_sched_conn_closed(struct isert_conn *isert_conn)
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
INIT_WORK(&isert_conn->close_work, isert_conn_closed_do_work,
@@ -663,37 +665,36 @@ static void isert_sched_conn_closed(struct isert_connection *isert_conn)
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
static void isert_conn_free_do_work(void *ctx)
static void isert_release_work(void *ctx)
#else
static void isert_conn_free_do_work(struct work_struct *work)
static void isert_release_work(struct work_struct *work)
#endif
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
struct isert_connection *isert_conn = ctx;
struct isert_conn *isert_conn = ctx;
#else
struct isert_connection *isert_conn =
container_of(work, struct isert_connection, free_work);
struct isert_conn *isert_conn =
container_of(work, struct isert_conn, release_work);
#endif
isert_conn_free(isert_conn);
isert_put_conn(isert_conn);
}
void isert_sched_conn_free(struct isert_connection *isert_conn)
void isert_sched_conn_free(struct isert_conn *isert_conn)
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
INIT_WORK(&isert_conn->free_work, isert_conn_free_do_work,
isert_conn);
INIT_WORK(&isert_conn->release_work, isert_release_work, isert_conn);
#else
INIT_WORK(&isert_conn->free_work, isert_conn_free_do_work);
INIT_WORK(&isert_conn->release_work, isert_release_work);
#endif
isert_conn_queue_work(&isert_conn->free_work);
isert_conn_queue_work(&isert_conn->release_work);
}
static void isert_handle_wc_error(struct ib_wc *wc)
{
struct isert_wr *wr = _u64_to_ptr(wc->wr_id);
struct isert_cmnd *isert_pdu = wr->pdu;
struct isert_connection *isert_conn = wr->conn;
struct isert_conn *isert_conn = wr->conn;
struct isert_buf *isert_buf = wr->buf;
struct isert_device *isert_dev = wr->isert_dev;
struct ib_device *ib_dev = isert_dev->ib_dev;
@@ -887,7 +888,7 @@ static void isert_async_evt_handler(struct ib_event *async_ev, void *context)
struct ib_device *ib_dev = isert_dev->ib_dev;
char *dev_name = ib_dev->name;
enum ib_event_type ev_type = async_ev->event;
struct isert_connection *isert_conn;
struct isert_conn *isert_conn;
TRACE_ENTRY();
@@ -1206,7 +1207,7 @@ static int isert_get_cq_idx(struct isert_device *isert_dev)
return min_idx;
}
static int isert_conn_qp_create(struct isert_connection *isert_conn)
static int isert_conn_qp_create(struct isert_conn *isert_conn)
{
struct rdma_cm_id *cm_id = isert_conn->cm_id;
struct isert_device *isert_dev = isert_conn->isert_dev;
@@ -1266,10 +1267,24 @@ fail_create_qp:
goto out;
}
static struct isert_connection *isert_conn_create(struct rdma_cm_id *cm_id,
static void
isert_init_conn(struct isert_conn *isert_conn)
{
isert_conn->state = ISER_CONN_INIT;
INIT_LIST_HEAD(&isert_conn->rx_buf_list);
INIT_LIST_HEAD(&isert_conn->tx_free_list);
INIT_LIST_HEAD(&isert_conn->tx_busy_list);
spin_lock_init(&isert_conn->tx_lock);
spin_lock_init(&isert_conn->post_recv_lock);
init_waitqueue_head(&isert_conn->rem_wait);
kref_init(&isert_conn->kref);
mutex_init(&isert_conn->state_mutex);
}
static struct isert_conn *isert_conn_create(struct rdma_cm_id *cm_id,
struct isert_device *isert_dev)
{
struct isert_connection *isert_conn;
struct isert_conn *isert_conn;
int err;
struct isert_cq *cq;
@@ -1281,7 +1296,9 @@ static struct isert_connection *isert_conn_create(struct rdma_cm_id *cm_id,
err = -ENOMEM;
goto fail_alloc;
}
isert_conn->state = ISER_CONN_INIT;
isert_init_conn(isert_conn);
isert_conn->cm_id = cm_id;
isert_conn->isert_dev = isert_dev;
@@ -1307,12 +1324,6 @@ static struct isert_connection *isert_conn_create(struct rdma_cm_id *cm_id,
goto fail_login_req_pdu;
}
INIT_LIST_HEAD(&isert_conn->rx_buf_list);
INIT_LIST_HEAD(&isert_conn->tx_free_list);
INIT_LIST_HEAD(&isert_conn->tx_busy_list);
spin_lock_init(&isert_conn->tx_lock);
spin_lock_init(&isert_conn->post_recv_lock);
isert_conn->login_req_pdu = isert_rx_pdu_alloc(isert_conn,
ISER_MAX_LOGIN_RDSL);
if (unlikely(!isert_conn->login_req_pdu)) {
@@ -1340,9 +1351,6 @@ static struct isert_connection *isert_conn_create(struct rdma_cm_id *cm_id,
goto fail_post_recv;
}
kref_init(&isert_conn->kref);
mutex_init(&isert_conn->state_mutex);
TRACE_EXIT();
return isert_conn;
@@ -1370,11 +1378,11 @@ static void isert_deref_device(struct isert_device *isert_dev)
isert_device_release(isert_dev);
}
static void isert_kref_free(struct kref *kref)
static void isert_release_kref(struct kref *kref)
{
struct isert_conn_dev *dev;
struct isert_connection *isert_conn =
container_of(kref, struct isert_connection, kref);
struct isert_conn *isert_conn =
container_of(kref, struct isert_conn, kref);
struct isert_device *isert_dev = isert_conn->isert_dev;
struct isert_cq *cq = isert_conn->qp->recv_cq->cq_context;
@@ -1384,8 +1392,11 @@ static void isert_kref_free(struct kref *kref)
isert_free_conn_resources(isert_conn);
rdma_destroy_id(isert_conn->cm_id);
isert_conn->cm_id = NULL;
if (isert_conn->cm_id &&
!atomic_read(&isert_conn->dev_removed)) {
rdma_destroy_id(isert_conn->cm_id);
isert_conn->cm_id = NULL;
}
dev = isert_get_priv(&isert_conn->iscsi);
if (dev) {
@@ -1408,30 +1419,35 @@ static void isert_kref_free(struct kref *kref)
isert_portal_free(isert_conn->portal);
mutex_unlock(&dev_list_mutex);
isert_conn_kfree(isert_conn);
module_put(THIS_MODULE);
if (atomic_read(&isert_conn->dev_removed)) {
atomic_set(&isert_conn->dev_removed, 0);
wake_up_interruptible(&isert_conn->rem_wait);
} else {
isert_conn_kfree(isert_conn);
module_put(THIS_MODULE);
}
TRACE_EXIT();
}
void isert_conn_free(struct isert_connection *isert_conn)
void isert_put_conn(struct isert_conn *isert_conn)
{
sBUG_ON(kref_read(&isert_conn->kref) == 0);
kref_put(&isert_conn->kref, isert_kref_free);
kref_put(&isert_conn->kref, isert_release_kref);
}
static int isert_cm_disconnected_handler(struct rdma_cm_id *cm_id,
struct rdma_cm_event *event)
{
struct isert_connection *isert_conn = cm_id->qp->qp_context;
struct isert_conn *isert_conn = cm_id->qp->qp_context;
if (!test_and_set_bit(ISERT_CONNECTION_CLOSE, &isert_conn->flags))
isert_sched_conn_closed(isert_conn);
return 0;
}
static void isert_immediate_conn_close(struct isert_connection *isert_conn)
static void isert_immediate_conn_close(struct isert_conn *isert_conn)
{
set_bit(ISERT_CONNECTION_ABORTED, &isert_conn->flags);
set_bit(ISERT_CONNECTION_CLOSE, &isert_conn->flags);
@@ -1441,8 +1457,8 @@ static void isert_immediate_conn_close(struct isert_connection *isert_conn)
* one from the init and two from the connect request,
* thus it is safe to deref directly before the sched_conn_free.
*/
isert_conn_free(isert_conn);
isert_conn_free(isert_conn);
isert_put_conn(isert_conn);
isert_put_conn(isert_conn);
isert_sched_conn_free(isert_conn);
}
@@ -1453,7 +1469,7 @@ static int isert_cm_conn_req_handler(struct rdma_cm_id *cm_id,
struct isert_portal *portal = cm_id->context;
struct ib_device *ib_dev = cm_id->device;
struct isert_device *isert_dev;
struct isert_connection *isert_conn;
struct isert_conn *isert_conn;
struct rdma_conn_param *ini_conn_param;
struct rdma_conn_param tgt_conn_param;
struct isert_cm_hdr cm_hdr = { 0 };
@@ -1559,7 +1575,7 @@ fail_dev_create:
static int isert_cm_connect_handler(struct rdma_cm_id *cm_id,
struct rdma_cm_event *event)
{
struct isert_connection *isert_conn = cm_id->qp->qp_context;
struct isert_conn *isert_conn = cm_id->qp->qp_context;
int push_saved_pdu = 0;
int ret = 0;
@@ -1627,16 +1643,31 @@ static const char *rdma_event_msg(enum rdma_cm_event_type event)
}
#endif
static int isert_handle_failure(struct isert_connection *conn)
static int isert_handle_failure(struct isert_conn *conn)
{
isert_conn_disconnect(conn);
return 0;
}
static void isert_portal_reinit_id_work(struct work_struct *w)
{
struct isert_portal *portal = container_of(w, struct isert_portal, work);
rdma_destroy_id(portal->cm_id);
portal->cm_id = isert_setup_id(portal);
if (IS_ERR(portal->cm_id)) {
PRINT_ERROR("Failed to create rdma id, err:%ld\n",
PTR_ERR(portal->cm_id));
portal->cm_id = NULL;
}
}
static int isert_cm_evt_listener_handler(struct rdma_cm_id *cm_id,
enum rdma_cm_event_type event)
{
struct isert_portal *portal;
int ret = -1;
portal = cm_id->context;
@@ -1644,19 +1675,23 @@ static int isert_cm_evt_listener_handler(struct rdma_cm_id *cm_id,
case RDMA_CM_EVENT_DEVICE_REMOVAL:
portal->cm_id = NULL;
break;
case RDMA_CM_EVENT_ADDR_CHANGE:
queue_work(portal->reinit_id_wq, &portal->work);
ret = 0;
break;
default:
PRINT_INFO("Listener event:%s(%d), ignored",
rdma_event_msg(event), event);
break;
}
return -1;
return ret;
}
static int isert_cm_disconnect_handler(struct rdma_cm_id *cm_id,
enum rdma_cm_event_type event)
{
struct isert_connection *isert_conn = cm_id->qp->qp_context;
struct isert_conn *isert_conn = cm_id->qp->qp_context;
isert_conn_disconnect(isert_conn);
@@ -1701,12 +1736,31 @@ static int isert_cm_evt_handler(struct rdma_cm_id *cm_id,
case RDMA_CM_EVENT_ADDR_CHANGE:
case RDMA_CM_EVENT_DISCONNECTED:
case RDMA_CM_EVENT_DEVICE_REMOVAL:
case RDMA_CM_EVENT_TIMEWAIT_EXIT:
isert_cm_disconnect_handler(cm_id, ev_type);
err = isert_cm_disconnected_handler(cm_id, cm_ev);
break;
case RDMA_CM_EVENT_DEVICE_REMOVAL: {
struct isert_conn *isert_conn = cm_id->qp->qp_context;
atomic_set(&isert_conn->dev_removed, 1);
isert_cm_disconnect_handler(cm_id, ev_type);
isert_cm_disconnected_handler(cm_id, cm_ev);
wait_event_interruptible(isert_conn->rem_wait,
!atomic_read(&isert_conn->dev_removed));
isert_conn_kfree(isert_conn);
module_put(THIS_MODULE);
/*
* return non-zero from the callback to destroy
* the rdma cm id
*/
err = 1;
break;
}
case RDMA_CM_EVENT_MULTICAST_JOIN:
case RDMA_CM_EVENT_MULTICAST_ERROR:
PRINT_ERROR("UD-related event:%d, ignored", ev_type);
@@ -1723,7 +1777,7 @@ static int isert_cm_evt_handler(struct rdma_cm_id *cm_id,
/* We can receive this instead of RDMA_CM_EVENT_ESTABLISHED */
case RDMA_CM_EVENT_UNREACHABLE:
{
struct isert_connection *isert_conn =
struct isert_conn *isert_conn =
cm_id->qp->qp_context;
mutex_lock(&isert_conn->state_mutex);
@@ -1748,10 +1802,69 @@ out:
return err;
}
static struct rdma_cm_id *
isert_setup_id(struct isert_portal *portal)
{
struct rdma_cm_id *id;
struct sockaddr *sa;
int ret;
sa = (struct sockaddr *)&portal->addr;
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) && \
(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 <= 5)
id = rdma_create_id(isert_cm_evt_handler, portal, RDMA_PS_TCP);
#elif !RDMA_CREATE_ID_TAKES_NET_ARG
id = rdma_create_id(isert_cm_evt_handler, portal, RDMA_PS_TCP,
IB_QPT_RC);
#else
id = rdma_create_id(iscsi_net_ns, isert_cm_evt_handler, portal,
RDMA_PS_TCP, IB_QPT_RC);
#endif
if (IS_ERR(id)) {
ret = PTR_ERR(id);
PRINT_ERROR("Failed to create rdma id, err:%d", ret);
goto out;
}
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
/*
* Allow both IPv4 and IPv6 sockets to bind a single port
* at the same time.
*/
ret = rdma_set_afonly(id, 1);
if (ret) {
PRINT_ERROR("Failed to set afonly, err:%d", ret);
goto out_id;
}
#endif
ret = rdma_bind_addr(id, sa);
if (ret) {
PRINT_ERROR("Failed to bind rdma addr, err:%d", ret);
goto out_id;
}
ret = rdma_listen(id, ISER_LISTEN_BACKLOG);
if (ret) {
PRINT_ERROR("Failed rdma listen, err:%d", ret);
goto out_id;
}
PRINT_INFO("iser portal with cm_id %p listens on %pISpc", id, &sa);
return id;
out_id:
rdma_destroy_id(id);
out:
return ERR_PTR(ret);
}
/* create a portal, after listening starts all events
* are received in isert_cm_evt_handler()
*/
struct isert_portal *isert_portal_create(void)
struct isert_portal *isert_portal_create(struct sockaddr *sa, size_t addr_len)
{
struct isert_portal *portal;
struct rdma_cm_id *cm_id;
@@ -1770,35 +1883,36 @@ struct isert_portal *isert_portal_create(void)
goto err_alloc;
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) && \
(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 <= 5)
cm_id = rdma_create_id(isert_cm_evt_handler, portal, RDMA_PS_TCP);
#elif !RDMA_CREATE_ID_TAKES_NET_ARG
cm_id = rdma_create_id(isert_cm_evt_handler, portal, RDMA_PS_TCP,
IB_QPT_RC);
#else
cm_id = rdma_create_id(iscsi_net_ns, isert_cm_evt_handler, portal,
RDMA_PS_TCP, IB_QPT_RC);
#endif
if (IS_ERR(cm_id)) {
err = PTR_ERR(cm_id);
PRINT_ERROR("Failed to create rdma id, err:%d", err);
goto create_id_err;
portal->reinit_id_wq = alloc_ordered_workqueue("isert_reinit_id_wq", WQ_MEM_RECLAIM);
if (unlikely(!portal->reinit_id_wq)) {
PRINT_ERROR("Unable to allocate reinit workqueue");
err = -ENOMEM;
goto free_portal;
}
portal->cm_id = cm_id;
INIT_WORK(&portal->work, isert_portal_reinit_id_work);
INIT_LIST_HEAD(&portal->conn_list);
isert_portal_list_add(portal);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
rdma_set_afonly(cm_id, 1);
#endif
memcpy(&portal->addr, sa, addr_len);
cm_id = isert_setup_id(portal);
if (IS_ERR(cm_id)) {
err = PTR_ERR(cm_id);
PRINT_ERROR("Failed to create rdma id, err:%d", err);
goto free_wq;
}
portal->cm_id = cm_id;
PRINT_INFO("Created iser portal cm_id:%p", cm_id);
out:
return portal;
create_id_err:
free_wq:
destroy_workqueue(portal->reinit_id_wq);
free_portal:
kfree(portal);
portal = ERR_PTR(err);
err_alloc:
@@ -1806,64 +1920,6 @@ err_alloc:
goto out;
}
int isert_portal_listen(struct isert_portal *portal,
struct sockaddr *sa,
size_t addr_len)
{
int err;
TRACE_ENTRY();
err = rdma_bind_addr(portal->cm_id, sa);
if (err) {
PRINT_WARNING("Failed to bind rdma addr, err:%d", err);
goto out;
}
err = rdma_listen(portal->cm_id, ISER_LISTEN_BACKLOG);
if (err) {
PRINT_ERROR("Failed rdma listen, err:%d", err);
goto out;
}
memcpy(&portal->addr, sa, addr_len);
switch (sa->sa_family) {
case AF_INET:
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
PRINT_INFO("iser portal cm_id:%p listens on: "
NIPQUAD_FMT ":%d", portal->cm_id,
NIPQUAD(((struct sockaddr_in *)sa)->sin_addr.s_addr),
(int)ntohs(((struct sockaddr_in *)sa)->sin_port));
#else
PRINT_INFO("iser portal cm_id:%p listens on: %pI4:%d",
portal->cm_id,
&((struct sockaddr_in *)sa)->sin_addr.s_addr,
(int)ntohs(((struct sockaddr_in *)sa)->sin_port));
#endif
break;
case AF_INET6:
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
PRINT_INFO("iser portal cm_id:%p listens on: "
NIP6_FMT " %d",
portal->cm_id,
NIP6(((struct sockaddr_in6 *)sa)->sin6_addr),
(int)ntohs(((struct sockaddr_in6 *)sa)->sin6_port));
#else
PRINT_INFO("iser portal cm_id:%p listens on: %pI6 %d",
portal->cm_id,
&((struct sockaddr_in6 *)sa)->sin6_addr,
(int)ntohs(((struct sockaddr_in6 *)sa)->sin6_port));
#endif
break;
default:
PRINT_ERROR("Unknown address family");
err = -EINVAL;
goto out;
}
out:
TRACE_EXIT_RES(err);
return err;
}
static void isert_portal_free(struct isert_portal *portal)
{
lockdep_assert_held(&dev_list_mutex);
@@ -1871,6 +1927,8 @@ static void isert_portal_free(struct isert_portal *portal)
if (portal->refcnt > 0)
return;
destroy_workqueue(portal->reinit_id_wq);
kfree(portal);
module_put(THIS_MODULE);
@@ -1879,7 +1937,7 @@ static void isert_portal_free(struct isert_portal *portal)
void isert_portal_release(struct isert_portal *portal)
{
struct isert_connection *conn;
struct isert_conn *conn;
PRINT_INFO("iser portal cm_id:%p releasing", portal->cm_id);
@@ -1905,17 +1963,5 @@ void isert_portal_release(struct isert_portal *portal)
struct isert_portal *isert_portal_start(struct sockaddr *sa, size_t addr_len)
{
struct isert_portal *portal;
int err;
portal = isert_portal_create();
if (IS_ERR(portal))
return portal;
err = isert_portal_listen(portal, sa, addr_len);
if (err) {
isert_portal_release(portal);
portal = ERR_PTR(err);
}
return portal;
return isert_portal_create(sa, addr_len);
}
iscsi-scst/kernel/isert-scst/isert_login.c
+2 -2
View File
@@ -486,8 +486,8 @@ void isert_connection_closed(struct iscsi_conn *iscsi_conn)
void isert_connection_abort(struct iscsi_conn *iscsi_conn)
{
struct isert_connection *isert_conn =
container_of(iscsi_conn, struct isert_connection, iscsi);
struct isert_conn *isert_conn =
container_of(iscsi_conn, struct isert_conn, iscsi);
TRACE_ENTRY();