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

Commit 0f4687c3 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Sasha Levin
Browse files

dm io: deal with wandering queue limits when handling REQ_DISCARD and REQ_WRITE_SAME 



[ Upstream commit e5db29806b99ce2b2640d2e4d4fcb983cea115c5 ]

Since it's possible for the discard and write same queue limits to
change while the upper level command is being sliced and diced, fix up
both of them (a) to reject IO if the special command is unsupported at
the start of the function and (b) read the limits once and let the
commands error out on their own if the status happens to change.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 28bd7dd3

drivers/md/dm-io.c

+11 −4
Original line number Diff line number Diff line
@@ -289,9 +289,16 @@ static void do_region(int rw, unsigned region, struct dm_io_region *where, 
	struct request_queue *q = bdev_get_queue(where->bdev);

	unsigned short logical_block_size = queue_logical_block_size(q);

	sector_t num_sectors;

	unsigned int uninitialized_var(special_cmd_max_sectors);



	/* Reject unsupported discard requests */

	if ((rw & REQ_DISCARD) && !blk_queue_discard(q)) {

	/*

	 * Reject unsupported discard and write same requests.

	 */

	if (rw & REQ_DISCARD)

		special_cmd_max_sectors = q->limits.max_discard_sectors;

	else if (rw & REQ_WRITE_SAME)

		special_cmd_max_sectors = q->limits.max_write_same_sectors;

	if ((rw & (REQ_DISCARD | REQ_WRITE_SAME)) && special_cmd_max_sectors == 0) {

		dec_count(io, region, -EOPNOTSUPP);

		return;

	}
@@ -317,7 +324,7 @@ static void do_region(int rw, unsigned region, struct dm_io_region *where, 
		store_io_and_region_in_bio(bio, io, region);



		if (rw & REQ_DISCARD) {

			num_sectors = min_t(sector_t, q->limits.max_discard_sectors, remaining);

			num_sectors = min_t(sector_t, special_cmd_max_sectors, remaining);

			bio->bi_iter.bi_size = num_sectors << SECTOR_SHIFT;

			remaining -= num_sectors;

		} else if (rw & REQ_WRITE_SAME) {
@@ -326,7 +333,7 @@ static void do_region(int rw, unsigned region, struct dm_io_region *where, 
			 */

			dp->get_page(dp, &page, &len, &offset);

			bio_add_page(bio, page, logical_block_size, offset);

			num_sectors = min_t(sector_t, q->limits.max_write_same_sectors, remaining);

			num_sectors = min_t(sector_t, special_cmd_max_sectors, remaining);

			bio->bi_iter.bi_size = num_sectors << SECTOR_SHIFT;



			offset = 0;