scsi: target: COMPARE AND WRITE miscompare sense
Subsystems (3)
cover scsi: target: COMPARE AND WRITE miscompare sense
This patchset adds missing functionality to return the offset of non-matching read/compare data in the sense INFORMATION field on COMPARE AND WRITE miscompare.
The functionality can be tested using the libiscsi CompareAndWrite.MiscompareSense test proposed via:
https://github.com/sahlberg/libiscsi/pull/344
Cheers, David
drivers/target/target_core_sbc.c | 134 +++++++++++++++---------- drivers/target/target_core_transport.c | 33 +++--- include/target/target_core_base.h | 2 +- lib/scatterlist.c | 2 +- 4 files changed, 102 insertions(+), 69 deletions(-)
PATCH 1/5 lib/scatterlist: use consistent sg_copy_buffer() return type
sg_copy_buffer() returns a size_t with the number of bytes copied. Return 0 instead of false if the copy is skipped.
--- lib/scatterlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/scatterlist.c +1 -1
@@ -933,7 +933,7 @@ size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf,sg_miter_start (&miter, sgl, nents, sg_flags);if (!sg_miter_skip (&miter, skip)) -return false; +return 0 ;while ((offset < buflen) &&sg_miter_next (&miter)) {unsigned int len;
Signature · 1 line
2.26.2
PATCH 2/5 scsi: target: rename struct sense_info to sense_detail
In reply to David DisseldorpThis helps distinguish it from the SCSI sense INFORMATION field.
--- drivers/target/target_core_transport.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/target/target_core_transport.c +11 -11
@@ -3094,14 +3094,14 @@ bool transport_wait_for_tasks(struct se_cmd *cmd) }EXPORT_SYMBOL (transport_wait_for_tasks); -struct sense_info { +struct sense_detail {u8 key;u8 asc;u8 ascq;bool add_sector_info; }; -static const struct sense_info sense_info_table[] = { +static const struct sense_detail sense_detail_table[] = { [TCM_NO_SENSE ] = { .key =NOT_READY },
@@ -3261,39 +3261,39 @@ static const struct sense_info sense_info_table[] = {*/ static void translate_sense_reason (struct se_cmd *cmd,sense_reason_t reason) { -const struct sense_info *si; +const struct sense_detail *sd;u8 *buffer = cmd->sense_buffer;int r = (__force int )reason;u8 key, asc, ascq;bool desc_format =target_sense_desc_format (cmd->se_dev); -if (r <ARRAY_SIZE (sense_info_table) && sense_info_table[r].key) - si = &sense_info_table[r]; +if (r <ARRAY_SIZE (sense_detail_table) && sense_detail_table[r].key) + sd = &sense_detail_table[r];else - si = &sense_info_table[(__force int ) + sd = &sense_detail_table[(__force int )TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE ]; - key = si->key; + key = sd->key;if (reason =TCM_CHECK_CONDITION_UNIT_ATTENTION ) {if (!core_scsi3_ua_for_check_condition (cmd, &key, &asc, &ascq)) { cmd->scsi_status =SAM_STAT_BUSY ;return ; } - }else if (si->asc =0 ) { + }else if (sd->asc =0 ) {WARN_ON_ONCE (cmd->scsi_asc =0 ); asc = cmd->scsi_asc; ascq = cmd->scsi_ascq; }else { - asc = si->asc; - ascq = si->ascq; + asc = sd->asc; + ascq = sd->ascq; } cmd->se_cmd_flags |=SCF_EMULATED_TASK_SENSE ; cmd->scsi_status =SAM_STAT_CHECK_CONDITION ; cmd->scsi_sense_length =TRANSPORT_SENSE_BUFFER ;scsi_build_sense_buffer (desc_format, buffer, key, asc, ascq); -if (si->add_sector_info) +if (sd->add_sector_info)WARN_ON_ONCE (scsi_set_sense_information (buffer, cmd->scsi_sense_length, cmd->bad_sector) <0 );
Signature · 1 line
2.26.2
PATCH 3/5 scsi: target: rename cmd.bad_sector to cmd.sense_info
In reply to David Disseldorpcmd.bad_sector currently gets packed into the sense INFORMATION field for TCM_LOGICAL_BLOCK_{GUARD,APP_TAG,REF_TAG}_CHECK_FAILED errors, which carry an .add_sector_info flag in the sense_detail_table to ensure this.
In preparation for propagating a byte offset on COMPARE AND WRITE TCM_MISCOMPARE_VERIFY error, rename cmd.bad_sector to cmd.sense_info and sense_detail.add_sector_info to sense_detail.add_sense_info so that it better reflects the sense INFORMATION field destination.
--- drivers/target/target_core_sbc.c | 2 +- drivers/target/target_core_transport.c | 12 ++++++------ include/target/target_core_base.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-)
drivers/target/target_core_sbc.c +1 -1
@@ -1439,7 +1439,7 @@ sbc_dif_verify(struct se_cmd *cmd, sector_t start, unsigned int sectors,if (rc) {kunmap_atomic (daddr - dsg->offset);kunmap_atomic (paddr - psg->offset); - cmd->bad_sector = sector; + cmd->sense_info = sector;return rc; } next:
drivers/target/target_core_transport.c +6 -6
@@ -3098,7 +3098,7 @@ struct sense_detail {u8 key;u8 asc;u8 ascq; -bool add_sector_info; +bool add_sense_info; };static const struct sense_detail sense_detail_table[] = {
@@ -3201,19 +3201,19 @@ static const struct sense_detail sense_detail_table[] = { .key = ABORTED_COMMAND, .asc = 0x10, .ascq = 0x01, /* LOGICAL BLOCK GUARD CHECK FAILED */ - .add_sector_info = true, + .add_sense_info = true, }, [TCM_LOGICAL_BLOCK_APP_TAG_CHECK_FAILED] = { .key = ABORTED_COMMAND, .asc = 0x10, .ascq = 0x02, /* LOGICAL BLOCK APPLICATION TAG CHECK FAILED */ - .add_sector_info = true, + .add_sense_info = true, }, [TCM_LOGICAL_BLOCK_REF_TAG_CHECK_FAILED] = { .key = ABORTED_COMMAND, .asc = 0x10, .ascq = 0x03, /* LOGICAL BLOCK REFERENCE TAG CHECK FAILED */ - .add_sector_info = true, + .add_sense_info = true, }, [TCM_COPY_TARGET_DEVICE_NOT_REACHABLE] = { .key = COPY_ABORTED,
@@ -3293,10 +3293,10 @@ static void translate_sense_reason(struct se_cmd *cmd, sense_reason_t reason) cmd->scsi_status =SAM_STAT_CHECK_CONDITION ; cmd->scsi_sense_length =TRANSPORT_SENSE_BUFFER ;scsi_build_sense_buffer (desc_format, buffer, key, asc, ascq); -if (sd->add_sector_info) +if (sd->add_sense_info)WARN_ON_ONCE (scsi_set_sense_information (buffer, cmd->scsi_sense_length, - cmd->bad_sector) <0 ); + cmd->sense_info) <0 ); }int
include/target/target_core_base.h +1 -1
@@ -540,7 +540,7 @@ struct se_cmd {struct scatterlist *t_prot_sg;unsigned int t_prot_nents;sense_reason_t pi_err; -sector_t bad_sector; +u64 sense_info;int cpuid; };
Signature · 1 line
2.26.2
PATCH 4/5 scsi: target: split out COMPARE AND WRITE memcmp into helper
In reply to David DisseldorpIn preparation for finding and returning the miscompare offset.
--- drivers/target/target_core_sbc.c | 117 ++++++++++++++++++------------- 1 file changed, 67 insertions(+), 50 deletions(-)
drivers/target/target_core_sbc.c +67 -50
@@ -434,20 +434,77 @@ static sense_reason_t compare_and_write_post(struct se_cmd *cmd, bool success,return ret; } +/* +* compare @cmp_len bytes of @read_sgl with @cmp_sgl. On miscompare return +* TCM_MISCOMPARE_VERIFY. +*/ +static sense_reason_t +compare_and_write_do_cmp (struct scatterlist *read_sgl,unsigned int read_nents, +struct scatterlist *cmp_sgl,unsigned int cmp_nents, +unsigned int cmp_len) +{ +unsigned char *buf =NULL ; +struct scatterlist *sg; +sense_reason_t ret; +unsigned int offset; +size_t rc; +int i; + + buf =kzalloc (cmp_len,GFP_KERNEL ); +if (!buf) { +pr_err ("Unable to allocate compare_and_write buf\n" ); + ret =TCM_OUT_OF_RESOURCES ; + goto out; + } + + rc =sg_copy_to_buffer (cmp_sgl, cmp_nents, buf, cmp_len); +if (!rc) { +pr_err ("sg_copy_to_buffer() failed for compare_and_write\n" ); + ret =TCM_OUT_OF_RESOURCES ; + goto out; + } +/* +* Compare SCSI READ payload against verify payload +*/ + offset =0 ; +for_each_sg (read_sgl, sg, read_nents, i) { +unsigned int len =min (sg->length, cmp_len); +unsigned char *addr =kmap_atomic (sg_page (sg)); + +if (memcmp (addr, buf + offset, len)) { +pr_warn ("Detected MISCOMPARE for addr: %p buf: %p\n" , + addr, buf + offset); +kunmap_atomic (addr); + ret =TCM_MISCOMPARE_VERIFY ; + goto out; + } +kunmap_atomic (addr); + + offset += len; + cmp_len -= len; +if (!cmp_len) +break ; + } +pr_debug ("COMPARE AND WRITE read data matches compare data\n" ); + ret =TCM_NO_SENSE ; +out: +kfree (buf); +return ret; +} +static sense_reason_t compare_and_write_callback (struct se_cmd *cmd,bool success,int *post_ret) {struct se_device *dev = cmd->se_dev;struct sg_table write_tbl = { }; -struct scatterlist *write_sg, *sg; -unsigned char *buf =NULL , *addr; +struct scatterlist *write_sg;struct sg_mapping_iter m; -unsigned int offset =0 , len; +unsigned int len;unsigned int nlbas = cmd->t_task_nolb;unsigned int block_size = dev->dev_attrib.block_size;unsigned int compare_len = (nlbas * block_size);sense_reason_t ret =TCM_NO_SENSE ; -int rc, i; +int i;/* * Handle early failure in transport_generic_request_failure(),
@@ -473,12 +530,13 @@ static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool succes goto out; } - buf =kzalloc (cmd->data_length,GFP_KERNEL ); -if (!buf) { -pr_err ("Unable to allocate compare_and_write buf\n" ); - ret =TCM_OUT_OF_RESOURCES ; + ret =compare_and_write_do_cmp (cmd->t_bidi_data_sg, + cmd->t_bidi_data_nents, + cmd->t_data_sg, + cmd->t_data_nents, + compare_len); +if (ret) goto out; - }if (sg_alloc_table (&write_tbl, cmd->t_data_nents,GFP_KERNEL ) <0 ) {pr_err ("Unable to allocate compare_and_write sg\n" );
@@ -486,41 +544,6 @@ static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool succes goto out; } write_sg = write_tbl.sgl; -/* -* Setup verify and write data payloads from total NumberLBAs. -*/ - rc =sg_copy_to_buffer (cmd->t_data_sg, cmd->t_data_nents, buf, - cmd->data_length); -if (!rc) { -pr_err ("sg_copy_to_buffer() failed for compare_and_write\n" ); - ret =TCM_OUT_OF_RESOURCES ; - goto out; - } -/* -* Compare against SCSI READ payload against verify payload -*/ -for_each_sg (cmd->t_bidi_data_sg, sg, cmd->t_bidi_data_nents, i) { - addr = (unsigned char *)kmap_atomic (sg_page (sg)); -if (!addr) { - ret =TCM_OUT_OF_RESOURCES ; - goto out; - } - - len =min (sg->length, compare_len); - -if (memcmp (addr, buf + offset, len)) { -pr_warn ("Detected MISCOMPARE for addr: %p buf: %p\n" , - addr, buf + offset); -kunmap_atomic (addr); - goto miscompare; - } -kunmap_atomic (addr); - - offset += len; - compare_len -= len; -if (!compare_len) -break ; - } i =0 ; len = cmd->t_task_nolb * block_size;
@@ -568,13 +591,8 @@ static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool succes__target_execute_cmd (cmd, false); -kfree (buf);return ret; -miscompare: -pr_warn ("Target/%s: Send MISCOMPARE check condition and sense\n" , - dev->transport->name); - ret =TCM_MISCOMPARE_VERIFY ; out:/* * In the MISCOMPARE or failure case, unlock ->caw_sem obtained in
@@ -582,7 +600,6 @@ static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool succes*/ up (&dev->caw_sem);sg_free_table (&write_tbl); -kfree (buf);return ret; }
Signature · 1 line
2.26.2
Re: [PATCH 4/5] scsi: target: split out COMPARE AND WRITE memcmp into helper
Am 23.10.20 um 22:57 schrieb David Disseldorp:
Quoted 63 lines
In preparation for finding and returning the miscompare offset.
Signed-off-by David Disseldorp <[email protected]>--- drivers/target/target_core_sbc.c | 117 ++++++++++++++++++------------- 1 file changed, 67 insertions(+), 50 deletions(-)drivers/target/target_core_sbc.c +48
-0@@ -434,20 +434,77 @@ static sense_reason_t compare_and_write_post(struct se_cmd *cmd, bool success,return ret; } +/* +* compare @cmp_len bytes of @read_sgl with @cmp_sgl. On miscompare return +* TCM_MISCOMPARE_VERIFY. +*/ +static sense_reason_t +compare_and_write_do_cmp (struct scatterlist *read_sgl,unsigned int read_nents, +struct scatterlist *cmp_sgl,unsigned int cmp_nents, +unsigned int cmp_len) +{ +unsigned char *buf =NULL ; +struct scatterlist *sg; +sense_reason_t ret; +unsigned int offset; +size_t rc; +int i; + + buf =kzalloc (cmp_len,GFP_KERNEL ); +if (!buf) { +pr_err ("Unable to allocate compare_and_write buf\n" ); + ret =TCM_OUT_OF_RESOURCES ; + goto out; + } + + rc =sg_copy_to_buffer (cmp_sgl, cmp_nents, buf, cmp_len); +if (!rc) { +pr_err ("sg_copy_to_buffer() failed for compare_and_write\n" ); + ret =TCM_OUT_OF_RESOURCES ; + goto out; + } +/* +* Compare SCSI READ payload against verify payload +*/ + offset =0 ; +for_each_sg (read_sgl, sg, read_nents, i) { +unsigned int len =min (sg->length, cmp_len); +unsigned char *addr =kmap_atomic (sg_page (sg)); + +if (memcmp (addr, buf + offset, len)) { +pr_warn ("Detected MISCOMPARE for addr: %p buf: %p\n" , + addr, buf + offset); +kunmap_atomic (addr); + ret =TCM_MISCOMPARE_VERIFY ; + goto out; + } +kunmap_atomic (addr); + + offset += len; + cmp_len -= len;
drivers/target/target_core_sbc.c static sense_reason_t compare_and_write_post(struct se_cmd *cmd, bool success, · line 494
Quoted 10 lines
drivers/target/target_core_sbc.c +10
-0+if (!cmp_len) +break ; + } +pr_debug ("COMPARE AND WRITE read data matches compare data\n" ); + ret =TCM_NO_SENSE ; +out: +kfree (buf); +return ret; +} +
Since you are going to split out a new helper, did you consider to re-write helper's code to avoid the intermediate buffer?
Douglas Gilbert currently tries to add new functions to lib/scatterlist.c One of them is sgl_compare_sgl, which directly compares content of two sg lists:
https://patchwork.kernel.org/project/linux-block/patch/[email protected]/
This code - based on the sg_miter_* calls - works without intermediate buffer.
Maybe your helper could use similar code or you could even call Douglas' helper, if he can enhance it to (optionally) return the miscompare offset.
Quoted 104 lines
drivers/target/target_core_sbc.c +9
-50static sense_reason_t compare_and_write_callback (struct se_cmd *cmd,bool success,int *post_ret) {struct se_device *dev = cmd->se_dev;struct sg_table write_tbl = { }; -struct scatterlist *write_sg, *sg; -unsigned char *buf =NULL , *addr; +struct scatterlist *write_sg;struct sg_mapping_iter m; -unsigned int offset =0 , len; +unsigned int len;unsigned int nlbas = cmd->t_task_nolb;unsigned int block_size = dev->dev_attrib.block_size;unsigned int compare_len = (nlbas * block_size);sense_reason_t ret =TCM_NO_SENSE ; -int rc, i; +int i;/* * Handle early failure in transport_generic_request_failure(), @@ -473,12 +530,13 @@ static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool succes goto out; } - buf =kzalloc (cmd->data_length,GFP_KERNEL ); -if (!buf) { -pr_err ("Unable to allocate compare_and_write buf\n" ); - ret =TCM_OUT_OF_RESOURCES ; + ret =compare_and_write_do_cmp (cmd->t_bidi_data_sg, + cmd->t_bidi_data_nents, + cmd->t_data_sg, + cmd->t_data_nents, + compare_len); +if (ret) goto out; - }if (sg_alloc_table (&write_tbl, cmd->t_data_nents,GFP_KERNEL ) <0 ) {pr_err ("Unable to allocate compare_and_write sg\n" );@@ -486,41 +544,6 @@ static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool succes goto out; } write_sg = write_tbl.sgl; -/* -* Setup verify and write data payloads from total NumberLBAs. -*/ - rc =sg_copy_to_buffer (cmd->t_data_sg, cmd->t_data_nents, buf, - cmd->data_length); -if (!rc) { -pr_err ("sg_copy_to_buffer() failed for compare_and_write\n" ); - ret =TCM_OUT_OF_RESOURCES ; - goto out; - } -/* -* Compare against SCSI READ payload against verify payload -*/ -for_each_sg (cmd->t_bidi_data_sg, sg, cmd->t_bidi_data_nents, i) { - addr = (unsigned char *)kmap_atomic (sg_page (sg)); -if (!addr) { - ret =TCM_OUT_OF_RESOURCES ; - goto out; - } - - len =min (sg->length, compare_len); - -if (memcmp (addr, buf + offset, len)) { -pr_warn ("Detected MISCOMPARE for addr: %p buf: %p\n" , - addr, buf + offset); -kunmap_atomic (addr); - goto miscompare; - } -kunmap_atomic (addr); - - offset += len; - compare_len -= len; -if (!compare_len) -break ; - } i =0 ; len = cmd->t_task_nolb * block_size;@@ -568,13 +591,8 @@ static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool succes__target_execute_cmd (cmd, false); -kfree (buf);return ret; -miscompare: -pr_warn ("Target/%s: Send MISCOMPARE check condition and sense\n" , - dev->transport->name); - ret =TCM_MISCOMPARE_VERIFY ; out:/* * In the MISCOMPARE or failure case, unlock ->caw_sem obtained in @@ -582,7 +600,6 @@ static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool succes*/ up (&dev->caw_sem);sg_free_table (&write_tbl); -kfree (buf);return ret; }
Re: [PATCH 4/5] scsi: target: split out COMPARE AND WRITE memcmp into helper
Hi Bodo,
Quoted 77 lines · Bodo Stroesser
Am 23.10.20 um 22:57 schrieb David Disseldorp:
Quoted 63 lines
In preparation for finding and returning the miscompare offset.
Signed-off-by David Disseldorp <[email protected]>--- drivers/target/target_core_sbc.c | 117 ++++++++++++++++++------------- 1 file changed, 67 insertions(+), 50 deletions(-)drivers/target/target_core_sbc.c +48
-0@@ -434,20 +434,77 @@ static sense_reason_t compare_and_write_post(struct se_cmd *cmd, bool success,return ret; } +/* +* compare @cmp_len bytes of @read_sgl with @cmp_sgl. On miscompare return +* TCM_MISCOMPARE_VERIFY. +*/ +static sense_reason_t +compare_and_write_do_cmp (struct scatterlist *read_sgl,unsigned int read_nents, +struct scatterlist *cmp_sgl,unsigned int cmp_nents, +unsigned int cmp_len) +{ +unsigned char *buf =NULL ; +struct scatterlist *sg; +sense_reason_t ret; +unsigned int offset; +size_t rc; +int i; + + buf =kzalloc (cmp_len,GFP_KERNEL ); +if (!buf) { +pr_err ("Unable to allocate compare_and_write buf\n" ); + ret =TCM_OUT_OF_RESOURCES ; + goto out; + } + + rc =sg_copy_to_buffer (cmp_sgl, cmp_nents, buf, cmp_len); +if (!rc) { +pr_err ("sg_copy_to_buffer() failed for compare_and_write\n" ); + ret =TCM_OUT_OF_RESOURCES ; + goto out; + } +/* +* Compare SCSI READ payload against verify payload +*/ + offset =0 ; +for_each_sg (read_sgl, sg, read_nents, i) { +unsigned int len =min (sg->length, cmp_len); +unsigned char *addr =kmap_atomic (sg_page (sg)); + +if (memcmp (addr, buf + offset, len)) { +pr_warn ("Detected MISCOMPARE for addr: %p buf: %p\n" , + addr, buf + offset); +kunmap_atomic (addr); + ret =TCM_MISCOMPARE_VERIFY ; + goto out; + } +kunmap_atomic (addr); + + offset += len; + cmp_len -= len;drivers/target/target_core_sbc.c static sense_reason_t compare_and_write_post(struct se_cmd *cmd, bool success, · line 494
Quoted 10 lines
drivers/target/target_core_sbc.c +10
-0+if (!cmp_len) +break ; + } +pr_debug ("COMPARE AND WRITE read data matches compare data\n" ); + ret =TCM_NO_SENSE ; +out: +kfree (buf); +return ret; +} +Since you are going to split out a new helper, did you consider to re-write helper's code to avoid the intermediate buffer?
Quoted 7 lines
Douglas Gilbert currently tries to add new functions to
lib/scatterlist.cOne of them issgl_compare_sgl, which directly compares content of two sg lists:https://patchwork.kernel.org/project/linux-block/patch/[email protected]/This code - based on the sg_miter_* calls - works without intermediate buffer.
Maybe your helper could use similar code or you could even call Douglas' helper, if he can enhance it to (optionally) return the miscompare offset.
Interesting, thanks for the heads-up. Dropping the intermediate compare buffer would be good, but I think this optimization should be left for a separate patchset, at least until sgl_compare_sgl() lands in mainline. LIO currently only supports 1-block compare-and-write requests, so the performance benefits would likely only be modest.
@Douglas: would you be open to returning the miscompare offset from sgl_compare_sgl()?
Cheers, David
PATCH 5/5 scsi: target: return COMPARE AND WRITE miscompare offsets
In reply to David DisseldorpSBC-4 r15 5.3 COMPARE AND WRITE command states:
if the compare operation does not indicate a match, then terminate the command with CHECK CONDITION status with the sense key set to MISCOMPARE and the additional sense code set to MISCOMPARE DURING VERIFY OPERATION. In the sense data (see 4.18 and SPC-5) the offset from the start of the Data-Out Buffer to the first byte of data that was not equal shall be reported in the INFORMATION field.
This change implements the missing logic to report the miscompare offset in the sense data INFORMATION field.
--- drivers/target/target_core_sbc.c | 35 ++++++++++++++++++-------- drivers/target/target_core_transport.c | 1 + 2 files changed, 26 insertions(+), 10 deletions(-)
drivers/target/target_core_sbc.c +25 -10
@@ -435,13 +435,13 @@ static sense_reason_t compare_and_write_post(struct se_cmd *cmd, bool success, }/* -* compare @cmp_len bytes of @read_sgl with @cmp_sgl. On miscompare return -* TCM_MISCOMPARE_VERIFY. +* compare @cmp_len bytes of @read_sgl with @cmp_sgl. On miscompare, fill +* @miscmp_off and return TCM_MISCOMPARE_VERIFY. */ static sense_reason_t compare_and_write_do_cmp (struct scatterlist *read_sgl,unsigned int read_nents,struct scatterlist *cmp_sgl,unsigned int cmp_nents, -unsigned int cmp_len) +unsigned int cmp_len,unsigned int *miscmp_off) {unsigned char *buf =NULL ;struct scatterlist *sg;
@@ -468,17 +468,20 @@ compare_and_write_do_cmp(struct scatterlist *read_sgl, unsigned int read_nents,*/ offset =0 ;for_each_sg (read_sgl, sg, read_nents, i) { +unsigned int i;unsigned int len =min (sg->length, cmp_len);unsigned char *addr =kmap_atomic (sg_page (sg)); -if (memcmp (addr, buf + offset, len)) { -pr_warn ("Detected MISCOMPARE for addr: %p buf: %p\n" , - addr, buf + offset); -kunmap_atomic (addr); +for (i =0 ; i < len && addr[i] = buf[offset + i]; i++); + +kunmap_atomic (addr); +if (i < len) { + *miscmp_off = offset + i; +pr_warn ("Detected MISCOMPARE at offset %u\n" , + *miscmp_off); ret =TCM_MISCOMPARE_VERIFY ; goto out; } -kunmap_atomic (addr); offset += len; cmp_len -= len;
@@ -503,6 +506,7 @@ static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool succesunsigned int nlbas = cmd->t_task_nolb;unsigned int block_size = dev->dev_attrib.block_size;unsigned int compare_len = (nlbas * block_size); +unsigned int miscmp_off =0 ;sense_reason_t ret =TCM_NO_SENSE ;int i;
@@ -534,8 +538,19 @@ static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool succes cmd->t_bidi_data_nents, cmd->t_data_sg, cmd->t_data_nents, - compare_len); -if (ret) + compare_len, + &miscmp_off); +if (ret =TCM_MISCOMPARE_VERIFY ) { +/* +* SBC-4 r15: 5.3 COMPARE AND WRITE command +* In the sense data (see 4.18 and SPC-5) the offset from the +* start of the Data-Out Buffer to the first byte of data that +* was not equal shall be reported in the INFORMATION field. +*/ +WARN_ON (miscmp_off >= compare_len); + cmd->sense_info = miscmp_off; + goto out; + }else if (ret) goto out;if (sg_alloc_table (&write_tbl, cmd->t_data_nents,GFP_KERNEL ) <0 ) {
drivers/target/target_core_transport.c +1 -0
@@ -3196,6 +3196,7 @@ static const struct sense_detail sense_detail_table[] = { .key = MISCOMPARE, .asc = 0x1d, /* MISCOMPARE DURING VERIFY OPERATION */ .ascq = 0x00, + .add_sense_info = true, }, [TCM_LOGICAL_BLOCK_GUARD_CHECK_FAILED] = { .key = ABORTED_COMMAND,
Signature · 1 line
2.26.2
Re: [PATCH 5/5] scsi: target: return COMPARE AND WRITE miscompare offsets
Quoted 41 lines · David Disseldorp
SBC-4 r15 5.3 COMPARE AND WRITE command states:
if the compare operation does not indicate a match, then terminate the command with CHECK CONDITION status with the sense key set to MISCOMPARE and the additional sense code set to MISCOMPARE DURING VERIFY OPERATION. In the sense data (see 4.18 and SPC-5) the offset from the start of the Data-Out Buffer to the first byte of data that was not equal shall be reported in the INFORMATION field.This change implements the missing logic to report the miscompare offset in the sense data INFORMATION field.
Signed-off-by David Disseldorp <[email protected]>--- drivers/target/target_core_sbc.c | 35 ++++++++++++++++++-------- drivers/target/target_core_transport.c | 1 + 2 files changed, 26 insertions(+), 10 deletions(-)drivers/target/target_core_sbc.c +3
-3@@ -435,13 +435,13 @@ static sense_reason_t compare_and_write_post(struct se_cmd *cmd, bool success, }/* -* compare @cmp_len bytes of @read_sgl with @cmp_sgl. On miscompare return -* TCM_MISCOMPARE_VERIFY. +* compare @cmp_len bytes of @read_sgl with @cmp_sgl. On miscompare, fill +* @miscmp_off and return TCM_MISCOMPARE_VERIFY. */ static sense_reason_t compare_and_write_do_cmp (struct scatterlist *read_sgl,unsigned int read_nents,struct scatterlist *cmp_sgl,unsigned int cmp_nents, -unsigned int cmp_len) +unsigned int cmp_len,unsigned int *miscmp_off) {unsigned char *buf =NULL ;struct scatterlist *sg;@@ -468,17 +468,20 @@ compare_and_write_do_cmp(struct scatterlist *read_sgl, unsigned int read_nents,*/ offset =0 ;
drivers/target/target_core_sbc.c compare_and_write_do_cmp(struct scatterlist *read_sgl, unsigned int read_nents, · line 475
Quoted 10 lines
drivers/target/target_core_sbc.c +2
-4for_each_sg (read_sgl, sg, read_nents, i) { +unsigned int i;unsigned int len =min (sg->length, cmp_len);unsigned char *addr =kmap_atomic (sg_page (sg)); -if (memcmp (addr, buf + offset, len)) { -pr_warn ("Detected MISCOMPARE for addr: %p buf: %p\n" , - addr, buf + offset); -kunmap_atomic (addr); +for (i =0 ; i < len && addr[i] = buf[offset + i]; i++);
I think it's a little nicer to put the ";" on the next line. It's just not a common line of code so your eyes miss it. It should also make the checkpatch script happy.
Quoted 27 lines
drivers/target/target_core_sbc.c +7
-3+ +kunmap_atomic (addr); +if (i < len) { + *miscmp_off = offset + i; +pr_warn ("Detected MISCOMPARE at offset %u\n" , + *miscmp_off); ret =TCM_MISCOMPARE_VERIFY ; goto out; } -kunmap_atomic (addr); offset += len; cmp_len -= len;@@ -503,6 +506,7 @@ static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool succesunsigned int nlbas = cmd->t_task_nolb;unsigned int block_size = dev->dev_attrib.block_size;unsigned int compare_len = (nlbas * block_size); +unsigned int miscmp_off =0 ;sense_reason_t ret =TCM_NO_SENSE ;int i;@@ -534,8 +538,19 @@ static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool succes cmd->t_bidi_data_nents, cmd->t_data_sg, cmd->t_data_nents, - compare_len); -if (ret)
drivers/target/target_core_sbc.c static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool succes · line 550
Quoted 10 lines
drivers/target/target_core_sbc.c +10
-0+ compare_len, + &miscmp_off); +if (ret =TCM_MISCOMPARE_VERIFY ) { +/* +* SBC-4 r15: 5.3 COMPARE AND WRITE command +* In the sense data (see 4.18 and SPC-5) the offset from the +* start of the Data-Out Buffer to the first byte of data that +* was not equal shall be reported in the INFORMATION field. +*/ +WARN_ON (miscmp_off >= compare_len);
I'm not sure how useful this is. If we hit this then we went wild in compare_and_write_do_cmp since we only allocate the cmp buffer to be compare_len bytes. If we think it's possible to hit this due to a incorrectly setup cmd or buffer/sgl or something, I would be more defensive in compare_and_write_do_cmp.
Quoted 19 lines
drivers/target/target_core_sbc.c +3
-0+ cmd->sense_info = miscmp_off; + goto out; + }else if (ret) goto out;if (sg_alloc_table (&write_tbl, cmd->t_data_nents,GFP_KERNEL ) <0 ) {drivers/target/target_core_transport.c +1
-0@@ -3196,6 +3196,7 @@ static const struct sense_detail sense_detail_table[] = { .key = MISCOMPARE, .asc = 0x1d, /* MISCOMPARE DURING VERIFY OPERATION */ .ascq = 0x00, + .add_sense_info = true, }, [TCM_LOGICAL_BLOCK_GUARD_CHECK_FAILED] = { .key = ABORTED_COMMAND,
Re: [PATCH 5/5] scsi: target: return COMPARE AND WRITE miscompare offsets
Thanks for the feedback Mike...
Quoted 47 lines · Mike Christie
Quoted 46 lines · David Disseldorp
SBC-4 r15 5.3 COMPARE AND WRITE command states:
if the compare operation does not indicate a match, then terminate the command with CHECK CONDITION status with the sense key set to MISCOMPARE and the additional sense code set to MISCOMPARE DURING VERIFY OPERATION. In the sense data (see 4.18 and SPC-5) the offset from the start of the Data-Out Buffer to the first byte of data that was not equal shall be reported in the INFORMATION field.This change implements the missing logic to report the miscompare offset in the sense data INFORMATION field.
Signed-off-by David Disseldorp <[email protected]>--- drivers/target/target_core_sbc.c | 35 ++++++++++++++++++-------- drivers/target/target_core_transport.c | 1 + 2 files changed, 26 insertions(+), 10 deletions(-)drivers/target/target_core_sbc.c +4
-3@@ -435,13 +435,13 @@ static sense_reason_t compare_and_write_post(struct se_cmd *cmd, bool success, }/* -* compare @cmp_len bytes of @read_sgl with @cmp_sgl. On miscompare return -* TCM_MISCOMPARE_VERIFY. +* compare @cmp_len bytes of @read_sgl with @cmp_sgl. On miscompare, fill +* @miscmp_off and return TCM_MISCOMPARE_VERIFY. */ static sense_reason_t compare_and_write_do_cmp (struct scatterlist *read_sgl,unsigned int read_nents,struct scatterlist *cmp_sgl,unsigned int cmp_nents, -unsigned int cmp_len) +unsigned int cmp_len,unsigned int *miscmp_off) {unsigned char *buf =NULL ;struct scatterlist *sg;@@ -468,17 +468,20 @@ compare_and_write_do_cmp(struct scatterlist *read_sgl, unsigned int read_nents,*/ offset =0 ;for_each_sg (read_sgl, sg, read_nents, i) { +unsigned int i;unsigned int len =min (sg->length, cmp_len);unsigned char *addr =kmap_atomic (sg_page (sg));
Quoted 9 lines
drivers/target/target_core_sbc.c compare_and_write_do_cmp(struct scatterlist *read_sgl, unsigned int read_nents, · line 475
Quoted 5 lines
drivers/target/target_core_sbc.c +1
-4-if (memcmp (addr, buf + offset, len)) { -pr_warn ("Detected MISCOMPARE for addr: %p buf: %p\n" , - addr, buf + offset); -kunmap_atomic (addr); +for (i =0 ; i < len && addr[i] = buf[offset + i]; i++);I think it's a little nicer to put the ";" on the next line. It's just not a common line of code so your eyes miss it. It should also make the checkpatch script happy.
Sure, will change this.
Quoted 35 lines
Quoted 35 lines
drivers/target/target_core_sbc.c +15
-3+ +kunmap_atomic (addr); +if (i < len) { + *miscmp_off = offset + i; +pr_warn ("Detected MISCOMPARE at offset %u\n" , + *miscmp_off); ret =TCM_MISCOMPARE_VERIFY ; goto out; } -kunmap_atomic (addr); offset += len; cmp_len -= len;@@ -503,6 +506,7 @@ static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool succesunsigned int nlbas = cmd->t_task_nolb;unsigned int block_size = dev->dev_attrib.block_size;unsigned int compare_len = (nlbas * block_size); +unsigned int miscmp_off =0 ;sense_reason_t ret =TCM_NO_SENSE ;int i;@@ -534,8 +538,19 @@ static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool succes cmd->t_bidi_data_nents, cmd->t_data_sg, cmd->t_data_nents, - compare_len); -if (ret) + compare_len, + &miscmp_off); +if (ret =TCM_MISCOMPARE_VERIFY ) { +/* +* SBC-4 r15: 5.3 COMPARE AND WRITE command +* In the sense data (see 4.18 and SPC-5) the offset from the +* start of the Data-Out Buffer to the first byte of data that +* was not equal shall be reported in the INFORMATION field.
Quoted 8 lines
drivers/target/target_core_sbc.c static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool succes · line 550
Quoted 2 lines
drivers/target/target_core_sbc.c +2
-0+*/ +WARN_ON (miscmp_off >= compare_len);I'm not sure how useful this is. If we hit this then we went wild in
compare_and_write_do_cmpsince we only allocate the cmp buffer to becompare_lenbytes. If we think it's possible to hit this due to a incorrectly setup cmd or buffer/sgl or something, I would be more defensive incompare_and_write_do_cmp.
I don't think it's possible to hit, but figured it didn't harm readability. I'll drop it in the next round.
Cheers, David