All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johannes Thumshirn <jth@kernel.org>
To: axboe@kernel.dk
Cc: johannes.thumshirn@wdc.com, agruenba@redhat.com,
	cluster-devel@redhat.com, damien.lemoal@wdc.com,
	dm-devel@redhat.com, dsterba@suse.com, hare@suse.de, hch@lst.de,
	jfs-discussion@lists.sourceforge.net, kch@nvidia.com,
	linux-block@vger.kernel.org, linux-btrfs@vger.kernel.org,
	linux-fsdevel@vger.kernel.org, linux-mm@kvack.org,
	linux-raid@vger.kernel.org, ming.lei@redhat.com,
	rpeterso@redhat.com, shaggy@kernel.org, snitzer@kernel.org,
	song@kernel.org, willy@infradead.org,
	Damien Le Moal <damien.lemoal@opensource.wdc.com>
Subject: [PATCH v3 18/19] dm-crypt: check if adding pages to clone bio fails
Date: Wed, 19 Apr 2023 16:09:28 +0200	[thread overview]
Message-ID: <20230419140929.5924-19-jth@kernel.org> (raw)
In-Reply-To: <20230419140929.5924-1-jth@kernel.org>

From: Johannes Thumshirn <johannes.thumshirn@wdc.com>

Check if adding pages to clone bio fails and if it does retry with
reclaim. This mirrors the behaviour of page allocation in
crypt_alloc_buffer().

This way we can mark bio_add_pages as __must_check.

Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
---
 drivers/md/dm-crypt.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 3ba53dc3cc3f..19f7e087c6df 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -1693,7 +1693,14 @@ static struct bio *crypt_alloc_buffer(struct dm_crypt_io *io, unsigned int size)
 
 		len = (remaining_size > PAGE_SIZE) ? PAGE_SIZE : remaining_size;
 
-		bio_add_page(clone, page, len, 0);
+		if (!bio_add_page(clone, page, len, 0)) {
+			mempool_free(page, &cc->page_pool);
+			crypt_free_buffer_pages(cc, clone);
+			bio_put(clone);
+			gfp_mask |= __GFP_DIRECT_RECLAIM;
+			goto retry;
+
+		}
 
 		remaining_size -= len;
 	}
-- 
2.39.2


WARNING: multiple messages have this Message-ID (diff)
From: Johannes Thumshirn <jth@kernel.org>
To: axboe@kernel.dk
Cc: shaggy@kernel.org, jfs-discussion@lists.sourceforge.net,
	linux-mm@kvack.org, dm-devel@redhat.com, hch@lst.de,
	agruenba@redhat.com,
	Damien Le Moal <damien.lemoal@opensource.wdc.com>,
	willy@infradead.org, cluster-devel@redhat.com, kch@nvidia.com,
	snitzer@kernel.org, ming.lei@redhat.com,
	linux-block@vger.kernel.org, rpeterso@redhat.com,
	dsterba@suse.com, linux-raid@vger.kernel.org,
	damien.lemoal@wdc.com, song@kernel.org,
	johannes.thumshirn@wdc.com, linux-fsdevel@vger.kernel.org,
	linux-btrfs@vger.kernel.org
Subject: [dm-devel] [PATCH v3 18/19] dm-crypt: check if adding pages to clone bio fails
Date: Wed, 19 Apr 2023 16:09:28 +0200	[thread overview]
Message-ID: <20230419140929.5924-19-jth@kernel.org> (raw)
In-Reply-To: <20230419140929.5924-1-jth@kernel.org>

From: Johannes Thumshirn <johannes.thumshirn@wdc.com>

Check if adding pages to clone bio fails and if it does retry with
reclaim. This mirrors the behaviour of page allocation in
crypt_alloc_buffer().

This way we can mark bio_add_pages as __must_check.

Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
---
 drivers/md/dm-crypt.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 3ba53dc3cc3f..19f7e087c6df 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -1693,7 +1693,14 @@ static struct bio *crypt_alloc_buffer(struct dm_crypt_io *io, unsigned int size)
 
 		len = (remaining_size > PAGE_SIZE) ? PAGE_SIZE : remaining_size;
 
-		bio_add_page(clone, page, len, 0);
+		if (!bio_add_page(clone, page, len, 0)) {
+			mempool_free(page, &cc->page_pool);
+			crypt_free_buffer_pages(cc, clone);
+			bio_put(clone);
+			gfp_mask |= __GFP_DIRECT_RECLAIM;
+			goto retry;
+
+		}
 
 		remaining_size -= len;
 	}
