From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 08/10] xfs: report quota block corruption errors to the health system
Date: Sun, 03 Nov 2019 14:25:34 -0800 [thread overview]
Message-ID: <157281993417.4152102.1224062505399137675.stgit@magnolia> (raw)
In-Reply-To: <157281988489.4152102.1632857939932700344.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
Whenever we encounter corrupt quota blocks, we should report that to the
health monitoring system for later reporting.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
fs/xfs/libxfs/xfs_health.h | 1 +
fs/xfs/xfs_dquot.c | 6 ++++++
fs/xfs/xfs_health.c | 15 +++++++++++++++
fs/xfs/xfs_qm.c | 3 +++
4 files changed, 25 insertions(+)
diff --git a/fs/xfs/libxfs/xfs_health.h b/fs/xfs/libxfs/xfs_health.h
index d9404cd3d09b..69e7d97ed480 100644
--- a/fs/xfs/libxfs/xfs_health.h
+++ b/fs/xfs/libxfs/xfs_health.h
@@ -144,6 +144,7 @@ void xfs_bmap_mark_sick(struct xfs_inode *ip, int whichfork);
void xfs_btree_mark_sick(struct xfs_btree_cur *cur);
void xfs_dirattr_mark_sick(struct xfs_inode *ip, int whichfork);
void xfs_da_mark_sick(struct xfs_da_args *args);
+void xfs_quota_mark_sick(struct xfs_mount *mp, uint dq_flags);
/* Now some helpers. */
diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index bcd4247b5014..cfaab8771f7b 100644
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
@@ -23,6 +23,7 @@
#include "xfs_trace.h"
#include "xfs_log.h"
#include "xfs_bmap_btree.h"
+#include "xfs_health.h"
/*
* Lock order:
@@ -419,6 +420,8 @@ xfs_dquot_disk_read(
error = xfs_trans_read_buf(mp, NULL, mp->m_ddev_targp, dqp->q_blkno,
mp->m_quotainfo->qi_dqchunklen, 0, &bp,
&xfs_dquot_buf_ops);
+ if (xfs_metadata_is_sick(error))
+ xfs_quota_mark_sick(mp, dqp->dq_flags);
if (error) {
ASSERT(bp == NULL);
return error;
@@ -1107,6 +1110,8 @@ xfs_qm_dqflush(
error = xfs_trans_read_buf(mp, NULL, mp->m_ddev_targp, dqp->q_blkno,
mp->m_quotainfo->qi_dqchunklen, 0, &bp,
&xfs_dquot_buf_ops);
+ if (xfs_metadata_is_sick(error))
+ xfs_quota_mark_sick(mp, dqp->dq_flags);
if (error)
goto out_unlock;
@@ -1126,6 +1131,7 @@ xfs_qm_dqflush(
xfs_buf_relse(bp);
xfs_dqfunlock(dqp);
xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);
+ xfs_quota_mark_sick(mp, dqp->dq_flags);
return -EFSCORRUPTED;
}
diff --git a/fs/xfs/xfs_health.c b/fs/xfs/xfs_health.c
index c1b6e8fb72ec..2d3da765722e 100644
--- a/fs/xfs/xfs_health.c
+++ b/fs/xfs/xfs_health.c
@@ -17,6 +17,7 @@
#include "xfs_btree.h"
#include "xfs_da_format.h"
#include "xfs_da_btree.h"
+#include "xfs_quota_defs.h"
/*
* Warn about metadata corruption that we detected but haven't fixed, and
@@ -556,3 +557,17 @@ xfs_da_mark_sick(
{
xfs_dirattr_mark_sick(args->dp, args->whichfork);
}
+
+/* Record observations of quota corruption with the health tracking system. */
+void
+xfs_quota_mark_sick(
+ struct xfs_mount *mp,
+ uint dq_flags)
+{
+ if (dq_flags & XFS_DQ_USER)
+ xfs_fs_mark_sick(mp, XFS_SICK_FS_UQUOTA);
+ if (dq_flags & XFS_DQ_GROUP)
+ xfs_fs_mark_sick(mp, XFS_SICK_FS_GQUOTA);
+ if (dq_flags & XFS_DQ_PROJ)
+ xfs_fs_mark_sick(mp, XFS_SICK_FS_PQUOTA);
+}
diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index b51f3f58eea6..d46519a3c1b3 100644
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -23,6 +23,7 @@
#include "xfs_trace.h"
#include "xfs_icache.h"
#include "xfs_error.h"
+#include "xfs_health.h"
/*
* The global quota manager. There is only one of these for the entire
@@ -757,6 +758,7 @@ xfs_qm_qino_alloc(
ino = mp->m_sb.sb_gquotino;
if (XFS_CORRUPT_ON(mp,
mp->m_sb.sb_pquotino != NULLFSINO)) {
+ xfs_quota_mark_sick(mp, XFS_DQ_PROJ);
return -EFSCORRUPTED;
}
} else if ((flags & XFS_QMOPT_GQUOTA) &&
@@ -764,6 +766,7 @@ xfs_qm_qino_alloc(
ino = mp->m_sb.sb_pquotino;
if (XFS_CORRUPT_ON(mp,
mp->m_sb.sb_gquotino != NULLFSINO)) {
+ xfs_quota_mark_sick(mp, XFS_DQ_GROUP);
return -EFSCORRUPTED;
}
}
next prev parent reply other threads:[~2019-11-03 22:25 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-03 22:24 [PATCH 00/10] xfs: report corruption to the health trackers Darrick J. Wong
2019-11-03 22:24 ` [PATCH 01/10] xfs: separate the marking of sick and checked metadata Darrick J. Wong
2019-11-03 22:24 ` [PATCH 02/10] xfs: report ag header corruption errors to the health tracking system Darrick J. Wong
2019-11-03 22:25 ` [PATCH 03/10] xfs: report block map " Darrick J. Wong
2019-11-03 22:25 ` [PATCH 04/10] xfs: report btree block corruption errors to the health system Darrick J. Wong
2019-11-03 22:25 ` [PATCH 05/10] xfs: report dir/attr " Darrick J. Wong
2019-11-03 22:25 ` [PATCH 06/10] xfs: report symlink " Darrick J. Wong
2019-11-03 22:25 ` [PATCH 07/10] xfs: report inode " Darrick J. Wong
2019-11-03 22:25 ` Darrick J. Wong [this message]
2019-11-03 22:25 ` [PATCH 09/10] xfs: report realtime metadata " Darrick J. Wong
2019-11-03 22:25 ` [PATCH 10/10] xfs: report XFS_CORRUPT_ON " Darrick J. Wong
2019-11-07 3:03 [PATCH 00/10] xfs: report corruption to the health trackers Darrick J. Wong
2019-11-07 3:03 ` [PATCH 08/10] xfs: report quota block corruption errors to the health system Darrick J. Wong
2019-11-08 7:05 [PATCH v3 00/10] xfs: report corruption to the health trackers Darrick J. Wong
2019-11-08 7:06 ` [PATCH 08/10] xfs: report quota block corruption errors to the health system Darrick J. Wong
2020-01-01 1:04 [PATCH 00/10] xfs: report corruption to the health trackers Darrick J. Wong
2020-01-01 1:05 ` [PATCH 08/10] xfs: report quota block corruption errors to the health system 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=157281993417.4152102.1224062505399137675.stgit@magnolia \
--to=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).