linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Thumshirn <johannes.thumshirn@wdc.com>
To: Jens Axboe <axboe@kernel.dk>
Cc: Christoph Hellwig <hch@lst.de>, Hannes Reinecke <hare@suse.de>,
	Chaitanya Kulkarni <kch@nvidia.com>,
	Damien Le Moal <damien.lemoal@wdc.com>,
	Ming Lei <ming.lei@redhat.com>,
	linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	linux-mm@kvack.org, dm-devel@redhat.com,
	Song Liu <song@kernel.org>,
	linux-raid@vger.kernel.org, Mike Snitzer <snitzer@kernel.org>,
	Matthew Wilcox <willy@infradead.org>,
	Dave Kleikamp <shaggy@kernel.org>,
	jfs-discussion@lists.sourceforge.net, cluster-devel@redhat.com,
	Bob Peterson <rpeterso@redhat.com>,
	Andreas Gruenbacher <agruenba@redhat.com>,
	David Sterba <dsterba@suse.com>,
	linux-btrfs@vger.kernel.org,
	Johannes Thumshirn <johannes.thumshirn@wdc.com>
Subject: [PATCH 17/19] md: raid1: check if adding pages to resync bio fails
Date: Wed, 29 Mar 2023 10:06:03 -0700	[thread overview]
Message-ID: <e2f96e539befa4f9d57f19ff1fc26cfc0d109435.1680108414.git.johannes.thumshirn@wdc.com> (raw)
In-Reply-To: <cover.1680108414.git.johannes.thumshirn@wdc.com>

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.

This way we can mark bio_add_pages as __must_check.

Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
---
 drivers/md/raid1-10.c |  7 ++++++-
 drivers/md/raid10.c   | 12 ++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/drivers/md/raid1-10.c b/drivers/md/raid1-10.c
index e61f6cad4e08..c21b6c168751 100644
--- a/drivers/md/raid1-10.c
+++ b/drivers/md/raid1-10.c
@@ -105,7 +105,12 @@ static void md_bio_reset_resync_pages(struct bio *bio, struct resync_pages *rp,
 		 * 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);
 }
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 6c66357f92f5..5682dba52fd3 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -3808,7 +3808,11 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr,
 			 * 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;
@@ -4989,7 +4993,11 @@ static sector_t reshape_request(struct mddev *mddev, sector_t sector_nr,
 			 * 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; /* XXX: is this correct? */
+			}
 		}
 		sector_nr += len >> 9;
 		nr_sectors += len >> 9;
