From: Chandan Babu R <chandanrlinux@gmail.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 04/18] xfs: stop using q_core.d_flags in the quota code
Date: Wed, 01 Jul 2020 14:04:17 +0530 [thread overview]
Message-ID: <3195745.yPKIM3DLQA@garuda> (raw)
In-Reply-To: <159353173676.2864738.5361850443664572160.stgit@magnolia>
On Tuesday 30 June 2020 9:12:16 PM IST Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> Use the incore dq_flags to figure out the dquot type. This is the first
> step towards removing xfs_disk_dquot from the incore dquot.
>
The changes are logically correct.
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> fs/xfs/libxfs/xfs_quota_defs.h | 2 ++
> fs/xfs/scrub/quota.c | 4 ----
> fs/xfs/xfs_dquot.c | 33 +++++++++++++++++++++++++++++++--
> fs/xfs/xfs_dquot.h | 2 ++
> fs/xfs/xfs_dquot_item.c | 6 ++++--
> fs/xfs/xfs_qm.c | 4 ++--
> fs/xfs/xfs_qm.h | 2 +-
> fs/xfs/xfs_qm_syscalls.c | 9 +++------
> 8 files changed, 45 insertions(+), 17 deletions(-)
>
>
> diff --git a/fs/xfs/libxfs/xfs_quota_defs.h b/fs/xfs/libxfs/xfs_quota_defs.h
> index 56d9dd787e7b..459023b0a304 100644
> --- a/fs/xfs/libxfs/xfs_quota_defs.h
> +++ b/fs/xfs/libxfs/xfs_quota_defs.h
> @@ -29,6 +29,8 @@ typedef uint16_t xfs_qwarncnt_t;
>
> #define XFS_DQ_ALLTYPES (XFS_DQ_USER|XFS_DQ_PROJ|XFS_DQ_GROUP)
>
> +#define XFS_DQ_ONDISK (XFS_DQ_ALLTYPES)
> +
> #define XFS_DQ_FLAGS \
> { XFS_DQ_USER, "USER" }, \
> { XFS_DQ_PROJ, "PROJ" }, \
> diff --git a/fs/xfs/scrub/quota.c b/fs/xfs/scrub/quota.c
> index 905a34558361..710659d3fa28 100644
> --- a/fs/xfs/scrub/quota.c
> +++ b/fs/xfs/scrub/quota.c
> @@ -108,10 +108,6 @@ xchk_quota_item(
>
> sqi->last_id = id;
>
> - /* Did we get the dquot type we wanted? */
> - if (dqtype != (d->d_flags & XFS_DQ_ALLTYPES))
> - xchk_fblock_set_corrupt(sc, XFS_DATA_FORK, offset);
> -
> if (d->d_pad0 != cpu_to_be32(0) || d->d_pad != cpu_to_be16(0))
> xchk_fblock_set_corrupt(sc, XFS_DATA_FORK, offset);
>
> diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
> index 46c8ca83c04d..59d1bce34a98 100644
> --- a/fs/xfs/xfs_dquot.c
> +++ b/fs/xfs/xfs_dquot.c
> @@ -561,6 +561,16 @@ xfs_dquot_from_disk(
> return 0;
> }
>
> +/* Copy the in-core quota fields into the on-disk buffer. */
> +void
> +xfs_dquot_to_disk(
> + struct xfs_disk_dquot *ddqp,
> + struct xfs_dquot *dqp)
> +{
> + memcpy(ddqp, &dqp->q_core, sizeof(struct xfs_disk_dquot));
> + ddqp->d_flags = dqp->dq_flags & XFS_DQ_ONDISK;
> +}
> +
> /* Allocate and initialize the dquot buffer for this in-core dquot. */
> static int
> xfs_qm_dqread_alloc(
> @@ -1108,6 +1118,17 @@ xfs_qm_dqflush_done(
> xfs_dqfunlock(dqp);
> }
>
> +/* Check incore dquot for errors before we flush. */
> +static xfs_failaddr_t
> +xfs_qm_dqflush_check(
> + struct xfs_dquot *dqp)
> +{
> + if (hweight8(dqp->dq_flags & XFS_DQ_ALLTYPES) != 1)
> + return __this_address;
> +
> + return NULL;
> +}
> +
> /*
> * Write a modified dquot to disk.
> * The dquot must be locked and the flush lock too taken by caller.
> @@ -1166,8 +1187,16 @@ xfs_qm_dqflush(
> goto out_abort;
> }
>
> - /* This is the only portion of data that needs to persist */
> - memcpy(ddqp, &dqp->q_core, sizeof(struct xfs_disk_dquot));
> + fa = xfs_qm_dqflush_check(dqp);
> + if (fa) {
> + xfs_alert(mp, "corrupt dquot ID 0x%x in memory at %pS",
> + be32_to_cpu(dqp->q_core.d_id), fa);
> + xfs_buf_relse(bp);
> + error = -EFSCORRUPTED;
> + goto out_abort;
> + }
> +
> + xfs_dquot_to_disk(ddqp, dqp);
>
> /*
> * Clear the dirty field and remember the flush lsn for later use.
> diff --git a/fs/xfs/xfs_dquot.h b/fs/xfs/xfs_dquot.h
> index 71e36c85e20b..1b1a4261a580 100644
> --- a/fs/xfs/xfs_dquot.h
> +++ b/fs/xfs/xfs_dquot.h
> @@ -144,6 +144,8 @@ static inline bool xfs_dquot_lowsp(struct xfs_dquot *dqp)
> return false;
> }
>
> +void xfs_dquot_to_disk(struct xfs_disk_dquot *ddqp, struct xfs_dquot *dqp);
> +
> #define XFS_DQ_IS_LOCKED(dqp) (mutex_is_locked(&((dqp)->q_qlock)))
> #define XFS_DQ_IS_DIRTY(dqp) ((dqp)->dq_flags & XFS_DQ_DIRTY)
> #define XFS_QM_ISUDQ(dqp) ((dqp)->dq_flags & XFS_DQ_USER)
> diff --git a/fs/xfs/xfs_dquot_item.c b/fs/xfs/xfs_dquot_item.c
> index 349c92d26570..ff0ab65cf413 100644
> --- a/fs/xfs/xfs_dquot_item.c
> +++ b/fs/xfs/xfs_dquot_item.c
> @@ -45,6 +45,7 @@ xfs_qm_dquot_logitem_format(
> struct xfs_log_item *lip,
> struct xfs_log_vec *lv)
> {
> + struct xfs_disk_dquot ddq;
> struct xfs_dq_logitem *qlip = DQUOT_ITEM(lip);
> struct xfs_log_iovec *vecp = NULL;
> struct xfs_dq_logformat *qlf;
> @@ -58,8 +59,9 @@ xfs_qm_dquot_logitem_format(
> qlf->qlf_boffset = qlip->qli_dquot->q_bufoffset;
> xlog_finish_iovec(lv, vecp, sizeof(struct xfs_dq_logformat));
>
> - xlog_copy_iovec(lv, &vecp, XLOG_REG_TYPE_DQUOT,
> - &qlip->qli_dquot->q_core,
> + xfs_dquot_to_disk(&ddq, qlip->qli_dquot);
> +
> + xlog_copy_iovec(lv, &vecp, XLOG_REG_TYPE_DQUOT, &ddq,
> sizeof(struct xfs_disk_dquot));
> }
>
> diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
> index 938023dd8ce5..632025c2f00b 100644
> --- a/fs/xfs/xfs_qm.c
> +++ b/fs/xfs/xfs_qm.c
> @@ -161,7 +161,7 @@ xfs_qm_dqpurge(
> xfs_dqfunlock(dqp);
> xfs_dqunlock(dqp);
>
> - radix_tree_delete(xfs_dquot_tree(qi, dqp->q_core.d_flags),
> + radix_tree_delete(xfs_dquot_tree(qi, dqp->dq_flags),
> be32_to_cpu(dqp->q_core.d_id));
> qi->qi_dquots--;
>
> @@ -1598,7 +1598,7 @@ xfs_qm_dqfree_one(
> struct xfs_quotainfo *qi = mp->m_quotainfo;
>
> mutex_lock(&qi->qi_tree_lock);
> - radix_tree_delete(xfs_dquot_tree(qi, dqp->q_core.d_flags),
> + radix_tree_delete(xfs_dquot_tree(qi, dqp->dq_flags),
> be32_to_cpu(dqp->q_core.d_id));
>
> qi->qi_dquots--;
> diff --git a/fs/xfs/xfs_qm.h b/fs/xfs/xfs_qm.h
> index 7b0e771fcbce..43b4650cdcdf 100644
> --- a/fs/xfs/xfs_qm.h
> +++ b/fs/xfs/xfs_qm.h
> @@ -85,7 +85,7 @@ xfs_dquot_tree(
> struct xfs_quotainfo *qi,
> int type)
> {
> - switch (type) {
> + switch (type & XFS_DQ_ALLTYPES) {
> case XFS_DQ_USER:
> return &qi->qi_uquota_tree;
> case XFS_DQ_GROUP:
> diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
> index 7effd7a28136..8cbb65f01bf1 100644
> --- a/fs/xfs/xfs_qm_syscalls.c
> +++ b/fs/xfs/xfs_qm_syscalls.c
> @@ -644,12 +644,9 @@ xfs_qm_scall_getquota_fill_qc(
> * gets turned off. No need to confuse the user level code,
> * so return zeroes in that case.
> */
> - if ((!XFS_IS_UQUOTA_ENFORCED(mp) &&
> - dqp->q_core.d_flags == XFS_DQ_USER) ||
> - (!XFS_IS_GQUOTA_ENFORCED(mp) &&
> - dqp->q_core.d_flags == XFS_DQ_GROUP) ||
> - (!XFS_IS_PQUOTA_ENFORCED(mp) &&
> - dqp->q_core.d_flags == XFS_DQ_PROJ)) {
> + if ((!XFS_IS_UQUOTA_ENFORCED(mp) && (dqp->dq_flags & XFS_DQ_USER)) ||
> + (!XFS_IS_GQUOTA_ENFORCED(mp) && (dqp->dq_flags & XFS_DQ_GROUP)) ||
> + (!XFS_IS_PQUOTA_ENFORCED(mp) && (dqp->dq_flags & XFS_DQ_PROJ))) {
> dst->d_spc_timer = 0;
> dst->d_ino_timer = 0;
> dst->d_rt_spc_timer = 0;
>
>
--
chandan
next prev parent reply other threads:[~2020-07-01 8:34 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 [this message]
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
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=3195745.yPKIM3DLQA@garuda \
--to=chandanrlinux@gmail.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).