Commit 0c67dd64 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Jens Axboe
Browse files

md: raid1: check if adding pages to resync bio fails 



Check if adding pages to resync bio fails and if bail out.

As the comment above suggests this cannot happen, WARN if it actually
happens. Technically __bio_add_pages() would be sufficient here, but
asserting the pages actually get added to the bio is preferred.

This way we can mark bio_add_pages as __must_check.

Reviewed-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Acked-by: default avatarSong Liu <song@kernel.org>
Signed-off-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/33aea4c271220dc9bcab58c4b7bec478c1511142.1685532726.git.johannes.thumshirn@wdc.com


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

drivers/md/raid1-10.c

+6 −5
Original line number Diff line number Diff line
@@ -101,11 +101,12 @@ static void md_bio_reset_resync_pages(struct bio *bio, struct resync_pages *rp, 
		struct page *page = resync_fetch_page(rp, idx);

		int len = min_t(int, size, PAGE_SIZE);



		/*

		 * won't fail because the vec table is big

		 * enough to hold all these pages

		 */

		bio_add_page(bio, page, len, 0);

		if (WARN_ON(!bio_add_page(bio, page, len, 0))) {

			bio->bi_status = BLK_STS_RESOURCE;

			bio_endio(bio);

			return;

		}



		size -= len;

	} while (idx++ < RESYNC_PAGES && size > 0);

}

drivers/md/raid10.c

+10 −10
Original line number Diff line number Diff line
@@ -3819,11 +3819,11 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr, 
		for (bio= biolist ; bio ; bio=bio->bi_next) {

			struct resync_pages *rp = get_resync_pages(bio);

			page = resync_fetch_page(rp, page_idx);

			/*

			 * won't fail because the vec table is big enough

			 * to hold all these pages

			 */

			bio_add_page(bio, page, len, 0);

			if (WARN_ON(!bio_add_page(bio, page, len, 0))) {

				bio->bi_status = BLK_STS_RESOURCE;

				bio_endio(bio);

				goto giveup;

			}

		}

		nr_sectors += len>>9;

		sector_nr += len>>9;
@@ -4997,11 +4997,11 @@ static sector_t reshape_request(struct mddev *mddev, sector_t sector_nr, 
		if (len > PAGE_SIZE)

			len = PAGE_SIZE;

		for (bio = blist; bio ; bio = bio->bi_next) {

			/*

			 * won't fail because the vec table is big enough

			 * to hold all these pages

			 */

			bio_add_page(bio, page, len, 0);

			if (WARN_ON(!bio_add_page(bio, page, len, 0))) {

				bio->bi_status = BLK_STS_RESOURCE;

				bio_endio(bio);

				return sectors_done;

			}

		}

		sector_nr += len >> 9;

		nr_sectors += len >> 9;