admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Add support for COMPARE_AND_WRITE command

Browse Source
This commit is contained in:
Ronnie Sahlberg
2012-07-14 11:34:40 +10:00
parent f6705d4691
commit bdd6e6bb11
7 changed files with 126 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/iscsi.h
View File

@@ -656,6 +656,11 @@ iscsi_write16_task(struct iscsi_context *iscsi, int lun, uint64_t lba,
int wrprotect, int dpo, int fua, int fua_nv, int group_number, int wrprotect, int dpo, int fua, int fua_nv, int group_number,
iscsi_command_cb cb, void *private_data); iscsi_command_cb cb, void *private_data);
EXTERN struct scsi_task * EXTERN struct scsi_task *
iscsi_compareandwrite_task(struct iscsi_context *iscsi, int lun, uint64_t lba,
unsigned char *data, uint32_t datalen, int blocksize,
int wrprotect, int dpo, int fua, int fua_nv, int group_number,
iscsi_command_cb cb, void *private_data);
EXTERN struct scsi_task *
iscsi_writeverify16_task(struct iscsi_context *iscsi, int lun, uint64_t lba, iscsi_writeverify16_task(struct iscsi_context *iscsi, int lun, uint64_t lba,
unsigned char *data, uint32_t datalen, int blocksize, unsigned char *data, uint32_t datalen, int blocksize,
int wrprotect, int dpo, int bytchk, int group_number, int wrprotect, int dpo, int bytchk, int group_number,
@@ -776,6 +781,11 @@ iscsi_write16_sync(struct iscsi_context *iscsi, int lun, uint64_t lba,
unsigned char *data, uint32_t datalen, int blocksize, unsigned char *data, uint32_t datalen, int blocksize,
int wrprotect, int dpo, int fua, int fua_nv, int group_number); int wrprotect, int dpo, int fua, int fua_nv, int group_number);
EXTERN struct scsi_task *
iscsi_compareandwrite_sync(struct iscsi_context *iscsi, int lun, uint64_t lba,
unsigned char *data, uint32_t datalen, int blocksize,
int wrprotect, int dpo, int fua, int fua_nv, int group_number);
EXTERN struct scsi_task * EXTERN struct scsi_task *
iscsi_writeverify16_sync(struct iscsi_context *iscsi, int lun, uint64_t lba, iscsi_writeverify16_sync(struct iscsi_context *iscsi, int lun, uint64_t lba,
unsigned char *data, uint32_t datalen, int blocksize, unsigned char *data, uint32_t datalen, int blocksize,

7
include/scsi-lowlevel.h
View File

@@ -38,6 +38,7 @@ enum scsi_opcode {
SCSI_OPCODE_WRITE_SAME10 = 0x41, SCSI_OPCODE_WRITE_SAME10 = 0x41,
SCSI_OPCODE_UNMAP = 0x42, SCSI_OPCODE_UNMAP = 0x42,
SCSI_OPCODE_READ16 = 0x88, SCSI_OPCODE_READ16 = 0x88,
SCSI_OPCODE_COMPARE_AND_WRITE = 0x89,
SCSI_OPCODE_WRITE16 = 0x8A, SCSI_OPCODE_WRITE16 = 0x8A,
SCSI_OPCODE_WRITE_VERIFY16 = 0x8E, SCSI_OPCODE_WRITE_VERIFY16 = 0x8E,
SCSI_OPCODE_VERIFY16 = 0x8F, SCSI_OPCODE_VERIFY16 = 0x8F,
@@ -130,6 +131,10 @@ struct scsi_write16_params {
uint64_t lba; uint64_t lba;
uint32_t num_blocks; uint32_t num_blocks;
}; };
struct scsi_compareandwrite_params {
uint64_t lba;
uint32_t num_blocks;
};
struct scsi_writeverify10_params { struct scsi_writeverify10_params {
uint32_t lba; uint32_t lba;
uint32_t num_blocks; uint32_t num_blocks;
@@ -218,6 +223,7 @@ struct scsi_task {
struct scsi_write10_params write10; struct scsi_write10_params write10;
struct scsi_write12_params write12; struct scsi_write12_params write12;
struct scsi_write16_params write16; struct scsi_write16_params write16;
struct scsi_compareandwrite_params compareandwrite;
struct scsi_writeverify10_params writeverify10; struct scsi_writeverify10_params writeverify10;
struct scsi_writeverify12_params writeverify12; struct scsi_writeverify12_params writeverify12;
struct scsi_writeverify16_params writeverify16; struct scsi_writeverify16_params writeverify16;
@@ -649,6 +655,7 @@ EXTERN struct scsi_task *scsi_cdb_read16(uint64_t lba, uint32_t xferlen, int blo
EXTERN struct scsi_task *scsi_cdb_write10(uint32_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group_number); EXTERN struct scsi_task *scsi_cdb_write10(uint32_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group_number);
EXTERN struct scsi_task *scsi_cdb_write12(uint32_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group_number); EXTERN struct scsi_task *scsi_cdb_write12(uint32_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group_number);
EXTERN struct scsi_task *scsi_cdb_write16(uint64_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group_number); EXTERN struct scsi_task *scsi_cdb_write16(uint64_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group_number);
EXTERN struct scsi_task *scsi_cdb_compareandwrite(uint64_t lba, uint8_t xferlen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group_number);
EXTERN struct scsi_task *scsi_cdb_writeverify10(uint32_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int bytchk, int group_number); EXTERN struct scsi_task *scsi_cdb_writeverify10(uint32_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int bytchk, int group_number);
EXTERN struct scsi_task *scsi_cdb_writeverify12(uint32_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int bytchk, int group_number); EXTERN struct scsi_task *scsi_cdb_writeverify12(uint32_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int bytchk, int group_number);
EXTERN struct scsi_task *scsi_cdb_writeverify16(uint64_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int bytchk, int group_number); EXTERN struct scsi_task *scsi_cdb_writeverify16(uint64_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int bytchk, int group_number);

2
lib/libiscsi.def
View File

@@ -88,6 +88,8 @@ iscsi_write12_sync
iscsi_write12_task iscsi_write12_task
iscsi_write16_sync iscsi_write16_sync
iscsi_write16_task iscsi_write16_task
iscsi_compareandwrite_sync
iscsi_compareandwrite_task
iscsi_writeverify10_sync iscsi_writeverify10_sync
iscsi_writeverify10_task iscsi_writeverify10_task
iscsi_writeverify12_sync iscsi_writeverify12_sync

2
lib/libiscsi.syms
View File

@@ -86,6 +86,8 @@ iscsi_write12_sync
iscsi_write12_task iscsi_write12_task
iscsi_write16_sync iscsi_write16_sync
iscsi_write16_task iscsi_write16_task
iscsi_compareandwrite_sync
iscsi_compareandwrite_task
iscsi_writeverify10_sync iscsi_writeverify10_sync
iscsi_writeverify10_task iscsi_writeverify10_task
iscsi_writeverify12_sync iscsi_writeverify12_sync

35
lib/scsi-command.c
View File

@@ -870,6 +870,41 @@ iscsi_write16_task(struct iscsi_context *iscsi, int lun, uint64_t lba,
return task; return task;
} }
struct scsi_task *
iscsi_compareandwrite_task(struct iscsi_context *iscsi, int lun, uint64_t lba,
unsigned char *data, uint32_t datalen, int blocksize,
int wrprotect, int dpo, int fua, int fua_nv, int group_number,
iscsi_command_cb cb, void *private_data)
{
struct scsi_task *task;
struct iscsi_data outdata;
if (datalen % blocksize != 0) {
iscsi_set_error(iscsi, "Datalen:%d is not a multiple of the "
"blocksize:%d.", datalen, blocksize);
return NULL;
}
task = scsi_cdb_compareandwrite(lba, datalen, blocksize, wrprotect,
dpo, fua, fua_nv, group_number);
if (task == NULL) {
iscsi_set_error(iscsi, "Out-of-memory: Failed to create "
"compareandwrite cdb.");
return NULL;
}
outdata.data = data;
outdata.size = datalen;
if (iscsi_scsi_command_async(iscsi, lun, task, cb, &outdata,
private_data) != 0) {
scsi_free_scsi_task(task);
return NULL;
}
return task;
}
struct scsi_task * struct scsi_task *
iscsi_writeverify10_task(struct iscsi_context *iscsi, int lun, uint32_t lba, iscsi_writeverify10_task(struct iscsi_context *iscsi, int lun, uint32_t lba,
unsigned char *data, uint32_t datalen, int blocksize, unsigned char *data, uint32_t datalen, int blocksize,

47
lib/scsi-lowlevel.c
View File

@@ -981,6 +981,53 @@ scsi_cdb_write16(uint64_t lba, uint32_t xferlen, int blocksize, int wrprotect, i
return task; return task;
} }
/*
* COMPAREANDWRITE
*/
struct scsi_task *
scsi_cdb_compareandwrite(uint64_t lba, uint8_t xferlen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group_number)
{
struct scsi_task *task;
task = malloc(sizeof(struct scsi_task));
if (task == NULL) {
return NULL;
}
memset(task, 0, sizeof(struct scsi_task));
task->cdb[0] = SCSI_OPCODE_COMPARE_AND_WRITE;
task->cdb[1] |= ((wrprotect & 0x07) << 5);
if (dpo) {
task->cdb[1] |= 0x10;
}
if (fua) {
task->cdb[1] |= 0x08;
}
if (fua_nv) {
task->cdb[1] |= 0x02;
}
*(uint32_t *)&task->cdb[2] = htonl(lba >> 32);
*(uint32_t *)&task->cdb[6] = htonl(lba & 0xffffffff);
task->cdb[13] = xferlen/blocksize;
task->cdb[14] |= (group_number & 0x1f);
task->cdb_size = 16;
if (xferlen != 0) {
task->xfer_dir = SCSI_XFER_WRITE;
} else {
task->xfer_dir = SCSI_XFER_NONE;
}
task->expxferlen = xferlen;
task->params.compareandwrite.lba = lba;
task->params.compareandwrite.num_blocks = xferlen/blocksize;
return task;
}
/* /*
* VERIFY10 * VERIFY10
*/ */

23
lib/sync.c
View File

@@ -528,6 +528,29 @@ iscsi_write16_sync(struct iscsi_context *iscsi, int lun, uint64_t lba,
return state.task; return state.task;
} }
struct scsi_task *
iscsi_compareandwrite_sync(struct iscsi_context *iscsi, int lun, uint64_t lba,
unsigned char *data, uint32_t datalen, int blocksize,
int wrprotect, int dpo, int fua, int fua_nv, int group_number)
{
struct iscsi_sync_state state;
memset(&state, 0, sizeof(state));
if (iscsi_compareandwrite_task(iscsi, lun, lba,
data, datalen, blocksize, wrprotect,
dpo, fua, fua_nv, group_number,
scsi_sync_cb, &state) == NULL) {
iscsi_set_error(iscsi,
"Failed to send CompareAndWrite command");
return NULL;
}
event_loop(iscsi, &state);
return state.task;
}
struct scsi_task * struct scsi_task *
iscsi_writeverify10_sync(struct iscsi_context *iscsi, int lun, uint32_t lba, iscsi_writeverify10_sync(struct iscsi_context *iscsi, int lun, uint32_t lba,
unsigned char *data, uint32_t datalen, int blocksize, unsigned char *data, uint32_t datalen, int blocksize,