Skip to contentSkip to conversation

tcm: Convert UNMAP + WRITE_SAME_* to IBLOCK only support

PATCH New Nicholas A. Bellinger 1 participant 1 message Oct 14, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tcm: Convert UNMAP + WRITE_SAME_* to IBLOCK only support

From: Nicholas Bellinger <[email protected]>

This patch series converts the existing transport_generic_unmap() and transport_generic_write_same() code to be called directly from TCM code using transport_emulate_control_cdb(). It also converts the primary struct se_subsystem_api->do_discard() to accept an 'sector_t lba' and 'u32 range' that is passed from SCSI UNMAP/WRITE_SAME emulation down to generic block level discard logic in TCM/IBLOCK.

This patch also makes emulate_tpu and emulate_tpws now disabled by default, even when the underlying struct block_device supports Discard during IBLOCK device creation. This means that these two attrs will need to be enabled on a per $HBA/$DEV/attrib/ basis to explictly activate SCSI UNMAP/WRITE_SAME support.

Finally, this patch also drops the Generic Block Discard support in TCM/FILEIO as there is really not a safe way to do this yet.

Thanks again to hch for his input on this item!

---
 drivers/target/target_core_device.c    |   18 +++++
 drivers/target/target_core_file.c      |  127 +-------------------------------
 drivers/target/target_core_iblock.c    |   41 ++---------
 drivers/target/target_core_transport.c |   27 ++++---
 include/target/target_core_transport.h |    9 +--
 5 files changed, 43 insertions(+), 179 deletions(-)
drivers/target/target_core_device.c +18 -0
index 070da98..5364259 100644
@@ -1231,6 +1231,15 @@ int se_dev_set_emulate_tpu(struct se_device *dev, int flag)
 		printk(KERN_ERR "Illegal value %d\n", flag);
 		return -1;
 	}
+	/*
+	 * We expect this value to be non-zero when generic Block Layer
+	 * Discard supported is detected iblock_create_virtdevice().
+	 */
+	if (!(DEV_ATTRIB(dev)->max_unmap_block_desc_count)) {
+		printk(KERN_ERR "Generic Block Discard not supported\n");
+		return -ENOSYS;
+	}
+
 	DEV_ATTRIB(dev)->emulate_tpu = flag;
 	printk(KERN_INFO "dev[%p]: SE Device Thin Provisioning UNMAP bit: %d\n",
 				dev, flag);
@@ -1243,6 +1252,15 @@ int se_dev_set_emulate_tpws(struct se_device *dev, int flag)
 		printk(KERN_ERR "Illegal value %d\n", flag);
 		return -1;
 	}
+	/*
+	 * We expect this value to be non-zero when generic Block Layer
+	 * Discard supported is detected iblock_create_virtdevice().
+	 */
+	if (!(DEV_ATTRIB(dev)->max_unmap_block_desc_count)) {
+		printk(KERN_ERR "Generic Block Discard not supported\n");
+		return -ENOSYS;
+	}
+
 	DEV_ATTRIB(dev)->emulate_tpws = flag;
 	printk(KERN_INFO "dev[%p]: SE Device Thin Provisioning WRITE_SAME: %d\n",
 				dev, flag);
drivers/target/target_core_file.c +1 -126

151 lines not on this page · raw message

drivers/target/target_core_iblock.c +7 -34

61 lines not on this page · raw message

drivers/target/target_core_transport.c +16 -11
index 4a30fb9..44376a3 100644
@@ -5475,14 +5475,15 @@ int transport_get_sense_data(struct se_cmd *cmd)
  * Used for TCM/IBLOCK and TCM/FILEIO for block/blk-lib.c level discard support.
  * Note this is not used for TCM/pSCSI passthrough
  */
-int transport_generic_unmap(struct se_cmd *cmd, struct block_device *bdev)
+static int transport_generic_unmap(struct se_task *task)
 {
+	struct se_cmd *cmd = TASK_CMD(task);
 	struct se_device *dev = SE_DEV(cmd);
 	unsigned char *buf = T_TASK(cmd)->t_task_buf, *ptr = NULL;
 	unsigned char *cdb = &T_TASK(cmd)->t_task_cdb[0];
 	sector_t lba;
 	unsigned int size = cmd->data_length, range;
-	int barrier = 0, ret, offset = 8; /* First UNMAP block descriptor starts at 8 byte offset */
+	int ret, offset = 8; /* First UNMAP block descriptor starts at 8 byte offset */
 	unsigned short dl, bd_dl;
 
 	/* Skip over UNMAP header */
@@ -5499,7 +5500,7 @@ int transport_generic_unmap(struct se_cmd *cmd, struct block_device *bdev)
 		printk(KERN_INFO "UNMAP: Using lba: %llu and range: %u\n",
                 (unsigned long long)lba, range);
 
-		ret = blkdev_issue_discard(bdev, lba, range, GFP_KERNEL, barrier);
+		ret = TRANSPORT(dev)->do_discard(dev, lba, range);
 		if (ret < 0) {
 			printk(KERN_ERR "blkdev_issue_discard() failed: %d\n", ret);
 			return -1;
@@ -5509,20 +5510,22 @@ int transport_generic_unmap(struct se_cmd *cmd, struct block_device *bdev)
 		size -= 16;
 	}
 
+	task->task_scsi_status = GOOD;
+	transport_complete_task(task, 1);
 	return 0;
 }
