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

scsi_bdev: respect allocation length in READ CAPACITY 10/16

Browse Source 
Change-Id: Iedab4471edc8639fde32bb29acba9172b0f65734
Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
This commit is contained in:
Pawel Wodkowski 2016-11-07 20:11:46 +01:00 committed by Jim Harris
parent 0244b5d78d
commit 4fdc493c8e
1 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/scsi/scsi_bdev.c
View File

@ -1537,35 +1537,54 @@ spdk_bdev_scsi_process_block(struct spdk_bdev *bdev,
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);
case SPDK_SBC_READ_CAPACITY_10: case SPDK_SBC_READ_CAPACITY_10: {
data = spdk_scsi_task_alloc_data(task, 8); uint8_t buffer[8];
if (bdev->blockcnt - 1 > 0xffffffffULL) { if (bdev->blockcnt - 1 > 0xffffffffULL) {
memset(data, 0xff, 4); memset(buffer, 0xff, 4);
} else { } else {
to_be32(data, bdev->blockcnt - 1); to_be32(buffer, bdev->blockcnt - 1);
} }
to_be32(&data[4], bdev->blocklen); to_be32(&buffer[4], bdev->blocklen);
len = task->length < 8 ? task->length : sizeof(buffer);
if (len) {
data = spdk_scsi_task_alloc_data(task, len);
memcpy(data, buffer, len);
}
task->data_transferred = 8; task->data_transferred = 8;
task->status = SPDK_SCSI_STATUS_GOOD; task->status = SPDK_SCSI_STATUS_GOOD;
break; break;
}
case SPDK_SPC_SERVICE_ACTION_IN_16: case SPDK_SPC_SERVICE_ACTION_IN_16:
switch (cdb[1] & 0x1f) { /* SERVICE ACTION */ switch (cdb[1] & 0x1f) { /* SERVICE ACTION */
case SPDK_SBC_SAI_READ_CAPACITY_16: case SPDK_SBC_SAI_READ_CAPACITY_16: {
data = spdk_scsi_task_alloc_data(task, 32); uint8_t buffer[32] = {0};
to_be64(&data[0], bdev->blockcnt - 1);
to_be32(&data[8], bdev->blocklen); to_be64(&buffer[0], bdev->blockcnt - 1);
to_be32(&buffer[8], bdev->blocklen);
/* /*
* Set the TPE bit to 1 to indicate thin provisioning. * Set the TPE bit to 1 to indicate thin provisioning.
* The position of TPE bit is the 7th bit in 14th byte * The position of TPE bit is the 7th bit in 14th byte
* in READ CAPACITY (16) parameter data. * in READ CAPACITY (16) parameter data.
*/ */
if (bdev->thin_provisioning) { if (bdev->thin_provisioning) {
data[14] |= 1 << 7; buffer[14] |= 1 << 7;
} }
task->data_transferred = 32;
len = from_be32(&cdb[10]);
if (len) {
len = len < sizeof(buffer) ? len : sizeof(buffer);
data = spdk_scsi_task_alloc_data(task, len);
memcpy(data, buffer, len);
}
task->data_transferred = len;
task->status = SPDK_SCSI_STATUS_GOOD; task->status = SPDK_SCSI_STATUS_GOOD;
break; break;
}
default: default:
return SPDK_SCSI_TASK_UNKNOWN; return SPDK_SCSI_TASK_UNKNOWN;