mirror of
https://github.com/torvalds/linux.git
synced 2024-12-03 17:41:22 +00:00
e897be17a4
Patch series "nilfs2 lockdep warning fixes". The first two are to resolve the lockdep warning issue, and the last one is the accompanying cleanup and low priority. Based on your comment, this series solves the issue by separating inode object as needed. Since I was worried about the impact of the object composition changes, I tested the series carefully not to cause regressions especially for delicate functions such like disk space reclamation and snapshots. This patch (of 3): If CONFIG_LOCKDEP is enabled, nilfs2 hits lockdep warnings at inode_to_wb() during page/folio operations for btree nodes: WARNING: CPU: 0 PID: 6575 at include/linux/backing-dev.h:269 inode_to_wb include/linux/backing-dev.h:269 [inline] WARNING: CPU: 0 PID: 6575 at include/linux/backing-dev.h:269 folio_account_dirtied mm/page-writeback.c:2460 [inline] WARNING: CPU: 0 PID: 6575 at include/linux/backing-dev.h:269 __folio_mark_dirty+0xa7c/0xe30 mm/page-writeback.c:2509 Modules linked in: ... RIP: 0010:inode_to_wb include/linux/backing-dev.h:269 [inline] RIP: 0010:folio_account_dirtied mm/page-writeback.c:2460 [inline] RIP: 0010:__folio_mark_dirty+0xa7c/0xe30 mm/page-writeback.c:2509 ... Call Trace: __set_page_dirty include/linux/pagemap.h:834 [inline] mark_buffer_dirty+0x4e6/0x650 fs/buffer.c:1145 nilfs_btree_propagate_p fs/nilfs2/btree.c:1889 [inline] nilfs_btree_propagate+0x4ae/0xea0 fs/nilfs2/btree.c:2085 nilfs_bmap_propagate+0x73/0x170 fs/nilfs2/bmap.c:337 nilfs_collect_dat_data+0x45/0xd0 fs/nilfs2/segment.c:625 nilfs_segctor_apply_buffers+0x14a/0x470 fs/nilfs2/segment.c:1009 nilfs_segctor_scan_file+0x47a/0x700 fs/nilfs2/segment.c:1048 nilfs_segctor_collect_blocks fs/nilfs2/segment.c:1224 [inline] nilfs_segctor_collect fs/nilfs2/segment.c:1494 [inline] nilfs_segctor_do_construct+0x14f3/0x6c60 fs/nilfs2/segment.c:2036 nilfs_segctor_construct+0x7a7/0xb30 fs/nilfs2/segment.c:2372 nilfs_segctor_thread_construct fs/nilfs2/segment.c:2480 [inline] nilfs_segctor_thread+0x3c3/0xf90 fs/nilfs2/segment.c:2563 kthread+0x405/0x4f0 kernel/kthread.c:327 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:295 This is because nilfs2 uses two page caches for each inode and inode->i_mapping never points to one of them, the btree node cache. This causes inode_to_wb(inode) to refer to a different page cache than the caller page/folio operations such like __folio_start_writeback(), __folio_end_writeback(), or __folio_mark_dirty() acquired the lock. This patch resolves the issue by allocating and using an additional inode to hold the page cache of btree nodes. The inode is attached one-to-one to the traditional nilfs2 inode if it requires a block mapping with b-tree. This setup change is in memory only and does not affect the disk format. Link: https://lkml.kernel.org/r/1647867427-30498-1-git-send-email-konishi.ryusuke@gmail.com Link: https://lkml.kernel.org/r/1647867427-30498-2-git-send-email-konishi.ryusuke@gmail.com Link: https://lore.kernel.org/r/YXrYvIo8YRnAOJCj@casper.infradead.org Link: https://lore.kernel.org/r/9a20b33d-b38f-b4a2-4742-c1eb5b8e4d6c@redhat.com Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com> Reported-by: syzbot+0d5b462a6f07447991b3@syzkaller.appspotmail.com Reported-by: syzbot+34ef28bb2aeb28724aa0@syzkaller.appspotmail.com Reported-by: Hao Sun <sunhao.th@gmail.com> Reported-by: David Hildenbrand <david@redhat.com> Tested-by: Ryusuke Konishi <konishi.ryusuke@gmail.com> Cc: Matthew Wilcox <willy@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
291 lines
7.0 KiB
C
291 lines
7.0 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* NILFS B-tree node cache
|
|
*
|
|
* Copyright (C) 2005-2008 Nippon Telegraph and Telephone Corporation.
|
|
*
|
|
* Originally written by Seiji Kihara.
|
|
* Fully revised by Ryusuke Konishi for stabilization and simplification.
|
|
*
|
|
*/
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/buffer_head.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/backing-dev.h>
|
|
#include <linux/gfp.h>
|
|
#include "nilfs.h"
|
|
#include "mdt.h"
|
|
#include "dat.h"
|
|
#include "page.h"
|
|
#include "btnode.h"
|
|
|
|
|
|
/**
|
|
* nilfs_init_btnc_inode - initialize B-tree node cache inode
|
|
* @btnc_inode: inode to be initialized
|
|
*
|
|
* nilfs_init_btnc_inode() sets up an inode for B-tree node cache.
|
|
*/
|
|
void nilfs_init_btnc_inode(struct inode *btnc_inode)
|
|
{
|
|
struct nilfs_inode_info *ii = NILFS_I(btnc_inode);
|
|
|
|
btnc_inode->i_mode = S_IFREG;
|
|
ii->i_flags = 0;
|
|
memset(&ii->i_bmap_data, 0, sizeof(struct nilfs_bmap));
|
|
mapping_set_gfp_mask(btnc_inode->i_mapping, GFP_NOFS);
|
|
}
|
|
|
|
void nilfs_btnode_cache_clear(struct address_space *btnc)
|
|
{
|
|
invalidate_mapping_pages(btnc, 0, -1);
|
|
truncate_inode_pages(btnc, 0);
|
|
}
|
|
|
|
struct buffer_head *
|
|
nilfs_btnode_create_block(struct address_space *btnc, __u64 blocknr)
|
|
{
|
|
struct inode *inode = btnc->host;
|
|
struct buffer_head *bh;
|
|
|
|
bh = nilfs_grab_buffer(inode, btnc, blocknr, BIT(BH_NILFS_Node));
|
|
if (unlikely(!bh))
|
|
return NULL;
|
|
|
|
if (unlikely(buffer_mapped(bh) || buffer_uptodate(bh) ||
|
|
buffer_dirty(bh))) {
|
|
brelse(bh);
|
|
BUG();
|
|
}
|
|
memset(bh->b_data, 0, i_blocksize(inode));
|
|
bh->b_bdev = inode->i_sb->s_bdev;
|
|
bh->b_blocknr = blocknr;
|
|
set_buffer_mapped(bh);
|
|
set_buffer_uptodate(bh);
|
|
|
|
unlock_page(bh->b_page);
|
|
put_page(bh->b_page);
|
|
return bh;
|
|
}
|
|
|
|
int nilfs_btnode_submit_block(struct address_space *btnc, __u64 blocknr,
|
|
sector_t pblocknr, int mode, int mode_flags,
|
|
struct buffer_head **pbh, sector_t *submit_ptr)
|
|
{
|
|
struct buffer_head *bh;
|
|
struct inode *inode = btnc->host;
|
|
struct page *page;
|
|
int err;
|
|
|
|
bh = nilfs_grab_buffer(inode, btnc, blocknr, BIT(BH_NILFS_Node));
|
|
if (unlikely(!bh))
|
|
return -ENOMEM;
|
|
|
|
err = -EEXIST; /* internal code */
|
|
page = bh->b_page;
|
|
|
|
if (buffer_uptodate(bh) || buffer_dirty(bh))
|
|
goto found;
|
|
|
|
if (pblocknr == 0) {
|
|
pblocknr = blocknr;
|
|
if (inode->i_ino != NILFS_DAT_INO) {
|
|
struct the_nilfs *nilfs = inode->i_sb->s_fs_info;
|
|
|
|
/* blocknr is a virtual block number */
|
|
err = nilfs_dat_translate(nilfs->ns_dat, blocknr,
|
|
&pblocknr);
|
|
if (unlikely(err)) {
|
|
brelse(bh);
|
|
goto out_locked;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (mode_flags & REQ_RAHEAD) {
|
|
if (pblocknr != *submit_ptr + 1 || !trylock_buffer(bh)) {
|
|
err = -EBUSY; /* internal code */
|
|
brelse(bh);
|
|
goto out_locked;
|
|
}
|
|
} else { /* mode == READ */
|
|
lock_buffer(bh);
|
|
}
|
|
if (buffer_uptodate(bh)) {
|
|
unlock_buffer(bh);
|
|
err = -EEXIST; /* internal code */
|
|
goto found;
|
|
}
|
|
set_buffer_mapped(bh);
|
|
bh->b_bdev = inode->i_sb->s_bdev;
|
|
bh->b_blocknr = pblocknr; /* set block address for read */
|
|
bh->b_end_io = end_buffer_read_sync;
|
|
get_bh(bh);
|
|
submit_bh(mode, mode_flags, bh);
|
|
bh->b_blocknr = blocknr; /* set back to the given block address */
|
|
*submit_ptr = pblocknr;
|
|
err = 0;
|
|
found:
|
|
*pbh = bh;
|
|
|
|
out_locked:
|
|
unlock_page(page);
|
|
put_page(page);
|
|
return err;
|
|
}
|
|
|
|
/**
|
|
* nilfs_btnode_delete - delete B-tree node buffer
|
|
* @bh: buffer to be deleted
|
|
*
|
|
* nilfs_btnode_delete() invalidates the specified buffer and delete the page
|
|
* including the buffer if the page gets unbusy.
|
|
*/
|
|
void nilfs_btnode_delete(struct buffer_head *bh)
|
|
{
|
|
struct address_space *mapping;
|
|
struct page *page = bh->b_page;
|
|
pgoff_t index = page_index(page);
|
|
int still_dirty;
|
|
|
|
get_page(page);
|
|
lock_page(page);
|
|
wait_on_page_writeback(page);
|
|
|
|
nilfs_forget_buffer(bh);
|
|
still_dirty = PageDirty(page);
|
|
mapping = page->mapping;
|
|
unlock_page(page);
|
|
put_page(page);
|
|
|
|
if (!still_dirty && mapping)
|
|
invalidate_inode_pages2_range(mapping, index, index);
|
|
}
|
|
|
|
/**
|
|
* nilfs_btnode_prepare_change_key
|
|
* prepare to move contents of the block for old key to one of new key.
|
|
* the old buffer will not be removed, but might be reused for new buffer.
|
|
* it might return -ENOMEM because of memory allocation errors,
|
|
* and might return -EIO because of disk read errors.
|
|
*/
|
|
int nilfs_btnode_prepare_change_key(struct address_space *btnc,
|
|
struct nilfs_btnode_chkey_ctxt *ctxt)
|
|
{
|
|
struct buffer_head *obh, *nbh;
|
|
struct inode *inode = btnc->host;
|
|
__u64 oldkey = ctxt->oldkey, newkey = ctxt->newkey;
|
|
int err;
|
|
|
|
if (oldkey == newkey)
|
|
return 0;
|
|
|
|
obh = ctxt->bh;
|
|
ctxt->newbh = NULL;
|
|
|
|
if (inode->i_blkbits == PAGE_SHIFT) {
|
|
struct page *opage = obh->b_page;
|
|
lock_page(opage);
|
|
retry:
|
|
/* BUG_ON(oldkey != obh->b_page->index); */
|
|
if (unlikely(oldkey != opage->index))
|
|
NILFS_PAGE_BUG(opage,
|
|
"invalid oldkey %lld (newkey=%lld)",
|
|
(unsigned long long)oldkey,
|
|
(unsigned long long)newkey);
|
|
|
|
xa_lock_irq(&btnc->i_pages);
|
|
err = __xa_insert(&btnc->i_pages, newkey, opage, GFP_NOFS);
|
|
xa_unlock_irq(&btnc->i_pages);
|
|
/*
|
|
* Note: page->index will not change to newkey until
|
|
* nilfs_btnode_commit_change_key() will be called.
|
|
* To protect the page in intermediate state, the page lock
|
|
* is held.
|
|
*/
|
|
if (!err)
|
|
return 0;
|
|
else if (err != -EBUSY)
|
|
goto failed_unlock;
|
|
|
|
err = invalidate_inode_pages2_range(btnc, newkey, newkey);
|
|
if (!err)
|
|
goto retry;
|
|
/* fallback to copy mode */
|
|
unlock_page(opage);
|
|
}
|
|
|
|
nbh = nilfs_btnode_create_block(btnc, newkey);
|
|
if (!nbh)
|
|
return -ENOMEM;
|
|
|
|
BUG_ON(nbh == obh);
|
|
ctxt->newbh = nbh;
|
|
return 0;
|
|
|
|
failed_unlock:
|
|
unlock_page(obh->b_page);
|
|
return err;
|
|
}
|
|
|
|
/**
|
|
* nilfs_btnode_commit_change_key
|
|
* commit the change_key operation prepared by prepare_change_key().
|
|
*/
|
|
void nilfs_btnode_commit_change_key(struct address_space *btnc,
|
|
struct nilfs_btnode_chkey_ctxt *ctxt)
|
|
{
|
|
struct buffer_head *obh = ctxt->bh, *nbh = ctxt->newbh;
|
|
__u64 oldkey = ctxt->oldkey, newkey = ctxt->newkey;
|
|
struct page *opage;
|
|
|
|
if (oldkey == newkey)
|
|
return;
|
|
|
|
if (nbh == NULL) { /* blocksize == pagesize */
|
|
opage = obh->b_page;
|
|
if (unlikely(oldkey != opage->index))
|
|
NILFS_PAGE_BUG(opage,
|
|
"invalid oldkey %lld (newkey=%lld)",
|
|
(unsigned long long)oldkey,
|
|
(unsigned long long)newkey);
|
|
mark_buffer_dirty(obh);
|
|
|
|
xa_lock_irq(&btnc->i_pages);
|
|
__xa_erase(&btnc->i_pages, oldkey);
|
|
__xa_set_mark(&btnc->i_pages, newkey, PAGECACHE_TAG_DIRTY);
|
|
xa_unlock_irq(&btnc->i_pages);
|
|
|
|
opage->index = obh->b_blocknr = newkey;
|
|
unlock_page(opage);
|
|
} else {
|
|
nilfs_copy_buffer(nbh, obh);
|
|
mark_buffer_dirty(nbh);
|
|
|
|
nbh->b_blocknr = newkey;
|
|
ctxt->bh = nbh;
|
|
nilfs_btnode_delete(obh); /* will decrement bh->b_count */
|
|
}
|
|
}
|
|
|
|
/**
|
|
* nilfs_btnode_abort_change_key
|
|
* abort the change_key operation prepared by prepare_change_key().
|
|
*/
|
|
void nilfs_btnode_abort_change_key(struct address_space *btnc,
|
|
struct nilfs_btnode_chkey_ctxt *ctxt)
|
|
{
|
|
struct buffer_head *nbh = ctxt->newbh;
|
|
__u64 oldkey = ctxt->oldkey, newkey = ctxt->newkey;
|
|
|
|
if (oldkey == newkey)
|
|
return;
|
|
|
|
if (nbh == NULL) { /* blocksize == pagesize */
|
|
xa_erase_irq(&btnc->i_pages, newkey);
|
|
unlock_page(ctxt->bh->b_page);
|
|
} else
|
|
brelse(nbh);
|
|
}
|