Skip to content

Commit 81378da

Browse files
Michal Hockotorvalds
authored andcommitted
jbd2: mark the transaction context with the scope GFP_NOFS context
now that we have memalloc_nofs_{save,restore} api we can mark the whole transaction context as implicitly GFP_NOFS. All allocations will automatically inherit GFP_NOFS this way. This means that we do not have to mark any of those requests with GFP_NOFS and moreover all the ext4_kv[mz]alloc(GFP_NOFS) are also safe now because even the hardcoded GFP_KERNEL allocations deep inside the vmalloc will be NOFS now. [[email protected]: tweak comments] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Michal Hocko <[email protected]> Reviewed-by: Jan Kara <[email protected]> Cc: Dave Chinner <[email protected]> Cc: Theodore Ts'o <[email protected]> Cc: Chris Mason <[email protected]> Cc: David Sterba <[email protected]> Cc: Brian Foster <[email protected]> Cc: Darrick J. Wong <[email protected]> Cc: Nikolay Borisov <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Vlastimil Babka <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 9ba1fb2 commit 81378da

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

fs/jbd2/transaction.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include <linux/backing-dev.h>
3030
#include <linux/bug.h>
3131
#include <linux/module.h>
32+
#include <linux/sched/mm.h>
3233

3334
#include <trace/events/jbd2.h>
3435

@@ -388,6 +389,11 @@ static int start_this_handle(journal_t *journal, handle_t *handle,
388389

389390
rwsem_acquire_read(&journal->j_trans_commit_map, 0, 0, _THIS_IP_);
390391
jbd2_journal_free_transaction(new_transaction);
392+
/*
393+
* Ensure that no allocations done while the transaction is open are
394+
* going to recurse back to the fs layer.
395+
*/
396+
handle->saved_alloc_context = memalloc_nofs_save();
391397
return 0;
392398
}
393399

@@ -466,6 +472,7 @@ handle_t *jbd2__journal_start(journal_t *journal, int nblocks, int rsv_blocks,
466472
trace_jbd2_handle_start(journal->j_fs_dev->bd_dev,
467473
handle->h_transaction->t_tid, type,
468474
line_no, nblocks);
475+
469476
return handle;
470477
}
471478
EXPORT_SYMBOL(jbd2__journal_start);
@@ -1760,6 +1767,11 @@ int jbd2_journal_stop(handle_t *handle)
17601767
if (handle->h_rsv_handle)
17611768
jbd2_journal_free_reserved(handle->h_rsv_handle);
17621769
free_and_exit:
1770+
/*
1771+
* Scope of the GFP_NOFS context is over here and so we can restore the
1772+
* original alloc context.
1773+
*/
1774+
memalloc_nofs_restore(handle->saved_alloc_context);
17631775
jbd2_free_handle(handle);
17641776
return err;
17651777
}

include/linux/jbd2.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,8 @@ struct jbd2_journal_handle
491491

492492
unsigned long h_start_jiffies;
493493
unsigned int h_requested_credits;
494+
495+
unsigned int saved_alloc_context;
494496
};
495497

496498

0 commit comments

Comments
 (0)