xfs: wire up realtime refcount btree cursors

Wire up realtime refcount btree cursors wherever they're needed
throughout the code base.

Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Darrick J. Wong 2024-11-20 16:20:55 -08:00
parent 4e87047539
commit e5a171729b
6 changed files with 187 additions and 20 deletions

View File

@ -297,7 +297,7 @@ struct xfs_btree_cur
struct {
unsigned int nr_ops; /* # record updates */
unsigned int shape_changes; /* # of extent splits */
} bc_refc; /* refcountbt */
} bc_refc; /* refcountbt/rtrefcountbt */
};
/* Must be at the end of the struct! */

View File

@ -27,6 +27,7 @@
#include "xfs_refcount_item.h"
#include "xfs_rtgroup.h"
#include "xfs_rtalloc.h"
#include "xfs_rtrefcount_btree.h"
struct kmem_cache *xfs_refcount_intent_cache;
@ -1462,6 +1463,32 @@ xfs_refcount_finish_one(
return error;
}
/*
* Set up a continuation a deferred rtrefcount operation by updating the
* intent. Checks to make sure we're not going to run off the end of the
* rtgroup.
*/
static inline int
xfs_rtrefcount_continue_op(
struct xfs_btree_cur *cur,
struct xfs_refcount_intent *ri,
xfs_agblock_t new_agbno)
{
struct xfs_mount *mp = cur->bc_mp;
struct xfs_rtgroup *rtg = to_rtg(ri->ri_group);
if (XFS_IS_CORRUPT(mp, !xfs_verify_rgbext(rtg, new_agbno,
ri->ri_blockcount))) {
xfs_btree_mark_sick(cur);
return -EFSCORRUPTED;
}
ri->ri_startblock = xfs_rgbno_to_rtb(rtg, new_agbno);
ASSERT(xfs_verify_rtbext(mp, ri->ri_startblock, ri->ri_blockcount));
return 0;
}
/*
* Process one of the deferred realtime refcount operations. We pass back the
* btree cursor to maintain our lock on the btree between calls.
@ -1472,8 +1499,77 @@ xfs_rtrefcount_finish_one(
struct xfs_refcount_intent *ri,
struct xfs_btree_cur **pcur)
{
ASSERT(0);
return -EFSCORRUPTED;
struct xfs_mount *mp = tp->t_mountp;
struct xfs_rtgroup *rtg = to_rtg(ri->ri_group);
struct xfs_btree_cur *rcur = *pcur;
int error = 0;
xfs_rgblock_t bno;
unsigned long nr_ops = 0;
int shape_changes = 0;
bno = xfs_rtb_to_rgbno(mp, ri->ri_startblock);
trace_xfs_refcount_deferred(mp, ri);
if (XFS_TEST_ERROR(false, mp, XFS_ERRTAG_REFCOUNT_FINISH_ONE))
return -EIO;
/*
* If we haven't gotten a cursor or the cursor AG doesn't match
* the startblock, get one now.
*/
if (rcur != NULL && rcur->bc_group != ri->ri_group) {
nr_ops = rcur->bc_refc.nr_ops;
shape_changes = rcur->bc_refc.shape_changes;
xfs_btree_del_cursor(rcur, 0);
rcur = NULL;
*pcur = NULL;
}
if (rcur == NULL) {
xfs_rtgroup_lock(rtg, XFS_RTGLOCK_REFCOUNT);
xfs_rtgroup_trans_join(tp, rtg, XFS_RTGLOCK_REFCOUNT);
*pcur = rcur = xfs_rtrefcountbt_init_cursor(tp, rtg);
rcur->bc_refc.nr_ops = nr_ops;
rcur->bc_refc.shape_changes = shape_changes;
}
switch (ri->ri_type) {
case XFS_REFCOUNT_INCREASE:
error = xfs_refcount_adjust(rcur, &bno, &ri->ri_blockcount,
XFS_REFCOUNT_ADJUST_INCREASE);
if (error)
return error;
if (ri->ri_blockcount > 0)
error = xfs_rtrefcount_continue_op(rcur, ri, bno);
break;
case XFS_REFCOUNT_DECREASE:
error = xfs_refcount_adjust(rcur, &bno, &ri->ri_blockcount,
XFS_REFCOUNT_ADJUST_DECREASE);
if (error)
return error;
if (ri->ri_blockcount > 0)
error = xfs_rtrefcount_continue_op(rcur, ri, bno);
break;
case XFS_REFCOUNT_ALLOC_COW:
error = __xfs_refcount_cow_alloc(rcur, bno, ri->ri_blockcount);
if (error)
return error;
ri->ri_blockcount = 0;
break;
case XFS_REFCOUNT_FREE_COW:
error = __xfs_refcount_cow_free(rcur, bno, ri->ri_blockcount);
if (error)
return error;
ri->ri_blockcount = 0;
break;
default:
ASSERT(0);
return -EFSCORRUPTED;
}
if (!error && ri->ri_blockcount > 0)
trace_xfs_refcount_finish_one_leftover(mp, ri);
return error;
}
/*

View File

@ -206,6 +206,9 @@ xfs_rtgroup_lock(
if ((rtglock_flags & XFS_RTGLOCK_RMAP) && rtg_rmap(rtg))
xfs_ilock(rtg_rmap(rtg), XFS_ILOCK_EXCL);
if ((rtglock_flags & XFS_RTGLOCK_REFCOUNT) && rtg_refcount(rtg))
xfs_ilock(rtg_refcount(rtg), XFS_ILOCK_EXCL);
}
/* Unlock metadata inodes associated with this rt group. */
@ -218,6 +221,9 @@ xfs_rtgroup_unlock(
ASSERT(!(rtglock_flags & XFS_RTGLOCK_BITMAP_SHARED) ||
!(rtglock_flags & XFS_RTGLOCK_BITMAP));
if ((rtglock_flags & XFS_RTGLOCK_REFCOUNT) && rtg_refcount(rtg))
xfs_iunlock(rtg_refcount(rtg), XFS_ILOCK_EXCL);
if ((rtglock_flags & XFS_RTGLOCK_RMAP) && rtg_rmap(rtg))
xfs_iunlock(rtg_rmap(rtg), XFS_ILOCK_EXCL);
@ -249,6 +255,9 @@ xfs_rtgroup_trans_join(
if ((rtglock_flags & XFS_RTGLOCK_RMAP) && rtg_rmap(rtg))
xfs_trans_ijoin(tp, rtg_rmap(rtg), XFS_ILOCK_EXCL);
if ((rtglock_flags & XFS_RTGLOCK_REFCOUNT) && rtg_refcount(rtg))
xfs_trans_ijoin(tp, rtg_refcount(rtg), XFS_ILOCK_EXCL);
}
/* Retrieve rt group geometry. */

View File

@ -273,10 +273,13 @@ int xfs_update_last_rtgroup_size(struct xfs_mount *mp,
#define XFS_RTGLOCK_BITMAP_SHARED (1U << 1)
/* Lock the rt rmap inode in exclusive mode */
#define XFS_RTGLOCK_RMAP (1U << 2)
/* Lock the rt refcount inode in exclusive mode */
#define XFS_RTGLOCK_REFCOUNT (1U << 3)
#define XFS_RTGLOCK_ALL_FLAGS (XFS_RTGLOCK_BITMAP | \
XFS_RTGLOCK_BITMAP_SHARED | \
XFS_RTGLOCK_RMAP)
XFS_RTGLOCK_RMAP | \
XFS_RTGLOCK_REFCOUNT)
void xfs_rtgroup_lock(struct xfs_rtgroup *rtg, unsigned int rtglock_flags);
void xfs_rtgroup_unlock(struct xfs_rtgroup *rtg, unsigned int rtglock_flags);

