Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 690699b2 authored by Martin K. Petersen's avatar Martin K. Petersen Committed by Greg Kroah-Hartman
Browse files

scsi: t10-pi: Return correct ref tag when queue has no integrity profile 



commit 60a89a3ce0cce515dc663bc1b45ac89202ad6c79 upstream.

Commit ddd0bc75 ("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: ddd0bc75 ("block: move ref_tag calculation func to the block layer")
Cc: stable@vger.kernel.org # 4.19+
Reported-by: default avatarJohn Garry <john.garry@huawei.com>
Tested-by: default avatarXiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 07364588

include/linux/t10-pi.h

+5 −4
Original line number Diff line number Diff line
@@ -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));



#ifdef CONFIG_BLK_DEV_INTEGRITY

	return blk_rq_pos(rq) >>

		(rq->q->integrity.interval_exp - 9) & 0xffffffff;

#else

	return -1U;

	if (rq->q->integrity.interval_exp)

		shift = rq->q->integrity.interval_exp;

#endif

	return blk_rq_pos(rq) >> (shift - SECTOR_SHIFT) & 0xffffffff;

}



extern const struct blk_integrity_profile t10_pi_type1_crc;