From patchwork Sat Jan 7 00:40:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 9502613 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4682860459 for ; Sat, 7 Jan 2017 00:40:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3A2552850E for ; Sat, 7 Jan 2017 00:40:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2F15628535; Sat, 7 Jan 2017 00:40:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A0AC82850E for ; Sat, 7 Jan 2017 00:40:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162193AbdAGAky (ORCPT ); Fri, 6 Jan 2017 19:40:54 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:16591 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1162018AbdAGAkx (ORCPT ); Fri, 6 Jan 2017 19:40:53 -0500 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v070eq4n024982 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sat, 7 Jan 2017 00:40:52 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id v070eq0f008200 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sat, 7 Jan 2017 00:40:52 GMT Received: from abhmp0013.oracle.com (abhmp0013.oracle.com [141.146.116.19]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id v070ep7n005736 for ; Sat, 7 Jan 2017 00:40:51 GMT Received: from localhost (/24.21.211.40) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 06 Jan 2017 16:40:51 -0800 Subject: [PATCH 46/47] xfs: query the per-AG reservation counters From: "Darrick J. Wong" To: darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org Date: Fri, 06 Jan 2017 16:40:50 -0800 Message-ID: <148374965066.30431.4065646608838336576.stgit@birch.djwong.org> In-Reply-To: <148374934333.30431.11042523766304087227.stgit@birch.djwong.org> References: <148374934333.30431.11042523766304087227.stgit@birch.djwong.org> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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(+) -- 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 diff --git a/fs/xfs/libxfs/xfs_fs.h b/fs/xfs/libxfs/xfs_fs.h index 5cc8462..160916c 100644 --- a/fs/xfs/libxfs/xfs_fs.h +++ b/fs/xfs/libxfs/xfs_fs.h @@ -608,6 +608,15 @@ struct xfs_scrub_metadata { #define XFS_SCRUB_FLAGS_ALL (XFS_SCRUB_FLAGS_IN | XFS_SCRUB_FLAGS_OUT) /* + * 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 @@ -683,6 +692,7 @@ struct xfs_scrub_metadata { #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 242e809..70b50f2 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 @@ -1067,3 +1068,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 f349158..91609ae 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 e9a4619..ee3720c 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -2021,6 +2021,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 40952b1..5e46832 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_CLEARALL: case XFS_IOC_GETFSMAP: case XFS_IOC_SCRUB_METADATA: + 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 */