[Scst-svn] SF.net SVN: scst: [239] trunk

[<vl...@us...>]

Revision: 239
          http://scst.svn.sourceforge.net/scst/?rev=239&view=rev
Author:   vlnb
Date:     2007-12-24 11:22:02 -0800 (Mon, 24 Dec 2007)

Log Message:
-----------
 - Broken VERIFY commands fixed (hopefully; compile tested only)
 - Mistyped spin_lock() instead spin_lock_bh() fixed
 - DEBUG_TM and small logging improvements
 - Docs update

Modified Paths:
--------------
    trunk/iscsi-scst/README
    trunk/scst/README
    trunk/scst/src/scst_cdbprobe.h
    trunk/scst/src/scst_lib.c
    trunk/scst/src/scst_priv.h
    trunk/scst/src/scst_targ.c

Modified: trunk/iscsi-scst/README
===================================================================
--- trunk/iscsi-scst/README	2007-12-24 10:20:18 UTC (rev 238)
+++ trunk/iscsi-scst/README	2007-12-24 19:22:02 UTC (rev 239)
@@ -111,6 +111,10 @@
 In this case value like 16 or even 10 depending of your backstorage
 speed could be more appropriate.
 
+CAUTION:  Working of target and initiator on the same host isn't
+========  supported. See SCST README file for details.
+
+
 Compilation options
 -------------------
 

Modified: trunk/scst/README
===================================================================
--- trunk/scst/README	2007-12-24 10:20:18 UTC (rev 238)
+++ trunk/scst/README	2007-12-24 19:22:02 UTC (rev 239)
@@ -95,6 +95,14 @@
 	   'echo "scsi add-single-device A 0 0 B" >/proc/scsi/scsi',
 	   where A - is the host number, B - LUN.
 
+IMPORTANT: Working of target and initiator on the same host isn't
+=========  supported. This is a limitation of the Linux memory/cache                      
+           manager, because in this case an OOM deadlock like: system
+	   needs some memory -> it decides to clear some cache -> cache
+	   needs to write on a target exported device -> initiator sends
+	   request to the target -> target needs memory -> problem is
+	   possible.
+
 IMPORTANT: Experience shows that if people work with out of SCST tree target
 =========  drivers, like target driver for Infiniband or in case if they
            downloaded and use the released versions of SCST and target

Modified: trunk/scst/src/scst_cdbprobe.h
===================================================================
--- trunk/scst/src/scst_cdbprobe.h	2007-12-24 10:20:18 UTC (rev 238)
+++ trunk/scst/src/scst_cdbprobe.h	2007-12-24 19:22:02 UTC (rev 239)
@@ -172,7 +172,7 @@
 	{0x12, "MMMMMMMMMMMMMMMM", "INQUIRY",
 	 SCST_DATA_READ, SCST_SMALL_TIMEOUT, 4, get_trans_len_1},
 	{0x13, "VOVVVV          ", "VERIFY(6)",
-	 SCST_DATA_WRITE, SCST_TRANSFER_LEN_TYPE_FIXED, 2, get_trans_len_3},
+	 SCST_DATA_NONE, SCST_TRANSFER_LEN_TYPE_FIXED, 2, get_trans_len_3},
 	{0x14, "VOOVVV          ", "RECOVER BUFFERED DATA",
 	 SCST_DATA_READ, SCST_TRANSFER_LEN_TYPE_FIXED, 2, get_trans_len_3},
 	{0x15, "OMOOOOOOOOOOOOOO", "MODE SELECT(6)",
@@ -248,7 +248,7 @@
 	{0x2E, "O   OO O        ", "WRITE AND VERIFY(10)",
 	 SCST_DATA_WRITE, SCST_TRANSFER_LEN_TYPE_FIXED, 7, get_trans_len_2},
 	{0x2F, "O   OO O        ", "VERIFY(10)",
-	 SCST_DATA_WRITE, SCST_TRANSFER_LEN_TYPE_FIXED, 7, get_trans_len_2},
+	 SCST_DATA_NONE, SCST_TRANSFER_LEN_TYPE_FIXED, 7, get_trans_len_2},
 	{0x33, "O   OO O        ", "SET LIMITS(10)",
 	 SCST_DATA_NONE, FLAG_NONE, 0, get_trans_len_none},
 	{0x34, " O              ", "READ POSITION",
@@ -376,7 +376,7 @@
 	{0x8E, "O   OO O        ", "WRITE AND VERIFY(16)",
 	 SCST_DATA_WRITE, SCST_TRANSFER_LEN_TYPE_FIXED, 10, get_trans_len_4},
 	{0x8F, "O   OO O        ", "VERIFY(16)",
-	 SCST_DATA_WRITE, SCST_TRANSFER_LEN_TYPE_FIXED, 10, get_trans_len_4},
+	 SCST_DATA_NONE, SCST_TRANSFER_LEN_TYPE_FIXED, 10, get_trans_len_4},
 	{0x90, "O   OO O        ", "PRE-FETCH(16)",
 	 SCST_DATA_NONE, FLAG_NONE, 0, get_trans_len_none},
 	{0x91, "O   OO O        ", "SYNCHRONIZE CACHE(16)",
@@ -440,7 +440,7 @@
 	{0xAE, "O   OO O        ", "WRITE AND VERIFY(12)",
 	 SCST_DATA_WRITE, SCST_TRANSFER_LEN_TYPE_FIXED, 6, get_trans_len_4},
 	{0xAF, "O   OO O        ", "VERIFY(12)",
-	 SCST_DATA_WRITE, SCST_TRANSFER_LEN_TYPE_FIXED, 6, get_trans_len_4},
+	 SCST_DATA_NONE, SCST_TRANSFER_LEN_TYPE_FIXED, 6, get_trans_len_4},
 /* No need to support at all.
 	{0xB0, "    OO O        ", "SEARCH DATA HIGH(12)",
 	 SCST_DATA_WRITE, FLAG_NONE, 9, get_trans_len_1},

Modified: trunk/scst/src/scst_lib.c
===================================================================
--- trunk/scst/src/scst_lib.c	2007-12-24 10:20:18 UTC (rev 238)
+++ trunk/scst/src/scst_lib.c	2007-12-24 19:22:02 UTC (rev 239)
@@ -1893,8 +1893,7 @@
 		if ((cmd->cdb[1] & BYTCHK) == 0) {
 			cmd->data_len = cmd->bufflen << get_block_shift(cmd);
 			cmd->bufflen = 0;
-			cmd->data_direction = SCST_DATA_NONE;
-			cmd->op_flags &= ~SCST_TRANSFER_LEN_TYPE_FIXED;
+			goto out;
 		} else
 			cmd->data_len = 0;
 		break;
@@ -1911,6 +1910,7 @@
 		cmd->bufflen = cmd->bufflen << get_block_shift(cmd);
 	}
 
+out:
 	TRACE_DBG("res %d, bufflen %d, data_len %d, direct %d",
 	      res, cmd->bufflen, cmd->data_len, cmd->data_direction);
 
@@ -1943,8 +1943,7 @@
 		if ((cmd->cdb[1] & BYTCHK) == 0) {
 			cmd->data_len = cmd->bufflen << get_block_shift(cmd);
 			cmd->bufflen = 0;
-			cmd->data_direction = SCST_DATA_NONE;
-			cmd->op_flags &= ~SCST_TRANSFER_LEN_TYPE_FIXED;
+			goto out;
 		}
 		break;
 	default:
@@ -1955,8 +1954,9 @@
 	if (cmd->op_flags & SCST_TRANSFER_LEN_TYPE_FIXED)
 		cmd->bufflen = cmd->bufflen << get_block_shift(cmd);
 
-	TRACE_DBG("res %d bufflen %d direct %d",
-	      res, cmd->bufflen, cmd->data_direction);
+out:
+	TRACE_DBG("res=%d, bufflen=%d, direct=%d", res, cmd->bufflen,
+		cmd->data_direction);
 
 	TRACE_EXIT();
 	return res;
@@ -1987,8 +1987,7 @@
 		if ((cmd->cdb[1] & BYTCHK) == 0) {
 			cmd->data_len = cmd->bufflen << get_block_shift(cmd);
 			cmd->bufflen = 0;
-			cmd->data_direction = SCST_DATA_NONE;
-			cmd->op_flags &= ~SCST_TRANSFER_LEN_TYPE_FIXED;
+			goto out;
 		}
 		break;
 	default:
@@ -1999,8 +1998,9 @@
 	if (cmd->op_flags & SCST_TRANSFER_LEN_TYPE_FIXED)
 		cmd->bufflen = cmd->bufflen << get_block_shift(cmd);
 
-	TRACE_DBG("res %d bufflen %d direct %d",
-	      res, cmd->bufflen, cmd->data_direction);
+out:
+	TRACE_DBG("res=%d, bufflen=%d, direct=%d", res, cmd->bufflen,
+		cmd->data_direction);
 
 	TRACE_EXIT_RES(res);
 	return res;
@@ -2488,7 +2488,7 @@
 
 	TRACE_ENTRY();
 
-	spin_lock(&tgt_dev->tgt_dev_lock);
+	spin_lock_bh(&tgt_dev->tgt_dev_lock);
 
 	list_for_each_entry(UA_entry_tmp, &tgt_dev->UA_list,
 			    UA_list_entry) {
@@ -2502,7 +2502,7 @@
 	if (skip_UA == 0)
 		scst_alloc_set_UA(tgt_dev, sense, sense_len, head);
 
-	spin_unlock(&tgt_dev->tgt_dev_lock);
+	spin_unlock_bh(&tgt_dev->tgt_dev_lock);
 
 	TRACE_EXIT();
 	return;
@@ -3321,18 +3321,33 @@
 	spin_unlock_irqrestore(&scst_tm_dbg_lock, flags);
 }
 
-/* No locks */
-void tm_dbg_task_mgmt(struct scst_tgt_dev *tgt_dev, const char *fn, int force)
+/* Might be called under scst_mutex */
+void tm_dbg_task_mgmt(struct scst_device *dev, const char *fn, int force)
 {
 	unsigned long flags;
 
 	if (!tm_dbg_flags.tm_dbg_active)
 		goto out;
 
-	if ((tgt_dev != NULL) && !test_bit(SCST_TGT_DEV_UNDER_TM_DBG,
-						&tgt_dev->tgt_dev_flags))
-		goto out;
+	if (dev != NULL) {
+		struct scst_tgt_dev *tgt_dev;
+		bool found = 0;
 
+		spin_lock_bh(&dev->dev_lock);
+		list_for_each_entry(tgt_dev, &dev->dev_tgt_dev_list,
+					    dev_tgt_dev_list_entry) {
+			if (test_bit(SCST_TGT_DEV_UNDER_TM_DBG,
+					&tgt_dev->tgt_dev_flags)) {
+				found = 1;
+				break;
+			}
+		}
+		spin_unlock_bh(&dev->dev_lock);
+
+		if (!found)
+			goto out;
+	}
+
 	spin_lock_irqsave(&scst_tm_dbg_lock, flags);
 	if ((tm_dbg_state != TM_DBG_STATE_OFFLINE) || force) {
 		TRACE_MGMT_DBG("%s: freeing %d delayed cmds", fn,

Modified: trunk/scst/src/scst_priv.h
===================================================================
--- trunk/scst/src/scst_priv.h	2007-12-24 10:20:18 UTC (rev 238)
+++ trunk/scst/src/scst_priv.h	2007-12-24 19:22:02 UTC (rev 239)
@@ -512,7 +512,7 @@
 extern void tm_dbg_check_released_cmds(void);
 extern int tm_dbg_check_cmd(struct scst_cmd *cmd);
 extern void tm_dbg_release_cmd(struct scst_cmd *cmd);
-extern void tm_dbg_task_mgmt(struct scst_tgt_dev *tgt_dev, const char *fn,
+extern void tm_dbg_task_mgmt(struct scst_device *dev, const char *fn,
 	int force);
 extern int tm_dbg_is_release(void);
 #else
@@ -525,7 +525,7 @@
 	return 0;
 }
 static inline void tm_dbg_release_cmd(struct scst_cmd *cmd) {}
-static inline void tm_dbg_task_mgmt(struct scst_tgt_dev *tgt_dev, const char *fn,
+static inline void tm_dbg_task_mgmt(struct scst_device *dev, const char *fn,
 	int force) {}
 static inline int tm_dbg_is_release(void)
 {

Modified: trunk/scst/src/scst_targ.c
===================================================================
--- trunk/scst/src/scst_targ.c	2007-12-24 10:20:18 UTC (rev 238)
+++ trunk/scst/src/scst_targ.c	2007-12-24 19:22:02 UTC (rev 239)
@@ -3729,6 +3729,8 @@
 		}
 		if (!found)
 			list_add_tail(&dev->tm_dev_list_entry, &host_devs);
+
+		tm_dbg_task_mgmt(dev, "TARGET RESET", 0);
 	}
 
 	/*
@@ -3761,7 +3763,6 @@
 
 	mutex_unlock(&scst_mutex);
 
-	tm_dbg_task_mgmt(mcmd->mcmd_tgt_dev, "TARGET RESET", 0);
 	res = scst_set_mcmd_next_state(mcmd);
 
 	TRACE_EXIT_RES(res);
@@ -3802,7 +3803,8 @@
 	}
 
 out_tm_dbg:
-	tm_dbg_task_mgmt(mcmd->mcmd_tgt_dev, "LUN RESET", 0);
+	tm_dbg_task_mgmt(mcmd->mcmd_tgt_dev->dev, "LUN RESET", 0);
+
 	res = scst_set_mcmd_next_state(mcmd);
 
 	TRACE_EXIT_RES(res);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.