scsi: target: COMPARE AND WRITE miscompare sense
Subsystems (3)
v2 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
Changes since v1:
- drop unnecessary WARN_ON()
- fix two checkpatch warnings
- drop single-use nlbas variable
- avoid compare_len recalculation
Cheers, David
drivers/target/target_core_sbc.c | 137 +++++++++++++++---------- drivers/target/target_core_transport.c | 33 +++--- include/target/target_core_base.h | 2 +- lib/scatterlist.c | 2 +- 4 files changed, 102 insertions(+), 72 deletions(-)
PATCH v2 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
Re: [PATCH v2 1/5] lib/scatterlist: use consistent sg_copy_buffer() return type
Quoted 14 lines · David Disseldorp
sg_copy_buffer()returns asize_twith the number of bytes copied. Return 0 instead of false if the copy is skipped.Signed-off-by David Disseldorp <[email protected]>--- lib/scatterlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/scatterlist.c +0
-0
lib/scatterlist.c size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf, · line 939
Quoted 8 lines
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;
This one probably should be sent by itself as a fix to:
[email protected]
and cc-ed to:
[email protected]
on the assumption that Jens Axboe is the maintainer of lib/scatterlist.c . He put a fix of mine in sgl_alloc_order() into the kernel recently.
Otherwise:
Re: [PATCH v2 1/5] lib/scatterlist: use consistent sg_copy_buffer() return type
Quoted 27 lines · Douglas Gilbert
Quoted 14 lines · David Disseldorp
sg_copy_buffer()returns asize_twith the number of bytes copied. Return 0 instead of false if the copy is skipped.Signed-off-by David Disseldorp <[email protected]>--- lib/scatterlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/scatterlist.c +0
-0lib/scatterlist.c size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf, · line 939
Quoted 8 lines
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;This one probably should be sent by itself as a fix to:
[email protected]
Quoted 8 lines
and cc-ed to:
[email protected]on the assumption that Jens Axboe is the maintainer of
lib/scatterlist.c. He put a fix of mine insgl_alloc_order()into the kernel recently.Otherwise:
Reviewed-by Douglas Gilbert <[email protected]>
Sent. Thanks Douglas!
PATCH v2 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 v2 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 v2 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 | 121 +++++++++++++++++-------------- 1 file changed, 68 insertions(+), 53 deletions(-)
drivers/target/target_core_sbc.c +68 -53
@@ -434,20 +434,75 @@ 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) { + 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 nlbas = cmd->t_task_nolb; +unsigned int len;unsigned int block_size = dev->dev_attrib.block_size; -unsigned int compare_len = (nlbas * block_size); +unsigned int compare_len = (cmd->t_task_nolb * block_size);sense_reason_t ret =TCM_NO_SENSE ; -int rc, i; +int i;/* * Handle early failure in transport_generic_request_failure(),
@@ -473,12 +528,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,44 +542,9 @@ 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; + len = compare_len;sg_miter_start (&m, cmd->t_data_sg, cmd->t_data_nents,SG_MITER_TO_SG );/* * Currently assumes NoLB=1 and SGLs are PAGE_SIZE..
@@ -568,13 +589,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 +598,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
PATCH v2 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 | 34 ++++++++++++++++++-------- drivers/target/target_core_transport.c | 1 + 2 files changed, 25 insertions(+), 10 deletions(-)
drivers/target/target_core_sbc.c +24 -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;
@@ -467,17 +467,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;
@@ -501,6 +504,7 @@ static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool succesunsigned int len;unsigned int block_size = dev->dev_attrib.block_size;unsigned int compare_len = (cmd->t_task_nolb * block_size); +unsigned int miscmp_off =0 ;sense_reason_t ret =TCM_NO_SENSE ;int i;
@@ -532,8 +536,18 @@ 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. +*/ + 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
Quoted 14 lines · David Disseldorp
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://urldefense.com/v3/__https://github.com/sahlberg/libiscsi/pull/344__;!!GqivPVa7Brio!LJ-un7MDdHXhZgIK1qgvDgza2El16FK-T_4oDi6VqM0CzetAV9pGHDvLDrZUkITTHxhO$Changes since v1:
- drop unnecessaryWARN_ON()
- fix two checkpatch warnings
- drop single-use nlbas variable
- avoidcompare_lenrecalculation
Quoted 7 lines
Cheers, David
drivers/target/target_core_sbc.c | 137 +++++++++++++++---------- drivers/target/target_core_transport.c | 33 +++--- include/target/target_core_base.h | 2 +- lib/scatterlist.c | 2 +- 4 files changed, 102 insertions(+), 72 deletions(-)
Quoted 4 lines · Mike Christie
Quoted 3 lines · David Disseldorp
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.
...
Quoted 8 lines
Quoted 8 lines
Changes since v1:
- drop unnecessaryWARN_ON()
- fix two checkpatch warnings
- drop single-use nlbas variable
- avoidcompare_lenrecalculationCheers, David
Quoted 8 lines
Quoted 5 lines
drivers/target/target_core_sbc.c | 137 +++++++++++++++---------- drivers/target/target_core_transport.c | 33 +++--- include/target/target_core_base.h | 2 +- lib/scatterlist.c | 2 +- 4 files changed, 102 insertions(+), 72 deletions(-)Reviewed-by Mike Christie <[email protected]>
Thanks Mike.
@Martin: please pull patches 2/5 through to 5/5 only; the independent scatterlist patch 1/5 has been submitted via linux-block.
Cheers, David
David,
Quoted 3 lines
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.
Applied 2-5 to 5.11/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Quoted 6 lines
Quoted 4 lines
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.
Applied 2-5 to 5.11/scsi-staging, thanks!
Dropped again, breaks IB.
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Quoted 8 lines · Martin K. Petersen
Quoted 5 lines
Quoted 3 lines
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.
Applied 2-5 to 5.11/scsi-staging, thanks!
Dropped again, breaks IB.
Hmm, I overlooked ib_isert in the bad_sector->sense_info rename, sorry. I'll post a v3 when done with testing.
Cheers, David