add read6 support

diff --git a/linux_scsi.c b/linux_scsi.c
index f0691aacfbf7bf86de38c3d8e8c44b38cb8659e4..8fcc4af64a2a376fab4e8f1eef479c82ce987f81 100644 (file)
--- a/linux_scsi.c
+++ b/linux_scsi.c
@@ -180,6 +180,40 @@ static void scsi_testunitready(struct dbench_op *op)
 }
 
 
+static void scsi_read6(struct dbench_op *op)
+{
+       struct scsi_device *sd;
+       unsigned char cdb[]={0x08,0,0,0,0,0};
+       int res;
+       int lba = op->params[0];
+       int xferlen = op->params[1];
+       unsigned int data_size=1024*1024;
+       char data[data_size];
+       unsigned char sc;
+
+       cdb[1] = (lba>>16)&0x1f;
+       cdb[2] = (lba>> 8)&0xff;
+       cdb[3] = (lba    )&0xff;
+
+       cdb[4] = xferlen&0xff;
+       data_size = xferlen*512;
+
+       sd = op->child->private;
+
+       res=scsi_io(sd->fd, cdb, sizeof(cdb), SG_DXFER_FROM_DEV, &data_size, data, &sc);
+       if(res){
+               printf("SCSI_IO failed\n");
+               failed(op->child);
+       }
+       if (!check_sense(sc, op->status)) {
+               printf("[%d] READ6 \"%s\" failed (0x%02x) - expected %s\n", 
+                      op->child->line, op->fname, sc, op->status);
+               failed(op->child);
+       }
+
+       op->child->bytes += xferlen*512;
+}
+
 static void scsi_read10(struct dbench_op *op)
 {
        struct scsi_device *sd;
@@ -255,6 +289,7 @@ static void scsi_readcapacity10(struct dbench_op *op)
 }
 
 static struct backend_op ops[] = {
+       { "READ6",            scsi_read6 },
        { "READ10",           scsi_read10 },
        { "READCAPACITY10",   scsi_readcapacity10 },
        { "TESTUNITREADY",    scsi_testunitready },

diff --git a/loadfiles/scsi.txt b/loadfiles/scsi.txt
index 993b430dcb8e872eef3577527df1bc6a82485410..0753c679bbf62dc780c2c573043fde2b828e6b86 100644 (file)
--- a/loadfiles/scsi.txt
+++ b/loadfiles/scsi.txt
@@ -4,6 +4,9 @@
 # timestamp TESTUNITREADY sense
 0.000 TESTUNITREADY 0x00
 #
+# timestamp READ6 lba #xferlen sense
+0.000 READ6    0 1 0x00
+#
 # timestamp READ10 lba #xferlen rd grp sense
 # rd is :
 # 3 bits     0xe0 : RDPROTECT