ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: fix the scsi read write direction issue.

Browse Source 
For iscsi read/write, expected_data_xfer_len
is 0, dxfer_dir is set to SPDK_SCSI_DIR_NONE.
But we can still have read/write op in SCSI layer.
This patch solves this issue.

Change-Id: I950e163fffb06fefaf8a913d1f6de29c96a52264
Signed-off-by: Ziye Yang <ziye.yang@intel.com>
This commit is contained in:
Ziye Yang 2017-01-23 15:20:54 +08:00 committed by Jim Harris
parent 2d5087b305
commit 4133842d36
1 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/scsi/scsi_bdev.c
View File

@ -1469,11 +1469,23 @@ spdk_bdev_scsi_sync(struct spdk_bdev *bdev, struct spdk_scsi_task *task,
static int static int
spdk_bdev_scsi_readwrite(struct spdk_bdev *bdev, spdk_bdev_scsi_readwrite(struct spdk_bdev *bdev,
struct spdk_scsi_task *task, struct spdk_scsi_task *task,
uint64_t lba, uint32_t xfer_len) uint64_t lba, uint32_t xfer_len, bool is_read)
{ {
if (task->dxfer_dir == SPDK_SCSI_DIR_FROM_DEV) { if (is_read) {
if ((task->dxfer_dir == SPDK_SCSI_DIR_FROM_DEV) ||
(task->dxfer_dir == SPDK_SCSI_DIR_NONE)) {
return spdk_bdev_scsi_read(bdev, task, lba, xfer_len); return spdk_bdev_scsi_read(bdev, task, lba, xfer_len);
} else if (task->dxfer_dir == SPDK_SCSI_DIR_TO_DEV) { } else {
SPDK_ERRLOG("Incorrect data direction\n");
spdk_scsi_task_set_status(task, SPDK_SCSI_STATUS_CHECK_CONDITION,
SPDK_SCSI_SENSE_NO_SENSE,
SPDK_SCSI_ASC_NO_ADDITIONAL_SENSE,
SPDK_SCSI_ASCQ_CAUSE_NOT_REPORTABLE);
return SPDK_SCSI_TASK_COMPLETE;
}
} else {
if ((task->dxfer_dir == SPDK_SCSI_DIR_TO_DEV) ||
(task->dxfer_dir == SPDK_SCSI_DIR_NONE)) {
return spdk_bdev_scsi_write(bdev, task, lba, xfer_len); return spdk_bdev_scsi_write(bdev, task, lba, xfer_len);
} else { } else {
SPDK_ERRLOG("Incorrect data direction\n"); SPDK_ERRLOG("Incorrect data direction\n");
@ -1483,6 +1495,7 @@ spdk_bdev_scsi_readwrite(struct spdk_bdev *bdev,
SPDK_SCSI_ASCQ_CAUSE_NOT_REPORTABLE); SPDK_SCSI_ASCQ_CAUSE_NOT_REPORTABLE);
return SPDK_SCSI_TASK_COMPLETE; return SPDK_SCSI_TASK_COMPLETE;
} }
}
} }
static int static int
@ -1577,25 +1590,28 @@ spdk_bdev_scsi_process_block(struct spdk_bdev *bdev,
if (xfer_len == 0) { if (xfer_len == 0) {
xfer_len = 256; xfer_len = 256;
} }
return spdk_bdev_scsi_readwrite(bdev, task, lba, xfer_len); return spdk_bdev_scsi_readwrite(bdev, task, lba, xfer_len,
cdb[0] == SPDK_SBC_READ_6);
case SPDK_SBC_READ_10: case SPDK_SBC_READ_10:
case SPDK_SBC_WRITE_10: case SPDK_SBC_WRITE_10:
lba = from_be32(&cdb[2]); lba = from_be32(&cdb[2]);
xfer_len = from_be16(&cdb[7]); xfer_len = from_be16(&cdb[7]);
return spdk_bdev_scsi_readwrite(bdev, task, lba, xfer_len); return spdk_bdev_scsi_readwrite(bdev, task, lba, xfer_len,
cdb[0] == SPDK_SBC_READ_10);
case SPDK_SBC_READ_12: case SPDK_SBC_READ_12:
case SPDK_SBC_WRITE_12: case SPDK_SBC_WRITE_12:
lba = from_be32(&cdb[2]); lba = from_be32(&cdb[2]);
xfer_len = from_be32(&cdb[6]); xfer_len = from_be32(&cdb[6]);
return spdk_bdev_scsi_readwrite(bdev, task, lba, xfer_len); return spdk_bdev_scsi_readwrite(bdev, task, lba, xfer_len,
cdb[0] == SPDK_SBC_READ_12);
case SPDK_SBC_READ_16: case SPDK_SBC_READ_16:
case SPDK_SBC_WRITE_16: case SPDK_SBC_WRITE_16:
lba = from_be64(&cdb[2]); lba = from_be64(&cdb[2]);
xfer_len = from_be32(&cdb[10]); xfer_len = from_be32(&cdb[10]);
return spdk_bdev_scsi_readwrite(bdev, task, lba, xfer_len); return spdk_bdev_scsi_readwrite(bdev, task, lba, xfer_len,
cdb[0] == SPDK_SBC_READ_16);
case SPDK_SBC_READ_CAPACITY_10: { case SPDK_SBC_READ_CAPACITY_10: {
uint8_t buffer[8]; uint8_t buffer[8];