Linux-XFS Archive on lore.kernel.org
 help / color / Atom feed
From: Allison Collins <allison.henderson@oracle.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 15/18] xfs: refactor xfs_qm_scall_setqlim
Date: Thu, 2 Jul 2020 21:11:28 -0700
Message-ID: <63697176-bee2-af5f-4ae5-b1814bbdcd4f@oracle.com> (raw)
In-Reply-To: <159353180627.2864738.644970181923295002.stgit@magnolia>



On 6/30/20 8:43 AM, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
> 
> Now that we can pass around quota resource and limit structures, clean
> up the open-coded field setting in xfs_qm_scall_setqlim.
> 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

Ok, I followed it through, and I think it looks ok
Reviewed-by: Allison Collins <allison.henderson@oracle.com>

> ---
>   fs/xfs/xfs_qm_syscalls.c |  164 ++++++++++++++++++++++++++--------------------
>   1 file changed, 93 insertions(+), 71 deletions(-)
> 
> 
> diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
> index 5423e02f9837..5044c333af5c 100644
> --- a/fs/xfs/xfs_qm_syscalls.c
> +++ b/fs/xfs/xfs_qm_syscalls.c
> @@ -436,6 +436,58 @@ xfs_qm_scall_quotaon(
>   #define XFS_QC_MASK \
>   	(QC_LIMIT_MASK | QC_TIMER_MASK | QC_WARNS_MASK)
>   
> +/*
> + * Adjust limits of this quota, and the defaults if passed in.  Returns true
> + * if the new limits made sense and were applied, false otherwise.
> + */
> +static inline bool
> +xfs_setqlim_limits(
> +	struct xfs_mount	*mp,
> +	struct xfs_dquot_res	*res,
> +	struct xfs_def_qres	*dres,
> +	xfs_qcnt_t		hard,
> +	xfs_qcnt_t		soft,
> +	const char		*tag)
> +{
> +	/* The hard limit can't be less than the soft limit. */
> +	if (hard != 0 && hard < soft) {
> +		xfs_debug(mp, "%shard %lld < %ssoft %lld", tag, hard, tag,
> +				soft);
> +		return false;
> +	}
> +
> +	res->hardlimit = hard;
> +	res->softlimit = soft;
> +	if (dres) {
> +		dres->hardlimit = hard;
> +		dres->softlimit = soft;
> +	}
> +
> +	return true;
> +}
> +
> +static inline void
> +xfs_setqlim_warns(
> +	struct xfs_dquot_res	*res,
> +	struct xfs_def_qres	*dres,
> +	int			warns)
> +{
> +	res->warnings = warns;
> +	if (dres)
> +		dres->warnlimit = warns;
> +}
> +
> +static inline void
> +xfs_setqlim_timer(
> +	struct xfs_dquot_res	*res,
> +	struct xfs_def_qres	*dres,
> +	s64			timer)
> +{
> +	res->timer = timer;
> +	if (dres)
> +		dres->timelimit = timer;
> +}
> +
>   /*
>    * Adjust quota limits, and start/stop timers accordingly.
>    */
> @@ -450,6 +502,8 @@ xfs_qm_scall_setqlim(
>   	struct xfs_dquot	*dqp;
>   	struct xfs_trans	*tp;
>   	struct xfs_def_quota	*defq;
> +	struct xfs_dquot_res	*res;
> +	struct xfs_def_qres	*dres;
>   	int			error;
>   	xfs_qcnt_t		hard, soft;
>   
> @@ -489,102 +543,70 @@ xfs_qm_scall_setqlim(
>   	xfs_trans_dqjoin(tp, dqp);
>   
>   	/*
> +	 * Update quota limits, warnings, and timers, and the defaults
> +	 * if we're touching id == 0.
> +	 *
>   	 * Make sure that hardlimits are >= soft limits before changing.
> +	 *
> +	 * Update warnings counter(s) if requested.
> +	 *
> +	 * Timelimits for the super user set the relative time the other users
> +	 * can be over quota for this file system. If it is zero a default is
> +	 * used.  Ditto for the default soft and hard limit values (already
> +	 * done, above), and for warnings.
> +	 *
> +	 * For other IDs, userspace can bump out the grace period if over
> +	 * the soft limit.
>   	 */
> +
> +	/* Blocks on the data device. */
>   	hard = (newlim->d_fieldmask & QC_SPC_HARD) ?
>   		(xfs_qcnt_t) XFS_B_TO_FSB(mp, newlim->d_spc_hardlimit) :
>   			dqp->q_blk.hardlimit;
>   	soft = (newlim->d_fieldmask & QC_SPC_SOFT) ?
>   		(xfs_qcnt_t) XFS_B_TO_FSB(mp, newlim->d_spc_softlimit) :
>   			dqp->q_blk.softlimit;
> -	if (hard == 0 || hard >= soft) {
> -		dqp->q_blk.hardlimit = hard;
> -		dqp->q_blk.softlimit = soft;
> +	res = &dqp->q_blk;
> +	dres = id == 0 ? &defq->dfq_blk : NULL;
> +
> +	if (xfs_setqlim_limits(mp, res, dres, hard, soft, "blk"))
>   		xfs_dquot_set_prealloc_limits(dqp);
> -		if (id == 0) {
> -			defq->dfq_blk.hardlimit = hard;
> -			defq->dfq_blk.softlimit = soft;
> -		}
> -	} else {
> -		xfs_debug(mp, "blkhard %Ld < blksoft %Ld", hard, soft);
> -	}
> +	if (newlim->d_fieldmask & QC_SPC_WARNS)
> +		xfs_setqlim_warns(res, dres, newlim->d_spc_warns);
> +	if (newlim->d_fieldmask & QC_SPC_TIMER)
> +		xfs_setqlim_timer(res, dres, newlim->d_spc_timer);
> +
> +	/* Blocks on the realtime device. */
>   	hard = (newlim->d_fieldmask & QC_RT_SPC_HARD) ?
>   		(xfs_qcnt_t) XFS_B_TO_FSB(mp, newlim->d_rt_spc_hardlimit) :
>   			dqp->q_rtb.hardlimit;
>   	soft = (newlim->d_fieldmask & QC_RT_SPC_SOFT) ?
>   		(xfs_qcnt_t) XFS_B_TO_FSB(mp, newlim->d_rt_spc_softlimit) :
>   			dqp->q_rtb.softlimit;
> -	if (hard == 0 || hard >= soft) {
> -		dqp->q_rtb.hardlimit = hard;
> -		dqp->q_rtb.softlimit = soft;
> -		if (id == 0) {
> -			defq->dfq_rtb.hardlimit = hard;
> -			defq->dfq_rtb.softlimit = soft;
> -		}
> -	} else {
> -		xfs_debug(mp, "rtbhard %Ld < rtbsoft %Ld", hard, soft);
> -	}
> +	res = &dqp->q_rtb;
> +	dres = id == 0 ? &defq->dfq_rtb : NULL;
>   
> +	xfs_setqlim_limits(mp, res, dres, hard, soft, "rtb");
> +	if (newlim->d_fieldmask & QC_RT_SPC_WARNS)
> +		xfs_setqlim_warns(res, dres, newlim->d_rt_spc_warns);
> +	if (newlim->d_fieldmask & QC_RT_SPC_TIMER)
> +		xfs_setqlim_timer(res, dres, newlim->d_rt_spc_timer);
> +
> +	/* Inodes */
>   	hard = (newlim->d_fieldmask & QC_INO_HARD) ?
>   		(xfs_qcnt_t) newlim->d_ino_hardlimit :
>   			dqp->q_ino.hardlimit;
>   	soft = (newlim->d_fieldmask & QC_INO_SOFT) ?
>   		(xfs_qcnt_t) newlim->d_ino_softlimit :
>   			dqp->q_ino.softlimit;
> -	if (hard == 0 || hard >= soft) {
> -		dqp->q_ino.hardlimit = hard;
> -		dqp->q_ino.softlimit = soft;
> -		if (id == 0) {
> -			defq->dfq_ino.hardlimit = hard;
> -			defq->dfq_ino.softlimit = soft;
> -		}
> -	} else {
> -		xfs_debug(mp, "ihard %Ld < isoft %Ld", hard, soft);
> -	}
> +	res = &dqp->q_ino;
> +	dres = id == 0 ? &defq->dfq_ino : NULL;
>   
> -	/*
> -	 * Update warnings counter(s) if requested
> -	 */
> -	if (newlim->d_fieldmask & QC_SPC_WARNS)
> -		dqp->q_blk.warnings = newlim->d_spc_warns;
> +	xfs_setqlim_limits(mp, res, dres, hard, soft, "ino");
>   	if (newlim->d_fieldmask & QC_INO_WARNS)
> -		dqp->q_ino.warnings = newlim->d_ino_warns;
> -	if (newlim->d_fieldmask & QC_RT_SPC_WARNS)
> -		dqp->q_rtb.warnings = newlim->d_rt_spc_warns;
> -
> -	if (id == 0) {
> -		if (newlim->d_fieldmask & QC_SPC_WARNS)
> -			defq->dfq_blk.warnlimit = newlim->d_spc_warns;
> -		if (newlim->d_fieldmask & QC_INO_WARNS)
> -			defq->dfq_ino.warnlimit = newlim->d_ino_warns;
> -		if (newlim->d_fieldmask & QC_RT_SPC_WARNS)
> -			defq->dfq_rtb.warnlimit = newlim->d_rt_spc_warns;
> -	}
> -
> -	/*
> -	 * Timelimits for the super user set the relative time the other users
> -	 * can be over quota for this file system. If it is zero a default is
> -	 * used.  Ditto for the default soft and hard limit values (already
> -	 * done, above), and for warnings.
> -	 *
> -	 * For other IDs, userspace can bump out the grace period if over
> -	 * the soft limit.
> -	 */
> -	if (newlim->d_fieldmask & QC_SPC_TIMER)
> -		dqp->q_blk.timer = newlim->d_spc_timer;
> +		xfs_setqlim_warns(res, dres, newlim->d_ino_warns);
>   	if (newlim->d_fieldmask & QC_INO_TIMER)
> -		dqp->q_ino.timer = newlim->d_ino_timer;
> -	if (newlim->d_fieldmask & QC_RT_SPC_TIMER)
> -		dqp->q_rtb.timer = newlim->d_rt_spc_timer;
> -
> -	if (id == 0) {
> -		if (newlim->d_fieldmask & QC_SPC_TIMER)
> -			defq->dfq_blk.timelimit = newlim->d_spc_timer;
> -		if (newlim->d_fieldmask & QC_INO_TIMER)
> -			defq->dfq_ino.timelimit = newlim->d_ino_timer;
> -		if (newlim->d_fieldmask & QC_RT_SPC_TIMER)
> -			defq->dfq_rtb.timelimit = newlim->d_rt_spc_timer;
> -	}
> +		xfs_setqlim_timer(res, dres, newlim->d_ino_timer);
>   
>   	if (id != 0) {
>   		/*
> 

  parent reply index

Thread overview: 94+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-30 15:41 [PATCH 00/18] xfs: remove xfs_disk_quot from incore dquot Darrick J. Wong
2020-06-30 15:41 ` [PATCH 01/18] xfs: clear XFS_DQ_FREEING if we can't lock the dquot buffer to flush Darrick J. Wong
2020-06-30 21:35   ` Allison Collins
2020-07-01  8:32   ` Chandan Babu R
2020-07-01  8:33   ` Christoph Hellwig
2020-07-01 22:42     ` Dave Chinner
2020-06-30 15:42 ` [PATCH 02/18] xfs: fix inode quota reservation checks Darrick J. Wong
2020-06-30 21:35   ` Allison Collins
2020-07-01  8:33   ` Chandan Babu R
2020-07-01  8:34   ` Christoph Hellwig
2020-06-30 15:42 ` [PATCH 03/18] xfs: validate ondisk/incore dquot flags Darrick J. Wong
2020-06-30 21:35   ` Allison Collins
2020-07-01  8:33   ` Chandan Babu R
2020-07-01  8:42   ` Christoph Hellwig
2020-07-01 18:25     ` Darrick J. Wong
2020-07-02  6:30       ` Christoph Hellwig
2020-07-02 15:13         ` Darrick J. Wong
2020-07-01 22:41   ` Dave Chinner
2020-07-01 23:16     ` Darrick J. Wong
2020-06-30 15:42 ` [PATCH 04/18] xfs: stop using q_core.d_flags in the quota code Darrick J. Wong
2020-07-01  8:34   ` Chandan Babu R
2020-07-01  8:47   ` Christoph Hellwig
2020-07-01 19:02     ` Darrick J. Wong
2020-07-01 20:15   ` Allison Collins
2020-07-01 22:50   ` Dave Chinner
2020-07-01 23:19     ` Darrick J. Wong
2020-07-01 23:44       ` Dave Chinner
2020-07-01 23:50         ` Darrick J. Wong
2020-07-03  0:58           ` Dave Chinner
2020-07-03 18:01             ` Darrick J. Wong
2020-06-30 15:42 ` [PATCH 05/18] xfs: stop using q_core.d_id " Darrick J. Wong
2020-07-01  8:33   ` Chandan Babu R
2020-07-01  8:48   ` Christoph Hellwig
2020-07-01 20:16   ` Allison Collins
2020-06-30 15:42 ` [PATCH 06/18] xfs: use a per-resource struct for incore dquot data Darrick J. Wong
2020-07-01  8:33   ` Chandan Babu R
2020-07-01  8:49   ` Christoph Hellwig
2020-07-01 20:16   ` Allison Collins
2020-06-30 15:42 ` [PATCH 07/18] xfs: stop using q_core limits in the quota code Darrick J. Wong
2020-07-01  8:33   ` Chandan Babu R
2020-07-01  8:50   ` Christoph Hellwig
2020-07-01 20:16   ` Allison Collins
2020-07-01 23:01   ` Dave Chinner
2020-07-01 23:13     ` Darrick J. Wong
2020-07-01 23:33       ` Darrick J. Wong
2020-07-01 23:45         ` Dave Chinner
2020-06-30 15:42 ` [PATCH 08/18] xfs: stop using q_core counters " Darrick J. Wong
2020-07-01  8:33   ` Chandan Babu R
2020-07-01  8:51   ` Christoph Hellwig
2020-07-01 23:20   ` Allison Collins
2020-06-30 15:42 ` [PATCH 09/18] xfs: stop using q_core warning " Darrick J. Wong
2020-07-01  8:33   ` Chandan Babu R
2020-07-01  8:51   ` Christoph Hellwig
2020-07-01 23:20   ` Allison Collins
2020-06-30 15:42 ` [PATCH 10/18] xfs: stop using q_core timers " Darrick J. Wong
2020-07-01  8:34   ` Chandan Babu R
2020-07-01  8:51   ` Christoph Hellwig
2020-07-01 23:20   ` Allison Collins
2020-06-30 15:43 ` [PATCH 11/18] xfs: remove qcore from incore dquots Darrick J. Wong
2020-07-01  8:34   ` Chandan Babu R
2020-07-01  8:52   ` Christoph Hellwig
2020-07-01 23:07   ` Dave Chinner
2020-07-01 23:14     ` Darrick J. Wong
2020-07-02  2:06   ` Allison Collins
2020-06-30 15:43 ` [PATCH 12/18] xfs: refactor default quota limits by resource Darrick J. Wong
2020-07-01  8:52   ` Chandan Babu R
2020-07-01  8:53   ` Christoph Hellwig
2020-07-01 23:30   ` Dave Chinner
2020-07-02  0:07     ` Darrick J. Wong
2020-07-02  2:06   ` Allison Collins
2020-06-30 15:43 ` [PATCH 13/18] xfs: remove unnecessary arguments from quota adjust functions Darrick J. Wong
2020-07-01  8:53   ` Christoph Hellwig
2020-07-01  8:58   ` Chandan Babu R
2020-07-02  2:06   ` Allison Collins
2020-06-30 15:43 ` [PATCH 14/18] xfs: refactor quota exceeded test Darrick J. Wong
2020-07-01  8:56   ` Christoph Hellwig
2020-07-01 17:51     ` Darrick J. Wong
2020-07-01 18:48       ` Eric Sandeen
2020-07-01 23:34       ` Dave Chinner
2020-07-01 10:19   ` Chandan Babu R
2020-07-02 18:57   ` Allison Collins
2020-06-30 15:43 ` [PATCH 15/18] xfs: refactor xfs_qm_scall_setqlim Darrick J. Wong
2020-07-01  8:56   ` Christoph Hellwig
2020-07-03  4:11   ` Allison Collins [this message]
2020-07-03 12:39   ` Chandan Babu R
2020-06-30 15:43 ` [PATCH 16/18] xfs: refactor xfs_trans_dqresv Darrick J. Wong
2020-07-03  4:11   ` Allison Collins
2020-07-03 13:00   ` Chandan Babu R
2020-06-30 15:43 ` [PATCH 17/18] xfs: refactor xfs_trans_apply_dquot_deltas Darrick J. Wong
2020-07-04 20:41   ` Allison Collins
2020-07-06 13:40   ` Chandan Babu R
2020-06-30 15:43 ` [PATCH 18/18] xfs: add more dquot tracepoints Darrick J. Wong
2020-07-04 20:41   ` Allison Collins
2020-07-06 13:42   ` Chandan Babu R

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=63697176-bee2-af5f-4ae5-b1814bbdcd4f@oracle.com \
    --to=allison.henderson@oracle.com \
    --cc=darrick.wong@oracle.com \
    --cc=linux-xfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-XFS Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-xfs/0 linux-xfs/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-xfs linux-xfs/ https://lore.kernel.org/linux-xfs \
		linux-xfs@vger.kernel.org
	public-inbox-index linux-xfs

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-xfs


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git