From: Brian Foster <bfoster@redhat.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 4/8] xfs: strengthen AGI unlinked inode bucket pointer checks
Date: Fri, 1 Feb 2019 14:00:52 -0500 [thread overview]
Message-ID: <20190201190052.GC31203@bfoster> (raw)
In-Reply-To: <154897669539.26065.18123748779523685840.stgit@magnolia>
On Thu, Jan 31, 2019 at 03:18:15PM -0800, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> Strengthen our checking of the AGI unlinked pointers when we start to
> use them for updating the metadata.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/xfs_inode.c | 28 +++++++++++++++++-----------
> 1 file changed, 17 insertions(+), 11 deletions(-)
>
>
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index 3c33136b21ef..4ddda3f3255f 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -1942,6 +1942,7 @@ xfs_iunlink(
> struct xfs_buf *ibp;
> struct xfs_perag *pag;
> xfs_agnumber_t agno;
> + xfs_agino_t next_agino;
> xfs_agino_t agino;
> short bucket_index;
> int offset;
> @@ -1966,13 +1967,19 @@ xfs_iunlink(
> agi = XFS_BUF_TO_AGI(agibp);
>
> /*
> - * Get the index into the agi hash table for the
> - * list this inode will go on.
> + * Get the index into the agi hash table for the list this inode will
> + * go on. Make sure the pointer isn't garbage and that this inode
> + * isn't already on the list.
> */
> - ASSERT(agi->agi_unlinked[bucket_index]);
> - ASSERT(be32_to_cpu(agi->agi_unlinked[bucket_index]) != agino);
> + next_agino = be32_to_cpu(agi->agi_unlinked[bucket_index]);
> + if (next_agino == agino ||
> + (next_agino != NULLAGINO &&
> + !xfs_verify_agino(mp, agno, next_agino))) {
> + error = -EFSCORRUPTED;
> + goto out_unlock;
> + }
>
> - if (agi->agi_unlinked[bucket_index] != cpu_to_be32(NULLAGINO)) {
> + if (next_agino != NULLAGINO) {
> /*
> * There is already another inode in the bucket we need
> * to add ourselves to. Add us at the front of the list.
> @@ -2054,18 +2061,18 @@ xfs_iunlink_remove(
> agi = XFS_BUF_TO_AGI(agibp);
>
> /*
> - * Get the index into the agi hash table for the
> - * list this inode will go on.
> + * Get the index into the agi hash table for the list this inode will
> + * go on. Make sure the head pointer isn't garbage.
> */
> - if (!xfs_verify_agino(mp, agno,
> - be32_to_cpu(agi->agi_unlinked[bucket_index]))) {
> + next_agino = be32_to_cpu(agi->agi_unlinked[bucket_index]);
> + if (!xfs_verify_agino(mp, agno, next_agino)) {
> XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
> agi, sizeof(*agi));
> error = -EFSCORRUPTED;
> goto out_unlock;
> }
>
> - if (be32_to_cpu(agi->agi_unlinked[bucket_index]) == agino) {
> + if (next_agino == agino) {
> /*
> * We're at the head of the list. Get the inode's on-disk
> * buffer to see if there is anyone after us on the list.
> @@ -2107,7 +2114,6 @@ xfs_iunlink_remove(
> /*
> * We need to search the list for the inode being freed.
> */
> - next_agino = be32_to_cpu(agi->agi_unlinked[bucket_index]);
> last_ibp = NULL;
> while (next_agino != agino) {
> struct xfs_imap imap;
>
next prev parent reply other threads:[~2019-02-01 19:00 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-31 23:17 [PATCH 0/8] xfs: incore unlinked list Darrick J. Wong
2019-01-31 23:17 ` [PATCH 1/8] xfs: clean up iunlink functions Darrick J. Wong
2019-02-01 8:01 ` Christoph Hellwig
2019-02-02 19:15 ` Darrick J. Wong
2019-01-31 23:18 ` [PATCH 2/8] xfs: track unlinked inode counts in per-ag data Darrick J. Wong
2019-02-01 18:59 ` Brian Foster
2019-02-01 19:33 ` Darrick J. Wong
2019-02-02 16:14 ` Christoph Hellwig
2019-02-02 19:28 ` Darrick J. Wong
2019-01-31 23:18 ` [PATCH 3/8] xfs: refactor AGI unlinked bucket updates Darrick J. Wong
2019-02-01 19:00 ` Brian Foster
2019-02-02 19:50 ` Darrick J. Wong
2019-02-02 16:21 ` Christoph Hellwig
2019-02-02 19:51 ` Darrick J. Wong
2019-01-31 23:18 ` [PATCH 4/8] xfs: strengthen AGI unlinked inode bucket pointer checks Darrick J. Wong
2019-02-01 19:00 ` Brian Foster [this message]
2019-02-02 16:22 ` Christoph Hellwig
2019-01-31 23:18 ` [PATCH 5/8] xfs: refactor inode unlinked pointer update functions Darrick J. Wong
2019-02-01 19:01 ` Brian Foster
2019-02-02 22:00 ` Darrick J. Wong
2019-02-02 16:27 ` Christoph Hellwig
2019-02-02 20:29 ` Darrick J. Wong
2019-01-31 23:18 ` [PATCH 6/8] xfs: hoist unlinked list search and mapping to a separate function Darrick J. Wong
2019-02-01 19:01 ` Brian Foster
2019-02-02 20:46 ` Darrick J. Wong
2019-02-04 13:18 ` Brian Foster
2019-02-04 16:31 ` Darrick J. Wong
2019-02-02 16:30 ` Christoph Hellwig
2019-02-02 20:42 ` Darrick J. Wong
2019-02-02 16:51 ` Christoph Hellwig
2019-01-31 23:18 ` [PATCH 7/8] xfs: add tracepoints for high level iunlink operations Darrick J. Wong
2019-02-01 19:01 ` Brian Foster
2019-02-01 19:14 ` Darrick J. Wong
2019-01-31 23:18 ` [PATCH 8/8] xfs: cache unlinked pointers in an rhashtable Darrick J. Wong
2019-02-01 8:03 ` Christoph Hellwig
2019-02-01 23:59 ` Dave Chinner
2019-02-02 4:31 ` Darrick J. Wong
2019-02-02 16:07 ` Christoph Hellwig
2019-02-01 19:29 ` Brian Foster
2019-02-01 19:40 ` Darrick J. Wong
2019-02-02 17:01 ` Christoph Hellwig
2019-02-01 7:57 ` [PATCH 0/8] xfs: incore unlinked list Christoph Hellwig
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=20190201190052.GC31203@bfoster \
--to=bfoster@redhat.com \
--cc=darrick.wong@oracle.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;
as well as URLs for NNTP newsgroup(s).