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

Commit 4eaf99be authored by Martin K. Petersen's avatar Martin K. Petersen Committed by Jens Axboe
Browse files

block: Don't merge requests if integrity flags differ 



We'd occasionally merge requests with conflicting integrity flags.
Introduce a merge helper which checks that the requests have compatible
integrity payloads.

Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagig@mellanox.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent aae7df50

block/blk-integrity.c

+26 −10
Original line number Diff line number Diff line
@@ -186,37 +186,53 @@ int blk_integrity_compare(struct gendisk *gd1, struct gendisk *gd2) 
}

EXPORT_SYMBOL(blk_integrity_compare);



int blk_integrity_merge_rq(struct request_queue *q, struct request *req,

bool blk_integrity_merge_rq(struct request_queue *q, struct request *req,

			    struct request *next)

{

	if (blk_integrity_rq(req) != blk_integrity_rq(next))

		return -1;

	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)

		return false;



	if (req->nr_integrity_segments + next->nr_integrity_segments >

	    q->limits.max_integrity_segments)

		return -1;

		return false;



	return 0;

	return true;

}

EXPORT_SYMBOL(blk_integrity_merge_rq);



int blk_integrity_merge_bio(struct request_queue *q, struct request *req,

bool blk_integrity_merge_bio(struct request_queue *q, struct request *req,

			     struct bio *bio)

{

	int nr_integrity_segs;

	struct bio *next = bio->bi_next;



	if (blk_integrity_rq(req) == 0 && bio_integrity(bio) == NULL)

		return true;



	if (blk_integrity_rq(req) == 0 || bio_integrity(bio) == NULL)

		return false;



	if (bio_integrity(req->bio)->bip_flags != bio_integrity(bio)->bip_flags)

		return false;



	bio->bi_next = NULL;

	nr_integrity_segs = blk_rq_count_integrity_sg(q, bio);

	bio->bi_next = next;



	if (req->nr_integrity_segments + nr_integrity_segs >

	    q->limits.max_integrity_segments)

		return -1;

		return false;



	req->nr_integrity_segments += nr_integrity_segs;



	return 0;

	return true;

}

EXPORT_SYMBOL(blk_integrity_merge_bio);

block/blk-merge.c

+3 −3
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ static inline int ll_new_hw_segment(struct request_queue *q, 
	if (req->nr_phys_segments + nr_phys_segs > queue_max_segments(q))

		goto no_merge;



	if (bio_integrity(bio) && blk_integrity_merge_bio(q, req, bio))

	if (blk_integrity_merge_bio(q, req, bio) == false)

		goto no_merge;



	/*
@@ -410,7 +410,7 @@ static int ll_merge_requests_fn(struct request_queue *q, struct request *req, 
	if (total_phys_segments > queue_max_segments(q))

		return 0;



	if (blk_integrity_rq(req) && blk_integrity_merge_rq(q, req, next))

	if (blk_integrity_merge_rq(q, req, next) == false)

		return 0;



	/* Merge is OK... */
@@ -590,7 +590,7 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio) 
		return false;



	/* only merge integrity protected bio into ditto rq */

	if (bio_integrity(bio) != blk_integrity_rq(rq))

	if (blk_integrity_merge_bio(rq->q, rq, bio) == false)

		return false;



	/* must be using the same buffer */

include/linux/blkdev.h

+10 −10
Original line number Diff line number Diff line
@@ -1497,9 +1497,9 @@ extern int blk_integrity_compare(struct gendisk *, struct gendisk *); 
extern int blk_rq_map_integrity_sg(struct request_queue *, struct bio *,

				   struct scatterlist *);

extern int blk_rq_count_integrity_sg(struct request_queue *, struct bio *);

extern int blk_integrity_merge_rq(struct request_queue *, struct request *,

extern bool blk_integrity_merge_rq(struct request_queue *, struct request *,

				   struct request *);

extern int blk_integrity_merge_bio(struct request_queue *, struct request *,

extern bool blk_integrity_merge_bio(struct request_queue *, struct request *,

				    struct bio *);



static inline
@@ -1580,13 +1580,13 @@ static inline unsigned short queue_max_integrity_segments(struct request_queue * 
{

	return 0;

}

static inline int blk_integrity_merge_rq(struct request_queue *rq,

static inline bool blk_integrity_merge_rq(struct request_queue *rq,

					  struct request *r1,

					  struct request *r2)

{

	return 0;

}

static inline int blk_integrity_merge_bio(struct request_queue *rq,

static inline bool blk_integrity_merge_bio(struct request_queue *rq,

					   struct request *r,

					   struct bio *b)

{