Skip to content

Commit e0f95d8

Browse files
ebiggersgregkh
authored andcommitted
ext4: fix deadlock allocating crypto bounce page from mempool
[ Upstream commit 547c556 ] ext4_writepages() on an encrypted file has to encrypt the data, but it can't modify the pagecache pages in-place, so it encrypts the data into bounce pages and writes those instead. All bounce pages are allocated from a mempool using GFP_NOFS. This is not correct use of a mempool, and it can deadlock. This is because GFP_NOFS includes __GFP_DIRECT_RECLAIM, which enables the "never fail" mode for mempool_alloc() where a failed allocation will fall back to waiting for one of the preallocated elements in the pool. But since this mode is used for all a bio's pages and not just the first, it can deadlock waiting for pages already in the bio to be freed. This deadlock can be reproduced by patching mempool_alloc() to pretend that pool->alloc() always fails (so that it always falls back to the preallocations), and then creating an encrypted file of size > 128 KiB. Fix it by only using GFP_NOFS for the first page in the bio. For subsequent pages just use GFP_NOWAIT, and if any of those fail, just submit the bio and start a new one. This will need to be fixed in f2fs too, but that's less straightforward. Fixes: c9af28f ("ext4 crypto: don't let data integrity writebacks fail with ENOMEM") Cc: [email protected] Signed-off-by: Eric Biggers <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Theodore Ts'o <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 5c8f577 commit e0f95d8

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

fs/ext4/page-io.c

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -469,16 +469,25 @@ int ext4_bio_write_page(struct ext4_io_submit *io,
469469
nr_to_submit) {
470470
gfp_t gfp_flags = GFP_NOFS;
471471

472+
/*
473+
* Since bounce page allocation uses a mempool, we can only use
474+
* a waiting mask (i.e. request guaranteed allocation) on the
475+
* first page of the bio. Otherwise it can deadlock.
476+
*/
477+
if (io->io_bio)
478+
gfp_flags = GFP_NOWAIT | __GFP_NOWARN;
472479
retry_encrypt:
473480
data_page = fscrypt_encrypt_page(inode, page, gfp_flags);
474481
if (IS_ERR(data_page)) {
475482
ret = PTR_ERR(data_page);
476-
if (ret == -ENOMEM && wbc->sync_mode == WB_SYNC_ALL) {
477-
if (io->io_bio) {
483+
if (ret == -ENOMEM &&
484+
(io->io_bio || wbc->sync_mode == WB_SYNC_ALL)) {
485+
gfp_flags = GFP_NOFS;
486+
if (io->io_bio)
478487
ext4_io_submit(io);
479-
congestion_wait(BLK_RW_ASYNC, HZ/50);
480-
}
481-
gfp_flags |= __GFP_NOFAIL;
488+
else
489+
gfp_flags |= __GFP_NOFAIL;
490+
congestion_wait(BLK_RW_ASYNC, HZ/50);
482491
goto retry_encrypt;
483492
}
484493
data_page = NULL;

0 commit comments

Comments
 (0)