1 files changed, 75 insertions, 17 deletions

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 3e10c306de94..136329b4027b 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -12,7 +12,7 @@
  *  SAS disks.
  *
  *
- *  For documentation see http://www.torque.net/sg/sdebug26.html
+ *  For documentation see http://sg.danny.cz/sg/sdebug26.html
  *
  *   D. Gilbert (dpg) work for Magneto-Optical device test [20010421]
  *   dpg: work for devfs large number of disks [20010809]
@@ -58,8 +58,8 @@
 #include "sd.h"
 #include "scsi_logging.h"
 
-#define SCSI_DEBUG_VERSION "1.81"
-static const char * scsi_debug_version_date = "20070104";
+#define SCSI_DEBUG_VERSION "1.82"
+static const char * scsi_debug_version_date = "20100324";
 
 /* Additional Sense Code (ASC) */
 #define NO_ADDITIONAL_SENSE 0x0
@@ -108,6 +108,7 @@ static const char * scsi_debug_version_date = "20070104";
 #define DEF_ATO 1
 #define DEF_PHYSBLK_EXP 0
 #define DEF_LOWEST_ALIGNED 0
+#define DEF_OPT_BLKS 64
 #define DEF_UNMAP_MAX_BLOCKS 0
 #define DEF_UNMAP_MAX_DESC 0
 #define DEF_UNMAP_GRANULARITY 0
@@ -147,12 +148,18 @@ static const char * scsi_debug_version_date = "20070104";
 #define SAM2_LUN_ADDRESS_METHOD 0
 #define SAM2_WLUN_REPORT_LUNS 0xc101
 
+/* Can queue up to this number of commands. Typically commands that
+ * that have a non-zero delay are queued. */
+#define SCSI_DEBUG_CANQUEUE  255
+
 static int scsi_debug_add_host = DEF_NUM_HOST;
 static int scsi_debug_delay = DEF_DELAY;
 static int scsi_debug_dev_size_mb = DEF_DEV_SIZE_MB;
 static int scsi_debug_every_nth = DEF_EVERY_NTH;
 static int scsi_debug_max_luns = DEF_MAX_LUNS;
+static int scsi_debug_max_queue = SCSI_DEBUG_CANQUEUE;
 static int scsi_debug_num_parts = DEF_NUM_PARTS;
+static int scsi_debug_no_uld = 0;
 static int scsi_debug_num_tgts = DEF_NUM_TGTS; /* targets per host */
 static int scsi_debug_opts = DEF_OPTS;
 static int scsi_debug_scsi_level = DEF_SCSI_LEVEL;
@@ -169,6 +176,7 @@ static int scsi_debug_guard = DEF_GUARD;
 static int scsi_debug_ato = DEF_ATO;
 static int scsi_debug_physblk_exp = DEF_PHYSBLK_EXP;
 static int scsi_debug_lowest_aligned = DEF_LOWEST_ALIGNED;
+static int scsi_debug_opt_blks = DEF_OPT_BLKS;
 static int scsi_debug_unmap_max_desc = DEF_UNMAP_MAX_DESC;
 static int scsi_debug_unmap_max_blocks = DEF_UNMAP_MAX_BLOCKS;
 static int scsi_debug_unmap_granularity = DEF_UNMAP_GRANULARITY;
@@ -192,7 +200,6 @@ static int sdebug_sectors_per;		/* sectors per cylinder */
 
 #define SDEBUG_SENSE_LEN 32
 
