Commit 162e0687 authored by Anuj Gupta's avatar Anuj Gupta Committed by Jens Axboe
Browse files

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



Commit c6e56cf6 ("block: move integrity information into
queue_limits") changed the ref tag calculation logic. It would break if
there is no integrity profile. This in turn causes read/write failures
for such cases.

Fixes: c6e56cf6 ("block: move integrity information into queue_limits")
Signed-off-by: default avatarAnuj Gupta <anuj20.g@samsung.com>
Link: https://lore.kernel.org/r/20240704061515.282343-1-joshi.k@samsung.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 98d34c08

include/linux/t10-pi.h

+8 −2
Original line number Diff line number Diff line
@@ -39,8 +39,11 @@ struct t10_pi_tuple { 


static inline u32 t10_pi_ref_tag(struct request *rq)

{

	unsigned int shift = rq->q->limits.integrity.interval_exp;

	unsigned int shift = ilog2(queue_logical_block_size(rq->q));



	if (IS_ENABLED(CONFIG_BLK_DEV_INTEGRITY) &&

	    rq->q->limits.integrity.interval_exp)

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

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

}
@@ -61,8 +64,11 @@ static inline u64 lower_48_bits(u64 n) 


static inline u64 ext_pi_ref_tag(struct request *rq)

{

	unsigned int shift = rq->q->limits.integrity.interval_exp;

	unsigned int shift = ilog2(queue_logical_block_size(rq->q));



	if (IS_ENABLED(CONFIG_BLK_DEV_INTEGRITY) &&

	    rq->q->limits.integrity.interval_exp)

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

	return lower_48_bits(blk_rq_pos(rq) >> (shift - SECTOR_SHIFT));

}