From patchwork Wed Apr 17 15:37:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 10905571 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 32EDC922 for ; Wed, 17 Apr 2019 15:37:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F818286B0 for ; Wed, 17 Apr 2019 15:37:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1442C287AA; Wed, 17 Apr 2019 15:37:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B2E6286B0 for ; Wed, 17 Apr 2019 15:37:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732697AbfDQPhW (ORCPT ); Wed, 17 Apr 2019 11:37:22 -0400 Received: from aserp2130.oracle.com ([141.146.126.79]:58060 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732689AbfDQPhW (ORCPT ); Wed, 17 Apr 2019 11:37:22 -0400 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x3HFJ4ba174395; Wed, 17 Apr 2019 15:37:18 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=7Aj+pjzOaO20yDNNAFzsIh3kgQDImmpCLwkYW+JNLyw=; b=d+Kz/to9oQSrRAfaJjXm3RHegRfgec96xsFRpJ9GFtYP6Jbis2wo3AsfepysEI7j/ERZ +e21xsHNl/u9s8M8bqzE3u/BtEvTwjNFQIREzH24ypOFRHKJQ6gnIfbVcsX59GkppsXK koT/M4OntfRF+/5EKGrcmM7aHkO43QOTYUC8CmCMRLE9rqoyWYxk7c92cUIufojy2c8M XrwkGE+RkqxoaUpYDp3iXX/sodZUekQPjpHuldZ19wereucaW3LDfuq09lt3623HR6Ih MgFFySzv5ztOOHCy87E1/aUvqBekEoLZdnByljAHTAjQu3vzyeNU83TpDIydroPqog06 8g== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by aserp2130.oracle.com with ESMTP id 2ru59dbt0f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Apr 2019 15:37:18 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x3HFaBwe038842; Wed, 17 Apr 2019 15:37:17 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserp3020.oracle.com with ESMTP id 2rv2tvenyr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Apr 2019 15:37:17 +0000 Received: from abhmp0008.oracle.com (abhmp0008.oracle.com [141.146.116.14]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x3HFbGjP012863; Wed, 17 Apr 2019 15:37:16 GMT Received: from localhost.localdomain (/116.87.143.221) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 17 Apr 2019 08:37:16 -0700 From: Anand Jain To: linux-btrfs@vger.kernel.org Cc: dsterba@suse.cz Subject: [PATCH 1/2 RFC] btrfs: refactor btrfs_set_props to validate externally Date: Wed, 17 Apr 2019 23:37:05 +0800 Message-Id: <20190417153706.29942-2-anand.jain@oracle.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190417153706.29942-1-anand.jain@oracle.com> References: <20190417153706.29942-1-anand.jain@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9230 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1904170104 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9230 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1904170104 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In preparation to merge multiple transactions when setting the inode attribute flags, move btrfs_set_props()'s validation part to outside. Signed-off-by: Anand Jain --- fs/btrfs/ioctl.c | 3 +++ fs/btrfs/props.c | 23 +++++++++++++++++------ fs/btrfs/props.h | 1 + fs/btrfs/xattr.c | 5 +++++ 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 8c9a908d3acc..63e6e2f5b659 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -284,6 +284,7 @@ static int btrfs_ioctl_setflags(struct file *file, void __user *arg) binode->flags &= ~BTRFS_INODE_COMPRESS; binode->flags |= BTRFS_INODE_NOCOMPRESS; + /* set no-compression no need to validate prop here */ ret = btrfs_set_prop_trans(inode, "btrfs.compression", NULL, 0, 0); if (ret && ret != -ENODATA) @@ -299,6 +300,7 @@ static int btrfs_ioctl_setflags(struct file *file, void __user *arg) binode->flags |= BTRFS_INODE_COMPRESS; binode->flags &= ~BTRFS_INODE_NOCOMPRESS; + /* compress_type is already validated during mount options */ comp = btrfs_compress_type2str(fs_info->compress_type); if (!comp || comp[0] == 0) comp = btrfs_compress_type2str(BTRFS_COMPRESS_ZLIB); @@ -309,6 +311,7 @@ static int btrfs_ioctl_setflags(struct file *file, void __user *arg) goto out_drop; } else { + /* reset prop, no need of validate prop here */ ret = btrfs_set_prop_trans(inode, "btrfs.compression", NULL, 0, 0); if (ret && ret != -ENODATA) diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c index 44b7bf647ab3..e356dd2a0f73 100644 --- a/fs/btrfs/props.c +++ b/fs/btrfs/props.c @@ -55,6 +55,23 @@ find_prop_handler(const char *name, return NULL; } +int btrfs_validate_prop(const char *name, const char *value, size_t value_len) +{ + const struct prop_handler *handler; + + if (strlen(name) <= XATTR_BTRFS_PREFIX_LEN) + return -EINVAL; + + handler = find_prop_handler(name, NULL); + if (!handler) + return -EINVAL; + + if (value_len == 0) + return 0; + + return handler->validate(value, value_len); +} + static int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode, const char *name, const char *value, size_t value_len, int flags) @@ -62,9 +79,6 @@ static int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode, const struct prop_handler *handler; int ret; - if (strlen(name) <= XATTR_BTRFS_PREFIX_LEN) - return -EINVAL; - handler = find_prop_handler(name, NULL); if (!handler) return -EINVAL; @@ -85,9 +99,6 @@ static int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode, return ret; } - ret = handler->validate(value, value_len); - if (ret) - return ret; if (trans) ret = btrfs_setxattr(trans, inode, handler->xattr_name, value, value_len, flags); diff --git a/fs/btrfs/props.h b/fs/btrfs/props.h index b1a6b233b774..01d2c1899bc7 100644 --- a/fs/btrfs/props.h +++ b/fs/btrfs/props.h @@ -12,6 +12,7 @@ void __init btrfs_props_init(void); int btrfs_set_prop_trans(struct inode *inode, const char *name, const char *value, size_t value_len, int flags); +int btrfs_validate_prop(const char *name, const char *value, size_t value_len); int btrfs_load_inode_props(struct inode *inode, struct btrfs_path *path); diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c index 10da873d11f5..807cc24dc885 100644 --- a/fs/btrfs/xattr.c +++ b/fs/btrfs/xattr.c @@ -373,7 +373,12 @@ static int btrfs_xattr_handler_set_prop(const struct xattr_handler *handler, const char *name, const void *value, size_t size, int flags) { + int ret; + name = xattr_full_name(handler, name); + ret = btrfs_validate_prop(name, value, size); + if (ret) + return ret; return btrfs_set_prop_trans(inode, name, value, size, flags); } From patchwork Wed Apr 17 15:37:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 10905573 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CB734922 for ; Wed, 17 Apr 2019 15:37:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B62DB286B0 for ; Wed, 17 Apr 2019 15:37:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AA01C28763; Wed, 17 Apr 2019 15:37:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A379D286B0 for ; Wed, 17 Apr 2019 15:37:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732713AbfDQPhX (ORCPT ); Wed, 17 Apr 2019 11:37:23 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:40156 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731743AbfDQPhX (ORCPT ); Wed, 17 Apr 2019 11:37:23 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x3HFJ1DT167740; Wed, 17 Apr 2019 15:37:20 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=3bZKcxDkKSEkztL0ON861p2PoXlKMkn93IY9QbuYhZc=; b=GUiPjZTdGfg/kEmdJAfF4bsSIjr3TT+KB9r40ZyFdX8aSTVngQz8sAB7HCEu7Duotcr2 TwxSKHFbZm08uKkOIL8H2c9O9liMHRL+Ez/wmTB6j8+fSNwBnwHHi9mmfTVTmnTHgnU2 UbJeK6zXHOzWbsBv8AMFy10bI6E2Ett36hvapZ4dL09vg8yH3KKWSSvveom7WPXBb54n AiCDg3o8q4YHWNc1JzKvYQg9W50oX/OX/+WdGmhCvsRHmJTSMTbpiWFDEQKCsgdEHAzq ZMEzGa7aEOeLIpqWBjD8v2EJ5RMOgU5WvFWhMoxtKpkS8xmSEjxUywG4cFgOrnZx+SJD pA== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by userp2130.oracle.com with ESMTP id 2rvwk3uv3r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Apr 2019 15:37:19 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x3HFaRen164815; Wed, 17 Apr 2019 15:37:19 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userp3020.oracle.com with ESMTP id 2rubq70s2k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Apr 2019 15:37:19 +0000 Received: from abhmp0008.oracle.com (abhmp0008.oracle.com [141.146.116.14]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x3HFbIAj002604; Wed, 17 Apr 2019 15:37:19 GMT Received: from localhost.localdomain (/116.87.143.221) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 17 Apr 2019 08:37:17 -0700 From: Anand Jain To: linux-btrfs@vger.kernel.org Cc: dsterba@suse.cz Subject: [PATCH 2/2 RFC] btrfs: start transaction in btrfs_ioctl_setflags() Date: Wed, 17 Apr 2019 23:37:06 +0800 Message-Id: <20190417153706.29942-3-anand.jain@oracle.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190417153706.29942-1-anand.jain@oracle.com> References: <20190417153706.29942-1-anand.jain@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9230 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1904170104 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9230 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1904170104 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When inode attribute flags is set through FS_IOC_SETFLAGS ioctl, there is a bit of duplicate codes, the following things happens twice - start/end_transaction, inode_inc_iversion(), current_time update to inode->i_ctime, and btrfs_update_inode(). These are updated both at btrfs_ioctl_setflags() and btrfs_set_props() as well. (RFC: So inode version and the generation number should have increased by +2, but I don't see that in the test case below ran without this patch) This patch merges these two duplicate codes at btrfs_ioctl_setflags(). $ cat a mkfs.btrfs -fq /dev/sdb || exit mount /dev/sdb /btrfs touch /btrfs/file1 sync echo before: btrfs in dump-super /dev/sdb | grep ^generation btrfs in dump-tree /dev/sdb | grep -A4 "257 XATTR_ITEM" btrfs in dump-tree /dev/sdb | grep -A4 "257 INODE_ITEM 0) item" echo echo "chattr +Ac /btrfs/file1" chattr +Ac /btrfs/file1 sync echo after: btrfs in dump-super /dev/sdb | grep ^generation btrfs in dump-tree /dev/sdb | grep -A4 "257 XATTR_ITEM" btrfs in dump-tree /dev/sdb | grep -A4 "257 INODE_ITEM 0) item" $ umount /btrfs; ./a before: generation 6 item 4 key (257 INODE_ITEM 0) itemoff 15881 itemsize 160 generation 6 transid 6 size 0 nbytes 0 block group 0 mode 100644 links 1 uid 0 gid 0 rdev 0 sequence 19 flags 0x0(none) chattr +Ac /btrfs/file1 after: generation 7 item 6 key (257 XATTR_ITEM 550297449) itemoff 15815 itemsize 51 location key (0 UNKNOWN.0 0) type XATTR transid 7 data_len 4 name_len 17 name: btrfs.compression data zlib item 4 key (257 INODE_ITEM 0) itemoff 15881 itemsize 160 generation 6 transid 7 size 0 nbytes 0 block group 0 mode 100644 links 1 uid 0 gid 0 rdev 0 sequence 21 flags 0xa00(NOATIME|COMPRESS) Signed-off-by: Anand Jain --- fs/btrfs/ioctl.c | 38 ++++++++++++++++++-------------------- fs/btrfs/props.c | 6 +++--- fs/btrfs/props.h | 3 +++ 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 63e6e2f5b659..82772523bb87 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -192,6 +192,7 @@ static int btrfs_ioctl_setflags(struct file *file, void __user *arg) u64 old_flags; unsigned int old_i_flags; umode_t mode; + const char *comp = NULL; if (!inode_owner_or_capable(inode)) return -EPERM; @@ -283,14 +284,7 @@ static int btrfs_ioctl_setflags(struct file *file, void __user *arg) if (fsflags & FS_NOCOMP_FL) { binode->flags &= ~BTRFS_INODE_COMPRESS; binode->flags |= BTRFS_INODE_NOCOMPRESS; - - /* set no-compression no need to validate prop here */ - ret = btrfs_set_prop_trans(inode, "btrfs.compression", NULL, - 0, 0); - if (ret && ret != -ENODATA) - goto out_drop; } else if (fsflags & FS_COMPR_FL) { - const char *comp; if (IS_SWAPFILE(inode)) { ret = -ETXTBSY; @@ -300,36 +294,40 @@ static int btrfs_ioctl_setflags(struct file *file, void __user *arg) binode->flags |= BTRFS_INODE_COMPRESS; binode->flags &= ~BTRFS_INODE_NOCOMPRESS; - /* compress_type is already validated during mount options */ comp = btrfs_compress_type2str(fs_info->compress_type); if (!comp || comp[0] == 0) comp = btrfs_compress_type2str(BTRFS_COMPRESS_ZLIB); - - ret = btrfs_set_prop_trans(inode, "btrfs.compression", comp, - strlen(comp), 0); - if (ret) - goto out_drop; - } else { - /* reset prop, no need of validate prop here */ - ret = btrfs_set_prop_trans(inode, "btrfs.compression", NULL, - 0, 0); - if (ret && ret != -ENODATA) - goto out_drop; binode->flags &= ~(BTRFS_INODE_COMPRESS | BTRFS_INODE_NOCOMPRESS); } - trans = btrfs_start_transaction(root, 1); + trans = btrfs_start_transaction(root, 3); if (IS_ERR(trans)) { ret = PTR_ERR(trans); goto out_drop; } + if (comp) { + ret = btrfs_set_prop(trans, inode, "btrfs.compression", comp, + strlen(comp), 0); + if (ret) + goto out_abort; + set_bit(BTRFS_INODE_COPY_EVERYTHING, &BTRFS_I(inode)->runtime_flags); + } else { + ret = btrfs_set_prop(trans, inode, "btrfs.compression", NULL, + 0, 0); + if (ret && ret != -ENODATA) + goto out_abort; + } + btrfs_sync_inode_flags_to_i_flags(inode); inode_inc_iversion(inode); inode->i_ctime = current_time(inode); ret = btrfs_update_inode(trans, root, inode); + out_abort: + if (ret) + btrfs_abort_transaction(trans, ret); btrfs_end_transaction(trans); out_drop: if (ret) { diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c index e356dd2a0f73..aedf5a7d69c9 100644 --- a/fs/btrfs/props.c +++ b/fs/btrfs/props.c @@ -72,9 +72,9 @@ int btrfs_validate_prop(const char *name, const char *value, size_t value_len) return handler->validate(value, value_len); } -static int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode, - const char *name, const char *value, size_t value_len, - int flags) +int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode, + const char *name, const char *value, size_t value_len, + int flags) { const struct prop_handler *handler; int ret; diff --git a/fs/btrfs/props.h b/fs/btrfs/props.h index 01d2c1899bc7..30b99348977d 100644 --- a/fs/btrfs/props.h +++ b/fs/btrfs/props.h @@ -12,6 +12,9 @@ void __init btrfs_props_init(void); int btrfs_set_prop_trans(struct inode *inode, const char *name, const char *value, size_t value_len, int flags); +int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode, + const char *name, const char *value, size_t value_len, + int flags); int btrfs_validate_prop(const char *name, const char *value, size_t value_len); int btrfs_load_inode_props(struct inode *inode, struct btrfs_path *path);