From: Allison Collins <allison.henderson@oracle.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 17/18] xfs: refactor xfs_trans_apply_dquot_deltas
Date: Sat, 4 Jul 2020 13:41:11 -0700 [thread overview]
Message-ID: <a4570ea7-ea98-af5f-b248-1b71ef8105de@oracle.com> (raw)
In-Reply-To: <159353181889.2864738.7577728127911412217.stgit@magnolia>
On 6/30/20 8:43 AM, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> Hoist the code that adjusts the incore quota reservation count
> adjustments into a separate function, both to reduce the level of
> indentation and also to reduce the amount of open-coded logic.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Ok, it's a bit of a hoist and a simplification, but I think it's a good
clean up.
Reviewed-by: Allison Collins <allison.henderson@oracle.com>
> ---
> fs/xfs/xfs_trans_dquot.c | 103 +++++++++++++++++++++-------------------------
> 1 file changed, 46 insertions(+), 57 deletions(-)
>
>
> diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c
> index 30a011dc9828..701923ea6c04 100644
> --- a/fs/xfs/xfs_trans_dquot.c
> +++ b/fs/xfs/xfs_trans_dquot.c
> @@ -293,6 +293,37 @@ xfs_trans_dqlockedjoin(
> }
> }
>
> +/* Apply dqtrx changes to the quota reservation counters. */
> +static inline void
> +xfs_apply_quota_reservation_deltas(
> + struct xfs_dquot_res *res,
> + uint64_t reserved,
> + int64_t res_used,
> + int64_t count_delta)
> +{
> + if (reserved != 0) {
> + /*
> + * Subtle math here: If reserved > res_used (the normal case),
> + * we're simply subtracting the unused transaction quota
> + * reservation from the dquot reservation.
> + *
> + * If, however, res_used > reserved, then we have allocated
> + * more quota blocks than were reserved for the transaction.
> + * We must add that excess to the dquot reservation since it
> + * tracks (usage + resv) and by definition we didn't reserve
> + * that excess.
> + */
> + res->reserved -= abs(reserved - res_used);
> + } else if (count_delta != 0) {
> + /*
> + * These blks were never reserved, either inside a transaction
> + * or outside one (in a delayed allocation). Also, this isn't
> + * always a negative number since we sometimes deliberately
> + * skip quota reservations.
> + */
> + res->reserved += count_delta;
> + }
> +}
>
> /*
> * Called by xfs_trans_commit() and similar in spirit to
> @@ -327,6 +358,8 @@ xfs_trans_apply_dquot_deltas(
> xfs_trans_dqlockedjoin(tp, qa);
>
> for (i = 0; i < XFS_QM_TRANS_MAXDQS; i++) {
> + uint64_t blk_res_used;
> +
> qtrx = &qa[i];
> /*
> * The array of dquots is filled
> @@ -396,71 +429,27 @@ xfs_trans_apply_dquot_deltas(
> * In case of delayed allocations, there's no
> * reservation that a transaction structure knows of.
> */
> - if (qtrx->qt_blk_res != 0) {
> - uint64_t blk_res_used = 0;
> + blk_res_used = max_t(int64_t, 0, qtrx->qt_bcount_delta);
> + xfs_apply_quota_reservation_deltas(&dqp->q_blk,
> + qtrx->qt_blk_res, blk_res_used,
> + qtrx->qt_bcount_delta);
>
> - if (qtrx->qt_bcount_delta > 0)
> - blk_res_used = qtrx->qt_bcount_delta;
> -
> - if (qtrx->qt_blk_res != blk_res_used) {
> - if (qtrx->qt_blk_res > blk_res_used)
> - dqp->q_blk.reserved -= (xfs_qcnt_t)
> - (qtrx->qt_blk_res -
> - blk_res_used);
> - else
> - dqp->q_blk.reserved -= (xfs_qcnt_t)
> - (blk_res_used -
> - qtrx->qt_blk_res);
> - }
> - } else {
> - /*
> - * These blks were never reserved, either inside
> - * a transaction or outside one (in a delayed
> - * allocation). Also, this isn't always a
> - * negative number since we sometimes
> - * deliberately skip quota reservations.
> - */
> - if (qtrx->qt_bcount_delta) {
> - dqp->q_blk.reserved +=
> - (xfs_qcnt_t)qtrx->qt_bcount_delta;
> - }
> - }
> /*
> * Adjust the RT reservation.
> */
> - if (qtrx->qt_rtblk_res != 0) {
> - if (qtrx->qt_rtblk_res != qtrx->qt_rtblk_res_used) {
> - if (qtrx->qt_rtblk_res >
> - qtrx->qt_rtblk_res_used)
> - dqp->q_rtb.reserved -= (xfs_qcnt_t)
> - (qtrx->qt_rtblk_res -
> - qtrx->qt_rtblk_res_used);
> - else
> - dqp->q_rtb.reserved -= (xfs_qcnt_t)
> - (qtrx->qt_rtblk_res_used -
> - qtrx->qt_rtblk_res);
> - }
> - } else {
> - if (qtrx->qt_rtbcount_delta)
> - dqp->q_rtb.reserved +=
> - (xfs_qcnt_t)qtrx->qt_rtbcount_delta;
> - }
> + xfs_apply_quota_reservation_deltas(&dqp->q_rtb,
> + qtrx->qt_rtblk_res,
> + qtrx->qt_rtblk_res_used,
> + qtrx->qt_rtbcount_delta);
>
> /*
> * Adjust the inode reservation.
> */
> - if (qtrx->qt_ino_res != 0) {
> - ASSERT(qtrx->qt_ino_res >=
> - qtrx->qt_ino_res_used);
> - if (qtrx->qt_ino_res > qtrx->qt_ino_res_used)
> - dqp->q_ino.reserved -= (xfs_qcnt_t)
> - (qtrx->qt_ino_res -
> - qtrx->qt_ino_res_used);
> - } else {
> - if (qtrx->qt_icount_delta)
> - dqp->q_ino.reserved +=
> - (xfs_qcnt_t)qtrx->qt_icount_delta;
> - }
> + ASSERT(qtrx->qt_ino_res >= qtrx->qt_ino_res_used);
> + xfs_apply_quota_reservation_deltas(&dqp->q_ino,
> + qtrx->qt_ino_res,
> + qtrx->qt_ino_res_used,
> + qtrx->qt_icount_delta);
>
> ASSERT(dqp->q_blk.reserved >= dqp->q_blk.count);
> ASSERT(dqp->q_ino.reserved >= dqp->q_ino.count);
>
next prev parent reply other threads:[~2020-07-04 20:43 UTC|newest]
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
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 [this message]
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=a4570ea7-ea98-af5f-b248-1b71ef8105de@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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).