-- 
2.39.2



  parent reply	other threads:[~2023-03-29 17:07 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-29 17:05 [PATCH 00/19] bio: check return values of bio_add_page Johannes Thumshirn
2023-03-29 17:05 ` [PATCH 01/19] swap: use __bio_add_page to add page to bio Johannes Thumshirn
2023-03-29 23:29   ` Damien Le Moal
     [not found]   ` <CGME20230331122046eucas1p247e0cd2d06229a6b7cae9cb26ea43d5b@eucas1p2.samsung.com>
2023-03-31 12:12     ` Pankaj Raghav
2023-03-29 17:05 ` [PATCH 02/19] drbd: " Johannes Thumshirn
2023-03-29 17:48   ` Matthew Wilcox
2023-03-29 23:29   ` Damien Le Moal
2023-03-29 17:05 ` [PATCH 03/19] dm: dm-zoned: use __bio_add_page for adding single metadata page Johannes Thumshirn
2023-03-29 23:30   ` Damien Le Moal
2023-03-29 17:05 ` [PATCH 04/19] fs: buffer: use __bio_add_page to add single page to bio Johannes Thumshirn
2023-03-29 23:31   ` Damien Le Moal
     [not found]   ` <CGME20230331122235eucas1p2208286ce210d9b01ea36a26bd3897b72@eucas1p2.samsung.com>
2023-03-31 12:14     ` Pankaj Raghav
2023-03-29 17:05 ` [PATCH 05/19] md: use __bio_add_page to add single page Johannes Thumshirn
2023-03-29 23:31   ` Damien Le Moal
2023-03-29 17:05 ` [PATCH 06/19] md: raid5-log: " Johannes Thumshirn
2023-03-29 23:32   ` Damien Le Moal
2023-03-29 17:05 ` [PATCH 07/19] md: raid5: use __bio_add_page to add single page to new bio Johannes Thumshirn
2023-03-29 23:32   ` Damien Le Moal
2023-03-29 17:05 ` [PATCH 08/19] btrfs: repair: use __bio_add_page for adding single page Johannes Thumshirn
2023-03-29 23:33   ` Damien Le Moal
2023-03-29 17:05 ` [PATCH 09/19] btrfs: raid56: use __bio_add_page to add " Johannes Thumshirn
2023-03-29 23:33   ` Damien Le Moal
2023-03-29 17:05 ` [PATCH 10/19] jfs: logmgr: use __bio_add_page to add single page to bio Johannes Thumshirn
2023-03-29 23:34   ` Damien Le Moal
2023-03-29 17:05 ` [PATCH 11/19] gfs: use __bio_add_page for adding " Johannes Thumshirn
2023-03-29 23:34   ` Damien Le Moal
2023-03-29 17:05 ` [PATCH 12/19] zonefs: " Johannes Thumshirn
2023-03-29 23:35   ` Damien Le Moal
2023-03-29 17:05 ` [PATCH 13/19] zram: " Johannes Thumshirn
2023-03-29 23:36   ` Damien Le Moal
     [not found]   ` <CGME20230331122828eucas1p18e0bbbda45a6955f59fc82b29f42a8bb@eucas1p1.samsung.com>
2023-03-31 12:20     ` Pankaj Raghav
2023-03-29 17:06 ` [PATCH 14/19] floppy: " Johannes Thumshirn
2023-03-29 23:36   ` Damien Le Moal
2023-03-29 17:06 ` [PATCH 15/19] md: check for failure when adding pages in alloc_behind_master_bio Johannes Thumshirn
2023-03-29 23:38   ` Damien Le Moal
2023-03-29 17:06 ` [PATCH 16/19] md: raid1: use __bio_add_page for adding single page to bio Johannes Thumshirn
2023-03-29 23:38   ` Damien Le Moal
2023-03-29 17:06 ` Johannes Thumshirn [this message]
2023-03-29 23:44   ` [PATCH 17/19] md: raid1: check if adding pages to resync bio fails Damien Le Moal
2023-03-30 10:38     ` Johannes Thumshirn
2023-03-29 17:06 ` [PATCH 18/19] dm-crypt: check if adding pages to clone " Johannes Thumshirn
2023-03-29 23:49   ` Damien Le Moal
2023-03-30  0:17     ` Yang Shi
2023-03-30  0:24       ` Damien Le Moal
2023-03-30 22:29         ` Yang Shi
2023-03-29 17:06 ` [PATCH 19/19] block: mark bio_add_page as __must_check Johannes Thumshirn
2023-03-29 23:58   ` Damien Le Moal

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e2f96e539befa4f9d57f19ff1fc26cfc0d109435.1680108414.git.johannes.thumshirn@wdc.com \
    --to=johannes.thumshirn@wdc.com \
    --cc=agruenba@redhat.com \
    --cc=axboe@kernel.dk \
    --cc=cluster-devel@redhat.com \
    --cc=damien.lemoal@wdc.com \
    --cc=dm-devel@redhat.com \
    --cc=dsterba@suse.com \
    --cc=hare@suse.de \
    --cc=hch@lst.de \
    --cc=jfs-discussion@lists.sourceforge.net \
    --cc=kch@nvidia.com \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux-raid@vger.kernel.org \
    --cc=ming.lei@redhat.com \
    --cc=rpeterso@redhat.com \
    --cc=shaggy@kernel.org \
    --cc=snitzer@kernel.org \
    --cc=song@kernel.org \
    --cc=willy@infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox