From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: sandeen@sandeen.net, darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 1/3] xfs_scrub: refactor queueing of subdir scan work item
Date: Thu, 05 Sep 2019 20:34:03 -0700 [thread overview]
Message-ID: <156774084332.2643257.12234848325153797756.stgit@magnolia> (raw)
In-Reply-To: <156774083707.2643257.15738851266613887341.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
Replace the open-coded process of queueing a subdirectory for scanning
with a single helper function.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
scrub/vfs.c | 109 ++++++++++++++++++++++++++++++++++++-----------------------
1 file changed, 67 insertions(+), 42 deletions(-)
diff --git a/scrub/vfs.c b/scrub/vfs.c
index b5d54837..add4e815 100644
--- a/scrub/vfs.c
+++ b/scrub/vfs.c
@@ -43,6 +43,57 @@ struct scan_fs_tree_dir {
bool rootdir;
};
+static void scan_fs_dir(struct workqueue *wq, xfs_agnumber_t agno, void *arg);
+
+/* Queue a directory for scanning. */
+static bool
+queue_subdir(
+ struct scrub_ctx *ctx,
+ struct scan_fs_tree *sft,
+ struct workqueue *wq,
+ const char *path,
+ bool is_rootdir)
+{
+ struct scan_fs_tree_dir *new_sftd;
+ int error;
+
+ new_sftd = malloc(sizeof(struct scan_fs_tree_dir));
+ if (!new_sftd) {
+ str_errno(ctx, _("creating directory scan context"));
+ return false;
+ }
+
+ new_sftd->path = strdup(path);
+ if (!new_sftd->path) {
+ str_errno(ctx, _("creating directory scan path"));
+ goto out_sftd;
+ }
+
+ new_sftd->sft = sft;
+ new_sftd->rootdir = is_rootdir;
+
+ pthread_mutex_lock(&sft->lock);
+ sft->nr_dirs++;
+ pthread_mutex_unlock(&sft->lock);
+ error = workqueue_add(wq, scan_fs_dir, 0, new_sftd);
+ if (error) {
+ /*
+ * XXX: need to decrement nr_dirs here; will do that in the
+ * next patch.
+ */
+ str_info(ctx, ctx->mntpoint,
+_("Could not queue subdirectory scan work."));
+ goto out_path;
+ }
+
+ return true;
+out_path:
+ free(new_sftd->path);
+out_sftd:
+ free(new_sftd);
+ return false;
+}
+
/* Scan a directory sub tree. */
static void
scan_fs_dir(
@@ -56,7 +107,6 @@ scan_fs_dir(
DIR *dir;
struct dirent *dirent;
char newpath[PATH_MAX];
- struct scan_fs_tree_dir *new_sftd;
struct stat sb;
int dir_fd;
int error;
@@ -117,25 +167,10 @@ scan_fs_dir(
/* If directory, call ourselves recursively. */
if (S_ISDIR(sb.st_mode) && strcmp(".", dirent->d_name) &&
strcmp("..", dirent->d_name)) {
- new_sftd = malloc(sizeof(struct scan_fs_tree_dir));
- if (!new_sftd) {
- str_errno(ctx, newpath);
- sft->moveon = false;
- break;
- }
- new_sftd->path = strdup(newpath);
- new_sftd->sft = sft;
- new_sftd->rootdir = false;
- pthread_mutex_lock(&sft->lock);
- sft->nr_dirs++;
- pthread_mutex_unlock(&sft->lock);
- error = workqueue_add(wq, scan_fs_dir, 0, new_sftd);
- if (error) {
- str_info(ctx, ctx->mntpoint,
-_("Could not queue subdirectory scan work."));
- sft->moveon = false;
+ sft->moveon = queue_subdir(ctx, sft, wq, newpath,
+ false);
+ if (!sft->moveon)
break;
- }
}
}
@@ -165,11 +200,10 @@ scan_fs_tree(
{
struct workqueue wq;
struct scan_fs_tree sft;
- struct scan_fs_tree_dir *sftd;
int ret;
sft.moveon = true;
- sft.nr_dirs = 1;
+ sft.nr_dirs = 0;
sft.root_sb = ctx->mnt_sb;
sft.dir_fn = dir_fn;
sft.dirent_fn = dirent_fn;
@@ -177,41 +211,32 @@ scan_fs_tree(
pthread_mutex_init(&sft.lock, NULL);
pthread_cond_init(&sft.wakeup, NULL);
- sftd = malloc(sizeof(struct scan_fs_tree_dir));
- if (!sftd) {
- str_errno(ctx, ctx->mntpoint);
- return false;
- }
- sftd->path = strdup(ctx->mntpoint);
- sftd->sft = &sft;
- sftd->rootdir = true;
-
ret = workqueue_create(&wq, (struct xfs_mount *)ctx,
scrub_nproc_workqueue(ctx));
if (ret) {
str_info(ctx, ctx->mntpoint, _("Could not create workqueue."));
- goto out_free;
+ return false;
}
- ret = workqueue_add(&wq, scan_fs_dir, 0, sftd);
- if (ret) {
- str_info(ctx, ctx->mntpoint,
-_("Could not queue directory scan work."));
+
+ sft.moveon = queue_subdir(ctx, &sft, &wq, ctx->mntpoint, true);
+ if (!sft.moveon)
goto out_wq;
- }
+ /*
+ * Wait for the wakeup to trigger, which should only happen when the
+ * last worker thread decrements nr_dirs to zero. Once the worker
+ * triggers the wakeup and unlocks the sft lock, it's no longer safe
+ * for any worker thread to access sft, as we now own the lock and are
+ * about to tear everything down.
+ */
pthread_mutex_lock(&sft.lock);
pthread_cond_wait(&sft.wakeup, &sft.lock);
assert(sft.nr_dirs == 0);
pthread_mutex_unlock(&sft.lock);
- workqueue_destroy(&wq);
- return sft.moveon;
out_wq:
workqueue_destroy(&wq);
-out_free:
- free(sftd->path);
- free(sftd);
- return false;
+ return sft.moveon;
}
#ifndef FITRIM
next prev parent reply other threads:[~2019-09-06 3:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-06 3:33 [PATCH 0/3] xfs_scrub: fix bugs in vfs tree walk code Darrick J. Wong
2019-09-06 3:34 ` Darrick J. Wong [this message]
2019-09-10 1:04 ` [PATCH 1/3] xfs_scrub: refactor queueing of subdir scan work item Dave Chinner
2019-09-06 3:34 ` [PATCH 2/3] xfs_scrub: fix nr_dirs accounting problems Darrick J. Wong
2019-09-06 3:34 ` [PATCH 3/3] xfs_scrub: remove unnecessary wakeup wait in scan_fs_tree Darrick J. Wong
-- strict thread matches above, loose matches on Subject: below --
2019-09-25 21:31 [PATCH 0/3] xfs_scrub: fix bugs in vfs tree walk code Darrick J. Wong
2019-09-25 21:31 ` [PATCH 1/3] xfs_scrub: refactor queueing of subdir scan work item Darrick J. Wong
2019-08-26 21:21 [PATCH 0/3] xfs_scrub: fix bugs in vfs tree walk code Darrick J. Wong
2019-08-26 21:21 ` [PATCH 1/3] xfs_scrub: refactor queueing of subdir scan work item Darrick J. Wong
2019-09-04 8:12 ` Dave Chinner
2019-09-04 16:37 ` 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=156774084332.2643257.12234848325153797756.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).