-- 
2.39.2

--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel


WARNING: multiple messages have this Message-ID (diff)
From: Johannes Thumshirn <jth@kernel.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCH v3 18/19] dm-crypt: check if adding pages to clone bio fails
Date: Wed, 19 Apr 2023 16:09:28 +0200	[thread overview]
Message-ID: <20230419140929.5924-19-jth@kernel.org> (raw)
In-Reply-To: <20230419140929.5924-1-jth@kernel.org>

From: Johannes Thumshirn <johannes.thumshirn@wdc.com>

Check if adding pages to clone bio fails and if it does retry with
reclaim. This mirrors the behaviour of page allocation in
crypt_alloc_buffer().

This way we can mark bio_add_pages as __must_check.

Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
---
 drivers/md/dm-crypt.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 3ba53dc3cc3f..19f7e087c6df 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -1693,7 +1693,14 @@ static struct bio *crypt_alloc_buffer(struct dm_crypt_io *io, unsigned int size)
 
 		len = (remaining_size > PAGE_SIZE) ? PAGE_SIZE : remaining_size;
 
-		bio_add_page(clone, page, len, 0);
+		if (!bio_add_page(clone, page, len, 0)) {
+			mempool_free(page, &cc->page_pool);
+			crypt_free_buffer_pages(cc, clone);
+			bio_put(clone);
+			gfp_mask |= __GFP_DIRECT_RECLAIM;
+			goto retry;
+
+		}
 
 		remaining_size -= len;
 	}
-- 
2.39.2


  parent reply	other threads:[~2023-04-19 14:11 UTC|newest]

