diff --git a/include/iscsi.h b/include/iscsi.h index 9cee64b..815664c 100644 --- a/include/iscsi.h +++ b/include/iscsi.h @@ -596,6 +596,11 @@ iscsi_synchronizecache10_task(struct iscsi_context *iscsi, int lun, int immed, iscsi_command_cb cb, void *private_data); EXTERN struct scsi_task * +iscsi_synchronizecache16_task(struct iscsi_context *iscsi, int lun, + uint64_t lba, uint32_t num_blocks, int syncnv, + int immed, iscsi_command_cb cb, + void *private_data); +EXTERN struct scsi_task * iscsi_prefetch10_task(struct iscsi_context *iscsi, int lun, uint32_t lba, int num_blocks, int immed, int group, @@ -760,6 +765,10 @@ EXTERN struct scsi_task * iscsi_synchronizecache10_sync(struct iscsi_context *iscsi, int lun, int lba, int num_blocks, int syncnv, int immed); +EXTERN struct scsi_task * +iscsi_synchronizecache16_sync(struct iscsi_context *iscsi, int lun, uint64_t lba, + uint32_t num_blocks, int syncnv, int immed); + EXTERN struct scsi_task * iscsi_prefetch10_sync(struct iscsi_context *iscsi, int lun, uint32_t lba, int num_blocks, int immed, int group); diff --git a/include/scsi-lowlevel.h b/include/scsi-lowlevel.h index fe25fbf..d9129f1 100644 --- a/include/scsi-lowlevel.h +++ b/include/scsi-lowlevel.h @@ -40,6 +40,7 @@ enum scsi_opcode { SCSI_OPCODE_WRITE16 = 0x8A, SCSI_OPCODE_VERIFY16 = 0x8F, SCSI_OPCODE_PREFETCH16 = 0x90, + SCSI_OPCODE_SYNCHRONIZECACHE16 = 0x91, SCSI_OPCODE_WRITE_SAME16 = 0x93, SCSI_OPCODE_SERVICE_ACTION_IN = 0x9E, SCSI_OPCODE_REPORTLUNS = 0xA0, @@ -636,6 +637,8 @@ EXTERN struct scsi_task *scsi_cdb_verify16(uint64_t lba, uint32_t xferlen, int v EXTERN struct scsi_task *scsi_cdb_synchronizecache10(int lba, int num_blocks, int syncnv, int immed); +EXTERN struct scsi_task *scsi_cdb_synchronizecache16(uint64_t lba, uint32_t num_blocks, + int syncnv, int immed); EXTERN struct scsi_task *scsi_cdb_serviceactionin16(enum scsi_service_action_in sa, uint32_t xferlen); EXTERN struct scsi_task *scsi_cdb_readcapacity16(void); EXTERN struct scsi_task *scsi_cdb_get_lba_status(uint64_t starting_lba, uint32_t alloc_len); diff --git a/lib/libiscsi.def b/lib/libiscsi.def index 5604251..0663da9 100644 --- a/lib/libiscsi.def +++ b/lib/libiscsi.def @@ -63,6 +63,8 @@ iscsi_set_targetname iscsi_set_tcp_keepalive iscsi_synchronizecache10_sync iscsi_synchronizecache10_task +iscsi_synchronizecache16_sync +iscsi_synchronizecache16_task iscsi_task_mgmt_abort_task_async iscsi_task_mgmt_abort_task_set_async iscsi_task_mgmt_async diff --git a/lib/libiscsi.syms b/lib/libiscsi.syms index 290545b..f798c00 100644 --- a/lib/libiscsi.syms +++ b/lib/libiscsi.syms @@ -61,6 +61,8 @@ iscsi_set_targetname iscsi_set_tcp_keepalive iscsi_synchronizecache10_sync iscsi_synchronizecache10_task +iscsi_synchronizecache16_sync +iscsi_synchronizecache16_task iscsi_task_mgmt_abort_task_async iscsi_task_mgmt_abort_task_set_async iscsi_task_mgmt_async diff --git a/lib/scsi-command.c b/lib/scsi-command.c index 0e8dfd7..6b39ec7 100644 --- a/lib/scsi-command.c +++ b/lib/scsi-command.c @@ -1016,6 +1016,29 @@ iscsi_synchronizecache10_task(struct iscsi_context *iscsi, int lun, int lba, return task; } +struct scsi_task * +iscsi_synchronizecache16_task(struct iscsi_context *iscsi, int lun, uint64_t lba, + uint32_t num_blocks, int syncnv, int immed, + iscsi_command_cb cb, void *private_data) +{ + struct scsi_task *task; + + task = scsi_cdb_synchronizecache16(lba, num_blocks, syncnv, + immed); + if (task == NULL) { + iscsi_set_error(iscsi, "Out-of-memory: Failed to create " + "synchronizecache16 cdb."); + return NULL; + } + if (iscsi_scsi_command_async(iscsi, lun, task, cb, NULL, + private_data) != 0) { + scsi_free_scsi_task(task); + return NULL; + } + + return task; +} + struct scsi_task * iscsi_prefetch10_task(struct iscsi_context *iscsi, int lun, uint32_t lba, int num_blocks, int immed, int group, diff --git a/lib/scsi-lowlevel.c b/lib/scsi-lowlevel.c index 87fc509..3f07634 100644 --- a/lib/scsi-lowlevel.c +++ b/lib/scsi-lowlevel.c @@ -1459,6 +1459,38 @@ scsi_cdb_synchronizecache10(int lba, int num_blocks, int syncnv, int immed) return task; } +/* + * SYNCHRONIZECACHE16 + */ +struct scsi_task * +scsi_cdb_synchronizecache16(uint64_t lba, uint32_t num_blocks, int syncnv, int immed) +{ + 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_SYNCHRONIZECACHE16; + + if (syncnv) { + task->cdb[1] |= 0x04; + } + if (immed) { + task->cdb[1] |= 0x02; + } + *(uint32_t *)&task->cdb[2] = htonl(lba >> 32); + *(uint32_t *)&task->cdb[6] = htonl(lba & 0xffffffff); + *(uint32_t *)&task->cdb[10] = htonl(num_blocks); + + task->cdb_size = 16; + task->xfer_dir = SCSI_XFER_NONE; + task->expxferlen = 0; + + return task; +} /* * PREFETCH10 diff --git a/lib/sync.c b/lib/sync.c index c5654cc..ff4366b 100644 --- a/lib/sync.c +++ b/lib/sync.c @@ -397,6 +397,27 @@ iscsi_synchronizecache10_sync(struct iscsi_context *iscsi, int lun, int lba, return state.task; } +struct scsi_task * +iscsi_synchronizecache16_sync(struct iscsi_context *iscsi, int lun, uint64_t lba, + uint32_t num_blocks, int syncnv, int immed) +{ + struct iscsi_sync_state state; + + memset(&state, 0, sizeof(state)); + + if (iscsi_synchronizecache16_task(iscsi, lun, lba, num_blocks, + syncnv, immed, + scsi_sync_cb, &state) == NULL) { + iscsi_set_error(iscsi, + "Failed to send SynchronizeCache16 command"); + return NULL; + } + + event_loop(iscsi, &state); + + return state.task; +} + struct scsi_task * iscsi_prefetch10_sync(struct iscsi_context *iscsi, int lun, uint32_t lba, int num_blocks, int immed, int group)