View File

@ -27,6 +27,7 @@
#include "xfs_ag.h"
#include "xfs_rtgroup.h"
#include "xfs_rtrmap_btree.h"
#include "xfs_rtrefcount_btree.h"
/* Convert an xfs_fsmap to an fsmap. */
static void
@ -212,21 +213,20 @@ xfs_getfsmap_is_shared(
struct xfs_mount *mp = tp->t_mountp;
struct xfs_btree_cur *cur;
xfs_agblock_t fbno;
xfs_extlen_t flen;
xfs_extlen_t flen = 0;
int error;
*stat = false;
if (!xfs_has_reflink(mp))
return 0;
/* rt files will have no perag structure */
if (!info->group)
if (!xfs_has_reflink(mp) || !info->group)
return 0;
if (info->group->xg_type == XG_TYPE_RTG)
cur = xfs_rtrefcountbt_init_cursor(tp, to_rtg(info->group));
else
cur = xfs_refcountbt_init_cursor(mp, tp, info->agf_bp,
to_perag(info->group));
/* Are there any shared blocks here? */
flen = 0;
cur = xfs_refcountbt_init_cursor(mp, tp, info->agf_bp,
to_perag(info->group));
error = xfs_refcount_find_shared(cur, frec->rec_key,
XFS_BB_TO_FSBT(mp, frec->len_daddr), &fbno, &flen,
false);
@ -863,7 +863,7 @@ xfs_getfsmap_rtdev_rmapbt_query(
struct xfs_rtgroup *rtg = to_rtg(info->group);
/* Query the rtrmapbt */
xfs_rtgroup_lock(rtg, XFS_RTGLOCK_RMAP);
xfs_rtgroup_lock(rtg, XFS_RTGLOCK_RMAP | XFS_RTGLOCK_REFCOUNT);
*curpp = xfs_rtrmapbt_init_cursor(tp, rtg);
return xfs_rmap_query_range(*curpp, &info->low, &info->high,
xfs_getfsmap_rtdev_rmapbt_helper, info);
@ -950,7 +950,8 @@ xfs_getfsmap_rtdev_rmapbt(
if (bt_cur) {
xfs_rtgroup_unlock(to_rtg(bt_cur->bc_group),
XFS_RTGLOCK_RMAP);
XFS_RTGLOCK_RMAP |
XFS_RTGLOCK_REFCOUNT);
xfs_btree_del_cursor(bt_cur, XFS_BTREE_NOERROR);
bt_cur = NULL;
}
@ -988,7 +989,7 @@ xfs_getfsmap_rtdev_rmapbt(
if (bt_cur) {
xfs_rtgroup_unlock(to_rtg(bt_cur->bc_group),
XFS_RTGLOCK_RMAP);
XFS_RTGLOCK_RMAP | XFS_RTGLOCK_REFCOUNT);
xfs_btree_del_cursor(bt_cur, error < 0 ? XFS_BTREE_ERROR :
XFS_BTREE_NOERROR);
}

View File

@ -30,6 +30,9 @@
#include "xfs_ag.h"
#include "xfs_ag_resv.h"
#include "xfs_health.h"
#include "xfs_rtrefcount_btree.h"
#include "xfs_rtalloc.h"
#include "xfs_rtgroup.h"
/*
* Copy on Write of Shared Blocks
@ -163,6 +166,53 @@ out:
return error;
}
/*
* Given a file mapping for the rt device, find the lowest-numbered run of
* shared blocks within that mapping and return it in shared_offset/shared_len.
* The offset is relative to the start of irec.
*
* If find_end_of_shared is true, return the longest contiguous extent of shared
* blocks. If there are no shared extents, shared_offset and shared_len will be
* set to 0;
*/
static int
xfs_reflink_find_rtshared(
struct xfs_mount *mp,
struct xfs_trans *tp,
const struct xfs_bmbt_irec *irec,
xfs_extlen_t *shared_offset,
xfs_extlen_t *shared_len,
bool find_end_of_shared)
{
struct xfs_rtgroup *rtg;
struct xfs_btree_cur *cur;
xfs_rgblock_t orig_bno;
xfs_agblock_t found_bno;
int error;
BUILD_BUG_ON(NULLRGBLOCK != NULLAGBLOCK);
/*
* Note: this uses the not quite correct xfs_agblock_t type because
* xfs_refcount_find_shared is shared between the RT and data device
* refcount code.
*/
orig_bno = xfs_rtb_to_rgbno(mp, irec->br_startblock);
rtg = xfs_rtgroup_get(mp, xfs_rtb_to_rgno(mp, irec->br_startblock));
xfs_rtgroup_lock(rtg, XFS_RTGLOCK_REFCOUNT);
cur = xfs_rtrefcountbt_init_cursor(tp, rtg);
error = xfs_refcount_find_shared(cur, orig_bno, irec->br_blockcount,
&found_bno, shared_len, find_end_of_shared);
xfs_btree_del_cursor(cur, error);
xfs_rtgroup_unlock(rtg, XFS_RTGLOCK_REFCOUNT);
xfs_rtgroup_put(rtg);
if (!error && *shared_len)
*shared_offset = found_bno - orig_bno;
return error;
}
/*
* Trim the mapping to the next block where there's a change in the
* shared/unshared status. More specifically, this means that we
@ -191,8 +241,12 @@ xfs_reflink_trim_around_shared(
trace_xfs_reflink_trim_around_shared(ip, irec);
error = xfs_reflink_find_shared(mp, NULL, irec, &shared_offset,
&shared_len, true);
if (XFS_IS_REALTIME_INODE(ip))
error = xfs_reflink_find_rtshared(mp, NULL, irec,
&shared_offset, &shared_len, true);
else
error = xfs_reflink_find_shared(mp, NULL, irec,
&shared_offset, &shared_len, true);
if (error)
return error;
@ -1554,8 +1608,12 @@ xfs_reflink_inode_has_shared_extents(
got.br_state != XFS_EXT_NORM)
goto next;
error = xfs_reflink_find_shared(mp, tp, &got, &shared_offset,
&shared_len, false);
if (XFS_IS_REALTIME_INODE(ip))
error = xfs_reflink_find_rtshared(mp, tp, &got,
&shared_offset, &shared_len, false);
else
error = xfs_reflink_find_shared(mp, tp, &got,
&shared_offset, &shared_len, false);
if (error)
return error;