scsi_debug: allow huge transfer length for read/write commands
authorAkinobu Mita <akinobu.mita@gmail.com>
Mon, 2 Jun 2014 13:56:49 +0000 (22:56 +0900)
committerChristoph Hellwig <hch@lst.de>
Thu, 17 Jul 2014 20:07:31 +0000 (22:07 +0200)
This change enables to test read/write commands with huge transfer
length such as 1GB.  For example:

# modprobe scsi_debug dev_size_mb=1024 clustering=1 opts=1
# cat /sys/block/$DEV/queue/max_hw_sectors_kb > \
/sys/block/$DEV/queue/max_sectors_kb
# fio --name=test --rw=write --bs=1g --size=1g --filename=/dev/$DEV \
--mem=mmaphuge  --direct=1

The data type of max_sectors in scsi_host_template has been extended
to unsigned int by the previous change.  So we can increase it from
0xffff to 0xffffffff to allow such huge transfer length.

Also, this increases sg_tablesize and max_segment_size, otherwise the
maximum transfer length is limited to 64MB.
(sg_tablesize * max_segment_size = 256 * 256KB)

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Acked by: Douglas Gilbert <dgilbert@interlog.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/scsi/scsi_debug.c

index 1328a2621070948980d6978fd0eb088b6ec11bbe..c4ad52c2ec6961261bcb26475cabf47f461e53d3 100644 (file)
@@ -2484,7 +2484,7 @@ static int scsi_debug_slave_configure(struct scsi_device *sdp)
        if (sdp->host->cmd_per_lun)
                scsi_adjust_queue_depth(sdp, SDEBUG_TAGGED_QUEUING,
                                        sdp->host->cmd_per_lun);
-       blk_queue_max_segment_size(sdp->request_queue, 256 * 1024);
+       blk_queue_max_segment_size(sdp->request_queue, -1U);
        if (scsi_debug_no_uld)
                sdp->no_uld_attach = 1;
        return 0;
@@ -3946,9 +3946,9 @@ static struct scsi_host_template sdebug_driver_template = {
        .bios_param =           scsi_debug_biosparam,
        .can_queue =            SCSI_DEBUG_CANQUEUE,
        .this_id =              7,
-       .sg_tablesize =         256,
+       .sg_tablesize =         SCSI_MAX_SG_CHAIN_SEGMENTS,
        .cmd_per_lun =          16,
-       .max_sectors =          0xffff,
+       .max_sectors =          -1U,
        .use_clustering =       DISABLE_CLUSTERING,
        .module =               THIS_MODULE,
 };