From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id EDA5021AEB0DB for ; Thu, 3 Aug 2017 19:32:36 -0700 (PDT) Subject: [PATCH v2 3/5] fs, xfs: introduce FALLOC_FL_UNSEAL_BLOCK_MAP From: Dan Williams Date: Thu, 03 Aug 2017 19:28:23 -0700 Message-ID: <150181370272.32119.9941879917087053701.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <150181368442.32119.13336247800141074356.stgit@dwillia2-desk3.amr.corp.intel.com> References: <150181368442.32119.13336247800141074356.stgit@dwillia2-desk3.amr.corp.intel.com> MIME-Version: 1.0 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" To: darrick.wong@oracle.com Cc: Jan Kara , linux-nvdimm@lists.01.org, Dave Chinner , linux-kernel@vger.kernel.org, linux-xfs@vger.kernel.org, Alexander Viro , luto@kernel.org, linux-fsdevel@vger.kernel.org, Christoph Hellwig List-ID: Provide an explicit fallocate operation type for clearing the S_IOMAP_IMMUTABLE flag. Like the enable case it requires CAP_IMMUTABLE and it can only be performed while no process has the file mapped. Cc: Jan Kara Cc: Jeff Moyer Cc: Christoph Hellwig Cc: Ross Zwisler Cc: Alexander Viro Cc: "Darrick J. Wong" Suggested-by: Dave Chinner Signed-off-by: Dan Williams --- fs/open.c | 17 +++++++++++------ fs/xfs/xfs_bmap_util.c | 42 ++++++++++++++++++++++++++++++++++++++++++ fs/xfs/xfs_bmap_util.h | 3 +++ fs/xfs/xfs_file.c | 4 +++- include/linux/falloc.h | 3 ++- include/uapi/linux/falloc.h | 1 + 6 files changed, 62 insertions(+), 8 deletions(-) diff --git a/fs/open.c b/fs/open.c index e3aae59785ae..ccfd8d3becc8 100644 --- a/fs/open.c +++ b/fs/open.c @@ -274,13 +274,17 @@ int vfs_fallocate(struct file *file, int mode, loff_t offset, loff_t len) return -EINVAL; /* - * Seal block map operation should only be used exclusively, and - * with the IMMUTABLE capability. + * Seal/unseal block map operations should only be used + * exclusively, and with the IMMUTABLE capability. */ - if (mode & FALLOC_FL_SEAL_BLOCK_MAP) { + if (mode & (FALLOC_FL_SEAL_BLOCK_MAP | FALLOC_FL_UNSEAL_BLOCK_MAP)) { if (!capable(CAP_LINUX_IMMUTABLE)) return -EPERM; - if (mode & ~FALLOC_FL_SEAL_BLOCK_MAP) + if (mode == (FALLOC_FL_SEAL_BLOCK_MAP + | FALLOC_FL_UNSEAL_BLOCK_MAP)) + return -EINVAL; + if (mode & ~(FALLOC_FL_SEAL_BLOCK_MAP + | FALLOC_FL_UNSEAL_BLOCK_MAP)) return -EINVAL; } @@ -303,9 +307,10 @@ int vfs_fallocate(struct file *file, int mode, loff_t offset, loff_t len) return -ETXTBSY; /* - * We cannot allow any allocation changes on an iomap immutable file + * We cannot allow any allocation changes on an iomap immutable + * file, but we can allow clearing the immutable state. */ - if (IS_IOMAP_IMMUTABLE(inode)) + if (IS_IOMAP_IMMUTABLE(inode) && !(mode & FALLOC_FL_UNSEAL_BLOCK_MAP)) return -ETXTBSY; /* diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c index 46d8eb9e19fc..70ac2d33ab27 100644 --- a/fs/xfs/xfs_bmap_util.c +++ b/fs/xfs/xfs_bmap_util.c @@ -1494,6 +1494,48 @@ xfs_seal_file_space( return error; } +int +xfs_unseal_file_space( + struct xfs_inode *ip, + xfs_off_t offset, + xfs_off_t len) +{ + struct inode *inode = VFS_I(ip); + struct address_space *mapping = inode->i_mapping; + int error; + + ASSERT(xfs_isilocked(ip, XFS_MMAPLOCK_EXCL)); + + if (offset) + return -EINVAL; + + xfs_ilock(ip, XFS_ILOCK_EXCL); + /* + * It does not make sense to unseal less than the full range of + * the file. + */ + error = -EINVAL; + if (len < i_size_read(inode)) + goto out_unlock; + + /* + * Provide safety against one thread changing the policy of not + * requiring fsync/msync (for block allocations) behind another + * thread's back. + */ + error = -EBUSY; + if (mapping_mapped(mapping)) + goto out_unlock; + + inode->i_flags &= ~S_IOMAP_IMMUTABLE; + error = 0; + +out_unlock: + xfs_iunlock(ip, XFS_ILOCK_EXCL); + + return error; +} + /* * @next_fsb will keep track of the extent currently undergoing shift. * @stop_fsb will keep track of the extent at which we have to stop. diff --git a/fs/xfs/xfs_bmap_util.h b/fs/xfs/xfs_bmap_util.h index 5115a32a2483..b64653a75942 100644 --- a/fs/xfs/xfs_bmap_util.h +++ b/fs/xfs/xfs_bmap_util.h @@ -62,6 +62,9 @@ int xfs_insert_file_space(struct xfs_inode *, xfs_off_t offset, xfs_off_t len); int xfs_seal_file_space(struct xfs_inode *, xfs_off_t offset, xfs_off_t len); +int xfs_unseal_file_space(struct xfs_inode *, xfs_off_t offset, + xfs_off_t len); + /* EOF block manipulation functions */ bool xfs_can_free_eofblocks(struct xfs_inode *ip, bool force); diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index e21121530a90..833f77700be2 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -740,7 +740,7 @@ xfs_file_write_iter( (FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE | \ FALLOC_FL_COLLAPSE_RANGE | FALLOC_FL_ZERO_RANGE | \ FALLOC_FL_INSERT_RANGE | FALLOC_FL_UNSHARE_RANGE | \ - FALLOC_FL_SEAL_BLOCK_MAP) + FALLOC_FL_SEAL_BLOCK_MAP | FALLOC_FL_UNSEAL_BLOCK_MAP) STATIC long xfs_file_fallocate( @@ -840,6 +840,8 @@ xfs_file_fallocate( XFS_BMAPI_PREALLOC); } else if (mode & FALLOC_FL_SEAL_BLOCK_MAP) { error = xfs_seal_file_space(ip, offset, len); + } else if (mode & FALLOC_FL_UNSEAL_BLOCK_MAP) { + error = xfs_unseal_file_space(ip, offset, len); } else error = xfs_alloc_file_space(ip, offset, len, XFS_BMAPI_PREALLOC); diff --git a/include/linux/falloc.h b/include/linux/falloc.h index 48546c6fbec7..b22c1368ed1e 100644 --- a/include/linux/falloc.h +++ b/include/linux/falloc.h @@ -27,6 +27,7 @@ struct space_resv { FALLOC_FL_ZERO_RANGE | \ FALLOC_FL_INSERT_RANGE | \ FALLOC_FL_UNSHARE_RANGE | \ - FALLOC_FL_SEAL_BLOCK_MAP) + FALLOC_FL_SEAL_BLOCK_MAP | \ + FALLOC_FL_UNSEAL_BLOCK_MAP) #endif /* _FALLOC_H_ */ diff --git a/include/uapi/linux/falloc.h b/include/uapi/linux/falloc.h index 39076975bf6f..a4949e1a2dae 100644 --- a/include/uapi/linux/falloc.h +++ b/include/uapi/linux/falloc.h @@ -95,4 +95,5 @@ * with the punch, zero, collapse, or insert range modes. */ #define FALLOC_FL_SEAL_BLOCK_MAP 0x080 +#define FALLOC_FL_UNSEAL_BLOCK_MAP 0x100 #endif /* _UAPI_FALLOC_H_ */ _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752121AbdHDCex (ORCPT ); Thu, 3 Aug 2017 22:34:53 -0400 Received: from mga11.intel.com ([192.55.52.93]:40420 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751910AbdHDCeu (ORCPT ); Thu, 3 Aug 2017 22:34:50 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,319,1498546800"; d="scan'208";a="119557164" Subject: [PATCH v2 3/5] fs, xfs: introduce FALLOC_FL_UNSEAL_BLOCK_MAP From: Dan Williams To: darrick.wong@oracle.com Cc: Jan Kara , linux-nvdimm@lists.01.org, Dave Chinner , linux-kernel@vger.kernel.org, linux-xfs@vger.kernel.org, Jeff Moyer , Alexander Viro , luto@kernel.org, linux-fsdevel@vger.kernel.org, Ross Zwisler , Christoph Hellwig Date: Thu, 03 Aug 2017 19:28:23 -0700 Message-ID: <150181370272.32119.9941879917087053701.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <150181368442.32119.13336247800141074356.stgit@dwillia2-desk3.amr.corp.intel.com> References: <150181368442.32119.13336247800141074356.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.17.1-9-g687f MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Provide an explicit fallocate operation type for clearing the S_IOMAP_IMMUTABLE flag. Like the enable case it requires CAP_IMMUTABLE and it can only be performed while no process has the file mapped. Cc: Jan Kara Cc: Jeff Moyer Cc: Christoph Hellwig Cc: Ross Zwisler Cc: Alexander Viro Cc: "Darrick J. Wong" Suggested-by: Dave Chinner Signed-off-by: Dan Williams --- fs/open.c | 17 +++++++++++------ fs/xfs/xfs_bmap_util.c | 42 ++++++++++++++++++++++++++++++++++++++++++ fs/xfs/xfs_bmap_util.h | 3 +++ fs/xfs/xfs_file.c | 4 +++- include/linux/falloc.h | 3 ++- include/uapi/linux/falloc.h | 1 + 6 files changed, 62 insertions(+), 8 deletions(-) diff --git a/fs/open.c b/fs/open.c index e3aae59785ae..ccfd8d3becc8 100644 --- a/fs/open.c +++ b/fs/open.c @@ -274,13 +274,17 @@ int vfs_fallocate(struct file *file, int mode, loff_t offset, loff_t len) return -EINVAL; /* - * Seal block map operation should only be used exclusively, and - * with the IMMUTABLE capability. + * Seal/unseal block map operations should only be used + * exclusively, and with the IMMUTABLE capability. */ - if (mode & FALLOC_FL_SEAL_BLOCK_MAP) { + if (mode & (FALLOC_FL_SEAL_BLOCK_MAP | FALLOC_FL_UNSEAL_BLOCK_MAP)) { if (!capable(CAP_LINUX_IMMUTABLE)) return -EPERM; - if (mode & ~FALLOC_FL_SEAL_BLOCK_MAP) + if (mode == (FALLOC_FL_SEAL_BLOCK_MAP + | FALLOC_FL_UNSEAL_BLOCK_MAP)) + return -EINVAL; + if (mode & ~(FALLOC_FL_SEAL_BLOCK_MAP + | FALLOC_FL_UNSEAL_BLOCK_MAP)) return -EINVAL; } @@ -303,9 +307,10 @@ int vfs_fallocate(struct file *file, int mode, loff_t offset, loff_t len) return -ETXTBSY; /* - * We cannot allow any allocation changes on an iomap immutable file + * We cannot allow any allocation changes on an iomap immutable + * file, but we can allow clearing the immutable state. */ - if (IS_IOMAP_IMMUTABLE(inode)) + if (IS_IOMAP_IMMUTABLE(inode) && !(mode & FALLOC_FL_UNSEAL_BLOCK_MAP)) return -ETXTBSY; /* diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c index 46d8eb9e19fc..70ac2d33ab27 100644 --- a/fs/xfs/xfs_bmap_util.c +++ b/fs/xfs/xfs_bmap_util.c @@ -1494,6 +1494,48 @@ xfs_seal_file_space( return error; } +int +xfs_unseal_file_space( + struct xfs_inode *ip, + xfs_off_t offset, + xfs_off_t len) +{ + struct inode *inode = VFS_I(ip); + struct address_space *mapping = inode->i_mapping; + int error; + + ASSERT(xfs_isilocked(ip, XFS_MMAPLOCK_EXCL)); + + if (offset) + return -EINVAL; + + xfs_ilock(ip, XFS_ILOCK_EXCL); + /* + * It does not make sense to unseal less than the full range of + * the file. + */ + error = -EINVAL; + if (len < i_size_read(inode)) + goto out_unlock; + + /* + * Provide safety against one thread changing the policy of not + * requiring fsync/msync (for block allocations) behind another + * thread's back. + */ + error = -EBUSY; + if (mapping_mapped(mapping)) + goto out_unlock; + + inode->i_flags &= ~S_IOMAP_IMMUTABLE; + error = 0; + +out_unlock: + xfs_iunlock(ip, XFS_ILOCK_EXCL); + + return error; +} + /* * @next_fsb will keep track of the extent currently undergoing shift. * @stop_fsb will keep track of the extent at which we have to stop. diff --git a/fs/xfs/xfs_bmap_util.h b/fs/xfs/xfs_bmap_util.h index 5115a32a2483..b64653a75942 100644 --- a/fs/xfs/xfs_bmap_util.h +++ b/fs/xfs/xfs_bmap_util.h @@ -62,6 +62,9 @@ int xfs_insert_file_space(struct xfs_inode *, xfs_off_t offset, xfs_off_t len); int xfs_seal_file_space(struct xfs_inode *, xfs_off_t offset, xfs_off_t len); +int xfs_unseal_file_space(struct xfs_inode *, xfs_off_t offset, + xfs_off_t len); + /* EOF block manipulation functions */ bool xfs_can_free_eofblocks(struct xfs_inode *ip, bool force); diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index e21121530a90..833f77700be2 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -740,7 +740,7 @@ xfs_file_write_iter( (FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE | \ FALLOC_FL_COLLAPSE_RANGE | FALLOC_FL_ZERO_RANGE | \ FALLOC_FL_INSERT_RANGE | FALLOC_FL_UNSHARE_RANGE | \ - FALLOC_FL_SEAL_BLOCK_MAP) + FALLOC_FL_SEAL_BLOCK_MAP | FALLOC_FL_UNSEAL_BLOCK_MAP) STATIC long xfs_file_fallocate( @@ -840,6 +840,8 @@ xfs_file_fallocate( XFS_BMAPI_PREALLOC); } else if (mode & FALLOC_FL_SEAL_BLOCK_MAP) { error = xfs_seal_file_space(ip, offset, len); + } else if (mode & FALLOC_FL_UNSEAL_BLOCK_MAP) { + error = xfs_unseal_file_space(ip, offset, len); } else error = xfs_alloc_file_space(ip, offset, len, XFS_BMAPI_PREALLOC); diff --git a/include/linux/falloc.h b/include/linux/falloc.h index 48546c6fbec7..b22c1368ed1e 100644 --- a/include/linux/falloc.h +++ b/include/linux/falloc.h @@ -27,6 +27,7 @@ struct space_resv { FALLOC_FL_ZERO_RANGE | \ FALLOC_FL_INSERT_RANGE | \ FALLOC_FL_UNSHARE_RANGE | \ - FALLOC_FL_SEAL_BLOCK_MAP) + FALLOC_FL_SEAL_BLOCK_MAP | \ + FALLOC_FL_UNSEAL_BLOCK_MAP) #endif /* _FALLOC_H_ */ diff --git a/include/uapi/linux/falloc.h b/include/uapi/linux/falloc.h index 39076975bf6f..a4949e1a2dae 100644 --- a/include/uapi/linux/falloc.h +++ b/include/uapi/linux/falloc.h @@ -95,4 +95,5 @@ * with the punch, zero, collapse, or insert range modes. */ #define FALLOC_FL_SEAL_BLOCK_MAP 0x080 +#define FALLOC_FL_UNSEAL_BLOCK_MAP 0x100 #endif /* _UAPI_FALLOC_H_ */