diff options
authorMartin K. Petersen <martin.petersen@oracle.com>2018-12-04 20:58:33 -0500
committerMartin K. Petersen <martin.petersen@oracle.com>2018-12-07 22:39:46 -0500
commit60a89a3ce0cce515dc663bc1b45ac89202ad6c79 (patch)
parentscsi: bnx2fc: Fix NULL dereference in error handling (diff)
scsi: t10-pi: Return correct ref tag when queue has no integrity profile
Commit ddd0bc756983 ("block: move ref_tag calculation func to the block layer") moved ref tag calculation from SCSI to a library function. However, this change broke returning the correct ref tag for devices operating in DIF mode since these do not have an associated block integrity profile. This in turn caused read/write failures on PI-formatted disks attached to an mpt3sas controller. Fixes: ddd0bc756983 ("block: move ref_tag calculation func to the block layer") Cc: stable@vger.kernel.org # 4.19+ Reported-by: John Garry <john.garry@huawei.com> Tested-by: Xiang Chen <chenxiang66@hisilicon.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/t10-pi.h b/include/linux/t10-pi.h
index b9626aa7e90c..3e2a80cc7b56 100644
--- a/include/linux/t10-pi.h
+++ b/include/linux/t10-pi.h
@@ -39,12 +39,13 @@ struct t10_pi_tuple {
static inline u32 t10_pi_ref_tag(struct request *rq)
+ unsigned int shift = ilog2(queue_logical_block_size(rq->q));
- return blk_rq_pos(rq) >>
- (rq->q->integrity.interval_exp - 9) & 0xffffffff;
- return -1U;
+ if (rq->q->integrity.interval_exp)
+ shift = rq->q->integrity.interval_exp;
+ return blk_rq_pos(rq) >> (shift - SECTOR_SHIFT) & 0xffffffff;
extern const struct blk_integrity_profile t10_pi_type1_crc;