linux-xfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: sandeen@sandeen.net, darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 8/9] xfs_scrub: request fewer bmaps when we can
Date: Tue, 22 Oct 2019 11:47:54 -0700	[thread overview]
Message-ID: <157177007451.1459098.7077839567802348147.stgit@magnolia> (raw)
In-Reply-To: <157177002473.1459098.11320398367215468164.stgit@magnolia>

From: Darrick J. Wong <darrick.wong@oracle.com>

In xfs_iterate_filemaps, we query the number of bmaps for a given file
that we're going to iterate, so feed that information to bmap so that
the kernel won't waste time allocating in-kernel memory unnecessarily.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 scrub/filemap.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)


diff --git a/scrub/filemap.c b/scrub/filemap.c
index bdc6d8f9..f92e9620 100644
--- a/scrub/filemap.c
+++ b/scrub/filemap.c
@@ -71,7 +71,6 @@ xfs_iterate_filemaps(
 		map->bmv_length = ULLONG_MAX;
 	else
 		map->bmv_length = BTOBB(key->bm_length);
-	map->bmv_count = BMAP_NR;
 	map->bmv_iflags = BMV_IF_NO_DMAPI_READ | BMV_IF_PREALLOC |
 			  BMV_IF_NO_HOLES;
 	switch (whichfork) {
@@ -97,6 +96,13 @@ xfs_iterate_filemaps(
 		goto out;
 	}
 
+	if (fsx.fsx_nextents == 0) {
+		moveon = true;
+		goto out;
+	}
+
+	map->bmv_count = min(fsx.fsx_nextents + 1, BMAP_NR);
+
 	while ((error = ioctl(fd, XFS_IOC_GETBMAPX, map)) == 0) {
 		for (i = 0, p = &map[i + 1]; i < map->bmv_entries; i++, p++) {
 			bmap.bm_offset = BBTOB(p->bmv_offset);


  parent reply	other threads:[~2019-10-22 18:48 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-22 18:47 [PATCH 0/9] xfs_scrub: fix IO error reporting Darrick J. Wong
2019-10-22 18:47 ` [PATCH 1/9] libfrog/xfs_scrub: improve iteration function documentation Darrick J. Wong
2019-11-01 19:57   ` Eric Sandeen
2019-10-22 18:47 ` [PATCH 2/9] xfs_scrub: separate media error reporting for attribute forks Darrick J. Wong
2019-11-01 20:00   ` Eric Sandeen
2019-10-22 18:47 ` [PATCH 3/9] xfs_scrub: improve reporting of file data media errors Darrick J. Wong
2019-11-01 20:04   ` Eric Sandeen
2019-10-22 18:47 ` [PATCH 4/9] xfs_scrub: better reporting of metadata " Darrick J. Wong
2019-11-01 20:08   ` Eric Sandeen
2019-10-22 18:47 ` [PATCH 5/9] xfs_scrub: improve reporting of file " Darrick J. Wong
2019-10-22 18:47 ` [PATCH 6/9] xfs_scrub: don't report media errors on unwritten extents Darrick J. Wong
2019-10-22 18:47 ` [PATCH 7/9] xfs_scrub: reduce fsmap activity for media errors Darrick J. Wong
2019-11-01 20:29   ` Eric Sandeen
2019-10-22 18:47 ` Darrick J. Wong [this message]
2019-11-01 20:31   ` [PATCH 8/9] xfs_scrub: request fewer bmaps when we can Eric Sandeen
2019-10-22 18:48 ` [PATCH 9/9] xfs_scrub: fix media verification thread pool size calculations Darrick J. Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=157177007451.1459098.7077839567802348147.stgit@magnolia \
    --to=darrick.wong@oracle.com \
    --cc=linux-xfs@vger.kernel.org \
    --cc=sandeen@sandeen.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).