From: Johannes Thumshirn <johannes.thumsh...@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.thumsh...@wdc.com>
Reviewed-by: Damien Le Moal <damien.lem...@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

Reply via email to