-#define SCSI_DEBUG_CANQUEUE  255
 #define SCSI_DEBUG_MAX_CMD_LEN 32
 
 struct sdebug_dev_info {
@@ -699,9 +706,13 @@ static int inquiry_evpd_b0(unsigned char * arr)
         unsigned int gran;
 
         memcpy(arr, vpdb0_data, sizeof(vpdb0_data));
+
+        /* Optimal transfer length granularity */
         gran = 1 << scsi_debug_physblk_exp;
         arr[2] = (gran >> 8) & 0xff;
         arr[3] = gran & 0xff;
+
+        /* Maximum Transfer Length */
         if (sdebug_store_sectors > 0x400) {
                 arr[4] = (sdebug_store_sectors >> 24) & 0xff;
                 arr[5] = (sdebug_store_sectors >> 16) & 0xff;
@@ -709,6 +720,9 @@ static int inquiry_evpd_b0(unsigned char * arr)
                 arr[7] = sdebug_store_sectors & 0xff;
         }
 
+        /* Optimal Transfer Length */
+        put_unaligned_be32(scsi_debug_opt_blks, &arr[8]);
+
         if (scsi_debug_unmap_max_desc) {
                 unsigned int blocks;
 
@@ -717,15 +731,20 @@ static int inquiry_evpd_b0(unsigned char * arr)
                 else
                         blocks = 0xffffffff;
 
+                /* Maximum Unmap LBA Count */
                 put_unaligned_be32(blocks, &arr[16]);
+
+                /* Maximum Unmap Block Descriptor Count */
                 put_unaligned_be32(scsi_debug_unmap_max_desc, &arr[20]);
         }
 
+        /* Unmap Granularity Alignment */
         if (scsi_debug_unmap_alignment) {
                 put_unaligned_be32(scsi_debug_unmap_alignment, &arr[28]);
                 arr[28] |= 0x80; /* UGAVALID */
         }
 
+        /* Optimal Unmap Granularity */
         if (scsi_debug_unmap_granularity) {
                 put_unaligned_be32(scsi_debug_unmap_granularity, &arr[24]);
                 return 0x3c; /* Mandatory page length for thin provisioning */
@@ -957,7 +976,8 @@ static int resp_start_stop(struct scsi_cmnd * scp,
 static sector_t get_sdebug_capacity(void)
 {
         if (scsi_debug_virtual_gb > 0)
-                return 2048 * 1024 * (sector_t)scsi_debug_virtual_gb;
+                return (sector_t)scsi_debug_virtual_gb *
+                        (1073741824 / scsi_debug_sector_size);
         else
                 return sdebug_store_sectors;
 }
@@ -2265,7 +2285,7 @@ static void timer_intr_handler(unsigned long indx)
         struct sdebug_queued_cmd * sqcp;
         unsigned long iflags;
 
-        if (indx >= SCSI_DEBUG_CANQUEUE) {
+        if (indx >= scsi_debug_max_queue) {
                 printk(KERN_ERR "scsi_debug:timer_intr_handler: indx too "
                        "large\n");
                 return;
@@ -2379,6 +2399,8 @@ static int scsi_debug_slave_configure(struct scsi_device *sdp)
                 scsi_adjust_queue_depth(sdp, SDEBUG_TAGGED_QUEUING,
                                         sdp->host->cmd_per_lun);
         blk_queue_max_segment_size(sdp->request_queue, 256 * 1024);
+        if (scsi_debug_no_uld)
+                sdp->no_uld_attach = 1;
         return 0;
 }
 
@@ -2405,7 +2427,7 @@ static int stop_queued_cmnd(struct scsi_cmnd *cmnd)
         struct sdebug_queued_cmd *sqcp;
 
         spin_lock_irqsave(&queued_arr_lock, iflags);
-        for (k = 0; k < SCSI_DEBUG_CANQUEUE; ++k) {
+        for (k = 0; k < scsi_debug_max_queue; ++k) {
                 sqcp = &queued_arr[k];
                 if (sqcp->in_use && (cmnd == sqcp->a_cmnd)) {
                         del_timer_sync(&sqcp->cmnd_timer);
@@ -2415,7 +2437,7 @@ static int stop_queued_cmnd(struct scsi_cmnd *cmnd)
                 }
         }
         spin_unlock_irqrestore(&queued_arr_lock, iflags);
-        return (k < SCSI_DEBUG_CANQUEUE) ? 1 : 0;
+        return (k < scsi_debug_max_queue) ? 1 : 0;
 }
 
 /* Deletes (stops) timers of all queued commands */
@@ -2426,7 +2448,7 @@ static void stop_all_queued(void)
         struct sdebug_queued_cmd *sqcp;
 
         spin_lock_irqsave(&queued_arr_lock, iflags);
-        for (k = 0; k < SCSI_DEBUG_CANQUEUE; ++k) {
+        for (k = 0; k < scsi_debug_max_queue; ++k) {
                 sqcp = &queued_arr[k];
                 if (sqcp->in_use && sqcp->a_cmnd) {
                         del_timer_sync(&sqcp->cmnd_timer);
@@ -2532,7 +2554,7 @@ static void __init init_all_queued(void)
         struct sdebug_queued_cmd * sqcp;
 
         spin_lock_irqsave(&queued_arr_lock, iflags);
-        for (k = 0; k < SCSI_DEBUG_CANQUEUE; ++k) {
+        for (k = 0; k < scsi_debug_max_queue; ++k) {
                 sqcp = &queued_arr[k];
                 init_timer(&sqcp->cmnd_timer);
                 sqcp->in_use = 0;
@@ -2624,12 +2646,12 @@ static int schedule_resp(struct scsi_cmnd * cmnd,
                 struct sdebug_queued_cmd * sqcp = NULL;
 
                 spin_lock_irqsave(&queued_arr_lock, iflags);
-                for (k = 0; k < SCSI_DEBUG_CANQUEUE; ++k) {
+                for (k = 0; k < scsi_debug_max_queue; ++k) {
                         sqcp = &queued_arr[k];
                         if (! sqcp->in_use)
                                 break;
                 }
-                if (k >= SCSI_DEBUG_CANQUEUE) {
+                if (k >= scsi_debug_max_queue) {
                         spin_unlock_irqrestore(&queued_arr_lock, iflags);
                         printk(KERN_WARNING "scsi_debug: can_queue exceeded\n");
                         return 1;       /* report busy to mid level */
@@ -2661,7 +2683,9 @@ module_param_named(dsense, scsi_debug_dsense, int, S_IRUGO | S_IWUSR);
 module_param_named(every_nth, scsi_debug_every_nth, int, S_IRUGO | S_IWUSR);
 module_param_named(fake_rw, scsi_debug_fake_rw, int, S_IRUGO | S_IWUSR);
 module_param_named(max_luns, scsi_debug_max_luns, int, S_IRUGO | S_IWUSR);
+module_param_named(max_queue, scsi_debug_max_queue, int, S_IRUGO | S_IWUSR);
 module_param_named(no_lun_0, scsi_debug_no_lun_0, int, S_IRUGO | S_IWUSR);
+module_param_named(no_uld, scsi_debug_no_uld, int, S_IRUGO);
 module_param_named(num_parts, scsi_debug_num_parts, int, S_IRUGO);
 module_param_named(num_tgts, scsi_debug_num_tgts, int, S_IRUGO | S_IWUSR);
 module_param_named(opts, scsi_debug_opts, int, S_IRUGO | S_IWUSR);
@@ -2676,6 +2700,7 @@ module_param_named(dif, scsi_debug_dif, int, S_IRUGO);
 module_param_named(guard, scsi_debug_guard, int, S_IRUGO);
 module_param_named(ato, scsi_debug_ato, int, S_IRUGO);
 module_param_named(physblk_exp, scsi_debug_physblk_exp, int, S_IRUGO);
+module_param_named(opt_blks, scsi_debug_opt_blks, int, S_IRUGO);
 module_param_named(lowest_aligned, scsi_debug_lowest_aligned, int, S_IRUGO);
 module_param_named(unmap_max_blocks, scsi_debug_unmap_max_blocks, int, S_IRUGO);
 module_param_named(unmap_max_desc, scsi_debug_unmap_max_desc, int, S_IRUGO);
@@ -2694,7 +2719,9 @@ MODULE_PARM_DESC(dsense, "use descriptor sense format(def=0 -> fixed)");
 MODULE_PARM_DESC(every_nth, "timeout every nth command(def=0)");
 MODULE_PARM_DESC(fake_rw, "fake reads/writes instead of copying (def=0)");
 MODULE_PARM_DESC(max_luns, "number of LUNs per target to simulate(def=1)");
+MODULE_PARM_DESC(max_queue, "max number of queued commands (1 to 255(def))");
 MODULE_PARM_DESC(no_lun_0, "no LU number 0 (def=0 -> have lun 0)");
+MODULE_PARM_DESC(no_uld, "stop ULD (e.g. sd driver) attaching (def=0))");
 MODULE_PARM_DESC(num_parts, "number of partitions(def=0)");
 MODULE_PARM_DESC(num_tgts, "number of targets per host to simulate(def=1)");
 MODULE_PARM_DESC(opts, "1->noise, 2->medium_err, 4->timeout, 8->recovered_err... (def=0)");
@@ -2704,6 +2731,7 @@ MODULE_PARM_DESC(virtual_gb, "virtual gigabyte size (def=0 -> use dev_size_mb)")
 MODULE_PARM_DESC(vpd_use_hostno, "0 -> dev ids ignore hostno (def=1 -> unique dev ids)");
 MODULE_PARM_DESC(sector_size, "logical block size in bytes (def=512)");
 MODULE_PARM_DESC(physblk_exp, "physical block exponent (def=0)");
+MODULE_PARM_DESC(opt_blks, "optimal transfer length in block (def=64)");
 MODULE_PARM_DESC(lowest_aligned, "lowest aligned lba (def=0)");
 MODULE_PARM_DESC(dix, "data integrity extensions mask (def=0)");
 MODULE_PARM_DESC(dif, "data integrity field type: 0-3 (def=0)");
@@ -2969,6 +2997,31 @@ static ssize_t sdebug_max_luns_store(struct device_driver * ddp,
 DRIVER_ATTR(max_luns, S_IRUGO | S_IWUSR, sdebug_max_luns_show,
             sdebug_max_luns_store);
 
+static ssize_t sdebug_max_queue_show(struct device_driver * ddp, char * buf)
+{
+        return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_max_queue);
+}
+static ssize_t sdebug_max_queue_store(struct device_driver * ddp,
+                                      const char * buf, size_t count)
+{
+        int n;
+
+        if ((count > 0) && (1 == sscanf(buf, "%d", &n)) && (n > 0) &&
+            (n <= SCSI_DEBUG_CANQUEUE)) {
+                scsi_debug_max_queue = n;
+                return count;
+        }
+        return -EINVAL;
+}
+DRIVER_ATTR(max_queue, S_IRUGO | S_IWUSR, sdebug_max_queue_show,
+            sdebug_max_queue_store);
+
+static ssize_t sdebug_no_uld_show(struct device_driver * ddp, char * buf)
+{
+        return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_no_uld);
+}
+DRIVER_ATTR(no_uld, S_IRUGO, sdebug_no_uld_show, NULL);
+
 static ssize_t sdebug_scsi_level_show(struct device_driver * ddp, char * buf)
 {
         return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_scsi_level);
@@ -3106,7 +3159,9 @@ static int do_create_driverfs_files(void)
         ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_every_nth);
         ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_fake_rw);
         ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_max_luns);
+        ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_max_queue);
         ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_no_lun_0);
+        ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_no_uld);
         ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_num_parts);
         ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_num_tgts);
         ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_ptype);
@@ -3138,7 +3193,9 @@ static void do_remove_driverfs_files(void)
         driver_remove_file(&sdebug_driverfs_driver, &driver_attr_ptype);
         driver_remove_file(&sdebug_driverfs_driver, &driver_attr_num_tgts);
         driver_remove_file(&sdebug_driverfs_driver, &driver_attr_num_parts);
+        driver_remove_file(&sdebug_driverfs_driver, &driver_attr_no_uld);
         driver_remove_file(&sdebug_driverfs_driver, &driver_attr_no_lun_0);
+        driver_remove_file(&sdebug_driverfs_driver, &driver_attr_max_queue);
         driver_remove_file(&sdebug_driverfs_driver, &driver_attr_max_luns);
         driver_remove_file(&sdebug_driverfs_driver, &driver_attr_fake_rw);
         driver_remove_file(&sdebug_driverfs_driver, &driver_attr_every_nth);
@@ -3829,12 +3886,13 @@ static int sdebug_driver_probe(struct device * dev)
 
         sdbg_host = to_sdebug_host(dev);
 
-        hpnt = scsi_host_alloc(&sdebug_driver_template, sizeof(sdbg_host));
-        if (NULL == hpnt) {
-                printk(KERN_ERR "%s: scsi_register failed\n", __func__);
-                error = -ENODEV;
+        sdebug_driver_template.can_queue = scsi_debug_max_queue;
+        hpnt = scsi_host_alloc(&sdebug_driver_template, sizeof(sdbg_host));
+        if (NULL == hpnt) {
+                printk(KERN_ERR "%s: scsi_register failed\n", __func__);
+                error = -ENODEV;
                 return error;
-        }
+        }
 
         sdbg_host->shost = hpnt;
         *((struct sdebug_host_info **)hpnt->hostdata) = sdbg_host;