From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D811C47082 for ; Mon, 7 Jun 2021 15:57:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 11F5361059 for ; Mon, 7 Jun 2021 15:57:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231197AbhFGP7M (ORCPT ); Mon, 7 Jun 2021 11:59:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:34486 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231196AbhFGP7L (ORCPT ); Mon, 7 Jun 2021 11:59:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3DC2C61245; Mon, 7 Jun 2021 15:57:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1623081440; bh=qVGPX3LywDB8BipLEorObrySOgwU+jJBE5bRZ3+o8kE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=upvXnMEp6Ze8A2rWUKJel+jUJWagT2e4TfSWp/KEU/afKXA5VYCWcm+O0zRUzX9Sk 8FQlSqXQD2mRAnUobBkb9qm3u2d25BGSloOyym5PoHnehWNS8kVIt6tXhcHOi2DXu8 X4mF6z/N2yX33fJZpsmsw1zRt/dW9iBrQNNVcYBTCnIgLZvS6p0umipUGnLZE3rDge zM2xJC73tKgLxGQL8YsGyxR2poicaVD44c8JZS/flJE95qk/UIA3/1bKgBXEJDxAMQ 1mSYumgPbVfFV7/FI18sTfDU3mX0buwoQvtD9wse2f8o8wTQBc2yNOLru5BofabhRj fwytFN0IpYoUw== Date: Mon, 7 Jun 2021 08:57:19 -0700 From: "Darrick J. Wong" To: Jan Kara Cc: linux-fsdevel@vger.kernel.org, Christoph Hellwig , Dave Chinner , ceph-devel@vger.kernel.org, Chao Yu , Damien Le Moal , "Darrick J. Wong" , Jaegeuk Kim , Jeff Layton , Johannes Thumshirn , linux-cifs@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-mm@kvack.org, linux-xfs@vger.kernel.org, Miklos Szeredi , Steve French , Ted Tso , Matthew Wilcox Subject: Re: [PATCH 09/14] xfs: Convert double locking of MMAPLOCK to use VFS helpers Message-ID: <20210607155719.GJ2945738@locust> References: <20210607144631.8717-1-jack@suse.cz> <20210607145236.31852-9-jack@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210607145236.31852-9-jack@suse.cz> Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org On Mon, Jun 07, 2021 at 04:52:19PM +0200, Jan Kara wrote: > Convert places in XFS that take MMAPLOCK for two inodes to use helper > VFS provides for it (filemap_invalidate_down_write_two()). Note that > this changes lock ordering for MMAPLOCK from inode number based ordering > to pointer based ordering VFS generally uses. > > CC: "Darrick J. Wong" > Reviewed-by: Darrick J. Wong > Signed-off-by: Jan Kara Looks straightforward, Reviewed-by: Darrick J. Wong --D > --- > fs/xfs/xfs_bmap_util.c | 15 ++++++++------- > fs/xfs/xfs_inode.c | 37 +++++++++++-------------------------- > 2 files changed, 19 insertions(+), 33 deletions(-) > > diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c > index a5e9d7d34023..7421d6ec4def 100644 > --- a/fs/xfs/xfs_bmap_util.c > +++ b/fs/xfs/xfs_bmap_util.c > @@ -1582,7 +1582,6 @@ xfs_swap_extents( > struct xfs_bstat *sbp = &sxp->sx_stat; > int src_log_flags, target_log_flags; > int error = 0; > - int lock_flags; > uint64_t f; > int resblks = 0; > unsigned int flags = 0; > @@ -1594,8 +1593,8 @@ xfs_swap_extents( > * do the rest of the checks. > */ > lock_two_nondirectories(VFS_I(ip), VFS_I(tip)); > - lock_flags = XFS_MMAPLOCK_EXCL; > - xfs_lock_two_inodes(ip, XFS_MMAPLOCK_EXCL, tip, XFS_MMAPLOCK_EXCL); > + filemap_invalidate_lock_two(VFS_I(ip)->i_mapping, > + VFS_I(tip)->i_mapping); > > /* Verify that both files have the same format */ > if ((VFS_I(ip)->i_mode & S_IFMT) != (VFS_I(tip)->i_mode & S_IFMT)) { > @@ -1667,7 +1666,6 @@ xfs_swap_extents( > * or cancel will unlock the inodes from this point onwards. > */ > xfs_lock_two_inodes(ip, XFS_ILOCK_EXCL, tip, XFS_ILOCK_EXCL); > - lock_flags |= XFS_ILOCK_EXCL; > xfs_trans_ijoin(tp, ip, 0); > xfs_trans_ijoin(tp, tip, 0); > > @@ -1786,13 +1784,16 @@ xfs_swap_extents( > trace_xfs_swap_extent_after(ip, 0); > trace_xfs_swap_extent_after(tip, 1); > > +out_unlock_ilock: > + xfs_iunlock(ip, XFS_ILOCK_EXCL); > + xfs_iunlock(tip, XFS_ILOCK_EXCL); > out_unlock: > - xfs_iunlock(ip, lock_flags); > - xfs_iunlock(tip, lock_flags); > + filemap_invalidate_unlock_two(VFS_I(ip)->i_mapping, > + VFS_I(tip)->i_mapping); > unlock_two_nondirectories(VFS_I(ip), VFS_I(tip)); > return error; > > out_trans_cancel: > xfs_trans_cancel(tp); > - goto out_unlock; > + goto out_unlock_ilock; > } > diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c > index e1854a660809..0468f56f3bbb 100644 > --- a/fs/xfs/xfs_inode.c > +++ b/fs/xfs/xfs_inode.c > @@ -556,12 +556,10 @@ xfs_lock_inodes( > } > > /* > - * xfs_lock_two_inodes() can only be used to lock one type of lock at a time - > - * the mmaplock or the ilock, but not more than one type at a time. If we lock > - * more than one at a time, lockdep will report false positives saying we have > - * violated locking orders. The iolock must be double-locked separately since > - * we use i_rwsem for that. We now support taking one lock EXCL and the other > - * SHARED. > + * xfs_lock_two_inodes() can only be used to lock ilock. The iolock and > + * mmaplock must be double-locked separately since we use i_rwsem and > + * invalidate_lock for that. We now support taking one lock EXCL and the > + * other SHARED. > */ > void > xfs_lock_two_inodes( > @@ -579,15 +577,8 @@ xfs_lock_two_inodes( > ASSERT(hweight32(ip1_mode) == 1); > ASSERT(!(ip0_mode & (XFS_IOLOCK_SHARED|XFS_IOLOCK_EXCL))); > ASSERT(!(ip1_mode & (XFS_IOLOCK_SHARED|XFS_IOLOCK_EXCL))); > - ASSERT(!(ip0_mode & (XFS_MMAPLOCK_SHARED|XFS_MMAPLOCK_EXCL)) || > - !(ip0_mode & (XFS_ILOCK_SHARED|XFS_ILOCK_EXCL))); > - ASSERT(!(ip1_mode & (XFS_MMAPLOCK_SHARED|XFS_MMAPLOCK_EXCL)) || > - !(ip1_mode & (XFS_ILOCK_SHARED|XFS_ILOCK_EXCL))); > - ASSERT(!(ip1_mode & (XFS_MMAPLOCK_SHARED|XFS_MMAPLOCK_EXCL)) || > - !(ip0_mode & (XFS_ILOCK_SHARED|XFS_ILOCK_EXCL))); > - ASSERT(!(ip0_mode & (XFS_MMAPLOCK_SHARED|XFS_MMAPLOCK_EXCL)) || > - !(ip1_mode & (XFS_ILOCK_SHARED|XFS_ILOCK_EXCL))); > - > + ASSERT(!(ip0_mode & (XFS_MMAPLOCK_SHARED|XFS_MMAPLOCK_EXCL))); > + ASSERT(!(ip1_mode & (XFS_MMAPLOCK_SHARED|XFS_MMAPLOCK_EXCL))); > ASSERT(ip0->i_ino != ip1->i_ino); > > if (ip0->i_ino > ip1->i_ino) { > @@ -3750,11 +3741,8 @@ xfs_ilock2_io_mmap( > ret = xfs_iolock_two_inodes_and_break_layout(VFS_I(ip1), VFS_I(ip2)); > if (ret) > return ret; > - if (ip1 == ip2) > - xfs_ilock(ip1, XFS_MMAPLOCK_EXCL); > - else > - xfs_lock_two_inodes(ip1, XFS_MMAPLOCK_EXCL, > - ip2, XFS_MMAPLOCK_EXCL); > + filemap_invalidate_lock_two(VFS_I(ip1)->i_mapping, > + VFS_I(ip2)->i_mapping); > return 0; > } > > @@ -3764,12 +3752,9 @@ xfs_iunlock2_io_mmap( > struct xfs_inode *ip1, > struct xfs_inode *ip2) > { > - bool same_inode = (ip1 == ip2); > - > - xfs_iunlock(ip2, XFS_MMAPLOCK_EXCL); > - if (!same_inode) > - xfs_iunlock(ip1, XFS_MMAPLOCK_EXCL); > + filemap_invalidate_unlock_two(VFS_I(ip1)->i_mapping, > + VFS_I(ip2)->i_mapping); > inode_unlock(VFS_I(ip2)); > - if (!same_inode) > + if (ip1 != ip2) > inode_unlock(VFS_I(ip1)); > } > -- > 2.26.2 >