* [f2fs-dev] [PATCH] f2fs: fix deadlock allocating bio_post_read_ctx from mempool
@ 2019-12-31 18:14 Eric Biggers
2020-01-02 8:13 ` Chao Yu
0 siblings, 1 reply; 2+ messages in thread
From: Eric Biggers @ 2019-12-31 18:14 UTC (permalink / raw)
To: linux-f2fs-devel; +Cc: linux-fscrypt
From: Eric Biggers <ebiggers@google.com>
Without any form of coordination, any case where multiple allocations
from the same mempool are needed at a time to make forward progress can
deadlock under memory pressure.
This is the case for struct bio_post_read_ctx, as one can be allocated
to decrypt a Merkle tree page during fsverity_verify_bio(), which itself
is running from a post-read callback for a data bio which has its own
struct bio_post_read_ctx.
Fix this by freeing first bio_post_read_ctx before calling
fsverity_verify_bio(). This works because verity (if enabled) is always
the last post-read step.
This deadlock can be reproduced by trying to read from an encrypted
verity file after reducing NUM_PREALLOC_POST_READ_CTXS to 1 and patching
mempool_alloc() to pretend that pool->alloc() always fails.
Note that since NUM_PREALLOC_POST_READ_CTXS is actually 128, to actually
hit this bug in practice would require reading from lots of encrypted
verity files at the same time. But it's theoretically possible, as N
available objects doesn't guarantee forward progress when > N/2 threads
each need 2 objects at a time.
Fixes: 95ae251fe828 ("f2fs: add fs-verity support")
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
fs/f2fs/data.c | 25 +++++++++++++++++++------
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 19cd03450066..618a05bf356e 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -199,19 +199,32 @@ static void f2fs_verity_work(struct work_struct *work)
{
struct bio_post_read_ctx *ctx =
container_of(work, struct bio_post_read_ctx, work);
+ struct bio *bio = ctx->bio;
+#ifdef CONFIG_F2FS_FS_COMPRESSION
+ unsigned int enabled_steps = ctx->enabled_steps;
+#endif
+
+ /*
+ * fsverity_verify_bio() may call readpages() again, and while verity
+ * will be disabled for this, decryption may still be needed, resulting
+ * in another bio_post_read_ctx being allocated. So to prevent
+ * deadlocks we need to release the current ctx to the mempool first.
+ * This assumes that verity is the last post-read step.
+ */
+ mempool_free(ctx, bio_post_read_ctx_pool);
+ bio->bi_private = NULL;
#ifdef CONFIG_F2FS_FS_COMPRESSION
/* previous step is decompression */
- if (ctx->enabled_steps & (1 << STEP_DECOMPRESS)) {
-
- f2fs_verify_bio(ctx->bio);
- f2fs_release_read_bio(ctx->bio);
+ if (enabled_steps & (1 << STEP_DECOMPRESS)) {
+ f2fs_verify_bio(bio);
+ f2fs_release_read_bio(bio);
return;
}
#endif
- fsverity_verify_bio(ctx->bio);
- __f2fs_read_end_io(ctx->bio, false, false);
+ fsverity_verify_bio(bio);
+ __f2fs_read_end_io(bio, false, false);
}
static void f2fs_post_read_work(struct work_struct *work)
--
2.24.1
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [f2fs-dev] [PATCH] f2fs: fix deadlock allocating bio_post_read_ctx from mempool
2019-12-31 18:14 [f2fs-dev] [PATCH] f2fs: fix deadlock allocating bio_post_read_ctx from mempool Eric Biggers
@ 2020-01-02 8:13 ` Chao Yu
0 siblings, 0 replies; 2+ messages in thread
From: Chao Yu @ 2020-01-02 8:13 UTC (permalink / raw)
To: Eric Biggers, linux-f2fs-devel; +Cc: linux-fscrypt
On 2020/1/1 2:14, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
>
> Without any form of coordination, any case where multiple allocations
> from the same mempool are needed at a time to make forward progress can
> deadlock under memory pressure.
>
> This is the case for struct bio_post_read_ctx, as one can be allocated
> to decrypt a Merkle tree page during fsverity_verify_bio(), which itself
> is running from a post-read callback for a data bio which has its own
> struct bio_post_read_ctx.
>
> Fix this by freeing first bio_post_read_ctx before calling
> fsverity_verify_bio(). This works because verity (if enabled) is always
> the last post-read step.
>
> This deadlock can be reproduced by trying to read from an encrypted
> verity file after reducing NUM_PREALLOC_POST_READ_CTXS to 1 and patching
> mempool_alloc() to pretend that pool->alloc() always fails.
>
> Note that since NUM_PREALLOC_POST_READ_CTXS is actually 128, to actually
> hit this bug in practice would require reading from lots of encrypted
> verity files at the same time. But it's theoretically possible, as N
> available objects doesn't guarantee forward progress when > N/2 threads
> each need 2 objects at a time.
>
> Fixes: 95ae251fe828 ("f2fs: add fs-verity support")
> Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Thanks,
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-01-02 8:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-31 18:14 [f2fs-dev] [PATCH] f2fs: fix deadlock allocating bio_post_read_ctx from mempool Eric Biggers
2020-01-02 8:13 ` Chao Yu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).