SBC: Add support for WRITESAME16 and add simple tests using it to unmap blocks from a thin provisioned lun

lib/libiscsi.def

@@ -49,6 +49,8 @@ iscsi_read6_task
 iscsi_read10_task
 iscsi_verify10_task
 iscsi_write10_task
+iscsi_writesame10_task
+iscsi_writesame16_task
 iscsi_modesense6_task
 iscsi_scsi_command_sync
 iscsi_reportluns_sync
@@ -61,6 +63,8 @@ iscsi_read6_sync
 iscsi_read10_sync
 iscsi_verify10_sync
 iscsi_write10_sync
+iscsi_writesame10_sync
+iscsi_writesame16_sync
 iscsi_scsi_task_cancel
 iscsi_scsi_cancel_all_tasks
 poll
@@ -88,6 +92,8 @@ scsi_cdb_read6
 scsi_cdb_read10
 scsi_cdb_verify10
 scsi_cdb_write10
+scsi_cdb_writesame10
+scsi_cdb_writesame16
 scsi_cdb_synchronizecache10
 scsi_cdb_readcapacity16
 scsi_cdb_serviceactionin16

lib/scsi-command.c

@@ -837,6 +837,47 @@ iscsi_writesame10_task(struct iscsi_context *iscsi, int lun,
 	return task;
 }
 
+struct scsi_task *
+iscsi_writesame16_task(struct iscsi_context *iscsi, int lun,
+		       unsigned char *data, uint32_t datalen,
+		       uint64_t lba, uint32_t num_blocks,
+		       int anchor, int unmap, int pbdata, int lbdata,
+		       int wrprotect, int group,
+		       iscsi_command_cb cb, void *private_data)
+{
+	struct scsi_task *task;
+	struct iscsi_data outdata;
+
+	task = scsi_cdb_writesame16(wrprotect, anchor, unmap, pbdata, lbdata, lba, group, num_blocks);
+	if (task == NULL) {
+		iscsi_set_error(iscsi, "Out-of-memory: Failed to create "
+				"writesame16 cdb.");
+		return NULL;
+	}
+
+	if (datalen) {
+		outdata.data = data;
+		outdata.size = datalen;
+		task->expxferlen = datalen;
+
+		if (iscsi_scsi_command_async(iscsi, lun, task, cb, &outdata,
+				       private_data) != 0) {
+			scsi_free_scsi_task(task);
+			return NULL;
+		}
+	} else {
+		task->expxferlen = 0;
+		task->xfer_dir = SCSI_XFER_NONE;
+
+		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_unmap_task(struct iscsi_context *iscsi, int lun, int anchor, int group,

lib/scsi-lowlevel.c

@@ -833,6 +833,51 @@ scsi_cdb_writesame10(int wrprotect, int anchor, int unmap, int pbdata, int lbdat
 	return task;
 }
 
+/*
+ * WRITE_SAME16
+ */
+struct scsi_task *
+scsi_cdb_writesame16(int wrprotect, int anchor, int unmap, int pbdata, int lbdata, uint64_t lba, int group, uint32_t num_blocks)
+{
+	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_WRITE_SAME16;
+
+	if (wrprotect) {
+		task->cdb[1] |= ((wrprotect & 0x7) << 5);
+	}
+	if (anchor) {
+		task->cdb[1] |= 0x10;
+	}
+	if (unmap) {
+		task->cdb[1] |= 0x08;
+	}
+	if (pbdata) {
+		task->cdb[1] |= 0x04;
+	}
+	if (lbdata) {
+		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);
+	if (group) {
+		task->cdb[14] |= (group & 0x1f);
+	}
+
+	task->cdb_size = 16;
+	task->xfer_dir = SCSI_XFER_WRITE;
+	task->expxferlen = 512;
+
+	return task;
+}
+
 /*
  * MODESENSE6
  */

lib/sync.c

@@ -387,6 +387,32 @@ iscsi_writesame10_sync(struct iscsi_context *iscsi, int lun,
 	return state.task;
 }
 
+struct scsi_task *
+iscsi_writesame16_sync(struct iscsi_context *iscsi, int lun,
+		       unsigned char *data, uint32_t datalen,
+		       uint64_t lba, uint32_t num_blocks,
+		       int anchor, int unmap, int pbdata, int lbdata,
+		       int wrprotect, int group)
+{
+	struct iscsi_sync_state state;
+
+	memset(&state, 0, sizeof(state));
+
+	if (iscsi_writesame16_task(iscsi, lun, data, datalen,
+	   			 lba, num_blocks,
+	   			 anchor, unmap, pbdata, lbdata,
+				 wrprotect, group,
+				 scsi_sync_cb, &state) == NULL) {
+		iscsi_set_error(iscsi,
+				"Failed to send WRITESAME16 command");
+		return NULL;
+	}
+
+	event_loop(iscsi, &state);
+
+	return state.task;
+}
+
 struct scsi_task *
 iscsi_unmap_sync(struct iscsi_context *iscsi, int lun, int anchor, int group,
 		 struct unmap_list *list, int list_len)