From: Christoph Hellwig <hch@infradead.org>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: Amir Goldstein <amir73il@gmail.com>,
linux-xfs@vger.kernel.org, sandeen@sandeen.net
Subject: Re: [PATCH 10/11] xfs: enable bigtime for quota timers
Date: Sat, 22 Aug 2020 08:36:00 +0100 [thread overview]
Message-ID: <20200822073600.GJ1629@infradead.org> (raw)
In-Reply-To: <159797595474.965217.7111215541487615114.stgit@magnolia>
On Thu, Aug 20, 2020 at 07:12:34PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> Enable the bigtime feature for quota timers. We decrease the accuracy
> of the timers to ~4s in exchange for being able to set timers up to the
> bigtime maximum.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> Reviewed-by: Amir Goldstein <amir73il@gmail.com>
> ---
> fs/xfs/libxfs/xfs_dquot_buf.c | 32 ++++++++++++++++++++++++++++++--
> fs/xfs/libxfs/xfs_format.h | 27 ++++++++++++++++++++++++++-
> fs/xfs/libxfs/xfs_quota_defs.h | 3 ++-
> fs/xfs/xfs_dquot.c | 25 +++++++++++++++++++++----
> fs/xfs/xfs_dquot.h | 3 ++-
> fs/xfs/xfs_ondisk.h | 7 +++++++
> fs/xfs/xfs_qm.c | 2 ++
> fs/xfs/xfs_qm_syscalls.c | 9 +++++----
> fs/xfs/xfs_trans_dquot.c | 6 ++++++
> 9 files changed, 101 insertions(+), 13 deletions(-)
>
>
> diff --git a/fs/xfs/libxfs/xfs_dquot_buf.c b/fs/xfs/libxfs/xfs_dquot_buf.c
> index 7f5291022b11..f5997fbdd308 100644
> --- a/fs/xfs/libxfs/xfs_dquot_buf.c
> +++ b/fs/xfs/libxfs/xfs_dquot_buf.c
> @@ -69,6 +69,13 @@ xfs_dquot_verify(
> ddq_type != XFS_DQTYPE_GROUP)
> return __this_address;
>
> + if ((ddq->d_type & XFS_DQTYPE_BIGTIME) &&
> + !xfs_sb_version_hasbigtime(&mp->m_sb))
> + return __this_address;
> +
> + if ((ddq->d_type & XFS_DQTYPE_BIGTIME) && !ddq->d_id)
> + return __this_address;
> +
> if (id != -1 && id != be32_to_cpu(ddq->d_id))
> return __this_address;
>
> @@ -296,7 +303,15 @@ xfs_dquot_from_disk_timestamp(
> time64_t *timer,
> __be32 dtimer)
> {
> - *timer = be32_to_cpu(dtimer);
> + uint64_t t;
> +
> + if (!timer || !(ddq->d_type & XFS_DQTYPE_BIGTIME)) {
> + *timer = be32_to_cpu(dtimer);
I don't think setting *time makes any sense if time is NULL..
> + return;
> + }
> +
> + t = be32_to_cpu(dtimer);
> + *timer = t << XFS_DQ_BIGTIME_SHIFT;
Why not:
*timer = (time64_t)be32_to_cpu(dtimer) << XFS_DQ_BIGTIME_SHIFT;
or (with my previous suggestion):
return (time64_t)be32_to_cpu(dtimer) << XFS_DQ_BIGTIME_SHIFT;
?
> @@ -1227,13 +1227,15 @@ static inline void xfs_dinode_put_rdev(struct xfs_dinode *dip, xfs_dev_t rdev)
> #define XFS_DQTYPE_USER 0x01 /* user dquot record */
> #define XFS_DQTYPE_PROJ 0x02 /* project dquot record */
> #define XFS_DQTYPE_GROUP 0x04 /* group dquot record */
> +#define XFS_DQTYPE_BIGTIME 0x08 /* large expiry timestamps */
>
> /* bitmask to determine if this is a user/group/project dquot */
> #define XFS_DQTYPE_REC_MASK (XFS_DQTYPE_USER | \
> XFS_DQTYPE_PROJ | \
> XFS_DQTYPE_GROUP)
>
> -#define XFS_DQTYPE_ANY (XFS_DQTYPE_REC_MASK)
> +#define XFS_DQTYPE_ANY (XFS_DQTYPE_REC_MASK | \
> + XFS_DQTYPE_BIGTIME)
>
> /*
> * XFS Quota Timers
> @@ -1270,6 +1272,29 @@ static inline void xfs_dinode_put_rdev(struct xfs_dinode *dip, xfs_dev_t rdev)
> #define XFS_DQ_GRACE_MIN ((int64_t)0)
> #define XFS_DQ_GRACE_MAX ((int64_t)U32_MAX)
>
> +/*
> + * When bigtime is enabled, we trade a few bits of precision to expand the
> + * expiration timeout range to match that of big inode timestamps. The grace
> + * periods stored in dquot 0 are not shifted, since they record an interval,
> + * not a timestamp.
> + */
> +#define XFS_DQ_BIGTIME_SHIFT (2)
> +#define XFS_DQ_BIGTIME_SLACK ((int64_t)(1ULL << XFS_DQ_BIGTIME_SHIFT) - 1)
> +
> +/*
> + * Smallest possible quota expiration with big timestamps, which is
> + * Jan 1 00:00:01 UTC 1970.
> + */
> +#define XFS_DQ_BIGTIMEOUT_MIN (XFS_DQ_TIMEOUT_MIN)
> +
> +/*
> + * Largest supported quota expiration with traditional timestamps, which is
> + * the largest bigtime inode timestamp, or Jul 2 20:20:25 UTC 2486. The field
This adds and > 80 char line.
next prev parent reply other threads:[~2020-08-22 7:36 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-21 2:11 [PATCH v3 00/11] xfs: widen timestamps to deal with y2038 Darrick J. Wong
2020-08-21 2:11 ` [PATCH 01/11] xfs: explicitly define inode timestamp range Darrick J. Wong
2020-08-22 7:12 ` Christoph Hellwig
2020-08-24 16:29 ` Darrick J. Wong
2020-08-23 23:54 ` Dave Chinner
2020-08-24 2:34 ` Darrick J. Wong
2020-08-21 2:11 ` [PATCH 02/11] xfs: refactor quota expiration timer modification Darrick J. Wong
2020-08-22 7:14 ` Christoph Hellwig
2020-08-23 23:57 ` Dave Chinner
2020-08-24 2:34 ` Darrick J. Wong
2020-08-21 2:11 ` [PATCH 03/11] xfs: refactor default quota grace period setting code Darrick J. Wong
2020-08-22 7:15 ` Christoph Hellwig
2020-08-24 0:01 ` Dave Chinner
2020-08-21 2:11 ` [PATCH 04/11] xfs: remove xfs_timestamp_t Darrick J. Wong
2020-08-22 7:15 ` Christoph Hellwig
2020-08-24 0:04 ` Dave Chinner
2020-08-21 2:12 ` [PATCH 05/11] xfs: move xfs_log_dinode_to_disk to the log code Darrick J. Wong
2020-08-22 7:16 ` Christoph Hellwig
2020-08-24 2:31 ` Darrick J. Wong
2020-08-24 0:06 ` Dave Chinner
2020-08-21 2:12 ` [PATCH 06/11] xfs: refactor inode timestamp coding Darrick J. Wong
2020-08-22 7:17 ` Christoph Hellwig
2020-08-24 0:10 ` Dave Chinner
2020-08-21 2:12 ` [PATCH 07/11] xfs: convert struct xfs_timestamp to union Darrick J. Wong
2020-08-22 7:18 ` Christoph Hellwig
2020-08-24 2:35 ` Darrick J. Wong
2020-08-21 2:12 ` [PATCH 08/11] xfs: widen ondisk timestamps to deal with y2038 problem Darrick J. Wong
2020-08-22 7:33 ` Christoph Hellwig
2020-08-24 2:43 ` Darrick J. Wong
2020-08-25 0:39 ` Darrick J. Wong
2020-08-24 1:25 ` Dave Chinner
2020-08-24 3:13 ` Darrick J. Wong
2020-08-24 6:15 ` Dave Chinner
2020-08-24 16:24 ` Darrick J. Wong
2020-08-24 21:13 ` Darrick J. Wong
2020-08-21 2:12 ` [PATCH 09/11] xfs: refactor quota timestamp coding Darrick J. Wong
2020-08-22 7:33 ` Christoph Hellwig
2020-08-24 2:38 ` Darrick J. Wong
2020-08-21 2:12 ` [PATCH 10/11] xfs: enable bigtime for quota timers Darrick J. Wong
2020-08-22 7:36 ` Christoph Hellwig [this message]
2020-08-24 2:39 ` Darrick J. Wong
2020-08-21 2:12 ` [PATCH 11/11] xfs: enable big timestamps Darrick J. Wong
-- strict thread matches above, loose matches on Subject: below --
2020-08-17 22:56 [PATCH v2 00/11] xfs: widen timestamps to deal with y2038 Darrick J. Wong
2020-08-17 22:57 ` [PATCH 10/11] xfs: enable bigtime for quota timers Darrick J. Wong
2020-08-18 13:58 ` Amir Goldstein
2020-08-18 15:59 ` Darrick J. Wong
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=20200822073600.GJ1629@infradead.org \
--to=hch@infradead.org \
--cc=amir73il@gmail.com \
--cc=darrick.wong@oracle.com \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
/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).