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

Commit 6548c7c5 authored by Mike Snitzer's avatar Mike Snitzer
Browse files

dm: fix dm_wq_work() to only use __split_and_process_bio() if appropriate 



Otherwise targets that don't support/expect IO splitting could resubmit
bios using code paths with unnecessary IO splitting complexity.

Depends-on: 24113d48 ("dm: avoid indirect call in __dm_make_request")
Fixes: 978e51ba ("dm: optimize bio-based NVMe IO submission")
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent a1e1cb72

drivers/md/dm.c

+12 −6
Original line number Diff line number Diff line
@@ -1725,6 +1725,15 @@ static blk_qc_t __process_bio(struct mapped_device *md, 
	return ret;

}



static blk_qc_t dm_process_bio(struct mapped_device *md,

			       struct dm_table *map, struct bio *bio)

{

	if (dm_get_md_type(md) == DM_TYPE_NVME_BIO_BASED)

		return __process_bio(md, map, bio);

	else

		return __split_and_process_bio(md, map, bio);

}



static blk_qc_t dm_make_request(struct request_queue *q, struct bio *bio)

{

	struct mapped_device *md = q->queuedata;
@@ -1745,10 +1754,7 @@ static blk_qc_t dm_make_request(struct request_queue *q, struct bio *bio) 
		return ret;

	}



	if (dm_get_md_type(md) == DM_TYPE_NVME_BIO_BASED)

		ret = __process_bio(md, map, bio);

	else

		ret = __split_and_process_bio(md, map, bio);

	ret = dm_process_bio(md, map, bio);



	dm_put_live_table(md, srcu_idx);

	return ret;
@@ -2427,9 +2433,9 @@ static void dm_wq_work(struct work_struct *work) 
			break;



		if (dm_request_based(md))

			generic_make_request(c);

			(void) generic_make_request(c);

		else

			__split_and_process_bio(md, map, c);

			(void) dm_process_bio(md, map, c);

	}



	dm_put_live_table(md, srcu_idx);