sbp-target: Conversion to percpu_ida tag pre-allocation

(Fix sbp_mgt_get_req() IS_ERR failure checking - Dan Carpenter)

Cc: Chris Boot <bootc@bootc.net>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
index ddd3398c156135ef3e92e054e0b0b98cb58de902..386300888da085c3e9f22671020c32d5cc3ccbe9 100644 (file)
--- a/drivers/target/sbp/sbp_target.c
+++ b/drivers/target/sbp/sbp_target.c
@@ -209,8 +209,10 @@ static struct sbp_session *sbp_session_create(
        INIT_DELAYED_WORK(&sess->maint_work, session_maintenance_work);
        sess->guid = guid;
 
-       sess->se_sess = target_alloc_session(&tpg->se_tpg, 0, 0, TARGET_PROT_NORMAL,
-                                            guid_str, sess, NULL);
+       sess->se_sess = target_alloc_session(&tpg->se_tpg, 128,
+                                            sizeof(struct sbp_target_request),
+                                            TARGET_PROT_NORMAL, guid_str,
+                                            sess, NULL);
        if (IS_ERR(sess->se_sess)) {
                pr_err("failed to init se_session\n");
                ret = PTR_ERR(sess->se_sess);
@@ -921,6 +923,24 @@ static inline bool tgt_agent_check_active(struct sbp_target_agent *agent)
        return active;
 }
 
+static struct sbp_target_request *sbp_mgt_get_req(struct sbp_session *sess,
+       struct fw_card *card, u64 next_orb)
+{
+       struct se_session *se_sess = sess->se_sess;
+       struct sbp_target_request *req;
+       int tag;
+
+       tag = percpu_ida_alloc(&se_sess->sess_tag_pool, GFP_ATOMIC);
+       if (tag < 0)
+               return ERR_PTR(-ENOMEM);
+
+       req = &((struct sbp_target_request *)se_sess->sess_cmd_map)[tag];
+       req->se_cmd.map_tag = tag;
+       req->se_cmd.tag = next_orb;
+
+       return req;
+}
+
 static void tgt_agent_fetch_work(struct work_struct *work)
 {
        struct sbp_target_agent *agent =
@@ -932,8 +952,8 @@ static void tgt_agent_fetch_work(struct work_struct *work)
        u64 next_orb = agent->orb_pointer;
 
        while (next_orb && tgt_agent_check_active(agent)) {
-               req = kzalloc(sizeof(*req), GFP_KERNEL);
-               if (!req) {
+               req = sbp_mgt_get_req(sess, sess->card, next_orb);
+               if (IS_ERR(req)) {
                        spin_lock_bh(&agent->lock);
                        agent->state = AGENT_STATE_DEAD;
                        spin_unlock_bh(&agent->lock);
@@ -1430,9 +1450,13 @@ static int sbp_send_sense(struct sbp_target_request *req)
 
 static void sbp_free_request(struct sbp_target_request *req)
 {
+       struct se_cmd *se_cmd = &req->se_cmd;
+       struct se_session *se_sess = se_cmd->se_sess;
+
        kfree(req->pg_tbl);
        kfree(req->cmd_buf);
-       kfree(req);
+
+       percpu_ida_free(&se_sess->sess_tag_pool, se_cmd->map_tag);
 }
 
 static void sbp_mgt_agent_process(struct work_struct *work)
@@ -1592,8 +1616,12 @@ static void sbp_mgt_agent_rw(struct fw_card *card,
                        rcode = RCODE_CONFLICT_ERROR;
                        goto out;
                }
-
+               // XXX:
+#if 0
+               req = sbp_mgt_get_req(agent->login->sess, card);
+#else
                req = kzalloc(sizeof(*req), GFP_ATOMIC);
+#endif
                if (!req) {
                        rcode = RCODE_CONFLICT_ERROR;
                        goto out;