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=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_SANE_1 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 21602C35656 for ; Fri, 21 Feb 2020 15:20:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DF6C3206EF for ; Fri, 21 Feb 2020 15:20:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="bkKXn13B" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729000AbgBUPUH (ORCPT ); Fri, 21 Feb 2020 10:20:07 -0500 Received: from aserp2120.oracle.com ([141.146.126.78]:42564 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727352AbgBUPUH (ORCPT ); Fri, 21 Feb 2020 10:20:07 -0500 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 01LFHUot017571; Fri, 21 Feb 2020 15:20:01 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=corp-2020-01-29; bh=9rmTAYrxSTCIjdqHzt5jrFh0f0kBg9J/IV+GklaUUJk=; b=bkKXn13BwhK9y6ukcbCzpX69FpwVxOs+UwHnUbjBNimSSsZ/mTZMJOv15A6+Cdq0xD2y TxYEitW1qMQ9f9K9dcFKzmSJA3Y90NRBuPj8MRgNrsMvPwtcDK/LHNaQ676/6cuV3CJg MwTrZOos4IXS1kCW7Dzen9idx1jr9fhOB0mG6+8Du9qaGhum7in30QEZMRzCHt7XEtPT i+GBzVcEsXgrrGERjVncn1RwiGX2zhzMfhMmraFulWYECOukeDIXOAXJbxvsrBW3cNCk TBnHwpd/nZCK2n/QvXnBnctFo1lEJqt0BfKOhOVUvITrr7BtO3q/TgKuCMzqIDM+WGU1 wA== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by aserp2120.oracle.com with ESMTP id 2y8udks4g5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 Feb 2020 15:20:01 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 01LFK1Kf155900; Fri, 21 Feb 2020 15:20:01 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserp3020.oracle.com with ESMTP id 2y8udnds51-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 Feb 2020 15:20:01 +0000 Received: from abhmp0015.oracle.com (abhmp0015.oracle.com [141.146.116.21]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 01LFJwbE022935; Fri, 21 Feb 2020 15:19:58 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 21 Feb 2020 07:19:57 -0800 Date: Fri, 21 Feb 2020 07:19:56 -0800 From: "Darrick J. Wong" To: Christoph Hellwig Cc: linux-xfs@vger.kernel.org, Allison Collins , Dave Chinner , Chandan Rajendra Subject: Re: [PATCH 15/31] xfs: remove ATTR_ALLOC and XFS_DA_OP_ALLOCVAL Message-ID: <20200221151956.GJ9506@magnolia> References: <20200221141154.476496-1-hch@lst.de> <20200221141154.476496-16-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200221141154.476496-16-hch@lst.de> User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9537 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999 phishscore=0 suspectscore=2 mlxscore=0 malwarescore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2001150001 definitions=main-2002210118 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9537 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 lowpriorityscore=0 suspectscore=2 spamscore=0 priorityscore=1501 adultscore=0 mlxscore=0 clxscore=1015 malwarescore=0 mlxlogscore=999 phishscore=0 impostorscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2001150001 definitions=main-2002210118 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org On Fri, Feb 21, 2020 at 06:11:38AM -0800, Christoph Hellwig wrote: > Use a NULL args->value as the indicator to lazily allocate a buffer > instead, and let the caller always free args->value instead of > duplicating the cleanup. > > Signed-off-by: Christoph Hellwig > Reviewed-by: Dave Chinner > Reviewed-by: Chandan Rajendra Looks ok, Reviewed-by: Darrick J. Wong --D > --- > fs/xfs/libxfs/xfs_attr.c | 20 +++++--------------- > fs/xfs/libxfs/xfs_attr.h | 7 ++----- > fs/xfs/libxfs/xfs_attr_leaf.c | 2 +- > fs/xfs/libxfs/xfs_types.h | 2 -- > fs/xfs/xfs_acl.c | 20 ++++++++++---------- > 5 files changed, 18 insertions(+), 33 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c > index 469417786bfc..1382e51ef85e 100644 > --- a/fs/xfs/libxfs/xfs_attr.c > +++ b/fs/xfs/libxfs/xfs_attr.c > @@ -98,15 +98,14 @@ xfs_attr_get_ilocked( > * indication whether the attribute exists and the size of the value if it > * exists. The size is returned in args.valuelen. > * > + * If args->value is NULL but args->valuelen is non-zero, allocate the buffer > + * for the value after existence of the attribute has been determined. The > + * caller always has to free args->value if it is set, no matter if this > + * function was successful or not. > + * > * If the attribute is found, but exceeds the size limit set by the caller in > * args->valuelen, return -ERANGE with the size of the attribute that was found > * in args->valuelen. > - * > - * If ATTR_ALLOC is set in args->flags, allocate the buffer for the value after > - * existence of the attribute has been determined. On success, return that > - * buffer to the caller and leave them to free it. On failure, free any > - * allocated buffer and ensure the buffer pointer returned to the caller is > - * null. > */ > int > xfs_attr_get( > @@ -115,8 +114,6 @@ xfs_attr_get( > uint lock_mode; > int error; > > - ASSERT((args->flags & ATTR_ALLOC) || !args->valuelen || args->value); > - > XFS_STATS_INC(args->dp->i_mount, xs_attr_get); > > if (XFS_FORCED_SHUTDOWN(args->dp->i_mount)) > @@ -128,18 +125,11 @@ xfs_attr_get( > > /* Entirely possible to look up a name which doesn't exist */ > args->op_flags = XFS_DA_OP_OKNOENT; > - if (args->flags & ATTR_ALLOC) > - args->op_flags |= XFS_DA_OP_ALLOCVAL; > > lock_mode = xfs_ilock_attr_map_shared(args->dp); > error = xfs_attr_get_ilocked(args); > xfs_iunlock(args->dp, lock_mode); > > - /* on error, we have to clean up allocated value buffers */ > - if (error && (args->flags & ATTR_ALLOC)) { > - kmem_free(args->value); > - args->value = NULL; > - } > return error; > } > > diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h > index fe064cd81747..a6de050675c9 100644 > --- a/fs/xfs/libxfs/xfs_attr.h > +++ b/fs/xfs/libxfs/xfs_attr.h > @@ -35,10 +35,8 @@ struct xfs_attr_list_context; > > #define ATTR_KERNOTIME 0x1000 /* [kernel] don't update inode timestamps */ > > -#define ATTR_ALLOC 0x8000 /* [kernel] allocate xattr buffer on demand */ > - > #define ATTR_KERNEL_FLAGS \ > - (ATTR_KERNOTIME | ATTR_ALLOC) > + (ATTR_KERNOTIME) > > #define XFS_ATTR_FLAGS \ > { ATTR_DONTFOLLOW, "DONTFOLLOW" }, \ > @@ -47,8 +45,7 @@ struct xfs_attr_list_context; > { ATTR_SECURE, "SECURE" }, \ > { ATTR_CREATE, "CREATE" }, \ > { ATTR_REPLACE, "REPLACE" }, \ > - { ATTR_KERNOTIME, "KERNOTIME" }, \ > - { ATTR_ALLOC, "ALLOC" } > + { ATTR_KERNOTIME, "KERNOTIME" } > > /* > * The maximum size (into the kernel or returned from the kernel) of an > diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c > index 5e700dfc48a9..b0658eb8fbcc 100644 > --- a/fs/xfs/libxfs/xfs_attr_leaf.c > +++ b/fs/xfs/libxfs/xfs_attr_leaf.c > @@ -477,7 +477,7 @@ xfs_attr_copy_value( > return -ERANGE; > } > > - if (args->op_flags & XFS_DA_OP_ALLOCVAL) { > + if (!args->value) { > args->value = kmem_alloc_large(valuelen, 0); > if (!args->value) > return -ENOMEM; > diff --git a/fs/xfs/libxfs/xfs_types.h b/fs/xfs/libxfs/xfs_types.h > index 634814dd1d10..3379ebc0c7c5 100644 > --- a/fs/xfs/libxfs/xfs_types.h > +++ b/fs/xfs/libxfs/xfs_types.h > @@ -223,7 +223,6 @@ typedef struct xfs_da_args { > #define XFS_DA_OP_ADDNAME 0x0004 /* this is an add operation */ > #define XFS_DA_OP_OKNOENT 0x0008 /* lookup/add op, ENOENT ok, else die */ > #define XFS_DA_OP_CILOOKUP 0x0010 /* lookup to return CI name if found */ > -#define XFS_DA_OP_ALLOCVAL 0x0020 /* lookup to alloc buffer if found */ > #define XFS_DA_OP_INCOMPLETE 0x0040 /* lookup INCOMPLETE attr keys */ > > #define XFS_DA_OP_FLAGS \ > @@ -232,7 +231,6 @@ typedef struct xfs_da_args { > { XFS_DA_OP_ADDNAME, "ADDNAME" }, \ > { XFS_DA_OP_OKNOENT, "OKNOENT" }, \ > { XFS_DA_OP_CILOOKUP, "CILOOKUP" }, \ > - { XFS_DA_OP_ALLOCVAL, "ALLOCVAL" }, \ > { XFS_DA_OP_INCOMPLETE, "INCOMPLETE" } > > /* > diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c > index 780924984492..bc78b7c33401 100644 > --- a/fs/xfs/xfs_acl.c > +++ b/fs/xfs/xfs_acl.c > @@ -125,7 +125,7 @@ xfs_get_acl(struct inode *inode, int type) > struct posix_acl *acl = NULL; > struct xfs_da_args args = { > .dp = ip, > - .flags = ATTR_ALLOC | ATTR_ROOT, > + .flags = ATTR_ROOT, > .valuelen = XFS_ACL_MAX_SIZE(mp), > }; > int error; > @@ -144,19 +144,19 @@ xfs_get_acl(struct inode *inode, int type) > } > args.namelen = strlen(args.name); > > + /* > + * If the attribute doesn't exist make sure we have a negative cache > + * entry, for any other error assume it is transient. > + */ > error = xfs_attr_get(&args); > - if (error) { > - /* > - * If the attribute doesn't exist make sure we have a negative > - * cache entry, for any other error assume it is transient. > - */ > - if (error != -ENOATTR) > - acl = ERR_PTR(error); > - } else { > + if (!error) { > acl = xfs_acl_from_disk(mp, args.value, args.valuelen, > XFS_ACL_MAX_ENTRIES(mp)); > - kmem_free(args.value); > + } else if (error != -ENOATTR) { > + acl = ERR_PTR(error); > } > + > + kmem_free(args.value); > return acl; > } > > -- > 2.24.1 >