From nobody Mon Dec 15 18:17:59 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5BB2C67871 for ; Mon, 24 Oct 2022 19:45:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232380AbiJXTpA (ORCPT ); Mon, 24 Oct 2022 15:45:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233422AbiJXTmO (ORCPT ); Mon, 24 Oct 2022 15:42:14 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C60AF3C8DC; Mon, 24 Oct 2022 11:11:56 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 2CC2EB811AF; Mon, 24 Oct 2022 11:49:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 755B6C433C1; Mon, 24 Oct 2022 11:48:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612138; bh=NxgZ+UFijl6OL8pOEGlvJusFXy8NFC1qyy7SRIQqfrw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TzzG///rkzAeONTbr9lvj2Da0gkYTdqXep2mFS4CkiyfffFqPDPFPp6E3/aMVR5fH ZjecGCRebHJNLKVgkzP6KbfW8zhOtKVthg9e0aT31a5MDDSGmsZkZQW7xk2aNgQVre sZWl5tZ0xPIx/5Q/fhxkx7n8m4MbNBuCt3OcKWpc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ryusuke Konishi , Matthew Wilcox , David Hildenbrand , Hao Sun , Andrew Morton , Linus Torvalds Subject: [PATCH 4.14 067/210] nilfs2: fix lockdep warnings during disk space reclamation Date: Mon, 24 Oct 2022 13:29:44 +0200 Message-Id: <20221024112959.230524710@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112956.797777597@linuxfoundation.org> References: <20221024112956.797777597@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Ryusuke Konishi commit 6e211930f79aa45d422009a5f2e5467d2369ffe5 upstream. During disk space reclamation, nilfs2 still emits the following lockdep warning due to page/folio operations on shadowed page caches that nilfs2 uses to get a snapshot of DAT file in memory: WARNING: CPU: 0 PID: 2643 at include/linux/backing-dev.h:272 __folio_mark= _dirty+0x645/0x670 ... RIP: 0010:__folio_mark_dirty+0x645/0x670 ... Call Trace: filemap_dirty_folio+0x74/0xd0 __set_page_dirty_nobuffers+0x85/0xb0 nilfs_copy_dirty_pages+0x288/0x510 [nilfs2] nilfs_mdt_save_to_shadow_map+0x50/0xe0 [nilfs2] nilfs_clean_segments+0xee/0x5d0 [nilfs2] nilfs_ioctl_clean_segments.isra.19+0xb08/0xf40 [nilfs2] nilfs_ioctl+0xc52/0xfb0 [nilfs2] __x64_sys_ioctl+0x11d/0x170 This fixes the remaining warning by using inode objects to hold those page caches. Link: https://lkml.kernel.org/r/1647867427-30498-3-git-send-email-konishi.r= yusuke@gmail.com Signed-off-by: Ryusuke Konishi Tested-by: Ryusuke Konishi Cc: Matthew Wilcox Cc: David Hildenbrand Cc: Hao Sun Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- fs/nilfs2/dat.c | 4 ++- fs/nilfs2/inode.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++= +---- fs/nilfs2/mdt.c | 38 ++++++++++++++++++++++---------- fs/nilfs2/mdt.h | 6 +---- fs/nilfs2/nilfs.h | 2 + 5 files changed, 92 insertions(+), 21 deletions(-) --- a/fs/nilfs2/dat.c +++ b/fs/nilfs2/dat.c @@ -506,7 +506,9 @@ int nilfs_dat_read(struct super_block *s di =3D NILFS_DAT_I(dat); lockdep_set_class(&di->mi.mi_sem, &dat_lock_key); nilfs_palloc_setup_cache(dat, &di->palloc_cache); - nilfs_mdt_setup_shadow_map(dat, &di->shadow); + err =3D nilfs_mdt_setup_shadow_map(dat, &di->shadow); + if (err) + goto failed; =20 err =3D nilfs_read_inode_common(dat, raw_inode); if (err) --- a/fs/nilfs2/inode.c +++ b/fs/nilfs2/inode.c @@ -38,6 +38,7 @@ * @root: pointer on NILFS root object (mounted checkpoint) * @for_gc: inode for GC flag * @for_btnc: inode for B-tree node cache flag + * @for_shadow: inode for shadowed page cache flag */ struct nilfs_iget_args { u64 ino; @@ -45,6 +46,7 @@ struct nilfs_iget_args { struct nilfs_root *root; bool for_gc; bool for_btnc; + bool for_shadow; }; =20 static int nilfs_iget_test(struct inode *inode, void *opaque); @@ -334,7 +336,7 @@ static int nilfs_insert_inode_locked(str { struct nilfs_iget_args args =3D { .ino =3D ino, .root =3D root, .cno =3D 0, .for_gc =3D false, - .for_btnc =3D false + .for_btnc =3D false, .for_shadow =3D false }; =20 return insert_inode_locked4(inode, ino, nilfs_iget_test, &args); @@ -570,6 +572,12 @@ static int nilfs_iget_test(struct inode } else if (args->for_btnc) { return 0; } + if (test_bit(NILFS_I_SHADOW, &ii->i_state)) { + if (!args->for_shadow) + return 0; + } else if (args->for_shadow) { + return 0; + } =20 if (!test_bit(NILFS_I_GCINODE, &ii->i_state)) return !args->for_gc; @@ -591,6 +599,8 @@ static int nilfs_iget_set(struct inode * NILFS_I(inode)->i_state =3D BIT(NILFS_I_GCINODE); if (args->for_btnc) NILFS_I(inode)->i_state |=3D BIT(NILFS_I_BTNC); + if (args->for_shadow) + NILFS_I(inode)->i_state |=3D BIT(NILFS_I_SHADOW); return 0; } =20 @@ -599,7 +609,7 @@ struct inode *nilfs_ilookup(struct super { struct nilfs_iget_args args =3D { .ino =3D ino, .root =3D root, .cno =3D 0, .for_gc =3D false, - .for_btnc =3D false + .for_btnc =3D false, .for_shadow =3D false }; =20 return ilookup5(sb, ino, nilfs_iget_test, &args); @@ -610,7 +620,7 @@ struct inode *nilfs_iget_locked(struct s { struct nilfs_iget_args args =3D { .ino =3D ino, .root =3D root, .cno =3D 0, .for_gc =3D false, - .for_btnc =3D false + .for_btnc =3D false, .for_shadow =3D false }; =20 return iget5_locked(sb, ino, nilfs_iget_test, nilfs_iget_set, &args); @@ -642,7 +652,7 @@ struct inode *nilfs_iget_for_gc(struct s { struct nilfs_iget_args args =3D { .ino =3D ino, .root =3D NULL, .cno =3D cno, .for_gc =3D true, - .for_btnc =3D false + .for_btnc =3D false, .for_shadow =3D false }; struct inode *inode; int err; @@ -689,6 +699,7 @@ int nilfs_attach_btree_node_cache(struct args.cno =3D ii->i_cno; args.for_gc =3D test_bit(NILFS_I_GCINODE, &ii->i_state) !=3D 0; args.for_btnc =3D true; + args.for_shadow =3D test_bit(NILFS_I_SHADOW, &ii->i_state) !=3D 0; =20 btnc_inode =3D iget5_locked(inode->i_sb, inode->i_ino, nilfs_iget_test, nilfs_iget_set, &args); @@ -724,6 +735,50 @@ void nilfs_detach_btree_node_cache(struc } } =20 +/** + * nilfs_iget_for_shadow - obtain inode for shadow mapping + * @inode: inode object that uses shadow mapping + * + * nilfs_iget_for_shadow() allocates a pair of inodes that holds page + * caches for shadow mapping. The page cache for data pages is set up + * in one inode and the one for b-tree node pages is set up in the + * other inode, which is attached to the former inode. + * + * Return Value: On success, a pointer to the inode for data pages is + * returned. On errors, one of the following negative error code is return= ed + * in a pointer type. + * + * %-ENOMEM - Insufficient memory available. + */ +struct inode *nilfs_iget_for_shadow(struct inode *inode) +{ + struct nilfs_iget_args args =3D { + .ino =3D inode->i_ino, .root =3D NULL, .cno =3D 0, .for_gc =3D false, + .for_btnc =3D false, .for_shadow =3D true + }; + struct inode *s_inode; + int err; + + s_inode =3D iget5_locked(inode->i_sb, inode->i_ino, nilfs_iget_test, + nilfs_iget_set, &args); + if (unlikely(!s_inode)) + return ERR_PTR(-ENOMEM); + if (!(s_inode->i_state & I_NEW)) + return inode; + + NILFS_I(s_inode)->i_flags =3D 0; + memset(NILFS_I(s_inode)->i_bmap, 0, sizeof(struct nilfs_bmap)); + mapping_set_gfp_mask(s_inode->i_mapping, GFP_NOFS); + + err =3D nilfs_attach_btree_node_cache(s_inode); + if (unlikely(err)) { + iget_failed(s_inode); + return ERR_PTR(err); + } + unlock_new_inode(s_inode); + return s_inode; +} + void nilfs_write_inode_common(struct inode *inode, struct nilfs_inode *raw_inode, int has_bmap) { --- a/fs/nilfs2/mdt.c +++ b/fs/nilfs2/mdt.c @@ -478,9 +478,18 @@ int nilfs_mdt_init(struct inode *inode, void nilfs_mdt_clear(struct inode *inode) { struct nilfs_mdt_info *mdi =3D NILFS_MDT(inode); + struct nilfs_shadow_map *shadow =3D mdi->mi_shadow; =20 if (mdi->mi_palloc_cache) nilfs_palloc_destroy_cache(inode); + + if (shadow) { + struct inode *s_inode =3D shadow->inode; + + shadow->inode =3D NULL; + iput(s_inode); + mdi->mi_shadow =3D NULL; + } } =20 /** @@ -514,12 +523,15 @@ int nilfs_mdt_setup_shadow_map(struct in struct nilfs_shadow_map *shadow) { struct nilfs_mdt_info *mi =3D NILFS_MDT(inode); + struct inode *s_inode; =20 INIT_LIST_HEAD(&shadow->frozen_buffers); - address_space_init_once(&shadow->frozen_data); - nilfs_mapping_init(&shadow->frozen_data, inode); - address_space_init_once(&shadow->frozen_btnodes); - nilfs_mapping_init(&shadow->frozen_btnodes, inode); + + s_inode =3D nilfs_iget_for_shadow(inode); + if (IS_ERR(s_inode)) + return PTR_ERR(s_inode); + + shadow->inode =3D s_inode; mi->mi_shadow =3D shadow; return 0; } @@ -533,13 +545,14 @@ int nilfs_mdt_save_to_shadow_map(struct struct nilfs_mdt_info *mi =3D NILFS_MDT(inode); struct nilfs_inode_info *ii =3D NILFS_I(inode); struct nilfs_shadow_map *shadow =3D mi->mi_shadow; + struct inode *s_inode =3D shadow->inode; int ret; =20 - ret =3D nilfs_copy_dirty_pages(&shadow->frozen_data, inode->i_mapping); + ret =3D nilfs_copy_dirty_pages(s_inode->i_mapping, inode->i_mapping); if (ret) goto out; =20 - ret =3D nilfs_copy_dirty_pages(&shadow->frozen_btnodes, + ret =3D nilfs_copy_dirty_pages(NILFS_I(s_inode)->i_assoc_inode->i_mapping, ii->i_assoc_inode->i_mapping); if (ret) goto out; @@ -556,7 +569,7 @@ int nilfs_mdt_freeze_buffer(struct inode struct page *page; int blkbits =3D inode->i_blkbits; =20 - page =3D grab_cache_page(&shadow->frozen_data, bh->b_page->index); + page =3D grab_cache_page(shadow->inode->i_mapping, bh->b_page->index); if (!page) return -ENOMEM; =20 @@ -588,7 +601,7 @@ nilfs_mdt_get_frozen_buffer(struct inode struct page *page; int n; =20 - page =3D find_lock_page(&shadow->frozen_data, bh->b_page->index); + page =3D find_lock_page(shadow->inode->i_mapping, bh->b_page->index); if (page) { if (page_has_buffers(page)) { n =3D bh_offset(bh) >> inode->i_blkbits; @@ -629,11 +642,11 @@ void nilfs_mdt_restore_from_shadow_map(s nilfs_palloc_clear_cache(inode); =20 nilfs_clear_dirty_pages(inode->i_mapping, true); - nilfs_copy_back_pages(inode->i_mapping, &shadow->frozen_data); + nilfs_copy_back_pages(inode->i_mapping, shadow->inode->i_mapping); =20 nilfs_clear_dirty_pages(ii->i_assoc_inode->i_mapping, true); nilfs_copy_back_pages(ii->i_assoc_inode->i_mapping, - &shadow->frozen_btnodes); + NILFS_I(shadow->inode)->i_assoc_inode->i_mapping); =20 nilfs_bmap_restore(ii->i_bmap, &shadow->bmap_store); =20 @@ -648,10 +661,11 @@ void nilfs_mdt_clear_shadow_map(struct i { struct nilfs_mdt_info *mi =3D NILFS_MDT(inode); struct nilfs_shadow_map *shadow =3D mi->mi_shadow; + struct inode *shadow_btnc_inode =3D NILFS_I(shadow->inode)->i_assoc_inode; =20 down_write(&mi->mi_sem); nilfs_release_frozen_buffers(shadow); - truncate_inode_pages(&shadow->frozen_data, 0); - truncate_inode_pages(&shadow->frozen_btnodes, 0); + truncate_inode_pages(shadow->inode->i_mapping, 0); + truncate_inode_pages(shadow_btnc_inode->i_mapping, 0); up_write(&mi->mi_sem); } --- a/fs/nilfs2/mdt.h +++ b/fs/nilfs2/mdt.h @@ -27,14 +27,12 @@ /** * struct nilfs_shadow_map - shadow mapping of meta data file * @bmap_store: shadow copy of bmap state - * @frozen_data: shadowed dirty data pages - * @frozen_btnodes: shadowed dirty b-tree nodes' pages + * @inode: holder of page caches used in shadow mapping * @frozen_buffers: list of frozen buffers */ struct nilfs_shadow_map { struct nilfs_bmap_store bmap_store; - struct address_space frozen_data; - struct address_space frozen_btnodes; + struct inode *inode; struct list_head frozen_buffers; }; =20 --- a/fs/nilfs2/nilfs.h +++ b/fs/nilfs2/nilfs.h @@ -101,6 +101,7 @@ enum { NILFS_I_BMAP, /* has bmap and btnode_cache */ NILFS_I_GCINODE, /* inode for GC, on memory only */ NILFS_I_BTNC, /* inode for btree node cache */ + NILFS_I_SHADOW, /* inode for shadowed page cache */ }; =20 /* @@ -273,6 +274,7 @@ extern struct inode *nilfs_iget_for_gc(s unsigned long ino, __u64 cno); int nilfs_attach_btree_node_cache(struct inode *inode); void nilfs_detach_btree_node_cache(struct inode *inode); +struct inode *nilfs_iget_for_shadow(struct inode *inode); extern void nilfs_update_inode(struct inode *, struct buffer_head *, int); extern void nilfs_truncate(struct inode *); extern void nilfs_evict_inode(struct inode *);