@@ -16,6 +16,8 @@
#include "xfs_log.h"
#include "xfs_errortag.h"
#include "xfs_error.h"
+#include "xfs_trans.h"
+#include "xfs_buf_item.h"
static kmem_zone_t *xfs_buf_zone;
@@ -1477,6 +1479,8 @@ __xfs_buf_submit(
trace_xfs_buf_submit(bp, _RET_IP_);
ASSERT(!(bp->b_flags & _XBF_DELWRI_Q));
+ ASSERT(!bp->b_log_item ||
+ !test_bit(XFS_LI_RELOG, &bp->b_log_item->bli_item.li_flags));
/* on shutdown we stale and complete the buffer immediately */
if (XFS_FORCED_SHUTDOWN(bp->b_mount)) {
@@ -16,7 +16,7 @@
#include "xfs_trans_priv.h"
#include "xfs_trace.h"
#include "xfs_log.h"
-
+#include "xfs_log_priv.h"
kmem_zone_t *xfs_buf_item_zone;
@@ -157,7 +157,7 @@ xfs_buf_item_size(
return;
}
- ASSERT(bip->bli_flags & XFS_BLI_LOGGED);
+ ASSERT(bip->bli_flags & XFS_BLI_DIRTY);
if (bip->bli_flags & XFS_BLI_ORDERED) {
/*
@@ -463,6 +463,13 @@ xfs_buf_item_unpin(
list_del_init(&bp->b_li_list);
bp->b_iodone = NULL;
} else {
+ /* racy */
+ ASSERT(!test_bit(XFS_LI_RELOG_QUEUED, &lip->li_flags));
+ if (test_bit(XFS_LI_RELOG, &lip->li_flags)) {
+ atomic_dec(&bp->b_pin_count);
+ xfs_trans_relog_item_cancel(NULL, lip, true);
+ }
+
spin_lock(&ailp->ail_lock);
xfs_trans_ail_delete(ailp, lip, SHUTDOWN_LOG_IO_ERROR);
xfs_buf_item_relse(bp);
@@ -513,8 +520,6 @@ xfs_buf_item_push(
struct xfs_buf *bp = bip->bli_buf;
uint rval = XFS_ITEM_SUCCESS;
- if (xfs_buf_ispinned(bp))
- return XFS_ITEM_PINNED;
if (!xfs_buf_trylock(bp)) {
/*
* If we have just raced with a buffer being pinned and it has
@@ -528,6 +533,16 @@ xfs_buf_item_push(
return XFS_ITEM_LOCKED;
}
+ /* relog bufs are pinned so check relog state first */
+ if (test_bit(XFS_LI_RELOG, &lip->li_flags) &&
+ !test_bit(XFS_LI_RELOG_QUEUED, &lip->li_flags))
+ return XFS_ITEM_RELOG;
+
+ if (xfs_buf_ispinned(bp)) {
+ xfs_buf_unlock(bp);
+ return XFS_ITEM_PINNED;
+ }
+
ASSERT(!(bip->bli_flags & XFS_BLI_STALE));
trace_xfs_buf_item_push(bip);
@@ -694,6 +709,28 @@ xfs_buf_item_committed(
return lsn;
}
+STATIC void
+xfs_buf_item_relog(
+ struct xfs_log_item *lip,
+ struct xfs_trans *tp)
+{
+ struct xfs_buf_log_item *bip = BUF_ITEM(lip);
+ int res;
+
+ /*
+ * Grab a reference to the buffer for the transaction before we join
+ * and dirty it.
+ */
+ xfs_buf_hold(bip->bli_buf);
+ xfs_trans_bjoin(tp, bip->bli_buf);
+ xfs_trans_dirty_buf(tp, bip->bli_buf);
+
+ res = xfs_relog_calc_res(lip);
+ tp->t_ticket->t_curr_res += res;
+ tp->t_ticket->t_unit_res += res;
+ tp->t_log_res += res;
+}
+
static const struct xfs_item_ops xfs_buf_item_ops = {
.iop_size = xfs_buf_item_size,
.iop_format = xfs_buf_item_format,
@@ -703,6 +740,7 @@ static const struct xfs_item_ops xfs_buf_item_ops = {
.iop_committing = xfs_buf_item_committing,
.iop_committed = xfs_buf_item_committed,
.iop_push = xfs_buf_item_push,
+ .iop_relog = xfs_buf_item_relog,
};
STATIC void
@@ -956,6 +994,11 @@ STATIC void
xfs_buf_item_free(
struct xfs_buf_log_item *bip)
{
+ ASSERT(!test_bit(XFS_LI_RELOG, &bip->bli_item.li_flags));
+#ifdef DEBUG
+ ASSERT(!atomic64_read(&bip->bli_item.li_relog_res));
+#endif
+
xfs_buf_item_free_format(bip);
kmem_free(bip->bli_item.li_lv_shadow);
kmem_cache_free(xfs_buf_item_zone, bip);
@@ -227,7 +227,11 @@ xfs_relog_calc_res(
int nbytes = 0;
lip->li_ops->iop_size(lip, &niovecs, &nbytes);
- ASSERT(niovecs == 1);
+ ASSERT(niovecs == 1 || lip->li_type == XFS_LI_BUF);
+ /* ideally this is somewhere buffer specific.. */
+ if (lip->li_type == XFS_LI_BUF)
+ nbytes += round_up(sizeof(struct xlog_op_header) +
+ sizeof(struct xfs_buf_log_format), 128);
nbytes = xfs_log_calc_unit_res(lip->li_mountp, nbytes);
return nbytes;
@@ -244,6 +248,9 @@ void xfs_trans_inode_buf(xfs_trans_t *, struct xfs_buf *);
void xfs_trans_stale_inode_buf(xfs_trans_t *, struct xfs_buf *);
bool xfs_trans_ordered_buf(xfs_trans_t *, struct xfs_buf *);
void xfs_trans_dquot_buf(xfs_trans_t *, struct xfs_buf *, uint);
+bool xfs_trans_relog_buf(struct xfs_trans *, struct xfs_buf *);
+void xfs_trans_relog_buf_cancel(struct xfs_trans *,
+ struct xfs_buf *);
void xfs_trans_inode_alloc_buf(xfs_trans_t *, struct xfs_buf *);
void xfs_trans_ichgtime(struct xfs_trans *, struct xfs_inode *, int);
void xfs_trans_ijoin(struct xfs_trans *, struct xfs_inode *, uint);
@@ -588,6 +588,8 @@ xfs_trans_binval(
return;
}
+ /* return relog res before we reset dirty state */
+ xfs_trans_relog_buf_cancel(tp, bp);
xfs_buf_stale(bp);
bip->bli_flags |= XFS_BLI_STALE;
@@ -787,3 +789,60 @@ xfs_trans_dquot_buf(
xfs_trans_buf_set_type(tp, bp, type);
}
+
+/*
+ * Enable automatic relogging on a buffer. This essentially pins a dirty buffer
+ * in-core until relogging is disabled.
+ */
+bool
+xfs_trans_relog_buf(
+ struct xfs_trans *tp,
+ struct xfs_buf *bp)
+{
+ struct xfs_buf_log_item *bip = bp->b_log_item;
+ enum xfs_blft blft;
+
+ ASSERT(xfs_buf_islocked(bp));
+
+ if (bip->bli_flags & (XFS_BLI_ORDERED|XFS_BLI_STALE))
+ return false;
+
+ /*
+ * Skip buffers with higher level log items. Those items must be
+ * relogged directly to move in the log.
+ */
+ blft = xfs_blft_from_flags(&bip->__bli_format);
+ switch (blft) {
+ case XFS_BLFT_DINO_BUF:
+ case XFS_BLFT_UDQUOT_BUF:
+ case XFS_BLFT_PDQUOT_BUF:
+ case XFS_BLFT_GDQUOT_BUF:
+ return false;
+ default:
+ break;
+ }
+
+ /*
+ * Relog expects a worst case reservation from ->iop_size. Hack that in
+ * here by logging the entire buffer in this transaction. Also grab a
+ * buffer pin to prevent it from being written out.
+ */
+ xfs_buf_item_log(bip, 0, BBTOB(bp->b_length) - 1);
+ atomic_inc(&bp->b_pin_count);
+ xfs_trans_relog_item(tp, &bip->bli_item);
+ return true;
+}
+
+void
+xfs_trans_relog_buf_cancel(
+ struct xfs_trans *tp,
+ struct xfs_buf *bp)
+{
+ struct xfs_buf_log_item *bip = bp->b_log_item;
+
+ if (!test_bit(XFS_LI_RELOG, &bip->bli_item.li_flags))
+ return;
+
+ atomic_dec(&bp->b_pin_count);
+ xfs_trans_relog_item_cancel(tp, &bip->bli_item, false);
+}
Add a quick and dirty implementation of buffer relogging support. There is currently no use case for buffer relogging. This is for experimental use only and serves as an example to demonstrate the ability to relog arbitrary items in the future, if necessary. Add helpers to manage relogged buffers, update the buffer log item push handler to support relogged BLIs and add a log item relog callback to properly join buffers to the relog transaction. Note that buffers associated with higher level log items (i.e., inodes and dquots) are skipped. Signed-off-by: Brian Foster <bfoster@redhat.com> --- fs/xfs/xfs_buf.c | 4 +++ fs/xfs/xfs_buf_item.c | 51 +++++++++++++++++++++++++++++++++--- fs/xfs/xfs_trans.h | 9 ++++++- fs/xfs/xfs_trans_buf.c | 59 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 118 insertions(+), 5 deletions(-)