From: Filipe Manana <fdman...@suse.com>
When a transaction commit starts, it attempts to pause scrub and it blocks
until the scrub is paused. So while the transaction is blocked waiting for
scrub to pause, we can not do memory allocation with GFP_KERNEL while scrub
is running, we must use GFP_NOS to avoid deadlock with reclaim. Checking
for pause requests is done early in the while loop of scrub_stripe(), and
later in the loop, scrub_extent() is called, which in turns calls
scrub_pages(), which does memory allocations using GFP_KERNEL. So use
GFP_NOFS for the memory allocations if there are any scrub pause requests.
Fixes: 58c4e173847a ("btrfs: scrub: use GFP_KERNEL on the submission path")
Signed-off-by: Filipe Manana <fdman...@suse.com>
---
fs/btrfs/scrub.c | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index 3be1456b5116..5fcb9d1eb983 100644
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -2204,13 +2204,26 @@ static int scrub_pages(struct scrub_ctx *sctx, u64
logical, u64 len,
{
struct scrub_block *sblock;
int index;
+ bool pause_req = (atomic_read(&sctx->fs_info->scrub_pause_req) != 0);
+ unsigned int nofs_flag;
+ int ret = 0;
+
+ /*
+ * In order to avoid deadlock with reclaim when there is a transaction
+ * trying to pause scrub, use GFP_NOFS. The pausing request is done when
+ * the transaction commit starts, and it blocks the transaction until
+ * scrub is paused (done at specific points at scrub_stripe()).
+ */
+ if (pause_req)
+ nofs_flag = memalloc_nofs_save();
sblock = kzalloc(sizeof(*sblock), GFP_KERNEL);
if (!sblock) {
spin_lock(&sctx->stat_lock);
sctx->stat.malloc_errors++;
spin_unlock(&sctx->stat_lock);
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto out;
}
/* one ref inside this function, plus one for each page added to
@@ -2230,7 +2243,8 @@ static int scrub_pages(struct scrub_ctx *sctx, u64
logical, u64 len,
sctx->stat.malloc_errors++;
spin_unlock(&sctx->stat_lock);
scrub_block_put(sblock);
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto out;
}
BUG_ON(index >= SCRUB_MAX_PAGES_PER_BLOCK);
scrub_page_get(spage);
@@ -2269,12 +2283,11 @@ static int scrub_pages(struct scrub_ctx *sctx, u64
logical, u64 len,
} else {
for (index = 0; index < sblock->page_count; index++) {
struct scrub_page *spage = sblock->pagev[index];
- int ret;
ret = scrub_add_page_to_rd_bio(sctx, spage);
if (ret) {
scrub_block_put(sblock);
- return ret;
+ goto out;
}
}
@@ -2284,7 +2297,10 @@ static int scrub_pages(struct scrub_ctx *sctx, u64
logical, u64 len,
/* last one frees, either here or in bio completion for last page */
scrub_block_put(sblock);
- return 0;
+ out:
+ if (pause_req)
+ memalloc_nofs_restore(nofs_flag);
+ return ret;
}
static void scrub_bio_end_io(struct bio *bio)
--
2.11.0
