Home Home > GIT Browse > SLE12-SP4
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Iliopoulos <ailiopoulos@suse.com>2019-05-17 17:17:21 +0200
committerAnthony Iliopoulos <ailiopoulos@suse.com>2019-05-17 17:17:21 +0200
commit69250e0c5bee7f3dfdf0966b05f2e3b79d6527cf (patch)
tree4bea4452c1c5b8686bb54afb9d04f4bd3469293a
parent678f7f4b690df015c4d9cb2cccec58afd5cd04be (diff)
xfs: create block pointer check functions (bsc#1123663).
-rw-r--r--patches.fixes/xfs-create-block-pointer-check-functions.patch137
-rw-r--r--series.conf1
2 files changed, 138 insertions, 0 deletions
diff --git a/patches.fixes/xfs-create-block-pointer-check-functions.patch b/patches.fixes/xfs-create-block-pointer-check-functions.patch
new file mode 100644
index 0000000000..c4c84d8308
--- /dev/null
+++ b/patches.fixes/xfs-create-block-pointer-check-functions.patch
@@ -0,0 +1,137 @@
+From 21ec54168b368f1a98097dee00625ec8ec2d47f3 Mon Sep 17 00:00:00 2001
+From: "Darrick J. Wong" <darrick.wong@oracle.com>
+Date: Tue, 17 Oct 2017 21:37:32 -0700
+Subject: [PATCH] xfs: create block pointer check functions
+Git-commit: 21ec54168b368f1a98097dee00625ec8ec2d47f3
+Patch-mainline: v4.15-rc1
+References: bsc#1123663
+
+Create some helper functions to check that a block pointer points
+within the filesystem (or AG) and doesn't point at static metadata.
+We will use this for scrub.
+
+Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
+Reviewed-by: Dave Chinner <dchinner@redhat.com>
+Acked-by: Anthony Iliopoulos <ailiopoulos@suse.com>
+
+---
+ fs/xfs/libxfs/xfs_alloc.c | 49 ++++++++++++++++++++++++++++++++++++++++++++
+ fs/xfs/libxfs/xfs_alloc.h | 4 ++++
+ fs/xfs/libxfs/xfs_rtbitmap.c | 12 +++++++++++
+ fs/xfs/xfs_rtalloc.h | 2 ++
+ 4 files changed, 67 insertions(+)
+
+diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c
+index f965ce832bc0..11c01e2668bf 100644
+--- a/fs/xfs/libxfs/xfs_alloc.c
++++ b/fs/xfs/libxfs/xfs_alloc.c
+@@ -2931,3 +2931,52 @@ xfs_alloc_query_all(
+ query.fn = fn;
+ return xfs_btree_query_all(cur, xfs_alloc_query_range_helper, &query);
+ }
++
++/* Find the size of the AG, in blocks. */
++xfs_agblock_t
++xfs_ag_block_count(
++ struct xfs_mount *mp,
++ xfs_agnumber_t agno)
++{
++ ASSERT(agno < mp->m_sb.sb_agcount);
++
++ if (agno < mp->m_sb.sb_agcount - 1)
++ return mp->m_sb.sb_agblocks;
++ return mp->m_sb.sb_dblocks - (agno * mp->m_sb.sb_agblocks);
++}
++
++/*
++ * Verify that an AG block number pointer neither points outside the AG
++ * nor points at static metadata.
++ */
++bool
++xfs_verify_agbno(
++ struct xfs_mount *mp,
++ xfs_agnumber_t agno,
++ xfs_agblock_t agbno)
++{
++ xfs_agblock_t eoag;
++
++ eoag = xfs_ag_block_count(mp, agno);
++ if (agbno >= eoag)
++ return false;
++ if (agbno <= XFS_AGFL_BLOCK(mp))
++ return false;
++ return true;
++}
++
++/*
++ * Verify that an FS block number pointer neither points outside the
++ * filesystem nor points at static AG metadata.
++ */
++bool
++xfs_verify_fsbno(
++ struct xfs_mount *mp,
++ xfs_fsblock_t fsbno)
++{
++ xfs_agnumber_t agno = XFS_FSB_TO_AGNO(mp, fsbno);
++
++ if (agno >= mp->m_sb.sb_agcount)
++ return false;
++ return xfs_verify_agbno(mp, agno, XFS_FSB_TO_AGBNO(mp, fsbno));
++}
+diff --git a/fs/xfs/libxfs/xfs_alloc.h b/fs/xfs/libxfs/xfs_alloc.h
+index ef26edc2e938..7ba2d129d504 100644
+--- a/fs/xfs/libxfs/xfs_alloc.h
++++ b/fs/xfs/libxfs/xfs_alloc.h
+@@ -232,5 +232,9 @@ int xfs_alloc_query_range(struct xfs_btree_cur *cur,
+ xfs_alloc_query_range_fn fn, void *priv);
+ int xfs_alloc_query_all(struct xfs_btree_cur *cur, xfs_alloc_query_range_fn fn,
+ void *priv);
++xfs_agblock_t xfs_ag_block_count(struct xfs_mount *mp, xfs_agnumber_t agno);
++bool xfs_verify_agbno(struct xfs_mount *mp, xfs_agnumber_t agno,
++ xfs_agblock_t agbno);
++bool xfs_verify_fsbno(struct xfs_mount *mp, xfs_fsblock_t fsbno);
+
+ #endif /* __XFS_ALLOC_H__ */
+diff --git a/fs/xfs/libxfs/xfs_rtbitmap.c b/fs/xfs/libxfs/xfs_rtbitmap.c
+index 5d4e43ef4eea..4523a92d5507 100644
+--- a/fs/xfs/libxfs/xfs_rtbitmap.c
++++ b/fs/xfs/libxfs/xfs_rtbitmap.c
+@@ -1086,3 +1086,15 @@ xfs_rtalloc_query_all(
+
+ return xfs_rtalloc_query_range(tp, &keys[0], &keys[1], fn, priv);
+ }
++
++/*
++ * Verify that an realtime block number pointer doesn't point off the
++ * end of the realtime device.
++ */
++bool
++xfs_verify_rtbno(
++ struct xfs_mount *mp,
++ xfs_rtblock_t rtbno)
++{
++ return rtbno < mp->m_sb.sb_rblocks;
++}
+diff --git a/fs/xfs/xfs_rtalloc.h b/fs/xfs/xfs_rtalloc.h
+index 79defa722bf1..3f30f846d7f2 100644
+--- a/fs/xfs/xfs_rtalloc.h
++++ b/fs/xfs/xfs_rtalloc.h
+@@ -138,6 +138,7 @@ int xfs_rtalloc_query_range(struct xfs_trans *tp,
+ int xfs_rtalloc_query_all(struct xfs_trans *tp,
+ xfs_rtalloc_query_range_fn fn,
+ void *priv);
++bool xfs_verify_rtbno(struct xfs_mount *mp, xfs_rtblock_t rtbno);
+ #else
+ # define xfs_rtallocate_extent(t,b,min,max,l,f,p,rb) (ENOSYS)
+ # define xfs_rtfree_extent(t,b,l) (ENOSYS)
+@@ -146,6 +147,7 @@ int xfs_rtalloc_query_all(struct xfs_trans *tp,
+ # define xfs_rtalloc_query_range(t,l,h,f,p) (ENOSYS)
+ # define xfs_rtalloc_query_all(t,f,p) (ENOSYS)
+ # define xfs_rtbuf_get(m,t,b,i,p) (ENOSYS)
++# define xfs_verify_rtbno(m, r) (false)
+ static inline int /* error */
+ xfs_rtmount_init(
+ xfs_mount_t *mp) /* file system mount structure */
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 7503fd2261..930df40c13 100644
--- a/series.conf
+++ b/series.conf
@@ -8237,6 +8237,7 @@
patches.fixes/0027-xfs-remove-all-xfs_bmbt_set_-helpers-except-for-xfs_.patch
patches.fixes/0028-xfs-remove-xfs_bmbt_get_state.patch
patches.fixes/xfs-return-a-distinct-error-code-value-for-IGET_INCO.patch
+ patches.fixes/xfs-create-block-pointer-check-functions.patch
patches.fixes/0029-xfs-add-a-xfs_bmap_fork_to_state-helper.patch
patches.fixes/0030-xfs-make-better-use-of-the-state-variable-in-xfs_bma.patch
patches.fixes/0031-xfs-remove-post-bmap-tracing-in-xfs_bmap_local_to_ex.patch