-EXPORT_SYMBOL(transport_generic_unmap);
 
 /*
  * Used for TCM/IBLOCK and TCM/FILEIO for block/blk-lib.c level discard support.
  * Note this is not used for TCM/pSCSI passthrough
  */
-int transport_generic_write_same(struct se_cmd *cmd, struct block_device *bdev)
+static int transport_generic_write_same(struct se_task *task)
 {
+	struct se_cmd *cmd = TASK_CMD(task);
 	struct se_device *dev = SE_DEV(cmd);
 	sector_t lba;
 	unsigned int range;
-	int barrier = 0, ret;
+	int ret;
 
 	lba = T_TASK(cmd)->t_task_lba;
 	range = (cmd->data_length / TRANSPORT(dev)->get_blocksize(dev));
@@ -5530,14 +5533,16 @@ int transport_generic_write_same(struct se_cmd *cmd, struct block_device *bdev)
 	printk(KERN_INFO "WRITE_SAME UNMAP: LBA: %llu Range: %u\n",
                 (unsigned long long)lba, range);
 
-	ret = blkdev_issue_discard(bdev, lba, range, GFP_KERNEL, barrier);
+	ret = TRANSPORT(dev)->do_discard(dev, lba, range);
 	if (ret < 0) {
 		printk(KERN_INFO "blkdev_issue_discard() failed for WRITE_SAME\n");
 		return -1;
 	}
+
+	task->task_scsi_status = GOOD;
+	transport_complete_task(task, 1);
 	return 0;
 }
-EXPORT_SYMBOL(transport_generic_write_same);
 
 /*
  * Used by TCM subsystem plugins IBLOCK, FILEIO, and RAMDISK as a
@@ -5610,7 +5615,7 @@ int transport_emulate_control_cdb(struct se_task *task)
 					TRANSPORT(dev)->name);
 			return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
 		}
-		ret = TRANSPORT(dev)->do_discard(task, DISCARD_UNMAP);
+		ret = transport_generic_unmap(task);
 		if (ret < 0)
 			return ret;
 		break;
@@ -5620,7 +5625,7 @@ int transport_emulate_control_cdb(struct se_task *task)
 					" for: %s\n", TRANSPORT(dev)->name);
 			return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
 		}
-		ret = TRANSPORT(dev)->do_discard(task, DISCARD_WRITE_SAME_UNMAP);
+		ret = transport_generic_write_same(task);
 		if (ret < 0)
 			return ret;
 		break;
@@ -5633,7 +5638,7 @@ int transport_emulate_control_cdb(struct se_task *task)
 					" supported for: %s\n", TRANSPORT(dev)->name);
 				return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
 			}
-			ret = TRANSPORT(dev)->do_discard(task, DISCARD_WRITE_SAME_UNMAP);
+			ret = transport_generic_write_same(task);
 			if (ret < 0)
 				return ret;
 			break;
include/target/target_core_transport.h +1 -8
index 1f29cf3..c156098 100644
@@ -127,11 +127,6 @@
 
 #define MOD_MAX_SECTORS(ms, bs)			(ms % (PAGE_SIZE / bs))
 
-enum blk_discard_type {
-	DISCARD_UNMAP,
-	DISCARD_WRITE_SAME_UNMAP,
-};
-
 struct se_mem;
 struct se_subsystem_api;
 
@@ -243,8 +238,6 @@ extern int transport_generic_emulate_modesense(struct se_cmd *,
 extern int transport_generic_emulate_request_sense(struct se_cmd *,
 						   unsigned char *);
 extern int transport_get_sense_data(struct se_cmd *);
-extern int transport_generic_unmap(struct se_cmd *, struct block_device *);
-extern int transport_generic_write_same(struct se_cmd *, struct block_device *);
 extern int transport_emulate_control_cdb(struct se_task *);
 extern struct se_cmd *transport_allocate_passthrough(unsigned char *, int, u32,
 						void *, u32, u32, void *);
@@ -471,7 +464,7 @@ struct se_subsystem_api {
 	 * Used by virtual subsystem plugins IBLOCK and FILEIO to emulate
 	 * UNMAP and WRITE_SAME_* w/ UNMAP=1 <-> Linux/Block Discard
 	 */
-	int (*do_discard)(struct se_task *, enum blk_discard_type);
+	int (*do_discard)(struct se_device *, sector_t, u32);
 	/*
 	 * Used  by virtual subsystem plugins IBLOCK and FILEIO to emulate
 	 * SYNCHRONIZE_CACHE_* <-> Linux/Block blkdev_issue_flush()
Signature · 1 line
1.5.6.5