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.6 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,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 73A13C433DF for ; Fri, 3 Jul 2020 04:13:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4BE4820B1F for ; Fri, 3 Jul 2020 04:13:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="H1ZR2Ldv" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725764AbgGCENf (ORCPT ); Fri, 3 Jul 2020 00:13:35 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:52482 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725294AbgGCENf (ORCPT ); Fri, 3 Jul 2020 00:13:35 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 06347SMk175682 for ; Fri, 3 Jul 2020 04:13:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=corp-2020-01-29; bh=1xEsfGJLa+jeu7ANDl2KYEwQWH9357voz3SIhcoo9Cc=; b=H1ZR2LdvB12F35jb5R0vMaWJDwGC4Ts+rmkNIHOMersF4wYXsjvT9NqIVXqpyS2tpDsx frUjPEEBr7Bwnc20pkXfEv4She2GF+I62Add12p0Up1MoALwzKh4D9RZiLR1NVTu3a/F /iE4Q1ASMvRW4N3Z19caLHoaghrmHroHb2MxHv3JXtyJbnYJ1LK+IuLubLMaSDwHpAl7 +fchu3QaIeRkrKU2azCJPwJ7OwSzG4GaC+bqduLgYLRbL+icyc1v+VqjAWDLhkY4JkUM gSNRoSAKXvlkTN5in/fM0DAtmMZBLnNpUXmy7EBlnc3pPyWKqjXn04EUXegCgiF7aujN HQ== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by userp2130.oracle.com with ESMTP id 31ywrc1xap-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 03 Jul 2020 04:13:33 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 06348hjX189027 for ; Fri, 3 Jul 2020 04:11:33 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userp3020.oracle.com with ESMTP id 31xfvwnk9a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 03 Jul 2020 04:11:33 +0000 Received: from abhmp0005.oracle.com (abhmp0005.oracle.com [141.146.116.11]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 0634BWqe006440 for ; Fri, 3 Jul 2020 04:11:32 GMT Received: from [192.168.1.226] (/67.1.142.158) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 03 Jul 2020 04:11:32 +0000 Subject: Re: [PATCH 16/18] xfs: refactor xfs_trans_dqresv To: "Darrick J. Wong" Cc: linux-xfs@vger.kernel.org References: <159353170983.2864738.16885438169173786208.stgit@magnolia> <159353181258.2864738.8355431623063896449.stgit@magnolia> From: Allison Collins Message-ID: <71f1ba2b-f16d-ce39-021f-a3fcd4f96a0f@oracle.com> Date: Thu, 2 Jul 2020 21:11:31 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <159353181258.2864738.8355431623063896449.stgit@magnolia> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9670 signatures=668680 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 adultscore=0 spamscore=0 phishscore=0 malwarescore=0 mlxlogscore=999 bulkscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2004280000 definitions=main-2007030028 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9670 signatures=668680 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 mlxlogscore=999 clxscore=1015 cotscore=-2147483648 priorityscore=1501 lowpriorityscore=0 malwarescore=0 mlxscore=0 adultscore=0 suspectscore=0 impostorscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2004280000 definitions=main-2007030028 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org On 6/30/20 8:43 AM, Darrick J. Wong wrote: > From: Darrick J. Wong > > Now that we've refactored the resource usage and limits into > per-resource structures, we can refactor some of the open-coded > reservation limit checking in xfs_trans_dqresv. > > Signed-off-by: Darrick J. Wong Ok, I followed it through, and I think it makes sense Reviewed-by: Allison Collins > --- > fs/xfs/xfs_trans_dquot.c | 153 +++++++++++++++++++++++----------------------- > 1 file changed, 78 insertions(+), 75 deletions(-) > > > diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c > index 2712814d696d..30a011dc9828 100644 > --- a/fs/xfs/xfs_trans_dquot.c > +++ b/fs/xfs/xfs_trans_dquot.c > @@ -554,6 +554,58 @@ xfs_quota_warn( > mp->m_super->s_dev, type); > } > > +/* > + * Decide if we can make an additional reservation against a quota resource. > + * Returns an inode QUOTA_NL_ warning code and whether or not it's fatal. > + * > + * Note that we assume that the numeric difference between the inode and block > + * warning codes will always be 3 since it's userspace ABI now, and will never > + * decrease the quota reservation, so the *BELOW messages are irrelevant. > + */ > +static inline int > +xfs_dqresv_check( > + struct xfs_dquot_res *res, > + struct xfs_def_qres *dres, > + int64_t delta, > + bool *fatal) > +{ > + xfs_qcnt_t hardlimit = res->hardlimit; > + xfs_qcnt_t softlimit = res->softlimit; > + xfs_qcnt_t total_count = res->reserved + delta; > + > + BUILD_BUG_ON(QUOTA_NL_BHARDWARN != QUOTA_NL_IHARDWARN + 3); > + BUILD_BUG_ON(QUOTA_NL_BSOFTLONGWARN != QUOTA_NL_ISOFTLONGWARN + 3); > + BUILD_BUG_ON(QUOTA_NL_BSOFTWARN != QUOTA_NL_ISOFTWARN + 3); > + > + *fatal = false; > + if (delta <= 0) > + return QUOTA_NL_NOWARN; > + > + if (!hardlimit) > + hardlimit = dres->hardlimit; > + if (!softlimit) > + softlimit = dres->softlimit; > + > + if (hardlimit && total_count > hardlimit) { > + *fatal = true; > + return QUOTA_NL_IHARDWARN; > + } > + > + if (softlimit && total_count > softlimit) { > + time64_t now = ktime_get_real_seconds(); > + > + if ((res->timer != 0 && now > res->timer) || > + (res->warnings != 0 && res->warnings >= dres->warnlimit)) { > + *fatal = true; > + return QUOTA_NL_ISOFTLONGWARN; > + } > + > + return QUOTA_NL_ISOFTWARN; > + } > + > + return QUOTA_NL_NOWARN; > +} > + > /* > * This reserves disk blocks and inodes against a dquot. > * Flags indicate if the dquot is to be locked here and also > @@ -569,99 +621,51 @@ xfs_trans_dqresv( > long ninos, > uint flags) > { > - xfs_qcnt_t hardlimit; > - xfs_qcnt_t softlimit; > - time64_t timer; > - xfs_qwarncnt_t warns; > - xfs_qwarncnt_t warnlimit; > - xfs_qcnt_t total_count; > - xfs_qcnt_t *resbcountp; > struct xfs_quotainfo *q = mp->m_quotainfo; > struct xfs_def_quota *defq; > - > + struct xfs_dquot_res *blkres; > + struct xfs_def_qres *def_blkres; > > xfs_dqlock(dqp); > > defq = xfs_get_defquota(q, xfs_dquot_type(dqp)); > > if (flags & XFS_TRANS_DQ_RES_BLKS) { > - hardlimit = dqp->q_blk.hardlimit; > - if (!hardlimit) > - hardlimit = defq->dfq_blk.hardlimit; > - softlimit = dqp->q_blk.softlimit; > - if (!softlimit) > - softlimit = defq->dfq_blk.softlimit; > - timer = dqp->q_blk.timer; > - warns = dqp->q_blk.warnings; > - warnlimit = defq->dfq_blk.warnlimit; > - resbcountp = &dqp->q_blk.reserved; > + blkres = &dqp->q_blk; > + def_blkres = &defq->dfq_blk; > } else { > - ASSERT(flags & XFS_TRANS_DQ_RES_RTBLKS); > - hardlimit = dqp->q_rtb.hardlimit; > - if (!hardlimit) > - hardlimit = defq->dfq_rtb.hardlimit; > - softlimit = dqp->q_rtb.softlimit; > - if (!softlimit) > - softlimit = defq->dfq_rtb.softlimit; > - timer = dqp->q_rtb.timer; > - warns = dqp->q_rtb.warnings; > - warnlimit = defq->dfq_rtb.warnlimit; > - resbcountp = &dqp->q_rtb.reserved; > + blkres = &dqp->q_rtb; > + def_blkres = &defq->dfq_rtb; > } > > if ((flags & XFS_QMOPT_FORCE_RES) == 0 && dqp->q_id && > ((XFS_IS_UQUOTA_ENFORCED(dqp->q_mount) && XFS_QM_ISUDQ(dqp)) || > (XFS_IS_GQUOTA_ENFORCED(dqp->q_mount) && XFS_QM_ISGDQ(dqp)) || > (XFS_IS_PQUOTA_ENFORCED(dqp->q_mount) && XFS_QM_ISPDQ(dqp)))) { > - if (nblks > 0) { > + int quota_nl; > + bool fatal; > + > + /* > + * dquot is locked already. See if we'd go over the hardlimit > + * or exceed the timelimit if we'd reserve resources. > + */ > + quota_nl = xfs_dqresv_check(blkres, def_blkres, nblks, &fatal); > + if (quota_nl != QUOTA_NL_NOWARN) { > /* > - * dquot is locked already. See if we'd go over the > - * hardlimit or exceed the timelimit if we allocate > - * nblks. > + * Quota block warning codes are 3 more than the inode > + * codes, which we check above. > */ > - total_count = *resbcountp + nblks; > - if (hardlimit && total_count > hardlimit) { > - xfs_quota_warn(mp, dqp, QUOTA_NL_BHARDWARN); > + xfs_quota_warn(mp, dqp, quota_nl + 3); > + if (fatal) > goto error_return; > - } > - if (softlimit && total_count > softlimit) { > - if ((timer != 0 && > - ktime_get_real_seconds() > timer) || > - (warns != 0 && warns >= warnlimit)) { > - xfs_quota_warn(mp, dqp, > - QUOTA_NL_BSOFTLONGWARN); > - goto error_return; > - } > - > - xfs_quota_warn(mp, dqp, QUOTA_NL_BSOFTWARN); > - } > } > - if (ninos > 0) { > - total_count = dqp->q_ino.reserved + ninos; > - timer = dqp->q_ino.timer; > - warns = dqp->q_ino.warnings; > - warnlimit = defq->dfq_ino.warnlimit; > - hardlimit = dqp->q_ino.hardlimit; > - if (!hardlimit) > - hardlimit = defq->dfq_ino.hardlimit; > - softlimit = dqp->q_ino.softlimit; > - if (!softlimit) > - softlimit = defq->dfq_ino.softlimit; > > - if (hardlimit && total_count > hardlimit) { > - xfs_quota_warn(mp, dqp, QUOTA_NL_IHARDWARN); > + quota_nl = xfs_dqresv_check(&dqp->q_ino, &defq->dfq_ino, ninos, > + &fatal); > + if (quota_nl != QUOTA_NL_NOWARN) { > + xfs_quota_warn(mp, dqp, quota_nl); > + if (fatal) > goto error_return; > - } > - if (softlimit && total_count > softlimit) { > - if ((timer != 0 && > - ktime_get_real_seconds() > timer) || > - (warns != 0 && warns >= warnlimit)) { > - xfs_quota_warn(mp, dqp, > - QUOTA_NL_ISOFTLONGWARN); > - goto error_return; > - } > - xfs_quota_warn(mp, dqp, QUOTA_NL_ISOFTWARN); > - } > } > } > > @@ -669,9 +673,8 @@ xfs_trans_dqresv( > * Change the reservation, but not the actual usage. > * Note that q_blk.reserved = q_blk.count + resv > */ > - (*resbcountp) += (xfs_qcnt_t)nblks; > - if (ninos != 0) > - dqp->q_ino.reserved += (xfs_qcnt_t)ninos; > + blkres->reserved += (xfs_qcnt_t)nblks; > + dqp->q_ino.reserved += (xfs_qcnt_t)ninos; > > /* > * note the reservation amt in the trans struct too, >