From: Chandan Rajendra <chandan@linux.vnet.ibm.com>
To: linux-xfs@vger.kernel.org
Cc: Chandan Rajendra <chandan@linux.vnet.ibm.com>, darrick.wong@oracle.com
Subject: [PATCH] xfs: flush CoW fork reservations before processing quota get request
Date: Tue, 23 Oct 2018 12:18:08 +0530 [thread overview]
Message-ID: <20181023064808.23374-1-chandan@linux.vnet.ibm.com> (raw)
generic/305 fails on a 64k block sized filesystem due to the following
interaction,
1. We are writing 8 blocks (i.e. [0, 512k-1]) of data to a 1 MiB file.
2. XFS reserves 32 blocks of space in the CoW fork.
xfs_bmap_extsize_align() calculates XFS_DEFAULT_COWEXTSZ_HINT (32
blocks) as the number of blocks to be reserved.
3. The reserved space in the range [1M(i.e. i_size), 1M + 16
blocks] is freed by __fput(). This corresponds to freeing "eof
blocks" i.e. space reserved beyond EOF of a file.
The reserved space to which data was never written i.e. [9th block,
1M(EOF)], remains reserved in the CoW fork until either the CoW block
reservation trimming worker gets invoked or the filesystem is
unmounted.
This commit fixes the issue by freeing unused CoW block reservations
whenever quota numbers are requested by userspace application.
Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
---
PS: With the above patch, the tests xfs/214 & xfs/440 fail because the
value passed to xfs_io's cowextsize does not have any effect when CoW
fork reservations are flushed before querying for quota usage numbers.
fs/xfs/xfs_quotaops.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/fs/xfs/xfs_quotaops.c b/fs/xfs/xfs_quotaops.c
index a7c0c65..9236a38 100644
--- a/fs/xfs/xfs_quotaops.c
+++ b/fs/xfs/xfs_quotaops.c
@@ -218,14 +218,21 @@ xfs_fs_get_dqblk(
struct kqid qid,
struct qc_dqblk *qdq)
{
+ int ret;
struct xfs_mount *mp = XFS_M(sb);
xfs_dqid_t id;
+ struct xfs_eofblocks eofb = { 0 };
if (!XFS_IS_QUOTA_RUNNING(mp))
return -ENOSYS;
if (!XFS_IS_QUOTA_ON(mp))
return -ESRCH;
+ eofb.eof_flags = XFS_EOF_FLAGS_SYNC;
+ ret = xfs_icache_free_cowblocks(mp, &eofb);
+ if (ret)
+ return ret;
+
id = from_kqid(&init_user_ns, qid);
return xfs_qm_scall_getquota(mp, id, xfs_quota_type(qid.type), qdq);
}
@@ -240,12 +247,18 @@ xfs_fs_get_nextdqblk(
int ret;
struct xfs_mount *mp = XFS_M(sb);
xfs_dqid_t id;
+ struct xfs_eofblocks eofb = { 0 };
if (!XFS_IS_QUOTA_RUNNING(mp))
return -ENOSYS;
if (!XFS_IS_QUOTA_ON(mp))
return -ESRCH;
+ eofb.eof_flags = XFS_EOF_FLAGS_SYNC;
+ ret = xfs_icache_free_cowblocks(mp, &eofb);
+ if (ret)
+ return ret;
+
id = from_kqid(&init_user_ns, *qid);
ret = xfs_qm_scall_getquota_next(mp, &id, xfs_quota_type(qid->type),
qdq);
--
2.9.5
next reply other threads:[~2018-10-23 15:08 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-23 6:48 Chandan Rajendra [this message]
2018-10-31 12:11 ` [PATCH] xfs: flush CoW fork reservations before processing quota get request Brian Foster
2018-11-01 7:02 ` Chandan Rajendra
2018-11-01 13:12 ` Brian Foster
2018-10-31 15:33 ` Darrick J. Wong
2018-11-01 5:50 ` Chandan Rajendra
2018-11-01 16:37 ` 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=20181023064808.23374-1-chandan@linux.vnet.ibm.com \
--to=chandan@linux.vnet.ibm.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.