fs/buffer: split pagecache lookups into atomic or blocking
Subsystems (6)
cover fs/buffer: split pagecache lookups into atomic or blocking
Latest version.
Davidlohr Bueso (6):
fs/buffer: try to use folio lock for pagecache lookups fs/buffer: introduce __find_get_block_nonatomic() fs/ocfs2: use sleeping version of __find_get_block() fs/jbd2: use sleeping version of __find_get_block() fs/ext4: use sleeping version of __find_get_block() mm/migrate: fix sleep in atomic for large folios and bh
fs/buffer.c | 76 +++++++++++++++++++++++++++---------- fs/ext4/ialloc.c | 3 +- fs/ext4/inode.c | 2 + fs/ext4/mballoc.c | 3 +- fs/jbd2/revoke.c | 15 +++++--- fs/ocfs2/journal.c | 2 +- include/linux/buffer_head.h | 9 +++++ mm/migrate.c | 6 ++- 8 files changed, 86 insertions(+), 30 deletions(-)
Signature · 1 line
2.39.5
PATCH 1/6 fs/buffer: try to use folio lock for pagecache lookups
Callers of __find_get_block() may or may not allow for blocking semantics, and is currently assumed that it will not. Layout two paths based on this. Ultimately the i_private_lock scheme will be used as a fallback in non-blocking contexts. Otherwise always take the folio lock instead. The suggested trylock idea is implemented, thereby potentially reducing i_private_lock contention in addition to later addressing issues around large folios and noref migration.
No change in semantics. All lookup users are non-blocking.
--- fs/buffer.c | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-)
fs/buffer.c +29 -16
@@ -176,18 +176,8 @@ void end_buffer_write_sync(struct buffer_head *bh, int uptodate) }EXPORT_SYMBOL (end_buffer_write_sync); -/* -* Various filesystems appear to want __find_get_block to be non-blocking. -* But it's the page lock which protects the buffers. To get around this, -* we get exclusion from try_to_free_buffers with the blockdev mapping's -* i_private_lock. -* -* Hack idea: for the blockdev mapping, i_private_lock contention -* may be quite high. This code could TryLock the page, and if that -* succeeds, there is no need to take i_private_lock. -*/ static struct buffer_head * -__find_get_block_slow (struct block_device *bdev,sector_t block) +__find_get_block_slow (struct block_device *bdev,sector_t block,bool atomic) {struct address_space *bd_mapping = bdev->bd_mapping;const int blkbits = bd_mapping->host->i_blkbits;
@@ -197,6 +187,7 @@ __find_get_block_slow(struct block_device *bdev, sector_t block)struct buffer_head *head;struct folio *folio;int all_mapped =1 ; +bool folio_locked = true; static DEFINE_RATELIMIT_STATE(last_warned, HZ, 1); index = ((loff_t )block << blkbits) /PAGE_SIZE ;
@@ -204,7 +195,19 @@ __find_get_block_slow(struct block_device *bdev, sector_t block)if (IS_ERR (folio)) goto out; -spin_lock (&bd_mapping->i_private_lock); +/* +* Folio lock protects the buffers. Callers that cannot block +* will fallback to serializing vs try_to_free_buffers() via +* the i_private_lock. +*/ +if (!folio_trylock (folio)) { +if (atomic) { +spin_lock (&bd_mapping->i_private_lock); + folio_locked = false; + }else +folio_lock (folio); + } + head =folio_buffers (folio);if (!head) goto out_unlock;
@@ -236,7 +239,10 @@ __find_get_block_slow(struct block_device *bdev, sector_t block) 1 << blkbits); } out_unlock: -spin_unlock (&bd_mapping->i_private_lock); +if (folio_locked) +folio_unlock (folio); +else +spin_unlock (&bd_mapping->i_private_lock);folio_put (folio); out:return ret;
@@ -1388,14 +1394,15 @@ lookup_bh_lru(struct block_device *bdev, sector_t block, unsigned size)* it in the LRU and mark it as accessed. If it is not present then return * NULL */ -struct buffer_head * -__find_get_block (struct block_device *bdev,sector_t block,unsigned size) +static struct buffer_head * +find_get_block_common (struct block_device *bdev,sector_t block, +unsigned size,bool atomic) {struct buffer_head *bh =lookup_bh_lru (bdev, block, size);if (bh ==NULL ) {/* __find_get_block_slow will mark the page accessed */ - bh =__find_get_block_slow (bdev, block); + bh =__find_get_block_slow (bdev, block, atomic);if (bh)bh_lru_install (bh); }else
@@ -1403,6 +1410,12 @@ __find_get_block(struct block_device *bdev, sector_t block, unsigned size)return bh; } + +struct buffer_head * +__find_get_block (struct block_device *bdev,sector_t block,unsigned size) +{ +return find_get_block_common (bdev, block, size, true); +}EXPORT_SYMBOL (__find_get_block);/**
Signature · 1 line
2.39.5
PATCH 2/6 fs/buffer: introduce __find_get_block_nonatomic()
In reply to Davidlohr BuesoCallers that do not require atomic context for pagecache lookups can use this flavor to avoid the unnencesary contention on the blockdev mapping i_private_lock as well as waiting on noref migration.
Convert local caller write_boundary_block() which already takes the buffer lock as well as bdev_getblk() depending on the respective gpf flags. Either way there are no currently changes in semantics.
--- fs/buffer.c | 19 +++++++++++++++++-- include/linux/buffer_head.h | 2 ++ 2 files changed, 19 insertions(+), 2 deletions(-)
fs/buffer.c +17 -2
@@ -662,7 +662,8 @@ EXPORT_SYMBOL(generic_buffers_fsync);void write_boundary_block (struct block_device *bdev,sector_t bblock,unsigned blocksize) { -struct buffer_head *bh =__find_get_block (bdev, bblock +1 , blocksize); +struct buffer_head *bh =__find_get_block_nonatomic (bdev, bblock +1 , + blocksize);if (bh) {if (buffer_dirty (bh))write_dirty_buffer (bh,0 );
@@ -1418,6 +1419,15 @@ __find_get_block(struct block_device *bdev, sector_t block, unsigned size) }EXPORT_SYMBOL (__find_get_block); +/* same as __find_get_block() but allows sleeping contexts */ +struct buffer_head * +__find_get_block_nonatomic (struct block_device *bdev,sector_t block, +unsigned size) +{ +return find_get_block_common (bdev, block, size, false); +} +EXPORT_SYMBOL (__find_get_block_nonatomic); +/** * bdev_getblk - Get a buffer_head in a block device's buffer cache. * @bdev: The block device.
@@ -1435,7 +1445,12 @@ EXPORT_SYMBOL(__find_get_block);struct buffer_head *bdev_getblk (struct block_device *bdev,sector_t block,unsigned size,gfp_t gfp) { -struct buffer_head *bh =__find_get_block (bdev, block, size); +struct buffer_head *bh; + +if (gfpflags_allow_blocking (gfp)) + bh =__find_get_block_nonatomic (bdev, block, size); +else + bh =__find_get_block (bdev, block, size);might_alloc (gfp);if (bh)
include/linux/buffer_head.h +2 -0
@@ -222,6 +222,8 @@ void __wait_on_buffer(struct buffer_head *);wait_queue_head_t *bh_waitq_head (struct buffer_head *bh);struct buffer_head *__find_get_block (struct block_device *bdev,sector_t block,unsigned size); +struct buffer_head *__find_get_block_nonatomic (struct block_device *bdev, +sector_t block,unsigned size);struct buffer_head *bdev_getblk (struct block_device *bdev,sector_t block,unsigned size,gfp_t gfp);void __brelse (struct buffer_head *);
Signature · 1 line
2.39.5
PATCH 3/6 fs/ocfs2: use sleeping version of __find_get_block()
In reply to Davidlohr BuesoThis is a path that allows for blocking as it does IO. Convert to the new nonatomic flavor to benefit from potential performance benefits and adapt in the future vs migration such that semantics are kept.
--- fs/ocfs2/journal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ocfs2/journal.c +1 -1
@@ -1249,7 +1249,7 @@ static int ocfs2_force_read_journal(struct inode *inode) }for (i =0 ; i < p_blocks; i++, p_blkno++) { - bh =__find_get_block (osb->sb->s_bdev, p_blkno, + bh =__find_get_block_nonatomic (osb->sb->s_bdev, p_blkno, osb->sb->s_blocksize);/* block not cached. */ if (!bh)
Signature · 1 line
2.39.5
PATCH 4/6 fs/jbd2: use sleeping version of __find_get_block()
In reply to Davidlohr BuesoConvert to the new nonatomic flavor to benefit from potential performance benefits and adapt in the future vs migration such that semantics are kept.
- jbd2_journal_revoke(): can sleep (has might_sleep() in the beginning)
- jbd2_journal_cancel_revoke(): only used from do_get_write_access() and do_get_create_access() which do sleep. So can sleep.
- jbd2_clear_buffer_revoked_flags() - only called from journal commit code which sleeps. So can sleep.
--- fs/jbd2/revoke.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
fs/jbd2/revoke.c +9 -6
@@ -345,7 +345,8 @@ int jbd2_journal_revoke(handle_t *handle, unsigned long long blocknr, bh = bh_in;if (!bh) { - bh =__find_get_block (bdev, blocknr, journal->j_blocksize); + bh =__find_get_block_nonatomic (bdev, blocknr, + journal->j_blocksize);if (bh)BUFFER_TRACE (bh,"found on hash" ); }
@@ -355,7 +356,8 @@ int jbd2_journal_revoke(handle_t *handle, unsigned long long blocknr,/* If there is a different buffer_head lying around in * memory anywhere... */ - bh2 =__find_get_block (bdev, blocknr, journal->j_blocksize); + bh2 =__find_get_block_nonatomic (bdev, blocknr, + journal->j_blocksize);if (bh2) {/* ... and it has RevokeValid status... */ if (bh2 != bh &&buffer_revokevalid (bh2))
@@ -464,7 +466,8 @@ void jbd2_journal_cancel_revoke(handle_t *handle, struct journal_head *jh)* state machine will get very upset later on. */ if (need_cancel) {struct buffer_head *bh2; - bh2 =__find_get_block (bh->b_bdev, bh->b_blocknr, bh->b_size); + bh2 =__find_get_block_nonatomic (bh->b_bdev, bh->b_blocknr, + bh->b_size);if (bh2) {if (bh2 != bh)clear_buffer_revoked (bh2);
@@ -492,9 +495,9 @@ void jbd2_clear_buffer_revoked_flags(journal_t *journal)struct jbd2_revoke_record_s *record;struct buffer_head *bh; record = (struct jbd2_revoke_record_s *)list_entry; - bh =__find_get_block (journal->j_fs_dev, - record->blocknr, - journal->j_blocksize); + bh =__find_get_block_nonatomic (journal->j_fs_dev, + record->blocknr, + journal->j_blocksize);if (bh) {clear_buffer_revoked (bh);__brelse (bh);
Signature · 1 line
2.39.5
PATCH 5/6 fs/ext4: use sleeping version of __find_get_block()
In reply to Davidlohr BuesoTrivially introduce the wrapper and enable ext4_free_blocks() to use it, which has a cond_resched to begin with. Convert to the new nonatomic flavor to benefit from potential performance benefits and adapt in the future vs migration such that semantics are kept.
--- fs/ext4/inode.c | 2 ++ fs/ext4/mballoc.c | 3 ++- include/linux/buffer_head.h | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletion(-)
fs/ext4/inode.c +2 -0
@@ -860,6 +860,8 @@ struct buffer_head *ext4_getblk(handle_t *handle, struct inode *inode,return sb_find_get_block (inode->i_sb, map.m_pblk);/* +* Potential TODO: use sb_find_get_block_nonatomic() instead. +* * Since bh could introduce extra ref count such as referred by * journal_head etc. Try to avoid using __GFP_MOVABLE here * as it may fail the migration when journal_head remains.
fs/ext4/mballoc.c +2 -1
@@ -6644,7 +6644,8 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode,for (i =0 ; i < count; i++) {cond_resched ();if (is_metadata) - bh =sb_find_get_block (inode->i_sb, block + i); + bh =sb_find_get_block_nonatomic (inode->i_sb, + block + i);ext4_forget (handle, is_metadata, inode, bh, block + i); } }
include/linux/buffer_head.h +6 -0
@@ -399,6 +399,12 @@ sb_find_get_block(struct super_block *sb, sector_t block)return __find_get_block (sb->s_bdev, block, sb->s_blocksize); } +static inline struct buffer_head * +sb_find_get_block_nonatomic (struct super_block *sb,sector_t block) +{ +return __find_get_block_nonatomic (sb->s_bdev, block, sb->s_blocksize); +} +static inline void map_bh (struct buffer_head *bh,struct super_block *sb,sector_t block) {
Signature · 1 line
2.39.5
PATCH 6/6 mm/migrate: fix sleep in atomic for large folios and bh
In reply to Davidlohr BuesoThe large folio + buffer head noref migration scenarios are being naughty and blocking while holding a spinlock.
As a consequence of the pagecache lookup path taking the folio lock this serializes against migration paths, so they can wait for each other. For the i_private_lock fallback case, a new BH_Migrate flag is introduced which enables the lookup to bail.
This allows the critical region of the i_private_lock on the migration path to be reduced to the way it was before ebdf4de5642fb6 ("mm: migrate: fix reference check race between __find_get_block() and migration").
The scope is always noref migration.
--- fs/buffer.c | 12 +++++++++++- fs/ext4/ialloc.c | 3 ++- include/linux/buffer_head.h | 1 + mm/migrate.c | 6 ++++-- 4 files changed, 18 insertions(+), 4 deletions(-)
fs/buffer.c +11 -1
@@ -211,6 +211,15 @@ __find_get_block_slow(struct block_device *bdev, sector_t block, bool atomic) head =folio_buffers (folio);if (!head) goto out_unlock; +/* +* Upon a noref migration, the folio lock serializes here; +* otherwise bail. +*/ +if (test_bit_acquire (BH_Migrate, &head->b_state)) { +WARN_ON_ONCE (folio_locked); + goto out_unlock; + } + bh = head; do { if (!buffer_mapped(bh))
@@ -1393,7 +1402,8 @@ lookup_bh_lru(struct block_device *bdev, sector_t block, unsigned size)/* * Perform a pagecache lookup for the matching buffer. If it's there, refresh * it in the LRU and mark it as accessed. If it is not present then return -* NULL +* NULL. Atomic context callers may also return NULL if the buffer is being +* migrated; similarly the page is not marked accessed either. */ static struct buffer_head * find_get_block_common(struct block_device *bdev, sector_t block,
fs/ext4/ialloc.c +2 -1
@@ -691,7 +691,8 @@ static int recently_deleted(struct super_block *sb, ext4_group_t group, int ino)if (!bh || !buffer_uptodate (bh))/* * If the block is not in the buffer cache, then it -* must have been written out. +* must have been written out, or, most unlikely, is +* being migrated - false failure should be OK here. */ goto out;
include/linux/buffer_head.h +1 -0
@@ -34,6 +34,7 @@ enum bh_state_bits { BH_Meta,/* Buffer contains metadata */ BH_Prio,/* Buffer should be submitted with REQ_PRIO */ BH_Defer_Completion,/* Defer AIO completion to workqueue */ + BH_Migrate,/* Buffer is being migrated (norefs) */ BH_PrivateStart,/* not a state bit, but the first bit available* for private allocation by other entities
mm/migrate.c +4 -2
@@ -848,6 +848,8 @@ static int __buffer_migrate_folio(struct address_space *mapping,bool busy;bool invalidated = false; +VM_WARN_ON_ONCE (test_and_set_bit_lock (BH_Migrate, + &head->b_state)); recheck_buffers: busy = false;spin_lock (&mapping->i_private_lock);
@@ -859,12 +861,12 @@ static int __buffer_migrate_folio(struct address_space *mapping, } bh = bh->b_this_page; }while (bh != head); +spin_unlock (&mapping->i_private_lock);if (busy) {if (invalidated) { rc = -EAGAIN ; goto unlock_buffers; } -spin_unlock (&mapping->i_private_lock);invalidate_bh_lrus (); invalidated = true; goto recheck_buffers;
@@ -883,7 +885,7 @@ static int __buffer_migrate_folio(struct address_space *mapping, unlock_buffers:if (check_refs) -spin_unlock (&mapping->i_private_lock); +clear_bit_unlock (BH_Migrate, &head->b_state); bh = head; do { unlock_buffer(bh);
Signature · 1 line
2.39.5