For WRITE SAME, data transfer memory only contains a single block but
protection information is required for all blocks that are written by
the command.
This makes sbc_dif_generate() and sbc_dif_verify() work for WRITE_SAME.
Signed-off-by: Akinobu Mita <akinobu.m...@gmail.com>
Cc: Nicholas Bellinger <n...@linux-iscsi.org>
Cc: Sagi Grimberg <sa...@mellanox.com>
Cc: "Martin K. Petersen" <martin.peter...@oracle.com>
Cc: Christoph Hellwig <h...@lst.de>
Cc: "James E.J. Bottomley" <james.bottom...@hansenpartnership.com>
Cc: target-de...@vger.kernel.org
Cc: linux-scsi@vger.kernel.org
---
* Changes from v1:
- Fix sbc_dif_verify() for WRITE_SAME command
drivers/target/target_core_sbc.c | 39 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 38 insertions(+), 1 deletion(-)
diff --git a/drivers/target/target_core_sbc.c b/drivers/target/target_core_sbc.c
index 982836b..5577829 100644
--- a/drivers/target/target_core_sbc.c
+++ b/drivers/target/target_core_sbc.c
@@ -1177,6 +1177,24 @@ err:
}
EXPORT_SYMBOL(sbc_execute_unmap);
+static bool sbc_is_write_same(struct se_cmd *cmd)
+{
+ u16 service_action;
+
+ switch (cmd->t_task_cdb[0]) {
+ case WRITE_SAME:
+ case WRITE_SAME_16:
+ return true;
+ case VARIABLE_LENGTH_CMD:
+ service_action = get_unaligned_be16(&cmd->t_task_cdb[8]);
+ if (service_action == WRITE_SAME_32)
+ return true;
+ break;
+ }
+
+ return false;
+}
+
sense_reason_t
sbc_dif_generate(struct se_cmd *cmd)
{
@@ -1185,8 +1203,14 @@ sbc_dif_generate(struct se_cmd *cmd)
struct scatterlist *dsg, *psg = cmd->t_prot_sg;
sector_t sector = cmd->t_task_lba;
void *daddr, *paddr;
- int i, j, offset = 0;
+ int i, j, offset = 0, left = cmd->prot_length;
+ bool is_write_same = sbc_is_write_same(cmd);
+ if (is_write_same && (cmd->t_data_nents != 1 ||
+ cmd->t_data_sg->length != dev->dev_attrib.block_size))
+ return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
+
+repeat:
for_each_sg(cmd->t_data_sg, dsg, cmd->t_data_nents, i) {
if (dsg->length % dev->dev_attrib.block_size)
return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
@@ -1219,11 +1243,14 @@ sbc_dif_generate(struct se_cmd *cmd)
sector++;
offset += sizeof(struct se_dif_v1_tuple);
+ left -= sizeof(struct se_dif_v1_tuple);
}
kunmap_atomic(paddr);
kunmap_atomic(daddr);
}
+ if (is_write_same && left)
+ goto repeat;
return 0;
}
@@ -1326,7 +1353,14 @@ sbc_dif_verify(struct se_cmd *cmd, sector_t start,
unsigned int sectors,
void *daddr, *paddr;
int i, j;
sense_reason_t rc;
+ int left = cmd->prot_length;
+ bool is_write_same = sbc_is_write_same(cmd);
+
+ if (is_write_same && (cmd->t_data_nents != 1 ||
+ cmd->t_data_sg->length != dev->dev_attrib.block_size))
+ return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
+repeat:
for_each_sg(cmd->t_data_sg, dsg, cmd->t_data_nents, i) {
if (dsg->length % dev->dev_attrib.block_size)
return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
@@ -1368,11 +1402,14 @@ sbc_dif_verify(struct se_cmd *cmd, sector_t start,
unsigned int sectors,
sector++;
ei_lba++;
psg_off += sizeof(struct se_dif_v1_tuple);
+ left -= sizeof(struct se_dif_v1_tuple);
}
kunmap_atomic(paddr - psg->offset);
kunmap_atomic(daddr - dsg->offset);
}
+ if (is_write_same && left)
+ goto repeat;
return 0;
}
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
