From: Dave Chinner <david@fromorbit.com>
To: Christoph Hellwig <hch@infradead.org>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH 5/5] xfs: assert that we hold the ilock for extent map access
Date: Fri, 6 Dec 2013 08:10:47 +1100 [thread overview]
Message-ID: <20131205211047.GG29897@dastard> (raw)
In-Reply-To: <20131205155951.874279041@bombadil.infradead.org>
On Thu, Dec 05, 2013 at 07:58:35AM -0800, Christoph Hellwig wrote:
> Make sure that xfs_bmapi_read has the ilock held in some way, and that
> xfs_bmapi_write, xfs_bmapi_delay and xfs_iread_extents are called with
> the ilock held exclusively.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
>
> Index: xfs/fs/xfs/xfs_bmap.c
> ===================================================================
> --- xfs.orig/fs/xfs/xfs_bmap.c 2013-11-29 14:25:12.172459195 +0100
> +++ xfs/fs/xfs/xfs_bmap.c 2013-12-05 10:03:28.243801633 +0100
> @@ -3997,6 +3997,7 @@ xfs_bmapi_read(
> ASSERT(*nmap >= 1);
> ASSERT(!(flags & ~(XFS_BMAPI_ATTRFORK|XFS_BMAPI_ENTIRE|
> XFS_BMAPI_IGSTATE)));
> + ASSERT(xfs_isilocked(ip, XFS_ILOCK_SHARED|XFS_ILOCK_EXCL));
>
> if (unlikely(XFS_TEST_ERROR(
> (XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS &&
> @@ -4191,6 +4192,7 @@ xfs_bmapi_delay(
> ASSERT(*nmap >= 1);
> ASSERT(*nmap <= XFS_BMAP_MAX_NMAP);
> ASSERT(!(flags & ~XFS_BMAPI_ENTIRE));
> + ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
>
> if (unlikely(XFS_TEST_ERROR(
> (XFS_IFORK_FORMAT(ip, XFS_DATA_FORK) != XFS_DINODE_FMT_EXTENTS &&
> @@ -4484,6 +4486,7 @@ xfs_bmapi_write(
> ASSERT(tp != NULL);
> ASSERT(len > 0);
> ASSERT(XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_LOCAL);
> + ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
>
> if (unlikely(XFS_TEST_ERROR(
> (XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS &&
> Index: xfs/fs/xfs/xfs_inode_fork.c
> ===================================================================
> --- xfs.orig/fs/xfs/xfs_inode_fork.c 2013-12-05 09:57:24.347809100 +0100
> +++ xfs/fs/xfs/xfs_inode_fork.c 2013-12-05 09:59:04.767807039 +0100
> @@ -431,6 +431,8 @@ xfs_iread_extents(
> xfs_ifork_t *ifp;
> xfs_extnum_t nextents;
>
> + ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
> +
> if (unlikely(XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE)) {
> XFS_ERROR_REPORT("xfs_iread_extents", XFS_ERRLEVEL_LOW,
> ip->i_mount);
Looks good, but can we add an assert to xfs_bunmapi() at the same
time just to cover all the public bmapi interfaces with locking
requirements?
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2013-12-05 21:11 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-05 15:58 [PATCH 0/5] extent list locking fixes Christoph Hellwig
2013-12-05 15:58 ` [PATCH 1/5] xfs: take the ilock around xfs_bmapi_read in xfs_zero_remaining_bytes Christoph Hellwig
2013-12-05 19:38 ` Ben Myers
2013-12-05 20:31 ` Dave Chinner
2013-12-05 20:37 ` Ben Myers
2013-12-05 20:40 ` Christoph Hellwig
2013-12-05 15:58 ` [PATCH 2/5] xfs: use xfs_ilock_map_shared in xfs_qm_dqtobp Christoph Hellwig
2013-12-05 19:46 ` Ben Myers
2013-12-05 20:41 ` Dave Chinner
2013-12-05 20:53 ` Christoph Hellwig
2013-12-05 21:03 ` Dave Chinner
2013-12-05 15:58 ` [PATCH 3/5] xfs: use xfs_ilock_map_shared in xfs_qm_dqiterate Christoph Hellwig
2013-12-05 19:48 ` Ben Myers
2013-12-05 20:45 ` Dave Chinner
2013-12-05 15:58 ` [PATCH 4/5] xfs: use xfs_ilock_map_shared in xfs_attr_get Christoph Hellwig
2013-12-05 19:57 ` Ben Myers
2013-12-05 20:59 ` Dave Chinner
2013-12-05 21:01 ` Christoph Hellwig
2013-12-05 21:05 ` Dave Chinner
2013-12-05 21:10 ` Christoph Hellwig
2013-12-05 21:17 ` Dave Chinner
2013-12-05 15:58 ` [PATCH 5/5] xfs: assert that we hold the ilock for extent map access Christoph Hellwig
2013-12-05 20:11 ` Ben Myers
2013-12-05 21:10 ` Dave Chinner [this message]
2013-12-05 21:22 ` Christoph Hellwig
2013-12-05 21:40 ` Dave Chinner
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=20131205211047.GG29897@dastard \
--to=david@fromorbit.com \
--cc=hch@infradead.org \
--cc=xfs@oss.sgi.com \
/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