From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
On filesystems that support them, bmap intent log items can be used to
change mappings in inode data or attr forks. However, if the bmbt must
expand, the enormous block reservations that we make for finishing
chains of deferred log items become a liability because the bmbt block
allocator sets minleft to the transaction reservation and there probably
aren't any AGs in the filesystem that have that much free space.
Whereas previously we would reserve 93% of the free blocks in the
filesystem, now we only want to reserve 7/8ths of the free space in the
least full AG, and no more than half of the usable blocks in an AG. In
theory we shouldn't run out of space because (prior to the unclean
shutdown) all of the in-progress transactions successfully reserved the
worst case number of disk blocks.
Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
---
fs/xfs/libxfs/xfs_defer.c | 6 +---
fs/xfs/libxfs/xfs_defer.h | 2 +
fs/xfs/xfs_log_recover.c | 70 +++++++++++++++++++++++++++++++++------------
3 files changed, 54 insertions(+), 24 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_defer.c b/fs/xfs/libxfs/xfs_defer.c
index bbbd0141d4a6..ea4d28851bbd 100644
--- a/fs/xfs/libxfs/xfs_defer.c
+++ b/fs/xfs/libxfs/xfs_defer.c
@@ -577,8 +577,8 @@ xfs_defer_freeze(
return 0;
}
-/* Thaw a chain of deferred ops that are attached to a transaction. */
-int
+/* Thaw a chain of frozen deferred ops by attaching them to the transaction. */
+void
xfs_defer_thaw(
struct xfs_defer_freezer *dff,
struct xfs_trans *tp)
@@ -588,8 +588,6 @@ xfs_defer_thaw(
/* Add the dfops items to the transaction. */
list_splice_init(&dff->dff_dfops, &tp->t_dfops);
tp->t_flags |= dff->dff_tpflags;
-
- return 0;
}
/* Release a deferred op freezer and all resources associated with it. */
diff --git a/fs/xfs/libxfs/xfs_defer.h b/fs/xfs/libxfs/xfs_defer.h
index 4789bf53dd96..7ae05e10d750 100644
--- a/fs/xfs/libxfs/xfs_defer.h
+++ b/fs/xfs/libxfs/xfs_defer.h
@@ -80,7 +80,7 @@ struct xfs_defer_freezer {
/* Functions to freeze a chain of deferred operations for later. */
int xfs_defer_freeze(struct xfs_trans *tp, struct xfs_defer_freezer **dffp);
-int xfs_defer_thaw(struct xfs_defer_freezer *dff, struct xfs_trans *tp);
+void xfs_defer_thaw(struct xfs_defer_freezer *dff, struct xfs_trans *tp);
void xfs_defer_freeezer_finish(struct xfs_mount *mp,
struct xfs_defer_freezer *dff);
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 908bfb284a9a..50b9d70e502f 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -2512,6 +2512,44 @@ xlog_recover_process_data(
return 0;
}
+/*
+ * Estimate a block reservation for a log recovery transaction. Since we run
+ * separate transactions for each chain of deferred ops that get created as a
+ * result of recovering unfinished log intent items, we must be careful not to
+ * reserve so many blocks that block allocations fail because we can't satisfy
+ * the minleft requirements (e.g. for bmbt blocks).
+ */
+static int
+xlog_estimate_recovery_resblks(
+ struct xfs_mount *mp,
+ unsigned int *resblks)
+{
+ struct xfs_perag *pag;
+ xfs_agnumber_t agno;
+ unsigned int free = 0;
+ int error;
+
+ /* Don't use more than 7/8th of the free space in the least full AG. */
+ for (agno = 0; agno < mp->m_sb.sb_agcount; agno++) {
+ unsigned int ag_free;
+
+ error = xfs_alloc_pagf_init(mp, NULL, agno, 0);
+ if (error)
+ return error;
+ pag = xfs_perag_get(mp, agno);
+ ag_free = pag->pagf_freeblks + pag->pagf_flcount;
+ free = max(free, (ag_free * 7) / 8);
+ xfs_perag_put(pag);
+ }
+
+ /* Don't try to reserve more than half the usable AG blocks. */
+ *resblks = min(free, xfs_alloc_ag_max_usable(mp) / 2);
+ if (*resblks == 0)
+ return -ENOSPC;
+
+ return 0;
+}
+
/* Take all the collected deferred ops and finish them in order. */
static int
xlog_finish_defer_ops(
@@ -2520,27 +2558,25 @@ xlog_finish_defer_ops(
{
struct xfs_defer_freezer *dff, *next;
struct xfs_trans *tp;
- int64_t freeblks;
- uint resblks;
+ unsigned int max_resblks;
int error = 0;
+ error = xlog_estimate_recovery_resblks(mp, &max_resblks);
+ if (error)
+ goto out;
+
list_for_each_entry_safe(dff, next, dfops_freezers, dff_list) {
+ unsigned int resblks;
+
+ resblks = min_t(int64_t, percpu_counter_sum(&mp->m_fdblocks),
+ max_resblks);
+
/*
* We're finishing the defer_ops that accumulated as a result
* of recovering unfinished intent items during log recovery.
* We reserve an itruncate transaction because it is the
- * largest permanent transaction type. Since we're the only
- * user of the fs right now, take 93% (15/16) of the available
- * free blocks. Use weird math to avoid a 64-bit division.
+ * largest permanent transaction type.
*/
- freeblks = percpu_counter_sum(&mp->m_fdblocks);
- if (freeblks <= 0) {
- error = -ENOSPC;
- break;
- }
-
- resblks = min_t(int64_t, UINT_MAX, freeblks);
- resblks = (resblks * 15) >> 4;
error = xfs_trans_alloc(mp, &M_RES(mp)->tr_itruncate, resblks,
0, XFS_TRANS_RESERVE, &tp);
if (error)
@@ -2548,12 +2584,7 @@ xlog_finish_defer_ops(
/* transfer all collected dfops to this transaction */
list_del_init(&dff->dff_list);
- error = xfs_defer_thaw(dff, tp);
- if (error) {
- xfs_trans_cancel(tp);
- xfs_defer_freeezer_finish(mp, dff);
- break;
- }
+ xfs_defer_thaw(dff, tp);
error = xfs_trans_commit(tp);
xfs_defer_freeezer_finish(mp, dff);
@@ -2561,6 +2592,7 @@ xlog_finish_defer_ops(
break;
}
+out:
/* Kill any remaining freezers. */
list_for_each_entry_safe(dff, next, dfops_freezers, dff_list) {
list_del_init(&dff->dff_list);
