From patchwork Wed Sep 25 21:33:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11161409 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1744414DB for ; Wed, 25 Sep 2019 21:33:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D5D0F21D82 for ; Wed, 25 Sep 2019 21:33:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="bRF3qOLw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726762AbfIYVdK (ORCPT ); Wed, 25 Sep 2019 17:33:10 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:41730 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726875AbfIYVdK (ORCPT ); Wed, 25 Sep 2019 17:33:10 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x8PLTMqg005943; Wed, 25 Sep 2019 21:33:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2019-08-05; bh=FTqiSmp/Jm9+mtyl5gdLEWaH8RhQrV8tlFW/mLX4b40=; b=bRF3qOLwdYb/R2od+quhlM+Lybysrr66kNsgYZiGbaz4jkmFWvey4MYv4Xe7Sn+FGySE Edpu7547w67lSTsfFT9xLHI2JApHPnFBtk9CzkBueNCbkrLi4iev1QLMS+1EPVu7TQIp wc1fENpUAVVNv1J5aNaAqyGbPzgUnYfgahPX0KhOk/bTMb5T+7alzNfMXOLJ9KPmWZZJ yfeRtC8CnsyANNg0GqJXgIUn3kSyh2sD8LoZF/6cpS6hLw7MiLKzQrf0DD4s3ugQeBep r4jJ/frUGrEVc4kehsZT6L9+j4liKA7073FBqwktpZK2v0prfXsjEKCc4mmlD7uANT2g eQ== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by aserp2120.oracle.com with ESMTP id 2v5btq7hhv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 25 Sep 2019 21:33:05 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x8PLTEKd085267; Wed, 25 Sep 2019 21:33:05 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userp3020.oracle.com with ESMTP id 2v82qakqgc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 25 Sep 2019 21:33:04 +0000 Received: from abhmp0016.oracle.com (abhmp0016.oracle.com [141.146.116.22]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x8PLX304014232; Wed, 25 Sep 2019 21:33:03 GMT Received: from localhost (/10.145.178.55) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 25 Sep 2019 14:33:03 -0700 Subject: [PATCH 1/4] xfs_io: add a bulkstat command From: "Darrick J. Wong" To: sandeen@sandeen.net, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org Date: Wed, 25 Sep 2019 14:33:00 -0700 Message-ID: <156944718001.297551.8841062987630720604.stgit@magnolia> In-Reply-To: <156944717403.297551.9871784842549394192.stgit@magnolia> References: <156944717403.297551.9871784842549394192.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9391 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=2 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1908290000 definitions=main-1909250173 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9391 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1908290000 definitions=main-1909250173 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong Add a bulkstat command to xfs_io so that we can test our new xfrog code. Signed-off-by: Darrick J. Wong --- io/Makefile | 9 - io/bulkstat.c | 522 ++++++++++++++++++++++++++++++++++++++++++++++++++++ io/init.c | 1 io/io.h | 1 libfrog/bulkstat.c | 20 ++ libfrog/bulkstat.h | 3 man/man8/xfs_io.8 | 66 +++++++ 7 files changed, 618 insertions(+), 4 deletions(-) create mode 100644 io/bulkstat.c diff --git a/io/Makefile b/io/Makefile index 484e2b5a..1112605e 100644 --- a/io/Makefile +++ b/io/Makefile @@ -9,10 +9,11 @@ LTCOMMAND = xfs_io LSRCFILES = xfs_bmap.sh xfs_freeze.sh xfs_mkfile.sh HFILES = init.h io.h CFILES = init.c \ - attr.c bmap.c crc32cselftest.c cowextsize.c encrypt.c file.c freeze.c \ - fsync.c getrusage.c imap.c inject.c label.c link.c mmap.c open.c \ - parent.c pread.c prealloc.c pwrite.c reflink.c resblks.c scrub.c \ - seek.c shutdown.c stat.c swapext.c sync.c truncate.c utimes.c + attr.c bmap.c bulkstat.c crc32cselftest.c cowextsize.c encrypt.c \ + file.c freeze.c fsync.c getrusage.c imap.c inject.c label.c link.c \ + mmap.c open.c parent.c pread.c prealloc.c pwrite.c reflink.c \ + resblks.c scrub.c seek.c shutdown.c stat.c swapext.c sync.c \ + truncate.c utimes.c LLDLIBS = $(LIBXCMD) $(LIBHANDLE) $(LIBFROG) $(LIBPTHREAD) LTDEPENDENCIES = $(LIBXCMD) $(LIBHANDLE) $(LIBFROG) diff --git a/io/bulkstat.c b/io/bulkstat.c new file mode 100644 index 00000000..625f0abe --- /dev/null +++ b/io/bulkstat.c @@ -0,0 +1,522 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Oracle. All Rights Reserved. + * Author: Darrick J. Wong + */ +#include "xfs.h" +#include "platform_defs.h" +#include "command.h" +#include "init.h" +#include "libfrog/fsgeom.h" +#include "libfrog/bulkstat.h" +#include "libfrog/paths.h" +#include "io.h" +#include "input.h" + +static bool debug; + +static void +dump_bulkstat_time( + const char *tag, + uint64_t sec, + uint32_t nsec) +{ + printf("\t%s = %"PRIu64".%"PRIu32"\n", tag, sec, nsec); +} + +static void +dump_bulkstat( + struct xfs_bulkstat *bstat) +{ + printf("bs_ino = %"PRIu64"\n", bstat->bs_ino); + printf("\tbs_size = %"PRIu64"\n", bstat->bs_size); + + printf("\tbs_blocks = %"PRIu64"\n", bstat->bs_blocks); + printf("\tbs_xflags = 0x%"PRIx64"\n", bstat->bs_xflags); + + dump_bulkstat_time("bs_atime", bstat->bs_atime, bstat->bs_atime_nsec); + dump_bulkstat_time("bs_ctime", bstat->bs_ctime, bstat->bs_ctime_nsec); + dump_bulkstat_time("bs_mtime", bstat->bs_mtime, bstat->bs_mtime_nsec); + dump_bulkstat_time("bs_btime", bstat->bs_btime, bstat->bs_btime_nsec); + + printf("\tbs_gen = 0x%"PRIx32"\n", bstat->bs_gen); + printf("\tbs_uid = %"PRIu32"\n", bstat->bs_uid); + printf("\tbs_gid = %"PRIu32"\n", bstat->bs_gid); + printf("\tbs_projectid = %"PRIu32"\n", bstat->bs_projectid); + + printf("\tbs_blksize = %"PRIu32"\n", bstat->bs_blksize); + printf("\tbs_rdev = %"PRIu32"\n", bstat->bs_rdev); + printf("\tbs_cowextsize_blks = %"PRIu32"\n", bstat->bs_cowextsize_blks); + printf("\tbs_extsize_blks = %"PRIu32"\n", bstat->bs_extsize_blks); + + printf("\tbs_nlink = %"PRIu32"\n", bstat->bs_nlink); + printf("\tbs_extents = %"PRIu32"\n", bstat->bs_extents); + printf("\tbs_aextents = %"PRIu32"\n", bstat->bs_aextents); + printf("\tbs_version = %"PRIu16"\n", bstat->bs_version); + printf("\tbs_forkoff = %"PRIu16"\n", bstat->bs_forkoff); + + 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); +}; + +static void +bulkstat_help(void) +{ + printf(_( +"Bulk-queries the filesystem for inode stat information and prints it.\n" +"\n" +" -a Only iterate this AG.\n" +" -d Print debugging output.\n" +" -e Stop after this inode.\n" +" -n Ask for this many results at once.\n" +" -s Inode to start with.\n" +" -v Use this version of the ioctl (1 or 5).\n")); +} + +static void +set_xfd_flags( + struct xfs_fd *xfd, + uint32_t ver) +{ + switch (ver) { + case 1: + xfd->flags |= XFROG_FLAG_BULKSTAT_FORCE_V1; + break; + case 5: + xfd->flags |= XFROG_FLAG_BULKSTAT_FORCE_V5; + break; + default: + break; + } +} + +static int +bulkstat_f( + int argc, + char **argv) +{ + struct xfs_fd xfd = XFS_FD_INIT(file->fd); + struct xfs_bulkstat_req *breq; + uint64_t startino = 0; + uint64_t endino = -1ULL; + uint32_t batch_size = 4096; + uint32_t agno = 0; + uint32_t ver = 0; + bool has_agno = false; + unsigned int i; + int c; + int ret; + + while ((c = getopt(argc, argv, "a:de:n:s:v:")) != -1) { + switch (c) { + case 'a': + agno = cvt_u32(optarg, 10); + if (errno) { + perror(optarg); + return 1; + } + has_agno = true; + break; + case 'd': + debug = true; + break; + case 'e': + endino = cvt_u64(optarg, 10); + if (errno) { + perror(optarg); + return 1; + } + break; + case 'n': + batch_size = cvt_u32(optarg, 10); + if (errno) { + perror(optarg); + return 1; + } + break; + case 's': + startino = cvt_u64(optarg, 10); + if (errno) { + perror(optarg); + return 1; + } + break; + case 'v': + ver = cvt_u32(optarg, 10); + if (errno) { + perror(optarg); + return 1; + } + if (ver != 1 && ver != 5) { + fprintf(stderr, "version must be 1 or 5.\n"); + return 1; + } + break; + default: + bulkstat_help(); + return 0; + } + } + if (optind != argc) { + bulkstat_help(); + return 0; + } + + ret = xfd_prepare_geometry(&xfd); + if (ret) { + errno = ret; + perror("xfd_prepare_geometry"); + exitcode = 1; + return 0; + } + + breq = xfrog_bulkstat_alloc_req(batch_size, startino); + if (!breq) { + perror("alloc bulkreq"); + exitcode = 1; + return 0; + } + + if (has_agno) + xfrog_bulkstat_set_ag(breq, agno); + + set_xfd_flags(&xfd, ver); + + while ((ret = xfrog_bulkstat(&xfd, breq)) == 0) { + if (debug) + printf( +_("bulkstat: startino=%lld flags=0x%x agno=%u ret=%d icount=%u ocount=%u\n"), + (long long)breq->hdr.ino, + (unsigned int)breq->hdr.flags, + (unsigned int)breq->hdr.agno, + ret, + (unsigned int)breq->hdr.icount, + (unsigned int)breq->hdr.ocount); + if (breq->hdr.ocount == 0) + break; + + for (i = 0; i < breq->hdr.ocount; i++) { + if (breq->bulkstat[i].bs_ino > endino) + break; + dump_bulkstat(&breq->bulkstat[i]); + } + } + if (ret) { + errno = ret; + perror("xfrog_bulkstat"); + exitcode = 1; + return 0; + } + + free(breq); + return 0; +} + +static void +bulkstat_single_help(void) +{ + printf(_( +"Queries the filesystem for a single inode's stat information and prints it.\n" +"\n" +" -v Use this version of the ioctl (1 or 5).\n" +"\n" +"Pass in inode numbers or a special inode name:\n" +" root Root directory.\n")); +} + +struct single_map { + const char *tag; + uint64_t code; +}; + +struct single_map tags[] = { + {"root", XFS_BULK_IREQ_SPECIAL_ROOT}, + {NULL, 0}, +}; + +static int +bulkstat_single_f( + int argc, + char **argv) +{ + struct xfs_fd xfd = XFS_FD_INIT(file->fd); + struct xfs_bulkstat bulkstat; + unsigned long ver = 0; + unsigned int i; + int c; + int ret; + + while ((c = getopt(argc, argv, "v:")) != -1) { + switch (c) { + case 'v': + errno = 0; + ver = strtoull(optarg, NULL, 10); + if (errno) { + perror(optarg); + return 1; + } + if (ver != 1 && ver != 5) { + fprintf(stderr, "version must be 1 or 5.\n"); + return 1; + } + break; + default: + bulkstat_single_help(); + return 0; + } + } + + ret = xfd_prepare_geometry(&xfd); + if (ret) { + errno = ret; + perror("xfd_prepare_geometry"); + exitcode = 1; + return 0; + } + + switch (ver) { + case 1: + xfd.flags |= XFROG_FLAG_BULKSTAT_FORCE_V1; + break; + case 5: + xfd.flags |= XFROG_FLAG_BULKSTAT_FORCE_V5; + break; + default: + break; + } + + for (i = optind; i < argc; i++) { + struct single_map *sm = tags; + uint64_t ino; + unsigned int flags = 0; + + /* Try to look up our tag... */ + for (sm = tags; sm->tag; sm++) { + if (!strcmp(argv[i], sm->tag)) { + ino = sm->code; + flags |= XFS_BULK_IREQ_SPECIAL; + break; + } + } + + /* ...or else it's an inode number. */ + if (sm->tag == NULL) { + errno = 0; + ino = strtoull(argv[i], NULL, 10); + if (errno) { + perror(argv[i]); + exitcode = 1; + return 0; + } + } + + ret = xfrog_bulkstat_single(&xfd, ino, flags, &bulkstat); + if (ret) { + errno = ret; + perror("xfrog_bulkstat_single"); + continue; + } + + if (debug) + printf( +_("bulkstat_single: startino=%"PRIu64" flags=0x%"PRIx32" ret=%d\n"), + ino, flags, ret); + + dump_bulkstat(&bulkstat); + } + + return 0; +} + +static void +dump_inumbers( + struct xfs_inumbers *inumbers) +{ + printf("xi_startino = %"PRIu64"\n", inumbers->xi_startino); + printf("\txi_allocmask = 0x%"PRIx64"\n", inumbers->xi_allocmask); + printf("\txi_alloccount = %"PRIu8"\n", inumbers->xi_alloccount); + printf("\txi_version = %"PRIu8"\n", inumbers->xi_version); +} + +static void +inumbers_help(void) +{ + printf(_( +"Queries the filesystem for inode group information and prints it.\n" +"\n" +" -a Only iterate this AG.\n" +" -d Print debugging output.\n" +" -e Stop after this inode.\n" +" -n Ask for this many results at once.\n" +" -s Inode to start with.\n" +" -v Use this version of the ioctl (1 or 5).\n")); +} + +static int +inumbers_f( + int argc, + char **argv) +{ + struct xfs_fd xfd = XFS_FD_INIT(file->fd); + struct xfs_inumbers_req *ireq; + uint64_t startino = 0; + uint64_t endino = -1ULL; + uint32_t batch_size = 4096; + uint32_t agno = 0; + uint32_t ver = 0; + bool has_agno = false; + unsigned int i; + int c; + int ret; + + while ((c = getopt(argc, argv, "a:de:n:s:v:")) != -1) { + switch (c) { + case 'a': + agno = cvt_u32(optarg, 10); + if (errno) { + perror(optarg); + return 1; + } + has_agno = true; + break; + case 'd': + debug = true; + break; + case 'e': + endino = cvt_u64(optarg, 10); + if (errno) { + perror(optarg); + return 1; + } + break; + case 'n': + batch_size = cvt_u32(optarg, 10); + if (errno) { + perror(optarg); + return 1; + } + break; + case 's': + startino = cvt_u64(optarg, 10); + if (errno) { + perror(optarg); + return 1; + } + break; + case 'v': + ver = cvt_u32(optarg, 10); + if (errno) { + perror(optarg); + return 1; + } + if (ver != 1 && ver != 5) { + fprintf(stderr, "version must be 1 or 5.\n"); + return 1; + } + break; + default: + bulkstat_help(); + return 0; + } + } + if (optind != argc) { + bulkstat_help(); + return 0; + } + + ret = xfd_prepare_geometry(&xfd); + if (ret) { + errno = ret; + perror("xfd_prepare_geometry"); + exitcode = 1; + return 0; + } + + ireq = xfrog_inumbers_alloc_req(batch_size, startino); + if (!ireq) { + perror("alloc inumbersreq"); + exitcode = 1; + return 0; + } + + if (has_agno) + xfrog_inumbers_set_ag(ireq, agno); + + set_xfd_flags(&xfd, ver); + + while ((ret = xfrog_inumbers(&xfd, ireq)) == 0) { + if (debug) + printf( +_("bulkstat: startino=%"PRIu64" flags=0x%"PRIx32" agno=%"PRIu32" ret=%d icount=%"PRIu32" ocount=%"PRIu32"\n"), + ireq->hdr.ino, + ireq->hdr.flags, + ireq->hdr.agno, + ret, + ireq->hdr.icount, + ireq->hdr.ocount); + if (ireq->hdr.ocount == 0) + break; + + for (i = 0; i < ireq->hdr.ocount; i++) { + if (ireq->inumbers[i].xi_startino > endino) + break; + dump_inumbers(&ireq->inumbers[i]); + } + } + if (ret) { + errno = ret; + perror("xfrog_inumbers"); + exitcode = 1; + return 0; + } + + free(ireq); + return 0; +} + +static cmdinfo_t bulkstat_cmd = { + .name = "bulkstat", + .cfunc = bulkstat_f, + .argmin = 0, + .argmax = -1, + .flags = CMD_NOMAP_OK | CMD_FLAG_ONESHOT, + .help = bulkstat_help, +}; + +static cmdinfo_t bulkstat_single_cmd = { + .name = "bulkstat_single", + .cfunc = bulkstat_single_f, + .argmin = 1, + .argmax = -1, + .flags = CMD_NOMAP_OK | CMD_FLAG_ONESHOT, + .help = bulkstat_single_help, +}; + +static cmdinfo_t inumbers_cmd = { + .name = "inumbers", + .cfunc = inumbers_f, + .argmin = 0, + .argmax = -1, + .flags = CMD_NOMAP_OK | CMD_FLAG_ONESHOT, + .help = inumbers_help, +}; + +void +bulkstat_init(void) +{ + bulkstat_cmd.args = + _("[-a agno] [-d] [-e endino] [-n batchsize] [-s startino]"); + bulkstat_cmd.oneline = _("Bulk stat of inodes in a filesystem"); + + bulkstat_single_cmd.args = _("inum..."); + bulkstat_single_cmd.oneline = _("Stat one inode in a filesystem"); + + inumbers_cmd.args = + _("[-a agno] [-d] [-e endino] [-n batchsize] [-s startino]"); + inumbers_cmd.oneline = _("Query inode groups in a filesystem"); + + add_command(&bulkstat_cmd); + add_command(&bulkstat_single_cmd); + add_command(&inumbers_cmd); +} diff --git a/io/init.c b/io/init.c index 7025aea5..033ed67d 100644 --- a/io/init.c +++ b/io/init.c @@ -46,6 +46,7 @@ init_commands(void) { attr_init(); bmap_init(); + bulkstat_init(); copy_range_init(); cowextsize_init(); encrypt_init(); diff --git a/io/io.h b/io/io.h index 00dff2b7..49db902f 100644 --- a/io/io.h +++ b/io/io.h @@ -183,3 +183,4 @@ extern void log_writes_init(void); extern void scrub_init(void); extern void repair_init(void); extern void crc32cselftest_init(void); +extern void bulkstat_init(void); diff --git a/libfrog/bulkstat.c b/libfrog/bulkstat.c index 85594e5e..538b5197 100644 --- a/libfrog/bulkstat.c +++ b/libfrog/bulkstat.c @@ -435,6 +435,16 @@ xfrog_bulkstat_alloc_req( return breq; } +/* Set a bulkstat cursor to iterate only a particular AG. */ +void +xfrog_bulkstat_set_ag( + struct xfs_bulkstat_req *req, + uint32_t agno) +{ + req->hdr.agno = agno; + req->hdr.flags |= XFS_BULK_IREQ_AGNO; +} + /* Convert a inumbers data from v5 format to v1 format. */ void xfrog_inumbers_v5_to_v1( @@ -562,3 +572,13 @@ xfrog_inumbers_alloc_req( return ireq; } + +/* Set an inumbers cursor to iterate only a particular AG. */ +void +xfrog_inumbers_set_ag( + struct xfs_inumbers_req *req, + uint32_t agno) +{ + req->hdr.agno = agno; + req->hdr.flags |= XFS_BULK_IREQ_AGNO; +} diff --git a/libfrog/bulkstat.h b/libfrog/bulkstat.h index a085da3d..133a99b8 100644 --- a/libfrog/bulkstat.h +++ b/libfrog/bulkstat.h @@ -19,11 +19,14 @@ int xfrog_bulkstat_v5_to_v1(struct xfs_fd *xfd, struct xfs_bstat *bs1, void xfrog_bulkstat_v1_to_v5(struct xfs_fd *xfd, struct xfs_bulkstat *bstat, const struct xfs_bstat *bs1); +void xfrog_bulkstat_set_ag(struct xfs_bulkstat_req *req, uint32_t agno); + struct xfs_inogrp; int xfrog_inumbers(struct xfs_fd *xfd, struct xfs_inumbers_req *req); struct xfs_inumbers_req *xfrog_inumbers_alloc_req(uint32_t nr, uint64_t startino); +void xfrog_inumbers_set_ag(struct xfs_inumbers_req *req, uint32_t agno); void xfrog_inumbers_v5_to_v1(struct xfs_inogrp *ig1, const struct xfs_inumbers *ig); void xfrog_inumbers_v1_to_v5(struct xfs_inumbers *ig, diff --git a/man/man8/xfs_io.8 b/man/man8/xfs_io.8 index 6e064bdd..1e09b9e4 100644 --- a/man/man8/xfs_io.8 +++ b/man/man8/xfs_io.8 @@ -996,6 +996,44 @@ for the current memory mapping. .SH FILESYSTEM COMMANDS .TP +.BI "bulkstat [ \-a " agno " ] [ \-d ] [ \-e " endino " ] [ \-n " batchsize " ] [ \-s " startino " ] +Display raw stat information about a bunch of inodes in an XFS filesystem. +Options are as follows: +.RS 1.0i +.PD 0 +.TP +.BI \-a " agno" +Display only results from the given allocation group. +If not specified, all results returned will be displayed. +.TP +.BI \-d +Print debugging information about call results. +.TP +.BI \-e " endino" +Stop displaying records when this inode number is reached. +Defaults to stopping when the system call stops returning results. +.TP +.BI \-n " batchsize" +Retrieve at most this many records per call. +Defaults to 4,096. +.TP +.BI \-s " startino" +Display inode allocation records starting with this inode. +Defaults to the first inode in the filesystem. +.RE +.PD +.TP +.BI "bulkstat_single [ " inum... " | " special... " ] +Display raw stat information about individual inodes in an XFS filesystem. +Arguments must be inode numbers or any of the special values: +.RS 1.0i +.PD 0 +.TP +.B root +Display information about the root directory inode. +.RE +.PD +.TP .B freeze Suspend all write I/O requests to the filesystem of the current file. Only available in expert mode and requires privileges. @@ -1067,6 +1105,34 @@ was specified on the command line, the maximum possible inode number in the system will be printed along with its size. .PD .TP +.BI "inumbers [ \-a " agno " ] [ \-d ] [ \-e " endino " ] [ \-n " batchsize " ] [ \-s " startino " ] +Prints allocation information about groups of inodes in an XFS filesystem. +Callers can use this information to figure out which inodes are allocated. +Options are as follows: +.RS 1.0i +.PD 0 +.TP +.BI \-a " agno" +Display only results from the given allocation group. +If not specified, all results returned will be displayed. +.TP +.BI \-d +Print debugging information about call results. +.TP +.BI \-e " endino" +Stop displaying records when this inode number is reached. +Defaults to stopping when the system call stops returning results. +.TP +.BI \-n " batchsize" +Retrieve at most this many records per call. +Defaults to 4,096. +.TP +.BI \-s " startino" +Display inode allocation records starting with this inode. +Defaults to the first inode in the filesystem. +.RE +.PD +.TP .BI "scrub " type " [ " agnumber " | " "ino" " " "gen" " ]" Scrub internal XFS filesystem metadata. The .BI type From patchwork Wed Sep 25 21:33:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11161411 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A1EAB14DB for ; Wed, 25 Sep 2019 21:33:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8018221D81 for ; Wed, 25 Sep 2019 21:33:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="fyqQGoEn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727048AbfIYVdX (ORCPT ); Wed, 25 Sep 2019 17:33:23 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:57534 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727042AbfIYVdX (ORCPT ); Wed, 25 Sep 2019 17:33:23 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x8PLT2ka050614; Wed, 25 Sep 2019 21:33:11 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2019-08-05; bh=uw9cThtc8VJWIDacMX5Ruihq+ybpedlrMHJlaKHmHR4=; b=fyqQGoEnf9ySL7bAyZ1AxLRi2hxryO1gtnrPTWaMWh03osqOL0IQ47/Oi0opuRt3rIOw NaT40xuzXAoIp7BUw7/Akc/GMP4m5S2Jn1GkxrqGCg0UtPlPe3s4qfoXnH/r7cZ4tw5H 0gsoAqBoXbeTnezw67OI3lfjJ7O+yd03Nr6CqmJIOEI56fnwesL1mio7DLK9Y+KzMzgv ruBqq2NGKbfBSKKr8alThrGP0NGZYSlOWX3E48TdoIQ/KK3DBNDn0dFabSNIa14Y7b61 71sa2zVcZOXxIspE98F4g5ALytNxJ6B4lIhicMOzgHoVW3U9N62yZsHZr5Jc+7p5Jz/w LQ== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by userp2120.oracle.com with ESMTP id 2v5cgr7eqc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 25 Sep 2019 21:33:11 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x8PLTObL194434; Wed, 25 Sep 2019 21:33:10 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userp3030.oracle.com with ESMTP id 2v829w4wjx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 25 Sep 2019 21:33:10 +0000 Received: from abhmp0022.oracle.com (abhmp0022.oracle.com [141.146.116.28]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x8PLX9hS014275; Wed, 25 Sep 2019 21:33:09 GMT Received: from localhost (/10.145.178.55) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 25 Sep 2019 14:33:09 -0700 Subject: [PATCH 2/4] xfs_spaceman: remove open-coded per-ag bulkstat From: "Darrick J. Wong" To: sandeen@sandeen.net, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, Dave Chinner Date: Wed, 25 Sep 2019 14:33:08 -0700 Message-ID: <156944718836.297551.759888543573443808.stgit@magnolia> In-Reply-To: <156944717403.297551.9871784842549394192.stgit@magnolia> References: <156944717403.297551.9871784842549394192.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9391 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=2 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1908290000 definitions=main-1909250173 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9391 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1908290000 definitions=main-1909250173 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong Now that xfrog_bulkstat supports per-AG bulkstat, we can get rid of the open coded one in spaceman. Signed-off-by: Darrick J. Wong Reviewed-by: Dave Chinner --- spaceman/health.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/spaceman/health.c b/spaceman/health.c index b195a229..8fd985a2 100644 --- a/spaceman/health.c +++ b/spaceman/health.c @@ -268,30 +268,24 @@ report_bulkstat_health( { struct xfs_bulkstat_req *breq; char descr[256]; - uint64_t startino = 0; - uint64_t lastino = -1ULL; uint32_t i; int error; - if (agno != NULLAGNUMBER) { - startino = cvt_agino_to_ino(&file->xfd, agno, 0); - lastino = cvt_agino_to_ino(&file->xfd, agno + 1, 0) - 1; - } - - breq = xfrog_bulkstat_alloc_req(BULKSTAT_NR, startino); + breq = xfrog_bulkstat_alloc_req(BULKSTAT_NR, 0); if (!breq) { perror("bulk alloc req"); exitcode = 1; return 1; } + if (agno != NULLAGNUMBER) + xfrog_bulkstat_set_ag(breq, agno); + do { error = xfrog_bulkstat(&file->xfd, breq); if (error) break; for (i = 0; i < breq->hdr.ocount; i++) { - if (breq->bulkstat[i].bs_ino > lastino) - goto out; snprintf(descr, sizeof(descr) - 1, _("inode %"PRIu64), breq->bulkstat[i].bs_ino); report_sick(descr, inode_flags, @@ -304,7 +298,7 @@ report_bulkstat_health( errno = error; perror("bulkstat"); } -out: + free(breq); return error; } From patchwork Wed Sep 25 21:33:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11161437 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E69B117D4 for ; Wed, 25 Sep 2019 21:34:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C552E21D82 for ; Wed, 25 Sep 2019 21:34:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="Xmmhqtfb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727507AbfIYVek (ORCPT ); Wed, 25 Sep 2019 17:34:40 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:43270 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727384AbfIYVek (ORCPT ); Wed, 25 Sep 2019 17:34:40 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x8PLYTNO010156; Wed, 25 Sep 2019 21:34:29 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2019-08-05; bh=SVp2PN3caCKe/5J96Iib/pQh49racb5ktOp253xv5oE=; b=Xmmhqtfb9GMNY71WwAeLXWlZM2DWJ50AKyeMzl6daWJEWL2pFUIKO2cq+2/pkPIUiIPi cq1SQs3IkRUKiMuuiCQwnZrS7vuP1qKbINk6R2Po6ZJ0cd6kuBiwIuf5H6Y0GZsxZnKP jHNnE1JKRZ+BuDgyJS5qyOQqZSlUh0OKOtvwZ3doZdNgNaB3urUiA5+mynKgQRSVqno9 04i567bTlxVv78n0qibQgthfKXoLCHA5sTjeDGwDiUHWMIxoDEgymEnGtVK4lBAC2WJm qPfjpc7tI0J34RatW0P9b7AAmE5myZqIAgY/ImALXibf26NF1w1lSeBrBLd4bU/kUc/g yQ== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by aserp2120.oracle.com with ESMTP id 2v5btq7hm4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 25 Sep 2019 21:34:29 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x8PLYRl0011426; Wed, 25 Sep 2019 21:34:27 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userp3030.oracle.com with ESMTP id 2v829w4wrx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 25 Sep 2019 21:34:27 +0000 Received: from abhmp0010.oracle.com (abhmp0010.oracle.com [141.146.116.16]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x8PLXFah019400; Wed, 25 Sep 2019 21:33:15 GMT Received: from localhost (/10.145.178.55) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 25 Sep 2019 14:33:15 -0700 Subject: [PATCH 3/4] xfs_scrub: convert to per-ag inode bulkstat operations From: "Darrick J. Wong" To: sandeen@sandeen.net, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, Dave Chinner Date: Wed, 25 Sep 2019 14:33:14 -0700 Message-ID: <156944719446.297551.14261594420118373010.stgit@magnolia> In-Reply-To: <156944717403.297551.9871784842549394192.stgit@magnolia> References: <156944717403.297551.9871784842549394192.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9391 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=2 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1908290000 definitions=main-1909250174 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9391 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1908290000 definitions=main-1909250174 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong Now that we're done reworking the xfrog bulkstat wrapper functions, we can adapt xfs_scrub to use the per-ag iteration functionality. Signed-off-by: Darrick J. Wong Reviewed-by: Dave Chinner --- scrub/fscounters.c | 22 ++++++---------------- scrub/inodes.c | 20 ++++++-------------- 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/scrub/fscounters.c b/scrub/fscounters.c index 2fdf658a..a2cf8171 100644 --- a/scrub/fscounters.c +++ b/scrub/fscounters.c @@ -35,29 +35,25 @@ struct xfs_count_inodes { * exist in the filesystem, assuming we've already scrubbed that. */ static bool -xfs_count_inodes_range( +xfs_count_inodes_ag( struct scrub_ctx *ctx, const char *descr, - uint64_t first_ino, - uint64_t last_ino, + uint32_t agno, uint64_t *count) { struct xfs_inumbers_req *ireq; uint64_t nr = 0; int error; - ASSERT(!(first_ino & (XFS_INODES_PER_CHUNK - 1))); - ASSERT((last_ino & (XFS_INODES_PER_CHUNK - 1))); - - ireq = xfrog_inumbers_alloc_req(1, first_ino); + ireq = xfrog_inumbers_alloc_req(1, 0); if (!ireq) { str_info(ctx, descr, _("Insufficient memory; giving up.")); return false; } + xfrog_inumbers_set_ag(ireq, agno); while (!(error = xfrog_inumbers(&ctx->mnt, ireq))) { - if (ireq->hdr.ocount == 0 || - ireq->inumbers[0].xi_startino >= last_ino) + if (ireq->hdr.ocount == 0) break; nr += ireq->inumbers[0].xi_alloccount; } @@ -83,8 +79,6 @@ xfs_count_ag_inodes( struct xfs_count_inodes *ci = arg; struct scrub_ctx *ctx = (struct scrub_ctx *)wq->wq_ctx; char descr[DESCR_BUFSZ]; - uint64_t ag_ino; - uint64_t next_ag_ino; bool moveon; snprintf(descr, DESCR_BUFSZ, _("dev %d:%d AG %u inodes"), @@ -92,11 +86,7 @@ xfs_count_ag_inodes( minor(ctx->fsinfo.fs_datadev), agno); - ag_ino = cvt_agino_to_ino(&ctx->mnt, agno, 0); - next_ag_ino = cvt_agino_to_ino(&ctx->mnt, agno + 1, 0); - - moveon = xfs_count_inodes_range(ctx, descr, ag_ino, next_ag_ino - 1, - &ci->counters[agno]); + moveon = xfs_count_inodes_ag(ctx, descr, agno, &ci->counters[agno]); if (!moveon) ci->moveon = false; } diff --git a/scrub/inodes.c b/scrub/inodes.c index 964647ce..4cf8a120 100644 --- a/scrub/inodes.c +++ b/scrub/inodes.c @@ -82,12 +82,11 @@ xfs_iterate_inodes_range_check( * but we also can detect iget failures. */ static bool -xfs_iterate_inodes_range( +xfs_iterate_inodes_ag( struct scrub_ctx *ctx, const char *descr, void *fshandle, - uint64_t first_ino, - uint64_t last_ino, + uint32_t agno, xfs_inode_iter_fn fn, void *arg) { @@ -113,13 +112,14 @@ xfs_iterate_inodes_range( return false; } - ireq = xfrog_inumbers_alloc_req(1, first_ino); + ireq = xfrog_inumbers_alloc_req(1, 0); if (!ireq) { str_info(ctx, descr, _("Insufficient memory; giving up.")); free(breq); return false; } inumbers = &ireq->inumbers[0]; + xfrog_inumbers_set_ag(ireq, agno); /* Find the inode chunk & alloc mask */ error = xfrog_inumbers(&ctx->mnt, ireq); @@ -147,9 +147,6 @@ xfs_iterate_inodes_range( for (i = 0, bs = breq->bulkstat; i < inumbers->xi_alloccount; i++, bs++) { - if (bs->bs_ino > last_ino) - goto out; - handle.ha_fid.fid_ino = bs->bs_ino; handle.ha_fid.fid_gen = bs->bs_gen; error = fn(ctx, &handle, bs, arg); @@ -214,8 +211,6 @@ xfs_scan_ag_inodes( struct xfs_scan_inodes *si = arg; struct scrub_ctx *ctx = (struct scrub_ctx *)wq->wq_ctx; char descr[DESCR_BUFSZ]; - uint64_t ag_ino; - uint64_t next_ag_ino; bool moveon; snprintf(descr, DESCR_BUFSZ, _("dev %d:%d AG %u inodes"), @@ -223,11 +218,8 @@ xfs_scan_ag_inodes( minor(ctx->fsinfo.fs_datadev), agno); - ag_ino = cvt_agino_to_ino(&ctx->mnt, agno, 0); - next_ag_ino = cvt_agino_to_ino(&ctx->mnt, agno + 1, 0); - - moveon = xfs_iterate_inodes_range(ctx, descr, ctx->fshandle, ag_ino, - next_ag_ino - 1, si->fn, si->arg); + moveon = xfs_iterate_inodes_ag(ctx, descr, ctx->fshandle, agno, + si->fn, si->arg); if (!moveon) si->moveon = false; } From patchwork Wed Sep 25 21:33:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11161449 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CB4421800 for ; Wed, 25 Sep 2019 21:34:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA3C421D81 for ; Wed, 25 Sep 2019 21:34:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="HsNWPysM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727629AbfIYVet (ORCPT ); Wed, 25 Sep 2019 17:34:49 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:37606 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727512AbfIYVet (ORCPT ); Wed, 25 Sep 2019 17:34:49 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x8PLYW1b058043; Wed, 25 Sep 2019 21:34:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2019-08-05; bh=644Kk538U0mbrNn/NLXdmPbgup4TC8eba8m9M9rR6x4=; b=HsNWPysMs3otmkLjsI8DXLeBA/MJ7s8fqpe6Jb2cy/8amG4uMnjym5XYaFvwLfD7/6uK 1fgdLa4Az7gqh5LIQJAWTRZHueQV8qy/pfGCD07Y28HL5h3T79DQRcshfpsmpXM3OQR8 QoQYK76YdtUDgSYlja0dCdyt0jdWhl1O+8myU5dwpCkrz1rH0DUJ2NLNkw51lYfBBr6O 3U5dyniuYZUd7TyXIV4N4EuYIXkFdnqaXu/xzQPYN5sUQ+5wpuCefiTsC3z2+pEDOcmU vRaS0Fzqsha8m9OhNFQcjgya4kxvaDusrzrF5LrW6SuAttIPBRpvUWvfdBRjq5enX46L ng== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by userp2130.oracle.com with ESMTP id 2v5b9tyh1b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 25 Sep 2019 21:34:42 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x8PLYQZw097675; Wed, 25 Sep 2019 21:34:42 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userp3020.oracle.com with ESMTP id 2v82qakqwx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 25 Sep 2019 21:34:34 +0000 Received: from abhmp0003.oracle.com (abhmp0003.oracle.com [141.146.116.9]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x8PLXM2Q014403; Wed, 25 Sep 2019 21:33:22 GMT Received: from localhost (/10.145.178.55) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 25 Sep 2019 14:33:21 -0700 Subject: [PATCH 4/4] xfs_scrub: batch inumbers calls during fscounters calculation From: "Darrick J. Wong" To: sandeen@sandeen.net, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, Dave Chinner Date: Wed, 25 Sep 2019 14:33:20 -0700 Message-ID: <156944720050.297551.11989510278130886367.stgit@magnolia> In-Reply-To: <156944717403.297551.9871784842549394192.stgit@magnolia> References: <156944717403.297551.9871784842549394192.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9391 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=2 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1908290000 definitions=main-1909250174 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9391 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1908290000 definitions=main-1909250174 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong Improve the efficiency of the phase 7 inode counts by batching requests, now that we have per-AG inumbers wrappers. Signed-off-by: Darrick J. Wong Reviewed-by: Dave Chinner --- scrub/fscounters.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scrub/fscounters.c b/scrub/fscounters.c index a2cf8171..ad467e0c 100644 --- a/scrub/fscounters.c +++ b/scrub/fscounters.c @@ -43,9 +43,10 @@ xfs_count_inodes_ag( { struct xfs_inumbers_req *ireq; uint64_t nr = 0; + unsigned int i; int error; - ireq = xfrog_inumbers_alloc_req(1, 0); + ireq = xfrog_inumbers_alloc_req(64, 0); if (!ireq) { str_info(ctx, descr, _("Insufficient memory; giving up.")); return false; @@ -55,7 +56,8 @@ xfs_count_inodes_ag( while (!(error = xfrog_inumbers(&ctx->mnt, ireq))) { if (ireq->hdr.ocount == 0) break; - nr += ireq->inumbers[0].xi_alloccount; + for (i = 0; i < ireq->hdr.ocount; i++) + nr += ireq->inumbers[i].xi_alloccount; } free(ireq);