Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
[linux-2.6.git] / drivers / target / target_core_tmr.c
index b1b9f2d..f015839 100644 (file)
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/list.h>
+#include <linux/export.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
 
 #include <target/target_core_base.h>
-#include <target/target_core_device.h>
-#include <target/target_core_tmr.h>
-#include <target/target_core_transport.h>
-#include <target/target_core_fabric_ops.h>
+#include <target/target_core_backend.h>
+#include <target/target_core_fabric.h>
 #include <target/target_core_configfs.h>
 
+#include "target_core_internal.h"
 #include "target_core_alua.h"
 #include "target_core_pr.h"
 
-struct se_tmr_req *core_tmr_alloc_req(
+int core_tmr_alloc_req(
        struct se_cmd *se_cmd,
        void *fabric_tmr_ptr,
        u8 function,
@@ -48,17 +48,20 @@ struct se_tmr_req *core_tmr_alloc_req(
 {
        struct se_tmr_req *tmr;
 
-       tmr = kmem_cache_zalloc(se_tmr_req_cache, gfp_flags);
+       tmr = kzalloc(sizeof(struct se_tmr_req), gfp_flags);
        if (!tmr) {
                pr_err("Unable to allocate struct se_tmr_req\n");
-               return ERR_PTR(-ENOMEM);
+               return -ENOMEM;
        }
+
+       se_cmd->se_cmd_flags |= SCF_SCSI_TMR_CDB;
+       se_cmd->se_tmr_req = tmr;
        tmr->task_cmd = se_cmd;
        tmr->fabric_tmr_ptr = fabric_tmr_ptr;
        tmr->function = function;
        INIT_LIST_HEAD(&tmr->tmr_list);
 
-       return tmr;
+       return 0;
 }
 EXPORT_SYMBOL(core_tmr_alloc_req);
 
@@ -69,7 +72,7 @@ void core_tmr_release_req(
        unsigned long flags;
 
        if (!dev) {
-               kmem_cache_free(se_tmr_req_cache, tmr);
+               kfree(tmr);
                return;
        }
 
@@ -77,7 +80,7 @@ void core_tmr_release_req(
        list_del(&tmr->tmr_list);
        spin_unlock_irqrestore(&dev->se_tmr_lock, flags);
 
-       kmem_cache_free(se_tmr_req_cache, tmr);
+       kfree(tmr);
 }
 
 static void core_tmr_handle_tas_abort(
@@ -100,6 +103,85 @@ static void core_tmr_handle_tas_abort(
        transport_cmd_finish_abort(cmd, 0);
 }
 
+static int target_check_cdb_and_preempt(struct list_head *list,
+               struct se_cmd *cmd)
+{
+       struct t10_pr_registration *reg;
+
+       if (!list)
+               return 0;
+       list_for_each_entry(reg, list, pr_reg_abort_list) {
+               if (reg->pr_res_key == cmd->pr_res_key)
+                       return 0;
+       }
+
+       return 1;
+}
+
+void core_tmr_abort_task(
+       struct se_device *dev,
+       struct se_tmr_req *tmr,
+       struct se_session *se_sess)
+{
+       struct se_cmd *se_cmd, *tmp_cmd;
+       unsigned long flags;
+       int ref_tag;
+
+       spin_lock_irqsave(&se_sess->sess_cmd_lock, flags);
+       list_for_each_entry_safe(se_cmd, tmp_cmd,
+                       &se_sess->sess_cmd_list, se_cmd_list) {
+
+               if (dev != se_cmd->se_dev)
+                       continue;
+               ref_tag = se_cmd->se_tfo->get_task_tag(se_cmd);
+               if (tmr->ref_task_tag != ref_tag)
+                       continue;
+
+               printk("ABORT_TASK: Found referenced %s task_tag: %u\n",
+                       se_cmd->se_tfo->get_fabric_name(), ref_tag);
+
+               spin_lock_irq(&se_cmd->t_state_lock);
+               if (se_cmd->transport_state & CMD_T_COMPLETE) {
+                       printk("ABORT_TASK: ref_tag: %u already complete, skipping\n", ref_tag);
+                       spin_unlock_irq(&se_cmd->t_state_lock);
+                       spin_unlock_irqrestore(&se_sess->sess_cmd_lock, flags);
+                       goto out;
+               }
+               se_cmd->transport_state |= CMD_T_ABORTED;
+               spin_unlock_irq(&se_cmd->t_state_lock);
+
+               list_del_init(&se_cmd->se_cmd_list);
+               kref_get(&se_cmd->cmd_kref);
+               spin_unlock_irqrestore(&se_sess->sess_cmd_lock, flags);
+
+               cancel_work_sync(&se_cmd->work);
+               transport_wait_for_tasks(se_cmd);
+               /*
+                * Now send SAM_STAT_TASK_ABORTED status for the referenced
+                * se_cmd descriptor..
+                */
+               transport_send_task_abort(se_cmd);
+               /*
+                * Also deal with possible extra acknowledge reference..
+                */
+               if (se_cmd->se_cmd_flags & SCF_ACK_KREF)
+                       target_put_sess_cmd(se_sess, se_cmd);
+
+               target_put_sess_cmd(se_sess, se_cmd);
+
+               printk("ABORT_TASK: Sending TMR_FUNCTION_COMPLETE for"
+                               " ref_tag: %d\n", ref_tag);
+               tmr->response = TMR_FUNCTION_COMPLETE;
+               return;
+       }
+       spin_unlock_irqrestore(&se_sess->sess_cmd_lock, flags);
+
+out:
+       printk("ABORT_TASK: Sending TMR_TASK_DOES_NOT_EXIST for ref_tag: %d\n",
+                       tmr->ref_task_tag);
+       tmr->response = TMR_TASK_DOES_NOT_EXIST;
+}
+
 static void core_tmr_drain_tmr_list(
        struct se_device *dev,
        struct se_tmr_req *tmr,
@@ -131,13 +213,11 @@ static void core_tmr_drain_tmr_list(
                 * parameter (eg: for PROUT PREEMPT_AND_ABORT service action
                 * skip non regisration key matching TMRs.
                 */
-               if (preempt_and_abort_list &&
-                   (core_scsi3_check_cdb_abort_and_preempt(
-                                       preempt_and_abort_list, cmd) != 0))
+               if (target_check_cdb_and_preempt(preempt_and_abort_list, cmd))
                        continue;
 
                spin_lock(&cmd->t_state_lock);
-               if (!atomic_read(&cmd->t_transport_active)) {
+               if (!(cmd->transport_state & CMD_T_ACTIVE)) {
                        spin_unlock(&cmd->t_state_lock);
                        continue;
                }
@@ -210,9 +290,7 @@ static void core_tmr_drain_task_list(
                 * For PREEMPT_AND_ABORT usage, only process commands
                 * with a matching reservation key.
                 */
-               if (preempt_and_abort_list &&
-                   (core_scsi3_check_cdb_abort_and_preempt(
-                                       preempt_and_abort_list, cmd) != 0))
+               if (target_check_cdb_and_preempt(preempt_and_abort_list, cmd))
                        continue;
                /*
                 * Not aborting PROUT PREEMPT_AND_ABORT CDB..
@@ -221,7 +299,7 @@ static void core_tmr_drain_task_list(
                        continue;
 
                list_move_tail(&task->t_state_list, &drain_task_list);
-               atomic_set(&task->task_state_active, 0);
+               task->t_state_active = false;
                /*
                 * Remove from task execute list before processing drain_task_list
                 */
@@ -244,15 +322,15 @@ static void core_tmr_drain_task_list(
                        cmd->t_task_cdb[0]);
                pr_debug("LUN_RESET: ITT[0x%08x] - pr_res_key: 0x%016Lx"
                        " t_task_cdbs: %d t_task_cdbs_left: %d"
-                       " t_task_cdbs_sent: %d -- t_transport_active: %d"
-                       " t_transport_stop: %d t_transport_sent: %d\n",
+                       " t_task_cdbs_sent: %d -- CMD_T_ACTIVE: %d"
+                       " CMD_T_STOP: %d CMD_T_SENT: %d\n",
                        cmd->se_tfo->get_task_tag(cmd), cmd->pr_res_key,
                        cmd->t_task_list_num,
                        atomic_read(&cmd->t_task_cdbs_left),
                        atomic_read(&cmd->t_task_cdbs_sent),
-                       atomic_read(&cmd->t_transport_active),
-                       atomic_read(&cmd->t_transport_stop),
-                       atomic_read(&cmd->t_transport_sent));
+                       (cmd->transport_state & CMD_T_ACTIVE) != 0,
+                       (cmd->transport_state & CMD_T_STOP) != 0,
+                       (cmd->transport_state & CMD_T_SENT) != 0);
 
                /*
                 * If the command may be queued onto a workqueue cancel it now.
@@ -276,19 +354,19 @@ static void core_tmr_drain_task_list(
                }
                fe_count = atomic_read(&cmd->t_fe_count);
 
-               if (atomic_read(&cmd->t_transport_active)) {
-                       pr_debug("LUN_RESET: got t_transport_active = 1 for"
+               if (!(cmd->transport_state & CMD_T_ACTIVE)) {
+                       pr_debug("LUN_RESET: got CMD_T_ACTIVE for"
                                " task: %p, t_fe_count: %d dev: %p\n", task,
                                fe_count, dev);
-                       atomic_set(&cmd->t_transport_aborted, 1);
+                       cmd->transport_state |= CMD_T_ABORTED;
                        spin_unlock_irqrestore(&cmd->t_state_lock, flags);
 
                        core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
                        continue;
                }
-               pr_debug("LUN_RESET: Got t_transport_active = 0 for task: %p,"
+               pr_debug("LUN_RESET: Got !CMD_T_ACTIVE for task: %p,"
                        " t_fe_count: %d dev: %p\n", task, fe_count, dev);
-               atomic_set(&cmd->t_transport_aborted, 1);
+               cmd->transport_state |= CMD_T_ABORTED;
                spin_unlock_irqrestore(&cmd->t_state_lock, flags);
 
                core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
@@ -320,27 +398,15 @@ static void core_tmr_drain_cmd_list(
                 * For PREEMPT_AND_ABORT usage, only process commands
                 * with a matching reservation key.
                 */
-               if (preempt_and_abort_list &&
-                   (core_scsi3_check_cdb_abort_and_preempt(
-                                       preempt_and_abort_list, cmd) != 0))
+               if (target_check_cdb_and_preempt(preempt_and_abort_list, cmd))
                        continue;
                /*
                 * Not aborting PROUT PREEMPT_AND_ABORT CDB..
                 */
                if (prout_cmd == cmd)
                        continue;
-               /*
-                * Skip direct processing of TRANSPORT_FREE_CMD_INTR for
-                * HW target mode fabrics.
-                */
-               spin_lock(&cmd->t_state_lock);
-               if (cmd->t_state == TRANSPORT_FREE_CMD_INTR) {
-                       spin_unlock(&cmd->t_state_lock);
-                       continue;
-               }
-               spin_unlock(&cmd->t_state_lock);
 
-               atomic_set(&cmd->t_transport_queue_active, 0);
+               cmd->transport_state &= ~CMD_T_QUEUED;
                atomic_dec(&qobj->queue_cnt);
                list_move_tail(&cmd->se_queue_node, &drain_cmd_list);
        }
@@ -354,10 +420,6 @@ static void core_tmr_drain_cmd_list(
                        " %d t_fe_count: %d\n", (preempt_and_abort_list) ?
                        "Preempt" : "", cmd, cmd->t_state,
                        atomic_read(&cmd->t_fe_count));
-               /*
-                * Signal that the command has failed via cmd->se_cmd_flags,
-                */
-               transport_new_cmd_failure(cmd);
 
                core_tmr_handle_tas_abort(tmr_nacl, cmd, tas,
                                atomic_read(&cmd->t_fe_count));