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 v4 18/22] dm-crypt: check if adding pages to clone bio fails
Date: Thu, 20 Apr 2023 12:04:57 +0200 [thread overview]
Message-ID: <20230420100501.32981-19-jth@kernel.org> (raw)
In-Reply-To: <20230420100501.32981-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
next prev parent reply other threads:[~2023-04-20 10:06 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-20 10:04 [PATCH v4 00/22] bio: check return values of bio_add_page Johannes Thumshirn
2023-04-20 10:04 ` [PATCH v4 01/22] swap: use __bio_add_page to add page to bio Johannes Thumshirn
2023-04-20 10:04 ` [PATCH v4 03/22] dm: dm-zoned: use __bio_add_page for adding single metadata page Johannes Thumshirn
2023-04-20 10:04 ` [PATCH v4 05/22] md: use __bio_add_page to add single page Johannes Thumshirn
2023-04-20 10:04 ` [PATCH v4 11/22] gfs2: use __bio_add_page for adding single page to bio Johannes Thumshirn
2023-04-20 10:04 ` [PATCH v4 15/22] md: check for failure when adding pages in alloc_behind_master_bio Johannes Thumshirn
2023-04-20 10:04 ` [PATCH v4 17/22] md: raid1: check if adding pages to resync bio fails Johannes Thumshirn
2023-04-20 10:04 ` Johannes Thumshirn [this message]
2023-04-20 10:04 ` [PATCH v4 19/22] block: mark bio_add_page as __must_check Johannes Thumshirn
2023-04-20 10:04 ` [PATCH v4 20/22] block: add __bio_add_folio Johannes Thumshirn
2023-04-20 10:05 ` [PATCH v4 21/22] fs: iomap: use __bio_add_folio where possible Johannes Thumshirn
2023-04-20 10:05 ` [PATCH v4 22/22] block: mark bio_add_folio as __must_check Johannes Thumshirn
[not found] ` <20230420100501.32981-14-jth@kernel.org>
2023-04-21 6:57 ` [PATCH v4 13/22] zram: use __bio_add_page for adding single page to bio Sergey Senozhatsky
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=20230420100501.32981-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox