From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Dave Chinner <david@fromorbit.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 28/30] xfs: scrub directory parent pointers
Date: Mon, 16 Oct 2017 14:46:01 -0700 [thread overview]
Message-ID: <20171016214601.GN4703@magnolia> (raw)
In-Reply-To: <20171016050928.GE3666@dastard>
On Mon, Oct 16, 2017 at 04:09:28PM +1100, Dave Chinner wrote:
> On Wed, Oct 11, 2017 at 06:43:47PM -0700, Darrick J. Wong wrote:
> > From: Darrick J. Wong <darrick.wong@oracle.com>
> >
> > Scrub parent pointers, sort of. For directories, we can ride the
> > '..' entry up to the parent to confirm that there's at most one
> > dentry that points back to this directory.
>
> ....
>
> > +/* Count the number of dentries in the parent dir that point to this inode. */
> > +STATIC int
> > +xfs_scrub_parent_count_parent_dentries(
> > + struct xfs_scrub_context *sc,
> > + struct xfs_inode *parent,
> > + xfs_nlink_t *nlink)
> > +{
> > + struct xfs_scrub_parent_ctx spc = {
> > + .dc.actor = xfs_scrub_parent_actor,
> > + .dc.pos = 0,
> > + .ino = sc->ip->i_ino,
> > + .nlink = 0,
> > + };
> > + struct xfs_ifork *ifp;
> > + size_t bufsize;
> > + loff_t oldpos;
> > + uint lock_mode;
> > + int error;
> > +
> > + /*
> > + * Load the parent directory's extent map. A regular directory
> > + * open would start readahead (and thus load the extent map)
> > + * before we even got to a readdir call, but this isn't
> > + * guaranteed here.
> > + */
> > + lock_mode = xfs_ilock_data_map_shared(parent);
> > + ifp = XFS_IFORK_PTR(parent, XFS_DATA_FORK);
> > + if (XFS_IFORK_FORMAT(parent, XFS_DATA_FORK) == XFS_DINODE_FMT_BTREE &&
> > + !(ifp->if_flags & XFS_IFEXTENTS)) {
> > + error = xfs_iread_extents(sc->tp, parent, XFS_DATA_FORK);
> > + if (error) {
> > + xfs_iunlock(parent, lock_mode);
> > + return error;
> > + }
> > + }
> > + xfs_iunlock(parent, lock_mode);
>
> Why not just do what xfs_dir_open() does? i.e.
>
> /*
> * If there are any blocks, read-ahead block 0 as we're almost
> * certain to have the next operation be a read there.
> */
> mode = xfs_ilock_data_map_shared(ip);
> if (ip->i_d.di_nextents > 0)
> error = xfs_dir3_data_readahead(ip, 0, -1);
> xfs_iunlock(ip, mode);
Ok.
> > + /*
> > + * Iterate the parent dir to confirm that there is
> > + * exactly one entry pointing back to the inode being
> > + * scanned.
> > + */
> > + bufsize = (size_t)min_t(loff_t, 32768, parent->i_d.di_size);
>
> Perhaps we need a define for that 32k magic number now it's being
> used in multiple places?
Magic indeed; glibc uses the minimum of (4 * BUFSIZ) or (sizeof(struct
dirent)); musl uses a static 2k buffer; dietlibc uses (PAGE_SIZE -
sizeof(structure header))...
...what would we call it?
/*
* The Linux API doesn't pass down the total size of the buffer we read
* into down to the filesystem. With the filldir concept it's not
* needed for correct information, but the XFS dir2 leaf code wants an
* estimate of the buffer size to calculate its readahead window and
* size the buffers used for mapping to physical blocks.
*
* Try to give it an estimate that's good enough, maybe at some point we
* can change the ->readdir prototype to include the buffer size. For
* now we use the current glibc buffer size.
*/
#define XFS_DEFAULT_READDIR_BUFSIZE (32768)
(As a side question, do we want to bump this up to a full pagesize on
architectures that have 64k pages? I'd probably just leave it, but
let's see if anyone running those architectures complains or sends in a
patch?)
> > + oldpos = 0;
> > + while (true) {
> > + error = xfs_readdir(sc->tp, parent, &spc.dc, bufsize);
> > + if (error)
> > + goto out;
> > + if (oldpos == spc.dc.pos)
> > + break;
> > + oldpos = spc.dc.pos;
> > + }
> > + *nlink = spc.nlink;
> > +out:
> > + return error;
> > +}
> > +
> > +/* Scrub a parent pointer. */
> > +int
> > +xfs_scrub_parent(
> > + struct xfs_scrub_context *sc)
> > +{
> > + struct xfs_mount *mp = sc->mp;
> > + struct xfs_inode *dp = NULL;
> > + xfs_ino_t dnum;
> > + xfs_nlink_t expected_nlink;
> > + xfs_nlink_t nlink;
> > + int tries = 0;
> > + int error;
> > +
> > + /*
> > + * If we're a directory, check that the '..' link points up to
> > + * a directory that has one entry pointing to us.
> > + */
> > + if (!S_ISDIR(VFS_I(sc->ip)->i_mode))
> > + return -ENOENT;
> > +
> > + /* We're not a special inode, are we? */
> > + if (!xfs_verify_dir_ino_ptr(mp, sc->ip->i_ino)) {
> > + xfs_scrub_fblock_set_corrupt(sc, XFS_DATA_FORK, 0);
> > + goto out;
> > + }
> > +
> > + /*
> > + * If we're an unlinked directory, the parent /won't/ have a link
> > + * to us. Otherwise, it should have one link.
> > + */
> > + expected_nlink = VFS_I(sc->ip)->i_nlink == 0 ? 0 : 1;
> > +
> > + /*
> > + * The VFS grabs a read or write lock via i_rwsem before it reads
> > + * or writes to a directory. If we've gotten this far we've
> > + * already obtained IOLOCK_EXCL, which (since 4.10) is the same as
> > + * getting a write lock on i_rwsem. Therefore, it is safe for us
> > + * to drop the ILOCK here in order to do directory lookups.
> > + */
> > + sc->ilock_flags &= ~(XFS_ILOCK_EXCL | XFS_MMAPLOCK_EXCL);
> > + xfs_iunlock(sc->ip, XFS_ILOCK_EXCL | XFS_MMAPLOCK_EXCL);
> > +
> > + /* Look up '..' */
> > + error = xfs_dir_lookup(sc->tp, sc->ip, &xfs_name_dotdot, &dnum, NULL);
> > + if (!xfs_scrub_fblock_process_error(sc, XFS_DATA_FORK, 0, &error))
> > + goto out;
> > + if (!xfs_verify_dir_ino_ptr(mp, dnum)) {
> > + xfs_scrub_fblock_set_corrupt(sc, XFS_DATA_FORK, 0);
> > + goto out;
> > + }
> > +
> > + /* Is this the root dir? Then '..' must point to itself. */
> > + if (sc->ip == mp->m_rootip) {
> > + if (sc->ip->i_ino != mp->m_sb.sb_rootino ||
> > + sc->ip->i_ino != dnum)
> > + xfs_scrub_fblock_set_corrupt(sc, XFS_DATA_FORK, 0);
> > + return 0;
> > + }
>
> All good to here.
>
> > +try_again:
> > + /* Otherwise, '..' must not point to ourselves. */
> > + if (sc->ip->i_ino == dnum) {
> > + xfs_scrub_fblock_set_corrupt(sc, XFS_DATA_FORK, 0);
> > + goto out;
> > + }
> > +
> > + error = xfs_iget(mp, sc->tp, dnum, XFS_IGET_DONTCACHE, 0, &dp);
> > + if (!xfs_scrub_fblock_process_error(sc, XFS_DATA_FORK, 0, &error))
> > + goto out;
> > + if (dp == sc->ip) {
> > + xfs_scrub_fblock_set_corrupt(sc, XFS_DATA_FORK, 0);
> > + goto out_rele;
> > + }
> > +
> > + /*
> > + * We prefer to keep the inode locked while we lock and search
> > + * its alleged parent for a forward reference. However, this
> > + * child -> parent scheme can deadlock with the parent -> child
> > + * scheme that is normally used. Therefore, if we can lock the
> > + * parent, just validate the references and get out.
> > + */
> > + if (xfs_ilock_nowait(dp, XFS_IOLOCK_SHARED)) {
> > + error = xfs_scrub_parent_count_parent_dentries(sc, dp, &nlink);
> > + if (!xfs_scrub_fblock_process_error(sc, XFS_DATA_FORK, 0,
> > + &error))
> > + goto out_unlock;
> > + if (nlink != expected_nlink)
> > + xfs_scrub_fblock_set_corrupt(sc, XFS_DATA_FORK, 0);
> > + goto out_unlock;
> > + }
> > +
> > + /*
> > + * The game changes if we get here. We failed to lock the parent,
> > + * so we're going to try to verify both pointers while only holding
> > + * one lock so as to avoid deadlocking with something that's actually
> > + * trying to traverse down the directory tree.
> > + */
> > + xfs_iunlock(sc->ip, sc->ilock_flags);
> > + sc->ilock_flags = 0;
> > + xfs_ilock(dp, XFS_IOLOCK_SHARED);
> > +
> > + /* Go looking for our dentry. */
> > + error = xfs_scrub_parent_count_parent_dentries(sc, dp, &nlink);
> > + if (!xfs_scrub_fblock_process_error(sc, XFS_DATA_FORK, 0, &error))
> > + goto out_unlock;
> > +
> > + /* Drop the parent lock, relock this inode. */
> > + xfs_iunlock(dp, XFS_IOLOCK_SHARED);
> > + sc->ilock_flags = XFS_IOLOCK_EXCL;
> > + xfs_ilock(sc->ip, sc->ilock_flags);
> > +
> > + /* Look up '..' to see if the inode changed. */
> > + error = xfs_dir_lookup(sc->tp, sc->ip, &xfs_name_dotdot, &dnum, NULL);
> > + if (!xfs_scrub_fblock_process_error(sc, XFS_DATA_FORK, 0, &error))
> > + goto out_rele;
> > +
> > + /* Drat, parent changed. Try again! */
> > + if (dnum != dp->i_ino) {
> > + iput(VFS_I(dp));
> > + tries++;
> > + if (tries < 20)
> > + goto try_again;
> > + xfs_scrub_set_incomplete(sc);
> > + goto out;
> > + }
> > + iput(VFS_I(dp));
>
> Can you factor this into a loop and function?
>
> do {
> valid = xfs_scrub_parent_validate(&error)
> if (error)
> goto out_unlock;
> } while (!valid && ++retries < 20)
Ok.
--D
>
> Cheers,
>
> Dave.
> --
> Dave Chinner
> david@fromorbit.com
> --
> 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
next prev parent reply other threads:[~2017-10-16 21:46 UTC|newest]
Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-12 1:40 [PATCH v12 00/30] xfs: online scrub support Darrick J. Wong
2017-10-12 1:40 ` [PATCH 01/30] xfs: return a distinct error code value for IGET_INCORE cache misses Darrick J. Wong
2017-10-12 5:25 ` Dave Chinner
2017-10-12 1:40 ` [PATCH 02/30] xfs: create block pointer check functions Darrick J. Wong
2017-10-12 5:28 ` Dave Chinner
2017-10-12 5:48 ` Dave Chinner
2017-10-16 19:46 ` Darrick J. Wong
2017-10-12 1:41 ` [PATCH 03/30] xfs: refactor btree pointer checks Darrick J. Wong
2017-10-12 5:51 ` Dave Chinner
2017-10-12 1:41 ` [PATCH 04/30] xfs: refactor btree block header checking functions Darrick J. Wong
2017-10-13 1:01 ` Dave Chinner
2017-10-13 21:15 ` Darrick J. Wong
2017-10-16 19:48 ` [PATCH v2 " Darrick J. Wong
2017-10-16 23:36 ` Dave Chinner
2017-10-12 1:41 ` [PATCH 05/30] xfs: create inode pointer verifiers Darrick J. Wong
2017-10-12 20:23 ` Darrick J. Wong
2017-10-13 5:22 ` Dave Chinner
2017-10-13 16:16 ` Darrick J. Wong
2017-10-16 19:49 ` [PATCH v2 " Darrick J. Wong
2017-10-16 23:53 ` Dave Chinner
2017-10-12 1:41 ` [PATCH 06/30] xfs: create an ioctl to scrub AG metadata Darrick J. Wong
2017-10-16 0:08 ` Dave Chinner
2017-10-12 1:41 ` [PATCH 07/30] xfs: dispatch metadata scrub subcommands Darrick J. Wong
2017-10-16 0:26 ` Dave Chinner
2017-10-12 1:41 ` [PATCH 08/30] xfs: probe the scrub ioctl Darrick J. Wong
2017-10-16 0:39 ` Dave Chinner
2017-10-16 19:54 ` Darrick J. Wong
2017-10-16 23:05 ` Dave Chinner
2017-10-12 1:41 ` [PATCH 09/30] xfs: create helpers to record and deal with scrub problems Darrick J. Wong
2017-10-16 0:40 ` Dave Chinner
2017-10-12 1:41 ` [PATCH 10/30] xfs: create helpers to scrub a metadata btree Darrick J. Wong
2017-10-16 0:56 ` Dave Chinner
2017-10-12 1:41 ` [PATCH 11/30] xfs: scrub the shape of " Darrick J. Wong
2017-10-16 1:29 ` Dave Chinner
2017-10-16 20:09 ` Darrick J. Wong
2017-10-12 1:42 ` [PATCH 12/30] xfs: scrub btree keys and records Darrick J. Wong
2017-10-16 1:31 ` Dave Chinner
2017-10-12 1:42 ` [PATCH 13/30] xfs: create helpers to scan an allocation group Darrick J. Wong
2017-10-16 1:32 ` Dave Chinner
2017-10-12 1:42 ` [PATCH 14/30] xfs: scrub the secondary superblocks Darrick J. Wong
2017-10-16 5:16 ` Dave Chinner
2017-10-20 23:34 ` Darrick J. Wong
2017-10-12 1:42 ` [PATCH 15/30] xfs: scrub AGF and AGFL Darrick J. Wong
2017-10-16 2:18 ` Dave Chinner
2017-10-12 1:42 ` [PATCH 16/30] xfs: scrub the AGI Darrick J. Wong
2017-10-16 2:19 ` Dave Chinner
2017-10-12 1:42 ` [PATCH 17/30] xfs: scrub free space btrees Darrick J. Wong
2017-10-16 2:25 ` Dave Chinner
2017-10-16 20:36 ` Darrick J. Wong
2017-10-12 1:42 ` [PATCH 18/30] xfs: scrub inode btrees Darrick J. Wong
2017-10-16 2:55 ` Dave Chinner
2017-10-16 22:16 ` Darrick J. Wong
2017-10-17 0:11 ` [PATCH v2 " Darrick J. Wong
2017-10-17 21:59 ` Dave Chinner
2017-10-12 1:42 ` [PATCH 19/30] xfs: scrub rmap btrees Darrick J. Wong
2017-10-16 3:01 ` Dave Chinner
2017-10-12 1:42 ` [PATCH 20/30] xfs: scrub refcount btrees Darrick J. Wong
2017-10-16 3:02 ` Dave Chinner
2017-10-12 1:43 ` [PATCH 21/30] xfs: scrub inodes Darrick J. Wong
2017-10-12 22:32 ` Darrick J. Wong
2017-10-16 3:16 ` Dave Chinner
2017-10-16 22:08 ` Darrick J. Wong
2017-10-17 0:13 ` [PATCH v2 " Darrick J. Wong
2017-10-17 22:01 ` Dave Chinner
2017-10-12 1:43 ` [PATCH 22/30] xfs: scrub inode block mappings Darrick J. Wong
2017-10-16 3:26 ` Dave Chinner
2017-10-16 20:43 ` Darrick J. Wong
2017-10-12 1:43 ` [PATCH 23/30] xfs: scrub directory/attribute btrees Darrick J. Wong
2017-10-16 4:13 ` Dave Chinner
2017-10-12 1:43 ` [PATCH 24/30] xfs: scrub directory metadata Darrick J. Wong
2017-10-16 4:29 ` Dave Chinner
2017-10-16 20:46 ` Darrick J. Wong
2017-10-17 0:14 ` [PATCH v2 " Darrick J. Wong
2017-10-17 22:06 ` Dave Chinner
2017-10-12 1:43 ` [PATCH 25/30] xfs: scrub directory freespace Darrick J. Wong
2017-10-16 4:49 ` Dave Chinner
2017-10-16 22:37 ` Darrick J. Wong
2017-10-16 23:11 ` Darrick J. Wong
2017-10-16 23:14 ` Dave Chinner
2017-10-16 23:38 ` Darrick J. Wong
2017-10-17 1:10 ` [PATCH v2 " Darrick J. Wong
2017-10-17 22:08 ` Dave Chinner
2017-10-17 23:51 ` Darrick J. Wong
2017-10-12 1:43 ` [PATCH 26/30] xfs: scrub extended attributes Darrick J. Wong
2017-10-16 4:50 ` Dave Chinner
2017-10-12 1:43 ` [PATCH 27/30] xfs: scrub symbolic links Darrick J. Wong
2017-10-16 4:52 ` Dave Chinner
2017-10-12 1:43 ` [PATCH 28/30] xfs: scrub directory parent pointers Darrick J. Wong
2017-10-16 5:09 ` Dave Chinner
2017-10-16 21:46 ` Darrick J. Wong [this message]
2017-10-16 23:30 ` Dave Chinner
2017-10-16 23:58 ` Darrick J. Wong
2017-10-17 0:16 ` [PATCH v2 " Darrick J. Wong
2017-10-17 22:11 ` Dave Chinner
2017-10-12 1:43 ` [PATCH 29/30] xfs: scrub realtime bitmap/summary Darrick J. Wong
2017-10-16 5:11 ` Dave Chinner
2017-10-12 1:44 ` [PATCH 30/30] xfs: scrub quota information Darrick J. Wong
2017-10-16 5:12 ` Dave Chinner
2017-10-17 1:11 ` 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=20171016214601.GN4703@magnolia \
--to=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=linux-xfs@vger.kernel.org \
/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