From patchwork Wed Jan 1 10:52:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ritesh Harjani X-Patchwork-Id: 11315047 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6115D17F0 for ; Wed, 1 Jan 2020 10:53:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3FE64206DB for ; Wed, 1 Jan 2020 10:53:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726477AbgAAKxE (ORCPT ); Wed, 1 Jan 2020 05:53:04 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:8154 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726264AbgAAKxE (ORCPT ); Wed, 1 Jan 2020 05:53:04 -0500 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 001ApQbc085744 for ; Wed, 1 Jan 2020 05:53:03 -0500 Received: from e06smtp04.uk.ibm.com (e06smtp04.uk.ibm.com [195.75.94.100]) by mx0a-001b2d01.pphosted.com with ESMTP id 2x869rwwht-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 01 Jan 2020 05:53:03 -0500 Received: from localhost by e06smtp04.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 1 Jan 2020 10:53:01 -0000 Received: from b06avi18878370.portsmouth.uk.ibm.com (9.149.26.194) by e06smtp04.uk.ibm.com (192.168.101.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 1 Jan 2020 10:52:56 -0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06avi18878370.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 001Aqtar42271198 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 1 Jan 2020 10:52:55 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 68CE652052; Wed, 1 Jan 2020 10:52:55 +0000 (GMT) Received: from dhcp-9-199-159-72.in.ibm.com (unknown [9.199.159.72]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id C0A3E5204F; Wed, 1 Jan 2020 10:52:52 +0000 (GMT) From: Ritesh Harjani To: linux-fsdevel@vger.kernel.org, viro@zeniv.linux.org.uk Cc: willy@infradead.org, jlayton@kernel.org, ceph-devel@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-nfs@vger.kernel.org, devel@lists.orangefs.org, linux-unionfs@vger.kernel.org, dsterba@suse.cz, Ritesh Harjani , David Sterba Subject: [RESEND PATCH 1/1] fs: Use inode_lock/unlock class of provided APIs in filesystems Date: Wed, 1 Jan 2020 16:22:48 +0530 X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200101105248.25304-1-riteshh@linux.ibm.com> References: <20200101105248.25304-1-riteshh@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 20010110-0016-0000-0000-000002D9A3D0 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 20010110-0017-0000-0000-0000333C09E4 Message-Id: <20200101105248.25304-2-riteshh@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,18.0.572 definitions=2020-01-01_03:2019-12-30,2020-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=246 bulkscore=0 malwarescore=0 adultscore=0 impostorscore=0 clxscore=1015 lowpriorityscore=0 phishscore=0 suspectscore=3 spamscore=0 mlxscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1910280000 definitions=main-2001010101 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org This defines 4 more APIs which some of the filesystem needs and reduces the direct use of i_rwsem in filesystem drivers. Instead those are replaced with inode_lock/unlock_** APIs. Signed-off-by: Ritesh Harjani Reviewed-by: Matthew Wilcox (Oracle) Reviewed-by: Jeff Layton Acked-by: David Sterba --- fs/btrfs/delayed-inode.c | 2 +- fs/btrfs/ioctl.c | 4 ++-- fs/ceph/io.c | 24 ++++++++++++------------ fs/nfs/io.c | 24 ++++++++++++------------ fs/orangefs/file.c | 4 ++-- fs/overlayfs/readdir.c | 2 +- fs/readdir.c | 4 ++-- include/linux/fs.h | 21 +++++++++++++++++++++ 8 files changed, 53 insertions(+), 32 deletions(-) diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index d3e15e1d4a91..c3e92f2fd915 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c @@ -1644,7 +1644,7 @@ void btrfs_readdir_put_delayed_items(struct inode *inode, * The VFS is going to do up_read(), so we need to downgrade back to a * read lock. */ - downgrade_write(&inode->i_rwsem); + inode_lock_downgrade(inode); } int btrfs_should_delete_dir_index(struct list_head *del_list, diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 18e328ce4b54..caa80372992d 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -961,7 +961,7 @@ static noinline int btrfs_mksubvol(const struct path *parent, struct dentry *dentry; int error; - error = down_write_killable_nested(&dir->i_rwsem, I_MUTEX_PARENT); + error = inode_lock_killable_nested(dir, I_MUTEX_PARENT); if (error == -EINTR) return error; @@ -2869,7 +2869,7 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file, goto out; - err = down_write_killable_nested(&dir->i_rwsem, I_MUTEX_PARENT); + err = inode_lock_killable_nested(dir, I_MUTEX_PARENT); if (err == -EINTR) goto out_drop_write; dentry = lookup_one_len(vol_args->name, parent, namelen); diff --git a/fs/ceph/io.c b/fs/ceph/io.c index 97602ea92ff4..e94186259c2e 100644 --- a/fs/ceph/io.c +++ b/fs/ceph/io.c @@ -53,14 +53,14 @@ ceph_start_io_read(struct inode *inode) struct ceph_inode_info *ci = ceph_inode(inode); /* Be an optimist! */ - down_read(&inode->i_rwsem); + inode_lock_shared(inode); if (!(READ_ONCE(ci->i_ceph_flags) & CEPH_I_ODIRECT)) return; - up_read(&inode->i_rwsem); + inode_unlock_shared(inode); /* Slow path.... */ - down_write(&inode->i_rwsem); + inode_lock(inode); ceph_block_o_direct(ci, inode); - downgrade_write(&inode->i_rwsem); + inode_lock_downgrade(inode); } /** @@ -73,7 +73,7 @@ ceph_start_io_read(struct inode *inode) void ceph_end_io_read(struct inode *inode) { - up_read(&inode->i_rwsem); + inode_unlock_shared(inode); } /** @@ -86,7 +86,7 @@ ceph_end_io_read(struct inode *inode) void ceph_start_io_write(struct inode *inode) { - down_write(&inode->i_rwsem); + inode_lock(inode); ceph_block_o_direct(ceph_inode(inode), inode); } @@ -100,7 +100,7 @@ ceph_start_io_write(struct inode *inode) void ceph_end_io_write(struct inode *inode) { - up_write(&inode->i_rwsem); + inode_unlock(inode); } /* Call with exclusively locked inode->i_rwsem */ @@ -139,14 +139,14 @@ ceph_start_io_direct(struct inode *inode) struct ceph_inode_info *ci = ceph_inode(inode); /* Be an optimist! */ - down_read(&inode->i_rwsem); + inode_lock_shared(inode); if (READ_ONCE(ci->i_ceph_flags) & CEPH_I_ODIRECT) return; - up_read(&inode->i_rwsem); + inode_unlock_shared(inode); /* Slow path.... */ - down_write(&inode->i_rwsem); + inode_lock(inode); ceph_block_buffered(ci, inode); - downgrade_write(&inode->i_rwsem); + inode_lock_downgrade(inode); } /** @@ -159,5 +159,5 @@ ceph_start_io_direct(struct inode *inode) void ceph_end_io_direct(struct inode *inode) { - up_read(&inode->i_rwsem); + inode_unlock_shared(inode); } diff --git a/fs/nfs/io.c b/fs/nfs/io.c index 5088fda9b453..bf5ed7bea59d 100644 --- a/fs/nfs/io.c +++ b/fs/nfs/io.c @@ -44,14 +44,14 @@ nfs_start_io_read(struct inode *inode) { struct nfs_inode *nfsi = NFS_I(inode); /* Be an optimist! */ - down_read(&inode->i_rwsem); + inode_lock_shared(inode); if (test_bit(NFS_INO_ODIRECT, &nfsi->flags) == 0) return; - up_read(&inode->i_rwsem); + inode_unlock_shared(inode); /* Slow path.... */ - down_write(&inode->i_rwsem); + inode_lock(inode); nfs_block_o_direct(nfsi, inode); - downgrade_write(&inode->i_rwsem); + inode_lock_downgrade(inode); } /** @@ -64,7 +64,7 @@ nfs_start_io_read(struct inode *inode) void nfs_end_io_read(struct inode *inode) { - up_read(&inode->i_rwsem); + inode_unlock_shared(inode); } /** @@ -77,7 +77,7 @@ nfs_end_io_read(struct inode *inode) void nfs_start_io_write(struct inode *inode) { - down_write(&inode->i_rwsem); + inode_lock(inode); nfs_block_o_direct(NFS_I(inode), inode); } @@ -91,7 +91,7 @@ nfs_start_io_write(struct inode *inode) void nfs_end_io_write(struct inode *inode) { - up_write(&inode->i_rwsem); + inode_unlock(inode); } /* Call with exclusively locked inode->i_rwsem */ @@ -124,14 +124,14 @@ nfs_start_io_direct(struct inode *inode) { struct nfs_inode *nfsi = NFS_I(inode); /* Be an optimist! */ - down_read(&inode->i_rwsem); + inode_lock_shared(inode); if (test_bit(NFS_INO_ODIRECT, &nfsi->flags) != 0) return; - up_read(&inode->i_rwsem); + inode_unlock_shared(inode); /* Slow path.... */ - down_write(&inode->i_rwsem); + inode_lock(inode); nfs_block_buffered(nfsi, inode); - downgrade_write(&inode->i_rwsem); + inode_lock_downgrade(inode); } /** @@ -144,5 +144,5 @@ nfs_start_io_direct(struct inode *inode) void nfs_end_io_direct(struct inode *inode) { - up_read(&inode->i_rwsem); + inode_unlock_shared(inode); } diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c index c740159d9ad1..369ace12249d 100644 --- a/fs/orangefs/file.c +++ b/fs/orangefs/file.c @@ -363,14 +363,14 @@ static ssize_t orangefs_file_read_iter(struct kiocb *iocb, ro->blksiz = iter->count; } - down_read(&file_inode(iocb->ki_filp)->i_rwsem); + inode_lock_shared(file_inode(iocb->ki_filp)); ret = orangefs_revalidate_mapping(file_inode(iocb->ki_filp)); if (ret) goto out; ret = generic_file_read_iter(iocb, iter); out: - up_read(&file_inode(iocb->ki_filp)->i_rwsem); + inode_unlock_shared(file_inode(iocb->ki_filp)); return ret; } diff --git a/fs/overlayfs/readdir.c b/fs/overlayfs/readdir.c index 47a91c9733a5..c203e73160b0 100644 --- a/fs/overlayfs/readdir.c +++ b/fs/overlayfs/readdir.c @@ -273,7 +273,7 @@ static int ovl_check_whiteouts(struct dentry *dir, struct ovl_readdir_data *rdd) old_cred = ovl_override_creds(rdd->dentry->d_sb); - err = down_write_killable(&dir->d_inode->i_rwsem); + err = inode_lock_killable(dir->d_inode); if (!err) { while (rdd->first_maybe_whiteout) { p = rdd->first_maybe_whiteout; diff --git a/fs/readdir.c b/fs/readdir.c index d26d5ea4de7b..10a34efa0af0 100644 --- a/fs/readdir.c +++ b/fs/readdir.c @@ -52,9 +52,9 @@ int iterate_dir(struct file *file, struct dir_context *ctx) goto out; if (shared) - res = down_read_killable(&inode->i_rwsem); + res = inode_lock_shared_killable(inode); else - res = down_write_killable(&inode->i_rwsem); + res = inode_lock_killable(inode); if (res) goto out; diff --git a/include/linux/fs.h b/include/linux/fs.h index 98e0349adb52..2b407464fac1 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -831,6 +831,27 @@ static inline void inode_lock_shared_nested(struct inode *inode, unsigned subcla down_read_nested(&inode->i_rwsem, subclass); } +static inline void inode_lock_downgrade(struct inode *inode) +{ + downgrade_write(&inode->i_rwsem); +} + +static inline int inode_lock_killable(struct inode *inode) +{ + return down_write_killable(&inode->i_rwsem); +} + +static inline int inode_lock_shared_killable(struct inode *inode) +{ + return down_read_killable(&inode->i_rwsem); +} + +static inline int inode_lock_killable_nested(struct inode *inode, + unsigned subclass) +{ + return down_write_killable_nested(&inode->i_rwsem, subclass); +} + void lock_two_nondirectories(struct inode *, struct inode*); void unlock_two_nondirectories(struct inode *, struct inode*);