diff options
author | Darrick J. Wong <darrick.wong@oracle.com> | 2019-05-21 17:08:13 -0700 |
---|---|---|
committer | Darrick J. Wong <darrick.wong@oracle.com> | 2019-08-10 09:58:10 -0700 |
commit | 478a4924b22beba1e7271cc63ad92addf459564d (patch) | |
tree | e4e6e99c1bbbbb3ecfeaa2149466e6feed4162d5 | |
parent | 1769356715b6b8c0862d9eb6f747d698340e0790 (diff) |
xfs: whine to dmesg when we encounter errorsdjwong-wtf_2019-08-10
Forward everything scrub whines about to dmesg.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
-rw-r--r-- | fs/xfs/scrub/btree.c | 68 | ||||
-rw-r--r-- | fs/xfs/scrub/common.c | 91 | ||||
-rw-r--r-- | fs/xfs/scrub/common.h | 1 | ||||
-rw-r--r-- | fs/xfs/scrub/dabtree.c | 15 | ||||
-rw-r--r-- | fs/xfs/scrub/scrub.c | 5 | ||||
-rw-r--r-- | fs/xfs/xfs_error.c | 4 |
6 files changed, 180 insertions, 4 deletions
diff --git a/fs/xfs/scrub/btree.c b/fs/xfs/scrub/btree.c index f52a7b8256f9..707041253a9b 100644 --- a/fs/xfs/scrub/btree.c +++ b/fs/xfs/scrub/btree.c @@ -10,6 +10,8 @@ #include "xfs_trans_resv.h" #include "xfs_mount.h" #include "xfs_btree.h" +#include "xfs_log_format.h" +#include "xfs_inode.h" #include "scrub/scrub.h" #include "scrub/common.h" #include "scrub/btree.h" @@ -17,6 +19,22 @@ /* btree scrubbing */ +/* Figure out which block the btree cursor was pointing to. */ +static inline xfs_fsblock_t +xchk_btree_cur_fsbno( + struct xfs_btree_cur *cur, + int level) +{ + if (level < cur->bc_nlevels && cur->bc_bufs[level]) + return XFS_DADDR_TO_FSB(cur->bc_mp, cur->bc_bufs[level]->b_bn); + else if (level == cur->bc_nlevels - 1 && + cur->bc_flags & XFS_BTREE_ROOT_IN_INODE) + return XFS_INO_TO_FSB(cur->bc_mp, cur->bc_private.b.ip->i_ino); + else if (!(cur->bc_flags & XFS_BTREE_LONG_PTRS)) + return XFS_AGB_TO_FSB(cur->bc_mp, cur->bc_private.a.agno, 0); + return NULLFSBLOCK; +} + /* * Check for btree operation errors. See the section about handling * operational errors in common.c. @@ -46,11 +64,37 @@ __xchk_btree_process_error( /* fall through */ default: if (cur->bc_flags & XFS_BTREE_ROOT_IN_INODE) + { + xfs_fsblock_t fsbno = xchk_btree_cur_fsbno(cur, level); + xchk_whine(sc->mp, "ino %llu fork %d type %d btnum %d level %d ptr %d agno %u agbno %u error %d ret_ip %pS", + cur->bc_private.b.ip->i_ino, + cur->bc_private.b.whichfork, + sc->sm->sm_type, + cur->bc_btnum, + level, + cur->bc_ptrs[level], + XFS_FSB_TO_AGNO(cur->bc_mp, fsbno), + XFS_FSB_TO_AGBNO(cur->bc_mp, fsbno), + *error, + ret_ip); trace_xchk_ifork_btree_op_error(sc, cur, level, *error, ret_ip); + } else + { + xfs_fsblock_t fsbno = xchk_btree_cur_fsbno(cur, level); + xchk_whine(sc->mp, "type %d btnum %d level %d ptr %d agno %u agbno %u error %d ret_ip %pS", + sc->sm->sm_type, + cur->bc_btnum, + level, + cur->bc_ptrs[level], + XFS_FSB_TO_AGNO(cur->bc_mp, fsbno), + XFS_FSB_TO_AGBNO(cur->bc_mp, fsbno), + *error, + ret_ip); trace_xchk_btree_op_error(sc, cur, level, *error, ret_ip); + } break; } return false; @@ -90,11 +134,35 @@ __xchk_btree_set_corrupt( sc->sm->sm_flags |= errflag; if (cur->bc_flags & XFS_BTREE_ROOT_IN_INODE) + { + xfs_fsblock_t fsbno = xchk_btree_cur_fsbno(cur, level); + xchk_whine(sc->mp, "ino %llu fork %d type %d btnum %d level %d ptr %d agno %u agbno %u ret_ip %pS", + cur->bc_private.b.ip->i_ino, + cur->bc_private.b.whichfork, + sc->sm->sm_type, + cur->bc_btnum, + level, + cur->bc_ptrs[level], + XFS_FSB_TO_AGNO(cur->bc_mp, fsbno), + XFS_FSB_TO_AGBNO(cur->bc_mp, fsbno), + ret_ip); trace_xchk_ifork_btree_error(sc, cur, level, ret_ip); + } else + { + xfs_fsblock_t fsbno = xchk_btree_cur_fsbno(cur, level); + xchk_whine(sc->mp, "type %d btnum %d level %d ptr %d agno %u agbno %u ret_ip %pS", + sc->sm->sm_type, + cur->bc_btnum, + level, + cur->bc_ptrs[level], + XFS_FSB_TO_AGNO(cur->bc_mp, fsbno), + XFS_FSB_TO_AGBNO(cur->bc_mp, fsbno), + ret_ip); trace_xchk_btree_error(sc, cur, level, ret_ip); + } } void diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c index 385d4a509a71..21c23071d8b1 100644 --- a/fs/xfs/scrub/common.c +++ b/fs/xfs/scrub/common.c @@ -27,6 +27,7 @@ #include "xfs_attr.h" #include "xfs_reflink.h" #include "xfs_rtrmap_btree.h" +#include "xfs_error.h" #include "scrub/scrub.h" #include "scrub/common.h" #include "scrub/trace.h" @@ -84,6 +85,12 @@ __xchk_process_error( *error = 0; /* fall through */ default: + xchk_whine(sc->mp, "type %d agno %u agbno %u error %d ret_ip %pS", + sc->sm->sm_type, + agno, + bno, + *error, + ret_ip); trace_xchk_op_error(sc, agno, bno, *error, ret_ip); break; @@ -137,6 +144,13 @@ __xchk_fblock_process_error( *error = 0; /* fall through */ default: + xchk_whine(sc->mp, "ino %llu fork %d type %d offset %llu error %d ret_ip %pS", + sc->ip->i_ino, + whichfork, + sc->sm->sm_type, + offset, + *error, + ret_ip); trace_xchk_file_op_error(sc, whichfork, offset, *error, ret_ip); break; @@ -208,6 +222,8 @@ xchk_set_corrupt( struct xfs_scrub *sc) { sc->sm->sm_flags |= XFS_SCRUB_OFLAG_CORRUPT; + xchk_whine(sc->mp, "type %d ret_ip %pS", sc->sm->sm_type, + __return_address); trace_xchk_fs_error(sc, 0, __return_address); } @@ -218,6 +234,11 @@ xchk_block_set_corrupt( struct xfs_buf *bp) { sc->sm->sm_flags |= XFS_SCRUB_OFLAG_CORRUPT; + xchk_whine(sc->mp, "type %d agno %u agbno %u ret_ip %pS", + sc->sm->sm_type, + XFS_FSB_TO_AGNO(sc->mp, XFS_DADDR_TO_FSB(sc->mp, bp->b_bn)), + XFS_FSB_TO_AGBNO(sc->mp, XFS_DADDR_TO_FSB(sc->mp, bp->b_bn)), + __return_address); trace_xchk_block_error(sc, bp->b_bn, __return_address); } @@ -228,6 +249,11 @@ xchk_block_xref_set_corrupt( struct xfs_buf *bp) { sc->sm->sm_flags |= XFS_SCRUB_OFLAG_XCORRUPT; + xchk_whine(sc->mp, "type %d agno %u agbno %u ret_ip %pS", + sc->sm->sm_type, + XFS_FSB_TO_AGNO(sc->mp, XFS_DADDR_TO_FSB(sc->mp, bp->b_bn)), + XFS_FSB_TO_AGBNO(sc->mp, XFS_DADDR_TO_FSB(sc->mp, bp->b_bn)), + __return_address); trace_xchk_block_error(sc, bp->b_bn, __return_address); } @@ -242,6 +268,8 @@ xchk_ino_set_corrupt( xfs_ino_t ino) { sc->sm->sm_flags |= XFS_SCRUB_OFLAG_CORRUPT; + xchk_whine(sc->mp, "ino %llu type %d ret_ip %pS", + ino, sc->sm->sm_type, __return_address); trace_xchk_ino_error(sc, ino, __return_address); } @@ -252,6 +280,8 @@ xchk_ino_xref_set_corrupt( xfs_ino_t ino) { sc->sm->sm_flags |= XFS_SCRUB_OFLAG_XCORRUPT; + xchk_whine(sc->mp, "ino %llu type %d ret_ip %pS", + ino, sc->sm->sm_type, __return_address); trace_xchk_ino_error(sc, ino, __return_address); } @@ -263,6 +293,12 @@ xchk_fblock_set_corrupt( xfs_fileoff_t offset) { sc->sm->sm_flags |= XFS_SCRUB_OFLAG_CORRUPT; + xchk_whine(sc->mp, "ino %llu fork %d type %d offset %llu ret_ip %pS", + sc->ip->i_ino, + whichfork, + sc->sm->sm_type, + offset, + __return_address); trace_xchk_fblock_error(sc, whichfork, offset, __return_address); } @@ -274,6 +310,12 @@ xchk_fblock_xref_set_corrupt( xfs_fileoff_t offset) { sc->sm->sm_flags |= XFS_SCRUB_OFLAG_XCORRUPT; + xchk_whine(sc->mp, "ino %llu fork %d type %d offset %llu ret_ip %pS", + sc->ip->i_ino, + whichfork, + sc->sm->sm_type, + offset, + __return_address); trace_xchk_fblock_error(sc, whichfork, offset, __return_address); } @@ -287,6 +329,8 @@ xchk_ino_set_warning( xfs_ino_t ino) { sc->sm->sm_flags |= XFS_SCRUB_OFLAG_WARNING; + xchk_whine(sc->mp, "ino %llu type %d agno %u agbno %u ret_ip %pS", + ino, sc->sm->sm_type, __return_address); trace_xchk_ino_warning(sc, ino, __return_address); } @@ -298,6 +342,12 @@ xchk_fblock_set_warning( xfs_fileoff_t offset) { sc->sm->sm_flags |= XFS_SCRUB_OFLAG_WARNING; + xchk_whine(sc->mp, "ino %llu fork %d type %d offset %llu ret_ip %pS", + sc->ip->i_ino, + whichfork, + sc->sm->sm_type, + offset, + __return_address); trace_xchk_fblock_warning(sc, whichfork, offset, __return_address); } @@ -748,6 +798,12 @@ xchk_get_inode( error = -EFSCORRUPTED; /* fall through */ default: + xchk_whine(mp, "type %d agno %u agbno %u error %d ret_ip %pS", + sc->sm->sm_type, + XFS_INO_TO_AGNO(mp, sc->sm->sm_ino), + XFS_INO_TO_AGBNO(mp, sc->sm->sm_ino), + error, + __return_address); trace_xchk_op_error(sc, XFS_INO_TO_AGNO(mp, sc->sm->sm_ino), XFS_INO_TO_AGBNO(mp, sc->sm->sm_ino), @@ -820,6 +876,10 @@ xchk_should_check_xref( } sc->sm->sm_flags |= XFS_SCRUB_OFLAG_XFAIL; + xchk_whine(sc->mp, "type %d xref error %d ret_ip %pS", + sc->sm->sm_type, + *error, + __return_address); trace_xchk_xref_error(sc, *error, __return_address); /* @@ -850,6 +910,11 @@ xchk_buffer_recheck( if (!fa) return; sc->sm->sm_flags |= XFS_SCRUB_OFLAG_CORRUPT; + xchk_whine(sc->mp, "type %d agno %u agbno %u ret_ip %pS", + sc->sm->sm_type, + XFS_FSB_TO_AGNO(sc->mp, XFS_DADDR_TO_FSB(sc->mp, bp->b_bn)), + XFS_FSB_TO_AGBNO(sc->mp, XFS_DADDR_TO_FSB(sc->mp, bp->b_bn)), + fa); trace_xchk_block_error(sc, bp->b_bn, fa); } @@ -1032,3 +1097,29 @@ xchk_fs_thaw( mutex_unlock(&sc->mp->m_scrub_freeze); return error; } + +/* Complain about failures... */ +void +xchk_whine( + const struct xfs_mount *mp, + const char *fmt, + ...) +{ + struct va_format vaf; + va_list args; + int level; + + va_start(args, fmt); + + vaf.fmt = fmt; + vaf.va = &args; + + printk(KERN_INFO "XFS (%s) %pf: %pV\n", mp->m_fsname, __return_address, + &vaf); + va_end(args); + + if (!kstrtoint(KERN_INFO, 0, &level) && + level <= LOGLEVEL_ERR && + xfs_error_level >= XFS_ERRLEVEL_HIGH) + xfs_stack_trace(); +} diff --git a/fs/xfs/scrub/common.h b/fs/xfs/scrub/common.h index fa08ca38c23d..d429908fa060 100644 --- a/fs/xfs/scrub/common.h +++ b/fs/xfs/scrub/common.h @@ -133,6 +133,7 @@ int xchk_get_inode(struct xfs_scrub *sc, struct xfs_inode *ip_in); int xchk_setup_inode_contents(struct xfs_scrub *sc, struct xfs_inode *ip, unsigned int resblks); void xchk_buffer_recheck(struct xfs_scrub *sc, struct xfs_buf *bp); +void xchk_whine(const struct xfs_mount *mp, const char *fmt, ...); /* * Don't bother cross-referencing if we already found corruption or cross diff --git a/fs/xfs/scrub/dabtree.c b/fs/xfs/scrub/dabtree.c index 8a3dfe88347f..c70130bbae7a 100644 --- a/fs/xfs/scrub/dabtree.c +++ b/fs/xfs/scrub/dabtree.c @@ -49,6 +49,14 @@ xchk_da_process_error( *error = 0; /* fall through */ default: + xchk_whine(sc->mp, "ino %llu fork %d type %d offset %llu error %d ret_ip %pS", + sc->ip->i_ino, + ds->dargs.whichfork, + sc->sm->sm_type, + xfs_dir2_da_to_db(ds->dargs.geo, + ds->state->path.blk[level].blkno), + *error, + __return_address); trace_xchk_file_op_error(sc, ds->dargs.whichfork, xfs_dir2_da_to_db(ds->dargs.geo, ds->state->path.blk[level].blkno), @@ -71,6 +79,13 @@ xchk_da_set_corrupt( sc->sm->sm_flags |= XFS_SCRUB_OFLAG_CORRUPT; + xchk_whine(sc->mp, "ino %llu fork %d type %d offset %llu ret_ip %pS", + sc->ip->i_ino, + ds->dargs.whichfork, + sc->sm->sm_type, + xfs_dir2_da_to_db(ds->dargs.geo, + ds->state->path.blk[level].blkno), + __return_address); trace_xchk_fblock_error(sc, ds->dargs.whichfork, xfs_dir2_da_to_db(ds->dargs.geo, ds->state->path.blk[level].blkno), diff --git a/fs/xfs/scrub/scrub.c b/fs/xfs/scrub/scrub.c index 711118b296b9..dc91cd862dfb 100644 --- a/fs/xfs/scrub/scrub.c +++ b/fs/xfs/scrub/scrub.c @@ -564,6 +564,11 @@ retry_op: * already tried to fix it, then attempt a repair. */ error = xrep_attempt(ip, &sc); + if (error != -EOPNOTSUPP && error != -ENOENT) + xchk_whine(mp, "REPAIRED? ino 0x%llx type %u agno %u inum %llu gen %u flags 0x%x error %d", + ip->i_ino, sm->sm_type, sm->sm_agno, + sm->sm_ino, sm->sm_gen, sm->sm_flags, + (sc.flags & XREP_ALREADY_FIXED) ? 0 : error); if (error == -EAGAIN) { /* * Either the repair function succeeded or it couldn't diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c index 544c9482a0ef..666c8beb1ca6 100644 --- a/fs/xfs/xfs_error.c +++ b/fs/xfs/xfs_error.c @@ -254,10 +254,6 @@ xfs_errortag_test( randfactor = mp->m_errortag[error_tag]; if (!randfactor || prandom_u32() % randfactor) return false; - - xfs_warn_ratelimited(mp, -"Injecting error (%s) at file %s, line %d, on filesystem \"%s\"", - expression, file, line, mp->m_fsname); return true; } |