diff --git a/include/iscsi.h b/include/iscsi.h index 8823bfb..1d1b2e1 100644 --- a/include/iscsi.h +++ b/include/iscsi.h @@ -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, iscsi_command_cb cb, void *private_data); 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, unsigned char *data, uint32_t datalen, int blocksize, 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, 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 * iscsi_writeverify16_sync(struct iscsi_context *iscsi, int lun, uint64_t lba, unsigned char *data, uint32_t datalen, int blocksize, diff --git a/include/scsi-lowlevel.h b/include/scsi-lowlevel.h index 7cac330..7599fa4 100644 --- a/include/scsi-lowlevel.h +++ b/include/scsi-lowlevel.h @@ -38,6 +38,7 @@ enum scsi_opcode { SCSI_OPCODE_WRITE_SAME10 = 0x41, SCSI_OPCODE_UNMAP = 0x42, SCSI_OPCODE_READ16 = 0x88, + SCSI_OPCODE_COMPARE_AND_WRITE = 0x89, SCSI_OPCODE_WRITE16 = 0x8A, SCSI_OPCODE_WRITE_VERIFY16 = 0x8E, SCSI_OPCODE_VERIFY16 = 0x8F, @@ -130,6 +131,10 @@ struct scsi_write16_params { uint64_t lba; uint32_t num_blocks; }; +struct scsi_compareandwrite_params { + uint64_t lba; + uint32_t num_blocks; +}; struct scsi_writeverify10_params { uint32_t lba; uint32_t num_blocks; @@ -218,6 +223,7 @@ struct scsi_task { struct scsi_write10_params write10; struct scsi_write12_params write12; struct scsi_write16_params write16; + struct scsi_compareandwrite_params compareandwrite; struct scsi_writeverify10_params writeverify10; struct scsi_writeverify12_params writeverify12; 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_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_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_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); diff --git a/lib/libiscsi.def b/lib/libiscsi.def index 34c45ef..cbfad61 100644 --- a/lib/libiscsi.def +++ b/lib/libiscsi.def @@ -88,6 +88,8 @@ iscsi_write12_sync iscsi_write12_task iscsi_write16_sync iscsi_write16_task +iscsi_compareandwrite_sync +iscsi_compareandwrite_task iscsi_writeverify10_sync iscsi_writeverify10_task iscsi_writeverify12_sync diff --git a/lib/libiscsi.syms b/lib/libiscsi.syms index afb70ab..db1ca20 100644 --- a/lib/libiscsi.syms +++ b/lib/libiscsi.syms @@ -86,6 +86,8 @@ iscsi_write12_sync iscsi_write12_task iscsi_write16_sync iscsi_write16_task +iscsi_compareandwrite_sync +iscsi_compareandwrite_task iscsi_writeverify10_sync iscsi_writeverify10_task iscsi_writeverify12_sync diff --git a/lib/scsi-command.c b/lib/scsi-command.c index 4a07212..b252407 100644 --- a/lib/scsi-command.c +++ b/lib/scsi-command.c @@ -870,6 +870,41 @@ iscsi_write16_task(struct iscsi_context *iscsi, int lun, uint64_t lba, 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 * iscsi_writeverify10_task(struct iscsi_context *iscsi, int lun, uint32_t lba, unsigned char *data, uint32_t datalen, int blocksize, diff --git a/lib/scsi-lowlevel.c b/lib/scsi-lowlevel.c index eee5aaa..ef24331 100644 --- a/lib/scsi-lowlevel.c +++ b/lib/scsi-lowlevel.c @@ -981,6 +981,53 @@ scsi_cdb_write16(uint64_t lba, uint32_t xferlen, int blocksize, int wrprotect, i 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 */ diff --git a/lib/sync.c b/lib/sync.c index 644493b..f72fa7a 100644 --- a/lib/sync.c +++ b/lib/sync.c @@ -528,6 +528,29 @@ iscsi_write16_sync(struct iscsi_context *iscsi, int lun, uint64_t lba, 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 * iscsi_writeverify10_sync(struct iscsi_context *iscsi, int lun, uint32_t lba, unsigned char *data, uint32_t datalen, int blocksize,