Thread overview: 75+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-19 14:09 [PATCH v3 00/19] bio: check return values of bio_add_page Johannes Thumshirn
2023-04-19 14:09 ` [Cluster-devel] " Johannes Thumshirn
2023-04-19 14:09 ` [dm-devel] " Johannes Thumshirn
2023-04-19 14:09 ` [PATCH v3 01/19] swap: use __bio_add_page to add page to bio Johannes Thumshirn
2023-04-19 14:09   ` [Cluster-devel] " Johannes Thumshirn
2023-04-19 14:09   ` [dm-devel] " Johannes Thumshirn
2023-04-19 14:09 ` [PATCH v3 02/19] drbd: " Johannes Thumshirn
2023-04-19 14:09   ` [Cluster-devel] " Johannes Thumshirn
2023-04-19 14:09   ` [dm-devel] " Johannes Thumshirn
2023-04-19 14:09 ` [PATCH v3 03/19] dm: dm-zoned: use __bio_add_page for adding single metadata page Johannes Thumshirn
2023-04-19 14:09   ` [Cluster-devel] " Johannes Thumshirn
2023-04-19 14:09   ` [dm-devel] " Johannes Thumshirn
2023-04-19 14:09 ` [PATCH v3 04/19] fs: buffer: use __bio_add_page to add single page to bio Johannes Thumshirn
2023-04-19 14:09   ` [Cluster-devel] " Johannes Thumshirn
2023-04-19 14:09   ` [dm-devel] " Johannes Thumshirn
2023-04-19 14:09 ` [PATCH v3 05/19] md: use __bio_add_page to add single page Johannes Thumshirn
2023-04-19 14:09   ` [Cluster-devel] " Johannes Thumshirn
2023-04-19 14:09   ` [dm-devel] " Johannes Thumshirn
2023-04-19 14:09 ` [PATCH v3 06/19] md: raid5-log: " Johannes Thumshirn
2023-04-19 14:09   ` [Cluster-devel] " Johannes Thumshirn
2023-04-19 14:09   ` [dm-devel] " Johannes Thumshirn
2023-04-19 14:09 ` [PATCH v3 07/19] md: raid5: use __bio_add_page to add single page to new bio Johannes Thumshirn
2023-04-19 14:09   ` [Cluster-devel] " Johannes Thumshirn
2023-04-19 14:09   ` [dm-devel] " Johannes Thumshirn
2023-04-19 14:09 ` [PATCH v3 08/19] btrfs: repair: use __bio_add_page for adding single page Johannes Thumshirn
2023-04-19 14:09   ` [Cluster-devel] " Johannes Thumshirn
2023-04-19 14:09   ` [dm-devel] " Johannes Thumshirn
2023-04-19 14:09 ` [PATCH v3 09/19] btrfs: raid56: use __bio_add_page to add " Johannes Thumshirn
2023-04-19 14:09   ` [Cluster-devel] " Johannes Thumshirn
2023-04-19 14:09   ` [dm-devel] " Johannes Thumshirn
2023-04-19 14:09 ` [PATCH v3 10/19] jfs: logmgr: use __bio_add_page to add single page to bio Johannes Thumshirn
2023-04-19 14:09   ` [Cluster-devel] " Johannes Thumshirn
2023-04-19 14:09   ` [dm-devel] " Johannes Thumshirn
2023-04-19 14:09 ` [PATCH v3 11/19] gfs: use __bio_add_page for adding " Johannes Thumshirn
2023-04-19 14:09   ` [Cluster-devel] " Johannes Thumshirn
2023-04-19 14:09   ` [dm-devel] " Johannes Thumshirn
2023-04-19 15:19   ` Andreas Gruenbacher
2023-04-19 15:19     ` [Cluster-devel] " Andreas Gruenbacher
2023-04-19 15:19     ` [dm-devel] " Andreas Gruenbacher
2023-04-20  8:55     ` Johannes Thumshirn
2023-04-20  8:55       ` [Cluster-devel] " Johannes Thumshirn
2023-04-20  8:55       ` [dm-devel] " Johannes Thumshirn
2023-04-19 14:09 ` [PATCH v3 12/19] zonefs: " Johannes Thumshirn
2023-04-19 14:09   ` [Cluster-devel] " Johannes Thumshirn
2023-04-19 14:09   ` [dm-devel] " Johannes Thumshirn
2023-04-19 14:09 ` [PATCH v3 13/19] zram: " Johannes Thumshirn
2023-04-19 14:09   ` [Cluster-devel] " Johannes Thumshirn
2023-04-19 14:09   ` [dm-devel] " Johannes Thumshirn
2023-04-19 14:09 ` [PATCH v3 14/19] floppy: " Johannes Thumshirn
2023-04-19 14:09   ` [Cluster-devel] " Johannes Thumshirn
2023-04-19 14:09   ` [dm-devel] " Johannes Thumshirn
2023-04-19 14:09 ` [PATCH v3 15/19] md: check for failure when adding pages in alloc_behind_master_bio Johannes Thumshirn
2023-04-19 14:09   ` [Cluster-devel] " Johannes Thumshirn
2023-04-19 14:09   ` [dm-devel] " Johannes Thumshirn
2023-04-19 14:09 ` [PATCH v3 16/19] md: raid1: use __bio_add_page for adding single page to bio Johannes Thumshirn
2023-04-19 14:09   ` [Cluster-devel] " Johannes Thumshirn
2023-04-19 14:09   ` [dm-devel] " Johannes Thumshirn
2023-04-19 14:09 ` [PATCH v3 17/19] md: raid1: check if adding pages to resync bio fails Johannes Thumshirn
2023-04-19 14:09   ` [Cluster-devel] " Johannes Thumshirn
2023-04-19 14:09   ` [dm-devel] " Johannes Thumshirn
2023-04-20  4:39   ` Song Liu
2023-04-20  4:39     ` [Cluster-devel] " Song Liu
2023-04-20  4:39     ` [dm-devel] " Song Liu
2023-04-19 14:09 ` Johannes Thumshirn [this message]
2023-04-19 14:09   ` [Cluster-devel] [PATCH v3 18/19] dm-crypt: check if adding pages to clone " Johannes Thumshirn
2023-04-19 14:09   ` [dm-devel] " Johannes Thumshirn
2023-04-19 14:09 ` [PATCH v3 19/19] block: mark bio_add_page as __must_check Johannes Thumshirn
2023-04-19 14:09   ` [Cluster-devel] " Johannes Thumshirn
2023-04-19 14:09   ` [dm-devel] " Johannes Thumshirn
2023-04-19 14:19   ` Matthew Wilcox
2023-04-19 14:19     ` [Cluster-devel] " Matthew Wilcox
2023-04-19 14:19     ` [dm-devel] " Matthew Wilcox
2023-04-19 15:49     ` Johannes Thumshirn
2023-04-19 15:49       ` [Cluster-devel] " Johannes Thumshirn
2023-04-19 15:49       ` [dm-devel] " Johannes Thumshirn

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=20230419140929.5924-19-jth@kernel.org \
    --to=jth@kernel.org \
    --cc=agruenba@redhat.com \
    --cc=axboe@kernel.dk \
    --cc=cluster-devel@redhat.com \
    --cc=damien.lemoal@opensource.wdc.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=johannes.thumshirn@wdc.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.