Re: [PATCH 01/22] xfs: query the per-AG reservation counters

Allison Henderson
2017-07-23T16:16:38Z

Looks good to me. This one hasn't changed much since v7. You can add
my review:
Reviewed by: Allison Henderson <allison.henderson@oracle.com>

On 7/20/2017 9:38 PM, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> Establish an ioctl for userspace to query the original and current
> per-AG reservation counts. This will be used by xfs_scrub to
> check that the vfs counters are at least somewhat sane.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> fs/xfs/libxfs/xfs_fs.h | 10 ++++++++++
> fs/xfs/xfs_fsops.c | 29 +++++++++++++++++++++++++++++
> fs/xfs/xfs_fsops.h | 2 ++
> fs/xfs/xfs_ioctl.c | 16 ++++++++++++++++
> fs/xfs/xfs_ioctl32.c | 1 +
> 5 files changed, 58 insertions(+)
>
>
> diff --git a/fs/xfs/libxfs/xfs_fs.h b/fs/xfs/libxfs/xfs_fs.h
> index 8c61f21..5dedab9 100644
> --- a/fs/xfs/libxfs/xfs_fs.h
> +++ b/fs/xfs/libxfs/xfs_fs.h
> @@ -469,6 +469,15 @@ typedef struct xfs_swapext
> #define XFS_FSOP_GOING_FLAGS_NOLOGFLUSH 0x2 /* don't flush log nor data */
>
> /*
> + * AG reserved block counters
> + */
> +struct xfs_fsop_ag_resblks {
> + __u64 resblks; /* blocks reserved now */
> + __u64 resblks_orig; /* blocks reserved at mount time */
> + __u64 reserved[2];
> +};
> +
> +/*
> * ioctl limits
> */
> #ifdef XATTR_LIST_MAX
> @@ -543,6 +552,7 @@ typedef struct xfs_swapext
> #define XFS_IOC_ATTRMULTI_BY_HANDLE _IOW ('X', 123, struct xfs_fsop_attrmulti_handlereq)
> #define XFS_IOC_FSGEOMETRY _IOR ('X', 124, struct xfs_fsop_geom)
> #define XFS_IOC_GOINGDOWN _IOR ('X', 125, uint32_t)
> +#define XFS_IOC_GET_AG_RESBLKS _IOR ('X', 126, struct xfs_fsop_ag_resblks)
> /* XFS_IOC_GETFSUUID ---------- deprecated 140 */
>
>
> diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
> index 8f22fc5..0920d59 100644
> --- a/fs/xfs/xfs_fsops.c
> +++ b/fs/xfs/xfs_fsops.c
> @@ -44,6 +44,7 @@
> #include "xfs_filestream.h"
> #include "xfs_rmap.h"
> #include "xfs_ag_resv.h"
> +#include "xfs_fs.h"
>
> /*
> * File system operations
> @@ -1046,3 +1047,31 @@ xfs_fs_unreserve_ag_blocks(
>
> return error;
> }
> +
> +/* Query the per-AG reservations to see how many blocks we have reserved. */
> +int
> +xfs_fs_get_ag_reserve_blocks(
> + struct xfs_mount *mp,
> + struct xfs_fsop_ag_resblks *out)
> +{
> + struct xfs_ag_resv *r;
> + struct xfs_perag *pag;
> + xfs_agnumber_t agno;
> +
> + out->resblks = 0;
> + out->resblks_orig = 0;
> + out->reserved[0] = out->reserved[1] = 0;
> +
> + for (agno = 0; agno < mp->m_sb.sb_agcount; agno++) {
> + pag = xfs_perag_get(mp, agno);
> + r = xfs_perag_resv(pag, XFS_AG_RESV_METADATA);
> + out->resblks += r->ar_reserved;
> + out->resblks_orig += r->ar_asked;
> + r = xfs_perag_resv(pag, XFS_AG_RESV_AGFL);
> + out->resblks += r->ar_reserved;
> + out->resblks_orig += r->ar_asked;
> + xfs_perag_put(pag);
> + }
> +
> + return 0;
> +}
> diff --git a/fs/xfs/xfs_fsops.h b/fs/xfs/xfs_fsops.h
> index 2954c13..c8f5e26 100644
> --- a/fs/xfs/xfs_fsops.h
> +++ b/fs/xfs/xfs_fsops.h
> @@ -25,6 +25,8 @@ extern int xfs_fs_counts(xfs_mount_t *mp, xfs_fsop_counts_t *cnt);
> extern int xfs_reserve_blocks(xfs_mount_t *mp, uint64_t *inval,
> xfs_fsop_resblks_t *outval);
> extern int xfs_fs_goingdown(xfs_mount_t *mp, uint32_t inflags);
> +extern int xfs_fs_get_ag_reserve_blocks(struct xfs_mount *mp,
> + struct xfs_fsop_ag_resblks *out);
>
> extern int xfs_fs_reserve_ag_blocks(struct xfs_mount *mp);
> extern int xfs_fs_unreserve_ag_blocks(struct xfs_mount *mp);
> diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
> index 9c0c7a9..cc00260 100644
> --- a/fs/xfs/xfs_ioctl.c
> +++ b/fs/xfs/xfs_ioctl.c
> @@ -1974,6 +1974,22 @@ xfs_file_ioctl(
> return 0;
> }
>
> + case XFS_IOC_GET_AG_RESBLKS: {
> + struct xfs_fsop_ag_resblks out;
> +
> + if (!capable(CAP_SYS_ADMIN))
> + return -EPERM;
> +
> + error = xfs_fs_get_ag_reserve_blocks(mp, &out);
> + if (error)
> + return error;
> +
> + if (copy_to_user(arg, &out, sizeof(out)))
> + return -EFAULT;
> +
> + return 0;
> + }
> +
> case XFS_IOC_FSGROWFSDATA: {
> xfs_growfs_data_t in;
>
> diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c
> index fa0bc4d..e8b4de3 100644
> --- a/fs/xfs/xfs_ioctl32.c
> +++ b/fs/xfs/xfs_ioctl32.c
> @@ -556,6 +556,7 @@ xfs_file_compat_ioctl(
> case XFS_IOC_ERROR_INJECTION:
> case XFS_IOC_ERROR_CLEARALL:
> case FS_IOC_GETFSMAP:
> + case XFS_IOC_GET_AG_RESBLKS:
> return xfs_file_ioctl(filp, cmd, p);
> #ifndef BROKEN_X86_ALIGNMENT
> /* These are handled fine if no alignment issues */
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>