Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[linux.git] / drivers / infiniband / ulp / srpt / ib_srpt.c

diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 578c3703421ddb18a5bad7c64bde26c83d546964..0bd3cb2f3c671a21fefd57dbc4851a24daa61e82 100644 (file)
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -1264,40 +1264,26 @@ static int srpt_map_sg_to_ib_sge(struct srpt_rdma_ch *ch,
  */
 static struct srpt_send_ioctx *srpt_get_send_ioctx(struct srpt_rdma_ch *ch)
 {
+       struct se_session *se_sess;
        struct srpt_send_ioctx *ioctx;
-       unsigned long flags;
+       int tag;
 
        BUG_ON(!ch);
+       se_sess = ch->sess;
 
-       ioctx = NULL;
-       spin_lock_irqsave(&ch->spinlock, flags);
-       if (!list_empty(&ch->free_list)) {
-               ioctx = list_first_entry(&ch->free_list,
-                                        struct srpt_send_ioctx, free_list);
-               list_del(&ioctx->free_list);
+       tag = percpu_ida_alloc(&se_sess->sess_tag_pool, TASK_RUNNING);
+       if (tag < 0) {
+               pr_err("Unable to obtain tag for srpt_send_ioctx\n");
+               return NULL;
        }
-       spin_unlock_irqrestore(&ch->spinlock, flags);
-
-       if (!ioctx)
-               return ioctx;
-
-       BUG_ON(ioctx->ch != ch);
+       ioctx = &((struct srpt_send_ioctx *)se_sess->sess_cmd_map)[tag];
+       memset(ioctx, 0, sizeof(struct srpt_send_ioctx));
+       ioctx->ch = ch;
        spin_lock_init(&ioctx->spinlock);
        ioctx->state = SRPT_STATE_NEW;
-       ioctx->n_rbuf = 0;
-       ioctx->rbufs = NULL;
-       ioctx->n_rdma = 0;
-       ioctx->n_rdma_wrs = 0;
-       ioctx->rdma_wrs = NULL;
-       ioctx->mapped_sg_count = 0;
        init_completion(&ioctx->tx_done);
-       ioctx->queue_status_only = false;
-       /*
-        * transport_init_se_cmd() does not initialize all fields, so do it
-        * here.
-        */
-       memset(&ioctx->cmd, 0, sizeof(ioctx->cmd));
-       memset(&ioctx->sense_data, 0, sizeof(ioctx->sense_data));
+
+       ioctx->cmd.map_tag = tag;
 
        return ioctx;
 }
@@ -2034,9 +2020,8 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id,
        struct srp_login_rej *rej;
        struct ib_cm_rep_param *rep_param;
        struct srpt_rdma_ch *ch, *tmp_ch;
-       struct se_node_acl *se_acl;
        u32 it_iu_len;
-       int i, ret = 0;
+       int ret = 0;
        unsigned char *p;
 
        WARN_ON_ONCE(irqs_disabled());
@@ -2158,12 +2143,6 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id,
        if (!ch->ioctx_ring)
                goto free_ch;
 
-       INIT_LIST_HEAD(&ch->free_list);
-       for (i = 0; i < ch->rq_size; i++) {
-               ch->ioctx_ring[i]->ch = ch;
-               list_add_tail(&ch->ioctx_ring[i]->free_list, &ch->free_list);
-       }
-
        ret = srpt_create_ch_ib(ch);
        if (ret) {
                rej->reason = cpu_to_be32(
@@ -2193,19 +2172,13 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id,
        pr_debug("registering session %s\n", ch->sess_name);
        p = &ch->sess_name[0];
 
-       ch->sess = transport_init_session(TARGET_PROT_NORMAL);
-       if (IS_ERR(ch->sess)) {
-               rej->reason = cpu_to_be32(
-                               SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES);
-               pr_debug("Failed to create session\n");
-               goto destroy_ib;
-       }
-
 try_again:
-       se_acl = core_tpg_get_initiator_node_acl(&sport->port_tpg_1, p);
-       if (!se_acl) {
+       ch->sess = target_alloc_session(&sport->port_tpg_1, ch->rq_size,
+                                       sizeof(struct srpt_send_ioctx),
+                                       TARGET_PROT_NORMAL, p, ch, NULL);
+       if (IS_ERR(ch->sess)) {
                pr_info("Rejected login because no ACL has been"
-                       " configured yet for initiator %s.\n", ch->sess_name);
+                       " configured yet for initiator %s.\n", p);
                /*
                 * XXX: Hack to retry of ch->i_port_id without leading '0x'
                 */
@@ -2213,14 +2186,11 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id,
                        p += 2;
                        goto try_again;
                }
-               rej->reason = cpu_to_be32(
+               rej->reason = cpu_to_be32((PTR_ERR(ch->sess) == -ENOMEM) ?
+                               SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES :
                                SRP_LOGIN_REJ_CHANNEL_LIMIT_REACHED);
-               transport_free_session(ch->sess);
                goto destroy_ib;
        }
-       ch->sess->se_node_acl = se_acl;
-
-       transport_register_session(&sport->port_tpg_1, se_acl, ch->sess, ch);
 
        pr_debug("Establish connection sess=%p name=%s cm_id=%p\n", ch->sess,
                 ch->sess_name, ch->cm_id);
@@ -2911,7 +2881,7 @@ static void srpt_release_cmd(struct se_cmd *se_cmd)
        struct srpt_send_ioctx *ioctx = container_of(se_cmd,
                                struct srpt_send_ioctx, cmd);
        struct srpt_rdma_ch *ch = ioctx->ch;
-       unsigned long flags;
+       struct se_session *se_sess = ch->sess;
 
        WARN_ON(ioctx->state != SRPT_STATE_DONE);
        WARN_ON(ioctx->mapped_sg_count != 0);
@@ -2922,9 +2892,7 @@ static void srpt_release_cmd(struct se_cmd *se_cmd)
                ioctx->n_rbuf = 0;
        }
 
-       spin_lock_irqsave(&ch->spinlock, flags);
-       list_add(&ioctx->free_list, &ch->free_list);
-       spin_unlock_irqrestore(&ch->spinlock, flags);
+       percpu_ida_free(&se_sess->sess_tag_pool, se_cmd->map_tag);
 }
 
 /**