From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: linux-xfs@vger.kernel.org
Cc: Dave Chinner <david@fromorbit.com>
Subject: [PATCH v2 05/30] xfs: create inode pointer verifiers
Date: Mon, 16 Oct 2017 12:49:32 -0700 [thread overview]
Message-ID: <20171016194932.GH4703@magnolia> (raw)
In-Reply-To: <150777247562.1724.7094279740133124537.stgit@magnolia>
Create some helper functions to check that inode pointers point to
somewhere within the filesystem and not at the static AG metadata.
Move xfs_internal_inum and create a directory inode check function.
We will use these functions in scrub and elsewhere.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
v2: fix names, fix incorrect results returned from agino_range, remove
unnecessary tests
---
fs/xfs/libxfs/xfs_dir2.c | 19 +--------
fs/xfs/libxfs/xfs_ialloc.c | 90 ++++++++++++++++++++++++++++++++++++++++++++
fs/xfs/libxfs/xfs_ialloc.h | 7 +++
fs/xfs/xfs_itable.c | 10 -----
fs/xfs/xfs_itable.h | 2 -
5 files changed, 100 insertions(+), 28 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_dir2.c b/fs/xfs/libxfs/xfs_dir2.c
index ccf9783..ee5e916 100644
--- a/fs/xfs/libxfs/xfs_dir2.c
+++ b/fs/xfs/libxfs/xfs_dir2.c
@@ -30,6 +30,7 @@
#include "xfs_bmap.h"
#include "xfs_dir2.h"
#include "xfs_dir2_priv.h"
+#include "xfs_ialloc.h"
#include "xfs_error.h"
#include "xfs_trace.h"
@@ -202,22 +203,8 @@ xfs_dir_ino_validate(
xfs_mount_t *mp,
xfs_ino_t ino)
{
- xfs_agblock_t agblkno;
- xfs_agino_t agino;
- xfs_agnumber_t agno;
- int ino_ok;
- int ioff;
-
- agno = XFS_INO_TO_AGNO(mp, ino);
- agblkno = XFS_INO_TO_AGBNO(mp, ino);
- ioff = XFS_INO_TO_OFFSET(mp, ino);
- agino = XFS_OFFBNO_TO_AGINO(mp, agblkno, ioff);
- ino_ok =
- agno < mp->m_sb.sb_agcount &&
- agblkno < mp->m_sb.sb_agblocks &&
- agblkno != 0 &&
- ioff < (1 << mp->m_sb.sb_inopblog) &&
- XFS_AGINO_TO_INO(mp, agno, agino) == ino;
+ bool ino_ok = xfs_verify_dir_ino(mp, ino);
+
if (unlikely(XFS_TEST_ERROR(!ino_ok, mp, XFS_ERRTAG_DIR_INO_VALIDATE))) {
xfs_warn(mp, "Invalid inode number 0x%Lx",
(unsigned long long) ino);
diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c
index dfd6439..e11f8af 100644
--- a/fs/xfs/libxfs/xfs_ialloc.c
+++ b/fs/xfs/libxfs/xfs_ialloc.c
@@ -2664,3 +2664,93 @@ xfs_ialloc_pagi_init(
xfs_trans_brelse(tp, bp);
return 0;
}
+
+/* Calculate the first and last possible inode number in an AG. */
+void
+xfs_ialloc_agino_range(
+ struct xfs_mount *mp,
+ xfs_agnumber_t agno,
+ xfs_agino_t *first,
+ xfs_agino_t *last)
+{
+ xfs_agblock_t bno;
+ xfs_agblock_t eoag;
+
+ eoag = xfs_ag_block_count(mp, agno);
+
+ /*
+ * Calculate the first inode, which will be in the first
+ * cluster-aligned block after the AGFL.
+ */
+ bno = round_up(XFS_AGFL_BLOCK(mp) + 1,
+ xfs_ialloc_cluster_alignment(mp));
+ *first = XFS_OFFBNO_TO_AGINO(mp, bno, 0);
+
+ /*
+ * Calculate the last inode, which will be at the end of the
+ * last (aligned) cluster that can be allocated in the AG.
+ */
+ bno = round_down(eoag, xfs_ialloc_cluster_alignment(mp));
+ *last = XFS_OFFBNO_TO_AGINO(mp, bno, 0) - 1;
+}
+
+/*
+ * Verify that an AG inode number pointer neither points outside the AG
+ * nor points at static metadata.
+ */
+bool
+xfs_verify_agino(
+ struct xfs_mount *mp,
+ xfs_agnumber_t agno,
+ xfs_agino_t agino)
+{
+ xfs_agino_t first;
+ xfs_agino_t last;
+
+ xfs_ialloc_agino_range(mp, agno, &first, &last);
+ return agino >= first && agino <= last;
+}
+
+/*
+ * Verify that an FS inode number pointer neither points outside the
+ * filesystem nor points at static AG metadata.
+ */
+bool
+xfs_verify_ino(
+ struct xfs_mount *mp,
+ xfs_ino_t ino)
+{
+ xfs_agnumber_t agno = XFS_INO_TO_AGNO(mp, ino);
+ xfs_agino_t agino = XFS_INO_TO_AGINO(mp, ino);
+
+ if (agno >= mp->m_sb.sb_agcount)
+ return false;
+ if (XFS_AGINO_TO_INO(mp, agno, agino) != ino)
+ return false;
+ return xfs_verify_agino(mp, agno, agino);
+}
+
+/* Is this an internal inode number? */
+bool
+xfs_internal_inum(
+ struct xfs_mount *mp,
+ xfs_ino_t ino)
+{
+ return ino == mp->m_sb.sb_rbmino || ino == mp->m_sb.sb_rsumino ||
+ (xfs_sb_version_hasquota(&mp->m_sb) &&
+ xfs_is_quota_inode(&mp->m_sb, ino));
+}
+
+/*
+ * Verify that a directory entry's inode number doesn't point at an internal
+ * inode, empty space, or static AG metadata.
+ */
+bool
+xfs_verify_dir_ino(
+ struct xfs_mount *mp,
+ xfs_ino_t ino)
+{
+ if (xfs_internal_inum(mp, ino))
+ return false;
+ return xfs_verify_ino(mp, ino);
+}
diff --git a/fs/xfs/libxfs/xfs_ialloc.h b/fs/xfs/libxfs/xfs_ialloc.h
index b32cfb5..d2bdcd5 100644
--- a/fs/xfs/libxfs/xfs_ialloc.h
+++ b/fs/xfs/libxfs/xfs_ialloc.h
@@ -173,5 +173,12 @@ void xfs_inobt_btrec_to_irec(struct xfs_mount *mp, union xfs_btree_rec *rec,
struct xfs_inobt_rec_incore *irec);
int xfs_ialloc_cluster_alignment(struct xfs_mount *mp);
+void xfs_ialloc_agino_range(struct xfs_mount *mp, xfs_agnumber_t agno,
+ xfs_agino_t *first, xfs_agino_t *last);
+bool xfs_verify_agino(struct xfs_mount *mp, xfs_agnumber_t agno,
+ xfs_agino_t agino);
+bool xfs_verify_ino(struct xfs_mount *mp, xfs_ino_t ino);
+bool xfs_internal_inum(struct xfs_mount *mp, xfs_ino_t ino);
+bool xfs_verify_dir_ino(struct xfs_mount *mp, xfs_ino_t ino);
#endif /* __XFS_IALLOC_H__ */
diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
index c393a2f..0172d0b 100644
--- a/fs/xfs/xfs_itable.c
+++ b/fs/xfs/xfs_itable.c
@@ -31,16 +31,6 @@
#include "xfs_trace.h"
#include "xfs_icache.h"
-int
-xfs_internal_inum(
- xfs_mount_t *mp,
- xfs_ino_t ino)
-{
- return (ino == mp->m_sb.sb_rbmino || ino == mp->m_sb.sb_rsumino ||
- (xfs_sb_version_hasquota(&mp->m_sb) &&
- xfs_is_quota_inode(&mp->m_sb, ino)));
-}
-
/*
* Return stat information for one inode.
* Return 0 if ok, else errno.
diff --git a/fs/xfs/xfs_itable.h b/fs/xfs/xfs_itable.h
index 17e86e0..6ea8b39 100644
--- a/fs/xfs/xfs_itable.h
+++ b/fs/xfs/xfs_itable.h
@@ -96,6 +96,4 @@ xfs_inumbers(
void __user *buffer, /* buffer with inode info */
inumbers_fmt_pf formatter);
-int xfs_internal_inum(struct xfs_mount *mp, xfs_ino_t ino);
-
#endif /* __XFS_ITABLE_H__ */
next prev parent reply other threads:[~2017-10-16 19:49 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 ` Darrick J. Wong [this message]
2017-10-16 23:53 ` [PATCH v2 " 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
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=20171016194932.GH4703@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;
as well as URLs for NNTP newsgroup(s).