block: don't merge bios with different app_tags
PATCH 1/1 block: don't merge bios with different app_tags
nvme_set_app_tag() uses the app_tag value from the bio_integrity_payload of the struct request's first bio. This assumes all the request's bios have the same app_tag. However, it is possible for bios with different app_tag values to be merged into a single request.
Add a check in blk_integrity_merge_{bio,rq}() to prevent the merging of bios/requests with different app_tag values if BIP_CHECK_APPTAG is set.
--- block/blk-integrity.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-)
block/blk-integrity.c +18 -5
@@ -138,18 +138,25 @@ int blk_rq_integrity_map_user(struct request *rq, void __user *ubuf,EXPORT_SYMBOL_GPL (blk_rq_integrity_map_user);bool blk_integrity_merge_rq (struct request_queue *q,struct request *req,struct request *next) { +struct bio_integrity_payload *bip, *bip_next; +if (blk_integrity_rq (req) ==0 &&blk_integrity_rq (next) ==0 )return true;if (blk_integrity_rq (req) ==0 ||blk_integrity_rq (next) ==0 )return false; -if (bio_integrity (req->bio)->bip_flags != -bio_integrity (next->bio)->bip_flags) + bip =bio_integrity (req->bio); + bip_next =bio_integrity (next->bio); +if (bip->bip_flags != bip_next->bip_flags) +return false; + +if (bip->bip_flags &BIP_CHECK_APPTAG && + bip->app_tag != bip_next->app_tag)return false;if (req->nr_integrity_segments + next->nr_integrity_segments > q->limits.max_integrity_segments)return false;
@@ -161,19 +168,25 @@ bool blk_integrity_merge_rq(struct request_queue *q, struct request *req, }bool blk_integrity_merge_bio (struct request_queue *q,struct request *req,struct bio *bio) { +struct bio_integrity_payload *bip, *bip_bio =bio_integrity (bio);int nr_integrity_segs; -if (blk_integrity_rq (req) ==0 &&bio_integrity (bio) ==NULL ) +if (blk_integrity_rq (req) ==0 && bip_bio ==NULL )return true; -if (blk_integrity_rq (req) ==0 ||bio_integrity (bio) ==NULL ) +if (blk_integrity_rq (req) ==0 || bip_bio ==NULL ) +return false; + + bip =bio_integrity (req->bio); +if (bip->bip_flags != bip_bio->bip_flags)return false; -if (bio_integrity (req->bio)->bip_flags !=bio_integrity (bio)->bip_flags) +if (bip->bip_flags &BIP_CHECK_APPTAG && + bip->app_tag != bip_bio->app_tag)return false; nr_integrity_segs =blk_rq_count_integrity_sg (q, bio);if (req->nr_integrity_segments + nr_integrity_segs > q->limits.max_integrity_segments)
Signature · 1 line
2.45.2
Quoted 8 lines · Caleb Sander Mateos
nvme_set_app_tag()uses theapp_tagvalue from thebio_integrity_payloadof the struct request's first bio. This assumes all the request's bios have the sameapp_tag. However, it is possible for bios with differentapp_tagvalues to be merged into a single request.
Add a check in blk_integrity_merge_{bio,rq}() to prevent the merging of bios/requests with differentapp_tagvalues ifBIP_CHECK_APPTAGis set.[...]
Applied, thanks!
[1/1] block: don't merge bios with different app_tags
commit: 6acd4ac5f8f0ec9b946875553e52907700bcfc77
Best regards,
Signature · 1 line
Jens Axboe