* [PATCH 1/5] xfs_repair: check filesystem geometry before allowing upgrades
2022-05-25 5:36 [PATCH 0/5] xfsprogs: Large extent counters Chandan Babu R
@ 2022-05-25 5:36 ` Chandan Babu R
2022-06-22 18:57 ` Eric Sandeen
2022-05-25 5:36 ` [PATCH 2/5] xfsprogs: Invoke bulkstat ioctl with XFS_BULK_IREQ_NREXT64 flag Chandan Babu R
` (4 subsequent siblings)
5 siblings, 1 reply; 9+ messages in thread
From: Chandan Babu R @ 2022-05-25 5:36 UTC (permalink / raw)
To: linux-xfs; +Cc: Darrick J. Wong, david, Chandan Babu R
From: "Darrick J. Wong" <djwong@kernel.org>
Currently, the two V5 feature upgrades permitted by xfs_repair do not
affect filesystem space usage, so we haven't needed to verify the
geometry.
However, this will change once we start to allow the sysadmin to add new
metadata indexes to existing filesystems. Add all the infrastructure we
need to ensure that the log will still be large enough, that there's
enough space for metadata space reservations, and the root inode will
still be where we expect it to be after the upgrade.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandan.babu@oracle.com>
[Recompute transaction reservation values; Exit with error if upgrade fails]
---
include/libxfs.h | 1 +
include/xfs_mount.h | 1 +
libxfs/init.c | 24 +++--
libxfs/libxfs_api_defs.h | 3 +
repair/phase2.c | 206 +++++++++++++++++++++++++++++++++++++--
5 files changed, 218 insertions(+), 17 deletions(-)
diff --git a/include/libxfs.h b/include/libxfs.h
index 915bf511..7d6e9a33 100644
--- a/include/libxfs.h
+++ b/include/libxfs.h
@@ -77,6 +77,7 @@ struct iomap;
#include "xfs_refcount_btree.h"
#include "xfs_refcount.h"
#include "xfs_btree_staging.h"
+#include "xfs_ag_resv.h"
#ifndef ARRAY_SIZE
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
diff --git a/include/xfs_mount.h b/include/xfs_mount.h
index b32ca152..011f395a 100644
--- a/include/xfs_mount.h
+++ b/include/xfs_mount.h
@@ -259,6 +259,7 @@ __XFS_UNSUPP_OPSTATE(shutdown)
#define LIBXFS_BHASHSIZE(sbp) (1<<10)
+void libxfs_compute_all_maxlevels(struct xfs_mount *mp);
struct xfs_mount *libxfs_mount(struct xfs_mount *mp, struct xfs_sb *sb,
dev_t dev, dev_t logdev, dev_t rtdev, unsigned int flags);
int libxfs_flush_mount(struct xfs_mount *mp);
diff --git a/libxfs/init.c b/libxfs/init.c
index a01a41b2..15052696 100644
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -728,6 +728,21 @@ xfs_agbtree_compute_maxlevels(
mp->m_agbtree_maxlevels = max(levels, mp->m_refc_maxlevels);
}
+/* Compute maximum possible height of all btrees. */
+void
+libxfs_compute_all_maxlevels(
+ struct xfs_mount *mp)
+{
+ xfs_alloc_compute_maxlevels(mp);
+ xfs_bmap_compute_maxlevels(mp, XFS_DATA_FORK);
+ xfs_bmap_compute_maxlevels(mp, XFS_ATTR_FORK);
+ xfs_ialloc_setup_geometry(mp);
+ xfs_rmapbt_compute_maxlevels(mp);
+ xfs_refcountbt_compute_maxlevels(mp);
+
+ xfs_agbtree_compute_maxlevels(mp);
+}
+
/*
* Mount structure initialization, provides a filled-in xfs_mount_t
* such that the numerous XFS_* macros can be used. If dev is zero,
@@ -772,14 +787,7 @@ libxfs_mount(
mp->m_swidth = sbp->sb_width;
}
- xfs_alloc_compute_maxlevels(mp);
- xfs_bmap_compute_maxlevels(mp, XFS_DATA_FORK);
- xfs_bmap_compute_maxlevels(mp, XFS_ATTR_FORK);
- xfs_ialloc_setup_geometry(mp);
- xfs_rmapbt_compute_maxlevels(mp);
- xfs_refcountbt_compute_maxlevels(mp);
-
- xfs_agbtree_compute_maxlevels(mp);
+ libxfs_compute_all_maxlevels(mp);
/*
* Check that the data (and log if separate) are an ok size.
diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h
index 370ad8b3..824f2c4d 100644
--- a/libxfs/libxfs_api_defs.h
+++ b/libxfs/libxfs_api_defs.h
@@ -21,6 +21,8 @@
#define xfs_ag_init_headers libxfs_ag_init_headers
#define xfs_ag_block_count libxfs_ag_block_count
+#define xfs_ag_resv_init libxfs_ag_resv_init
+#define xfs_ag_resv_free libxfs_ag_resv_free
#define xfs_alloc_ag_max_usable libxfs_alloc_ag_max_usable
#define xfs_allocbt_maxlevels_ondisk libxfs_allocbt_maxlevels_ondisk
@@ -112,6 +114,7 @@
#define xfs_highbit64 libxfs_highbit64
#define xfs_ialloc_calc_rootino libxfs_ialloc_calc_rootino
#define xfs_iallocbt_maxlevels_ondisk libxfs_iallocbt_maxlevels_ondisk
+#define xfs_ialloc_read_agi libxfs_ialloc_read_agi
#define xfs_idata_realloc libxfs_idata_realloc
#define xfs_idestroy_fork libxfs_idestroy_fork
#define xfs_iext_lookup_extent libxfs_iext_lookup_extent
diff --git a/repair/phase2.c b/repair/phase2.c
index 13832701..4c315055 100644
--- a/repair/phase2.c
+++ b/repair/phase2.c
@@ -133,7 +133,8 @@ zero_log(
static bool
set_inobtcount(
- struct xfs_mount *mp)
+ struct xfs_mount *mp,
+ struct xfs_sb *new_sb)
{
if (!xfs_has_crc(mp)) {
printf(
@@ -153,14 +154,15 @@ set_inobtcount(
}
printf(_("Adding inode btree counts to filesystem.\n"));
- mp->m_sb.sb_features_ro_compat |= XFS_SB_FEAT_RO_COMPAT_INOBTCNT;
- mp->m_sb.sb_features_incompat |= XFS_SB_FEAT_INCOMPAT_NEEDSREPAIR;
+ new_sb->sb_features_ro_compat |= XFS_SB_FEAT_RO_COMPAT_INOBTCNT;
+ new_sb->sb_features_incompat |= XFS_SB_FEAT_INCOMPAT_NEEDSREPAIR;
return true;
}
static bool
set_bigtime(
- struct xfs_mount *mp)
+ struct xfs_mount *mp,
+ struct xfs_sb *new_sb)
{
if (!xfs_has_crc(mp)) {
printf(
@@ -174,28 +176,214 @@ set_bigtime(
}
printf(_("Adding large timestamp support to filesystem.\n"));
- mp->m_sb.sb_features_incompat |= (XFS_SB_FEAT_INCOMPAT_NEEDSREPAIR |
- XFS_SB_FEAT_INCOMPAT_BIGTIME);
+ new_sb->sb_features_incompat |= (XFS_SB_FEAT_INCOMPAT_NEEDSREPAIR |
+ XFS_SB_FEAT_INCOMPAT_BIGTIME);
return true;
}
+struct check_state {
+ struct xfs_sb sb;
+ uint64_t features;
+ bool finobt_nores;
+};
+
+static inline void
+capture_old_state(
+ struct check_state *old_state,
+ const struct xfs_mount *mp)
+{
+ memcpy(&old_state->sb, &mp->m_sb, sizeof(struct xfs_sb));
+ old_state->finobt_nores = mp->m_finobt_nores;
+ old_state->features = mp->m_features;
+}
+
+static inline void
+restore_old_state(
+ struct xfs_mount *mp,
+ const struct check_state *old_state)
+{
+ memcpy(&mp->m_sb, &old_state->sb, sizeof(struct xfs_sb));
+ mp->m_finobt_nores = old_state->finobt_nores;
+ mp->m_features = old_state->features;
+ libxfs_compute_all_maxlevels(mp);
+ libxfs_trans_init(mp);
+}
+
+static inline void
+install_new_state(
+ struct xfs_mount *mp,
+ struct xfs_sb *new_sb)
+{
+ memcpy(&mp->m_sb, new_sb, sizeof(struct xfs_sb));
+ mp->m_features |= libxfs_sb_version_to_features(new_sb);
+ libxfs_compute_all_maxlevels(mp);
+ libxfs_trans_init(mp);
+}
+
+/*
+ * Make sure we can actually upgrade this (v5) filesystem without running afoul
+ * of root inode or log size requirements that would prevent us from mounting
+ * the filesystem. If everything checks out, commit the new geometry.
+ */
+static void
+install_new_geometry(
+ struct xfs_mount *mp,
+ struct xfs_sb *new_sb)
+{
+ struct check_state old;
+ struct xfs_perag *pag;
+ xfs_ino_t rootino;
+ xfs_agnumber_t agno;
+ int min_logblocks;
+ int error;
+
+ capture_old_state(&old, mp);
+ install_new_state(mp, new_sb);
+
+ /*
+ * The existing log must be large enough to satisfy the new minimum log
+ * size requirements.
+ */
+ min_logblocks = libxfs_log_calc_minimum_size(mp);
+ if (old.sb.sb_logblocks < min_logblocks) {
+ printf(
+ _("Filesystem log too small to upgrade filesystem; need %u blocks, have %u.\n"),
+ min_logblocks, old.sb.sb_logblocks);
+ exit(1);
+ }
+
+ /*
+ * The root inode must be where xfs_repair will expect it to be with
+ * the new geometry.
+ */
+ rootino = libxfs_ialloc_calc_rootino(mp, new_sb->sb_unit);
+ if (old.sb.sb_rootino != rootino) {
+ printf(
+ _("Cannot upgrade filesystem, root inode (%llu) cannot be moved to %llu.\n"),
+ (unsigned long long)old.sb.sb_rootino,
+ (unsigned long long)rootino);
+ exit(1);
+ }
+
+ /* Make sure we have enough space for per-AG reservations. */
+ for_each_perag(mp, agno, pag) {
+ struct xfs_trans *tp;
+ struct xfs_agf *agf;
+ struct xfs_buf *agi_bp, *agf_bp;
+ unsigned int avail, agblocks;
+
+ /* Put back the old super so that we can read AG headers. */
+ restore_old_state(mp, &old);
+
+ /*
+ * Create a dummy transaction so that we can load the AGI and
+ * AGF buffers in memory with the old fs geometry and pin them
+ * there while we try to make a per-AG reservation with the new
+ * geometry.
+ */
+ error = -libxfs_trans_alloc_empty(mp, &tp);
+ if (error)
+ do_error(
+ _("Cannot reserve resources for upgrade check, err=%d.\n"),
+ error);
+
+ error = -libxfs_ialloc_read_agi(mp, tp, pag->pag_agno,
+ &agi_bp);
+ if (error)
+ do_error(
+ _("Cannot read AGI %u for upgrade check, err=%d.\n"),
+ pag->pag_agno, error);
+
+ error = -libxfs_alloc_read_agf(mp, tp, pag->pag_agno, 0,
+ &agf_bp);
+ if (error)
+ do_error(
+ _("Cannot read AGF %u for upgrade check, err=%d.\n"),
+ pag->pag_agno, error);
+ agf = agf_bp->b_addr;
+ agblocks = be32_to_cpu(agf->agf_length);
+
+ /*
+ * Install the new superblock and try to make a per-AG space
+ * reservation with the new geometry. We pinned the AG header
+ * buffers to the transaction, so we shouldn't hit any
+ * corruption errors on account of the new geometry.
+ */
+ install_new_state(mp, new_sb);
+
+ error = -libxfs_ag_resv_init(pag, tp);
+ if (error == ENOSPC) {
+ printf(
+ _("Not enough free space would remain in AG %u for metadata.\n"),
+ pag->pag_agno);
+ exit(1);
+ }
+ if (error)
+ do_error(
+ _("Error %d while checking AG %u space reservation.\n"),
+ error, pag->pag_agno);
+
+ /*
+ * Would we have at least 10% free space in this AG after
+ * making per-AG reservations?
+ */
+ avail = pag->pagf_freeblks + pag->pagf_flcount;
+ avail -= pag->pag_meta_resv.ar_reserved;
+ avail -= pag->pag_rmapbt_resv.ar_asked;
+ if (avail < agblocks / 10)
+ printf(
+ _("AG %u will be low on space after upgrade.\n"),
+ pag->pag_agno);
+ libxfs_trans_cancel(tp);
+ }
+
+ /*
+ * Would we have at least 10% free space in the data device after all
+ * the upgrades?
+ */
+ if (mp->m_sb.sb_fdblocks < mp->m_sb.sb_dblocks / 10)
+ printf(_("Filesystem will be low on space after upgrade.\n"));
+
+ /*
+ * Release the per-AG reservations and mark the per-AG structure as
+ * uninitialized so that we don't trip over stale cached counters
+ * after the upgrade/
+ */
+ for_each_perag(mp, agno, pag) {
+ libxfs_ag_resv_free(pag);
+ pag->pagf_init = 0;
+ pag->pagi_init = 0;
+ }
+
+ /*
+ * Restore the old state to get everything back to a clean state,
+ * upgrade the featureset one more time, and recompute the btree max
+ * levels for this filesystem.
+ */
+ restore_old_state(mp, &old);
+ install_new_state(mp, new_sb);
+}
+
/* Perform the user's requested upgrades on filesystem. */
static void
upgrade_filesystem(
struct xfs_mount *mp)
{
+ struct xfs_sb new_sb;
struct xfs_buf *bp;
bool dirty = false;
int error;
+ memcpy(&new_sb, &mp->m_sb, sizeof(struct xfs_sb));
+
if (add_inobtcount)
- dirty |= set_inobtcount(mp);
+ dirty |= set_inobtcount(mp, &new_sb);
if (add_bigtime)
- dirty |= set_bigtime(mp);
+ dirty |= set_bigtime(mp, &new_sb);
if (!dirty)
return;
- mp->m_features |= libxfs_sb_version_to_features(&mp->m_sb);
+ install_new_geometry(mp, &new_sb);
if (no_modify)
return;
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 1/5] xfs_repair: check filesystem geometry before allowing upgrades
2022-05-25 5:36 ` [PATCH 1/5] xfs_repair: check filesystem geometry before allowing upgrades Chandan Babu R
@ 2022-06-22 18:57 ` Eric Sandeen
2022-06-22 22:12 ` Darrick J. Wong
0 siblings, 1 reply; 9+ messages in thread
From: Eric Sandeen @ 2022-06-22 18:57 UTC (permalink / raw)
To: Chandan Babu R, linux-xfs; +Cc: Darrick J. Wong, david
On 5/25/22 12:36 AM, Chandan Babu R wrote:
> From: "Darrick J. Wong" <djwong@kernel.org>
>
> Currently, the two V5 feature upgrades permitted by xfs_repair do not
> affect filesystem space usage, so we haven't needed to verify the
> geometry.
>
> However, this will change once we start to allow the sysadmin to add new
> metadata indexes to existing filesystems. Add all the infrastructure we
> need to ensure that the log will still be large enough, that there's
> enough space for metadata space reservations, and the root inode will
> still be where we expect it to be after the upgrade.
>
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> Signed-off-by: Chandan Babu R <chandan.babu@oracle.com>
> [Recompute transaction reservation values; Exit with error if upgrade fails]
This is a lot to digest; I'd like to go ahead and merge 3 patches out of
this 5 patch series and leave this + the upgrade patch until I get a chance
to digest it a bit more.
One thing at least, though:
> + /*
> + * Would we have at least 10% free space in the data device after all
> + * the upgrades?
> + */
> + if (mp->m_sb.sb_fdblocks < mp->m_sb.sb_dblocks / 10)
> + printf(_("Filesystem will be low on space after upgrade.\n"));
> +
This should be removed, IMHO; what is the point? The user can't do anything about
it, it proceeds anyway, and for all we know they started with less than 10% free.
So why bother printing something that might generate questions and support
calls? I don't think it's useful or actionable information.
Thanks,
-Eric
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/5] xfs_repair: check filesystem geometry before allowing upgrades
2022-06-22 18:57 ` Eric Sandeen
@ 2022-06-22 22:12 ` Darrick J. Wong
0 siblings, 0 replies; 9+ messages in thread
From: Darrick J. Wong @ 2022-06-22 22:12 UTC (permalink / raw)
To: Eric Sandeen; +Cc: Chandan Babu R, linux-xfs, david
On Wed, Jun 22, 2022 at 01:57:52PM -0500, Eric Sandeen wrote:
> On 5/25/22 12:36 AM, Chandan Babu R wrote:
> > From: "Darrick J. Wong" <djwong@kernel.org>
> >
> > Currently, the two V5 feature upgrades permitted by xfs_repair do not
> > affect filesystem space usage, so we haven't needed to verify the
> > geometry.
> >
> > However, this will change once we start to allow the sysadmin to add new
> > metadata indexes to existing filesystems. Add all the infrastructure we
> > need to ensure that the log will still be large enough, that there's
> > enough space for metadata space reservations, and the root inode will
> > still be where we expect it to be after the upgrade.
> >
> > Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> > Signed-off-by: Chandan Babu R <chandan.babu@oracle.com>
> > [Recompute transaction reservation values; Exit with error if upgrade fails]
>
> This is a lot to digest; I'd like to go ahead and merge 3 patches out of
> this 5 patch series and leave this + the upgrade patch until I get a chance
> to digest it a bit more.
>
> One thing at least, though:
>
>
> > + /*
> > + * Would we have at least 10% free space in the data device after all
> > + * the upgrades?
> > + */
> > + if (mp->m_sb.sb_fdblocks < mp->m_sb.sb_dblocks / 10)
> > + printf(_("Filesystem will be low on space after upgrade.\n"));
> > +
>
> This should be removed, IMHO; what is the point? The user can't do anything about
> it, it proceeds anyway, and for all we know they started with less than 10% free.
> So why bother printing something that might generate questions and support
> calls? I don't think it's useful or actionable information.
Would you rather this exit(1)'d afterwards? i.e. refuse the upgrade if
the fs doesn't have enough free space?
--D
> Thanks,
> -Eric
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/5] xfsprogs: Invoke bulkstat ioctl with XFS_BULK_IREQ_NREXT64 flag
2022-05-25 5:36 [PATCH 0/5] xfsprogs: Large extent counters Chandan Babu R
2022-05-25 5:36 ` [PATCH 1/5] xfs_repair: check filesystem geometry before allowing upgrades Chandan Babu R
@ 2022-05-25 5:36 ` Chandan Babu R
2022-05-25 5:36 ` [PATCH 3/5] xfs_info: Report NREXT64 feature status Chandan Babu R
` (3 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Chandan Babu R @ 2022-05-25 5:36 UTC (permalink / raw)
To: linux-xfs; +Cc: Chandan Babu R, david, Darrick J . Wong
This commit adds support to libfrog to enable reporting 64-bit extent counters
to its users. In order to do so, bulkstat ioctl is now invoked with the newly
introduced XFS_BULK_IREQ_NREXT64 flag if the underlying filesystem's geometry
supports 64-bit extent counters.
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandan.babu@oracle.com>
---
fsr/xfs_fsr.c | 4 ++--
io/bulkstat.c | 1 +
libfrog/bulkstat.c | 29 +++++++++++++++++++++++++++--
man/man2/ioctl_xfs_bulkstat.2 | 10 +++++++++-
4 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c
index 6cf8bfb7..ba02506d 100644
--- a/fsr/xfs_fsr.c
+++ b/fsr/xfs_fsr.c
@@ -590,7 +590,7 @@ cmp(const void *s1, const void *s2)
(bs1->bs_version == XFS_BULKSTAT_VERSION_V5 &&
bs2->bs_version == XFS_BULKSTAT_VERSION_V5));
- return (bs2->bs_extents - bs1->bs_extents);
+ return (bs2->bs_extents64 - bs1->bs_extents64);
}
/*
@@ -655,7 +655,7 @@ fsrfs(char *mntdir, xfs_ino_t startino, int targetrange)
for (p = buf, endp = (buf + buflenout); p < endp ; p++) {
/* Do some obvious checks now */
if (((p->bs_mode & S_IFMT) != S_IFREG) ||
- (p->bs_extents < 2))
+ (p->bs_extents64 < 2))
continue;
ret = -xfrog_bulkstat_v5_to_v1(&fsxfd, &bs1, p);
diff --git a/io/bulkstat.c b/io/bulkstat.c
index 41194200..a9ad87ca 100644
--- a/io/bulkstat.c
+++ b/io/bulkstat.c
@@ -57,6 +57,7 @@ dump_bulkstat(
printf("\tbs_sick = 0x%"PRIx16"\n", bstat->bs_sick);
printf("\tbs_checked = 0x%"PRIx16"\n", bstat->bs_checked);
printf("\tbs_mode = 0%"PRIo16"\n", bstat->bs_mode);
+ printf("\tbs_extents64 = %"PRIu64"\n", bstat->bs_extents64);
};
static void
diff --git a/libfrog/bulkstat.c b/libfrog/bulkstat.c
index 195f6ea0..0a90947f 100644
--- a/libfrog/bulkstat.c
+++ b/libfrog/bulkstat.c
@@ -56,6 +56,9 @@ xfrog_bulkstat_single5(
if (flags & ~(XFS_BULK_IREQ_SPECIAL))
return -EINVAL;
+ if (xfd->fsgeom.flags & XFS_FSOP_GEOM_FLAGS_NREXT64)
+ flags |= XFS_BULK_IREQ_NREXT64;
+
ret = xfrog_bulkstat_alloc_req(1, ino, &req);
if (ret)
return ret;
@@ -73,6 +76,12 @@ xfrog_bulkstat_single5(
}
memcpy(bulkstat, req->bulkstat, sizeof(struct xfs_bulkstat));
+
+ if (!(xfd->fsgeom.flags & XFS_FSOP_GEOM_FLAGS_NREXT64)) {
+ bulkstat->bs_extents64 = bulkstat->bs_extents;
+ bulkstat->bs_extents = 0;
+ }
+
free:
free(req);
return ret;
@@ -129,6 +138,7 @@ xfrog_bulkstat_single(
switch (error) {
case -EOPNOTSUPP:
case -ENOTTY:
+ assert(!(xfd->fsgeom.flags & XFS_FSOP_GEOM_FLAGS_NREXT64));
xfd->flags |= XFROG_FLAG_BULKSTAT_FORCE_V1;
break;
}
@@ -259,10 +269,23 @@ xfrog_bulkstat5(
struct xfs_bulkstat_req *req)
{
int ret;
+ int i;
+
+ if (xfd->fsgeom.flags & XFS_FSOP_GEOM_FLAGS_NREXT64)
+ req->hdr.flags |= XFS_BULK_IREQ_NREXT64;
ret = ioctl(xfd->fd, XFS_IOC_BULKSTAT, req);
if (ret)
return -errno;
+
+ if (!(xfd->fsgeom.flags & XFS_FSOP_GEOM_FLAGS_NREXT64)) {
+ for (i = 0; i < req->hdr.ocount; i++) {
+ req->bulkstat[i].bs_extents64 =
+ req->bulkstat[i].bs_extents;
+ req->bulkstat[i].bs_extents = 0;
+ }
+ }
+
return 0;
}
@@ -316,6 +339,7 @@ xfrog_bulkstat(
switch (error) {
case -EOPNOTSUPP:
case -ENOTTY:
+ assert(!(xfd->fsgeom.flags & XFS_FSOP_GEOM_FLAGS_NREXT64));
xfd->flags |= XFROG_FLAG_BULKSTAT_FORCE_V1;
break;
}
@@ -342,6 +366,7 @@ xfrog_bulkstat_v5_to_v1(
const struct xfs_bulkstat *bs5)
{
if (bs5->bs_aextents > UINT16_MAX ||
+ bs5->bs_extents64 > INT32_MAX ||
cvt_off_fsb_to_b(xfd, bs5->bs_extsize_blks) > UINT32_MAX ||
cvt_off_fsb_to_b(xfd, bs5->bs_cowextsize_blks) > UINT32_MAX ||
time_too_big(bs5->bs_atime) ||
@@ -366,7 +391,7 @@ xfrog_bulkstat_v5_to_v1(
bs1->bs_blocks = bs5->bs_blocks;
bs1->bs_xflags = bs5->bs_xflags;
bs1->bs_extsize = cvt_off_fsb_to_b(xfd, bs5->bs_extsize_blks);
- bs1->bs_extents = bs5->bs_extents;
+ bs1->bs_extents = bs5->bs_extents64;
bs1->bs_gen = bs5->bs_gen;
bs1->bs_projid_lo = bs5->bs_projectid & 0xFFFF;
bs1->bs_forkoff = bs5->bs_forkoff;
@@ -407,7 +432,6 @@ xfrog_bulkstat_v1_to_v5(
bs5->bs_blocks = bs1->bs_blocks;
bs5->bs_xflags = bs1->bs_xflags;
bs5->bs_extsize_blks = cvt_b_to_off_fsbt(xfd, bs1->bs_extsize);
- bs5->bs_extents = bs1->bs_extents;
bs5->bs_gen = bs1->bs_gen;
bs5->bs_projectid = bstat_get_projid(bs1);
bs5->bs_forkoff = bs1->bs_forkoff;
@@ -415,6 +439,7 @@ xfrog_bulkstat_v1_to_v5(
bs5->bs_checked = bs1->bs_checked;
bs5->bs_cowextsize_blks = cvt_b_to_off_fsbt(xfd, bs1->bs_cowextsize);
bs5->bs_aextents = bs1->bs_aextents;
+ bs5->bs_extents64 = bs1->bs_extents;
}
/* Allocate a bulkstat request. Returns zero or a negative error code. */
diff --git a/man/man2/ioctl_xfs_bulkstat.2 b/man/man2/ioctl_xfs_bulkstat.2
index cd0a9b06..3203ca0c 100644
--- a/man/man2/ioctl_xfs_bulkstat.2
+++ b/man/man2/ioctl_xfs_bulkstat.2
@@ -94,6 +94,13 @@ field.
This flag may not be set at the same time as the
.B XFS_BULK_IREQ_AGNO
flag.
+.TP
+.B XFS_BULK_IREQ_NREXT64
+If this is set, data fork extent count is returned via bs_extents64 field and
+0 is assigned to bs_extents. Otherwise, data fork extent count is returned
+via bs_extents field and bs_extents64 is assigned a value of 0. In the second
+case, bs_extents is set to (2^31 - 1) if data fork extent count is larger than
+2^31. This flag may be set independently of whether other flags have been set.
.RE
.PP
.I hdr.icount
@@ -161,8 +168,9 @@ struct xfs_bulkstat {
uint16_t bs_checked;
uint16_t bs_mode;
uint16_t bs_pad2;
+ uint64_t bs_extents64;
- uint64_t bs_pad[7];
+ uint64_t bs_pad[6];
};
.fi
.in
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/5] xfs_info: Report NREXT64 feature status
2022-05-25 5:36 [PATCH 0/5] xfsprogs: Large extent counters Chandan Babu R
2022-05-25 5:36 ` [PATCH 1/5] xfs_repair: check filesystem geometry before allowing upgrades Chandan Babu R
2022-05-25 5:36 ` [PATCH 2/5] xfsprogs: Invoke bulkstat ioctl with XFS_BULK_IREQ_NREXT64 flag Chandan Babu R
@ 2022-05-25 5:36 ` Chandan Babu R
2022-05-25 5:36 ` [PATCH 4/5] mkfs: Add option to create filesystem with large extent counters Chandan Babu R
` (2 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Chandan Babu R @ 2022-05-25 5:36 UTC (permalink / raw)
To: linux-xfs; +Cc: Chandan Babu R, david, Darrick J . Wong
This commit adds support to libfrog to obtain information about the
availability of NREXT64 feature in the underlying filesystem.
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandan.babu@oracle.com>
---
libfrog/fsgeom.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libfrog/fsgeom.c b/libfrog/fsgeom.c
index 4f1a1842..3e7f0797 100644
--- a/libfrog/fsgeom.c
+++ b/libfrog/fsgeom.c
@@ -30,6 +30,7 @@ xfs_report_geom(
int reflink_enabled;
int bigtime_enabled;
int inobtcount;
+ int nrext64;
isint = geo->logstart > 0;
lazycount = geo->flags & XFS_FSOP_GEOM_FLAGS_LAZYSB ? 1 : 0;
@@ -47,12 +48,13 @@ xfs_report_geom(
reflink_enabled = geo->flags & XFS_FSOP_GEOM_FLAGS_REFLINK ? 1 : 0;
bigtime_enabled = geo->flags & XFS_FSOP_GEOM_FLAGS_BIGTIME ? 1 : 0;
inobtcount = geo->flags & XFS_FSOP_GEOM_FLAGS_INOBTCNT ? 1 : 0;
+ nrext64 = geo->flags & XFS_FSOP_GEOM_FLAGS_NREXT64 ? 1 : 0;
printf(_(
"meta-data=%-22s isize=%-6d agcount=%u, agsize=%u blks\n"
" =%-22s sectsz=%-5u attr=%u, projid32bit=%u\n"
" =%-22s crc=%-8u finobt=%u, sparse=%u, rmapbt=%u\n"
-" =%-22s reflink=%-4u bigtime=%u inobtcount=%u\n"
+" =%-22s reflink=%-4u bigtime=%u inobtcount=%u nrext64=%u\n"
"data =%-22s bsize=%-6u blocks=%llu, imaxpct=%u\n"
" =%-22s sunit=%-6u swidth=%u blks\n"
"naming =version %-14u bsize=%-6u ascii-ci=%d, ftype=%d\n"
@@ -62,7 +64,7 @@ xfs_report_geom(
mntpoint, geo->inodesize, geo->agcount, geo->agblocks,
"", geo->sectsize, attrversion, projid32bit,
"", crcs_enabled, finobt_enabled, spinodes, rmapbt_enabled,
- "", reflink_enabled, bigtime_enabled, inobtcount,
+ "", reflink_enabled, bigtime_enabled, inobtcount, nrext64,
"", geo->blocksize, (unsigned long long)geo->datablocks,
geo->imaxpct,
"", geo->sunit, geo->swidth,
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/5] mkfs: Add option to create filesystem with large extent counters
2022-05-25 5:36 [PATCH 0/5] xfsprogs: Large extent counters Chandan Babu R
` (2 preceding siblings ...)
2022-05-25 5:36 ` [PATCH 3/5] xfs_info: Report NREXT64 feature status Chandan Babu R
@ 2022-05-25 5:36 ` Chandan Babu R
2022-05-25 5:36 ` [PATCH 5/5] xfs_repair: Add support for upgrading to " Chandan Babu R
2022-05-25 9:36 ` [PATCH 0/5] xfsprogs: Large " Chandan Babu R
5 siblings, 0 replies; 9+ messages in thread
From: Chandan Babu R @ 2022-05-25 5:36 UTC (permalink / raw)
To: linux-xfs; +Cc: Chandan Babu R, david, Darrick J . Wong
Enabling nrext64 option on mkfs.xfs command line extends the maximum values of
inode data and attr fork extent counters to 2^48 - 1 and 2^32 - 1
respectively. This also sets the XFS_SB_FEAT_INCOMPAT_NREXT64 incompat flag
on the superblock preventing older kernels from mounting such a filesystem.
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandan.babu@oracle.com>
---
man/man8/mkfs.xfs.8.in | 7 +++++++
mkfs/lts_4.19.conf | 1 +
mkfs/lts_5.10.conf | 1 +
mkfs/lts_5.15.conf | 1 +
mkfs/lts_5.4.conf | 1 +
mkfs/xfs_mkfs.c | 23 +++++++++++++++++++++++
6 files changed, 34 insertions(+)
diff --git a/man/man8/mkfs.xfs.8.in b/man/man8/mkfs.xfs.8.in
index 7b7e4f48..1d8c55f0 100644
--- a/man/man8/mkfs.xfs.8.in
+++ b/man/man8/mkfs.xfs.8.in
@@ -640,6 +640,13 @@ space over time such that no free extents are large enough to
accommodate a chunk of 64 inodes. Without this feature enabled, inode
allocations can fail with out of space errors under severe fragmented
free space conditions.
+.TP
+.BI nrext64[= value]
+Extend maximum values of inode data and attr fork extent counters from 2^31 -
+1 and 2^15 - 1 to 2^48 - 1 and 2^32 - 1 respectively. If the value is
+omitted, 1 is assumed. This feature is disabled by default. This feature is
+only available for filesystems formatted with -m crc=1.
+.TP
.RE
.PP
.PD 0
diff --git a/mkfs/lts_4.19.conf b/mkfs/lts_4.19.conf
index d21fcb7e..751be45e 100644
--- a/mkfs/lts_4.19.conf
+++ b/mkfs/lts_4.19.conf
@@ -2,6 +2,7 @@
# kernel was released at the end of 2018.
[metadata]
+nrext64=0
bigtime=0
crc=1
finobt=1
diff --git a/mkfs/lts_5.10.conf b/mkfs/lts_5.10.conf
index ac00960e..a1c991ce 100644
--- a/mkfs/lts_5.10.conf
+++ b/mkfs/lts_5.10.conf
@@ -2,6 +2,7 @@
# kernel was released at the end of 2020.
[metadata]
+nrext64=0
bigtime=0
crc=1
finobt=1
diff --git a/mkfs/lts_5.15.conf b/mkfs/lts_5.15.conf
index 32082958..d751f4c4 100644
--- a/mkfs/lts_5.15.conf
+++ b/mkfs/lts_5.15.conf
@@ -2,6 +2,7 @@
# kernel was released at the end of 2021.
[metadata]
+nrext64=0
bigtime=1
crc=1
finobt=1
diff --git a/mkfs/lts_5.4.conf b/mkfs/lts_5.4.conf
index dd60b9f1..7e8a0ff0 100644
--- a/mkfs/lts_5.4.conf
+++ b/mkfs/lts_5.4.conf
@@ -2,6 +2,7 @@
# kernel was released at the end of 2019.
[metadata]
+nrext64=0
bigtime=0
crc=1
finobt=1
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 8c9ef6fd..52f25e53 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -87,6 +87,7 @@ enum {
I_ATTR,
I_PROJID32BIT,
I_SPINODES,
+ I_NREXT64,
I_MAX_OPTS,
};
@@ -441,6 +442,7 @@ static struct opt_params iopts = {
[I_ATTR] = "attr",
[I_PROJID32BIT] = "projid32bit",
[I_SPINODES] = "sparse",
+ [I_NREXT64] = "nrext64",
},
.subopt_params = {
{ .index = I_ALIGN,
@@ -489,6 +491,12 @@ static struct opt_params iopts = {
.maxval = 1,
.defaultval = 1,
},
+ { .index = I_NREXT64,
+ .conflicts = { { NULL, LAST_CONFLICT } },
+ .minval = 0,
+ .maxval = 1,
+ .defaultval = 1,
+ }
},
};
@@ -813,6 +821,7 @@ struct sb_feat_args {
bool bigtime; /* XFS_SB_FEAT_INCOMPAT_BIGTIME */
bool nodalign;
bool nortalign;
+ bool nrext64;
};
struct cli_params {
@@ -1603,6 +1612,9 @@ inode_opts_parser(
case I_SPINODES:
cli->sb_feat.spinodes = getnum(value, opts, subopt);
break;
+ case I_NREXT64:
+ cli->sb_feat.nrext64 = getnum(value, opts, subopt);
+ break;
default:
return -EINVAL;
}
@@ -2180,6 +2192,14 @@ _("timestamps later than 2038 not supported without CRC support\n"));
usage();
}
cli->sb_feat.bigtime = false;
+
+ if (cli->sb_feat.nrext64 &&
+ cli_opt_set(&iopts, I_NREXT64)) {
+ fprintf(stderr,
+_("64 bit extent count not supported without CRC support\n"));
+ usage();
+ }
+ cli->sb_feat.nrext64 = false;
}
if (!cli->sb_feat.finobt) {
@@ -3172,6 +3192,8 @@ sb_set_features(
sbp->sb_features_incompat |= XFS_SB_FEAT_INCOMPAT_SPINODES;
}
+ if (fp->nrext64)
+ sbp->sb_features_incompat |= XFS_SB_FEAT_INCOMPAT_NREXT64;
}
/*
@@ -3937,6 +3959,7 @@ main(
.nodalign = false,
.nortalign = false,
.bigtime = true,
+ .nrext64 = false,
/*
* When we decide to enable a new feature by default,
* please remember to update the mkfs conf files.
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 5/5] xfs_repair: Add support for upgrading to large extent counters
2022-05-25 5:36 [PATCH 0/5] xfsprogs: Large extent counters Chandan Babu R
` (3 preceding siblings ...)
2022-05-25 5:36 ` [PATCH 4/5] mkfs: Add option to create filesystem with large extent counters Chandan Babu R
@ 2022-05-25 5:36 ` Chandan Babu R
2022-05-25 9:36 ` [PATCH 0/5] xfsprogs: Large " Chandan Babu R
5 siblings, 0 replies; 9+ messages in thread
From: Chandan Babu R @ 2022-05-25 5:36 UTC (permalink / raw)
To: linux-xfs; +Cc: Chandan Babu R, david, Darrick J . Wong
This commit adds support to xfs_repair to allow upgrading an existing
filesystem to support per-inode large extent counters.
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandan.babu@oracle.com>
---
man/man8/xfs_admin.8 | 7 +++++++
repair/globals.c | 1 +
repair/globals.h | 1 +
repair/phase2.c | 24 ++++++++++++++++++++++++
repair/xfs_repair.c | 11 +++++++++++
5 files changed, 44 insertions(+)
diff --git a/man/man8/xfs_admin.8 b/man/man8/xfs_admin.8
index ad28e0f6..4794d677 100644
--- a/man/man8/xfs_admin.8
+++ b/man/man8/xfs_admin.8
@@ -149,6 +149,13 @@ Upgrade a filesystem to support larger timestamps up to the year 2486.
The filesystem cannot be downgraded after this feature is enabled.
Once enabled, the filesystem will not be mountable by older kernels.
This feature was added to Linux 5.10.
+.TP 0.4i
+.B nrext64
+Upgrade a filesystem to support large per-inode extent counters. The maximum
+data fork extent count will be 2^48 - 1, while the maximum attribute fork
+extent count will be 2^32 - 1. The filesystem cannot be downgraded after this
+feature is enabled. Once enabled, the filesystem will not be mountable by
+older kernels. This feature was added to Linux 5.19.
.RE
.TP
.BI \-U " uuid"
diff --git a/repair/globals.c b/repair/globals.c
index f8d4f1e4..c4084985 100644
--- a/repair/globals.c
+++ b/repair/globals.c
@@ -51,6 +51,7 @@ int lazy_count; /* What to set if to if converting */
bool features_changed; /* did we change superblock feature bits? */
bool add_inobtcount; /* add inode btree counts to AGI */
bool add_bigtime; /* add support for timestamps up to 2486 */
+bool add_nrext64;
/* misc status variables */
diff --git a/repair/globals.h b/repair/globals.h
index 0f98bd2b..b65e4a2d 100644
--- a/repair/globals.h
+++ b/repair/globals.h
@@ -92,6 +92,7 @@ extern int lazy_count; /* What to set if to if converting */
extern bool features_changed; /* did we change superblock feature bits? */
extern bool add_inobtcount; /* add inode btree counts to AGI */
extern bool add_bigtime; /* add support for timestamps up to 2486 */
+extern bool add_nrext64;
/* misc status variables */
diff --git a/repair/phase2.c b/repair/phase2.c
index 4c315055..2c0b8a7e 100644
--- a/repair/phase2.c
+++ b/repair/phase2.c
@@ -181,6 +181,28 @@ set_bigtime(
return true;
}
+static bool
+set_nrext64(
+ struct xfs_mount *mp,
+ struct xfs_sb *new_sb)
+{
+ if (!xfs_has_crc(mp)) {
+ printf(
+ _("Nrext64 only supported on V5 filesystems.\n"));
+ exit(0);
+ }
+
+ if (xfs_has_large_extent_counts(mp)) {
+ printf(_("Filesystem already supports nrext64.\n"));
+ exit(0);
+ }
+
+ printf(_("Adding nrext64 to filesystem.\n"));
+ new_sb->sb_features_incompat |= XFS_SB_FEAT_INCOMPAT_NREXT64;
+ new_sb->sb_features_incompat |= XFS_SB_FEAT_INCOMPAT_NEEDSREPAIR;
+ return true;
+}
+
struct check_state {
struct xfs_sb sb;
uint64_t features;
@@ -380,6 +402,8 @@ upgrade_filesystem(
dirty |= set_inobtcount(mp, &new_sb);
if (add_bigtime)
dirty |= set_bigtime(mp, &new_sb);
+ if (add_nrext64)
+ dirty |= set_nrext64(mp, &new_sb);
if (!dirty)
return;
diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index de8617ba..c4705cf2 100644
--- a/repair/xfs_repair.c
+++ b/repair/xfs_repair.c
@@ -67,6 +67,7 @@ enum c_opt_nums {
CONVERT_LAZY_COUNT = 0,
CONVERT_INOBTCOUNT,
CONVERT_BIGTIME,
+ CONVERT_NREXT64,
C_MAX_OPTS,
};
@@ -74,6 +75,7 @@ static char *c_opts[] = {
[CONVERT_LAZY_COUNT] = "lazycount",
[CONVERT_INOBTCOUNT] = "inobtcount",
[CONVERT_BIGTIME] = "bigtime",
+ [CONVERT_NREXT64] = "nrext64",
[C_MAX_OPTS] = NULL,
};
@@ -324,6 +326,15 @@ process_args(int argc, char **argv)
_("-c bigtime only supports upgrades\n"));
add_bigtime = true;
break;
+ case CONVERT_NREXT64:
+ if (!val)
+ do_abort(
+ _("-c nrext64 requires a parameter\n"));
+ if (strtol(val, NULL, 0) != 1)
+ do_abort(
+ _("-c nrext64 only supports upgrades\n"));
+ add_nrext64 = true;
+ break;
default:
unknown('c', val);
break;
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 0/5] xfsprogs: Large extent counters
2022-05-25 5:36 [PATCH 0/5] xfsprogs: Large extent counters Chandan Babu R
` (4 preceding siblings ...)
2022-05-25 5:36 ` [PATCH 5/5] xfs_repair: Add support for upgrading to " Chandan Babu R
@ 2022-05-25 9:36 ` Chandan Babu R
5 siblings, 0 replies; 9+ messages in thread
From: Chandan Babu R @ 2022-05-25 9:36 UTC (permalink / raw)
To: david; +Cc: linux-xfs
On Wed, May 25, 2022 at 11:06:25 AM +0530, Chandan Babu R wrote:
> This patchset implements the changes to userspace programs that are
> required to support large per-inode extent counters. These changes
> allow programs in xfsprogs to be able to create and work with
> filesystem instances with 64-bit data fork extent counter and 32-bit
> attr fork extent counter fields.
>
> The patchset can also be obtained from
> https://github.com/chandanr/xfsprogs-dev.git at branch
> large-extent-counters.
>
> PS: Dave, I noticed that xfs/070 is failing during xfstest runs. This
> failure is seen on libxfs-5.19-sync branch as well. The bad commit was
> "xfs: validate v5 feature fields". I will debug this and find the root
> cause.
The failure is due to the above mentioned patch changing the warning message
printed (in xfs_validate_sb_common()) when an invalid superblock magic number
is detected.
--
chandan
^ permalink raw reply [flat|nested] 9+ messages in thread