From patchwork Sat Dec 3 01:38:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 9486647 X-Mozilla-Keys: nonjunk Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on sandeen.net X-Spam-Level: X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD, UNPARSEABLE_RELAY, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 X-Spam-HP: BAYES_00=-1.9,HEADER_FROM_DIFFERENT_DOMAINS=0.001, RCVD_IN_DNSWL_HI=-5,RP_MATCHES_RCVD=-0.1,UNPARSEABLE_RELAY=0.001, URIBL_BLOCKED=0.001 X-Original-To: sandeen@sandeen.net Delivered-To: sandeen@sandeen.net Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by sandeen.net (Postfix) with ESMTP id E1821325413 for ; Fri, 2 Dec 2016 19:38:42 -0600 (CST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755591AbcLCBjf (ORCPT ); Fri, 2 Dec 2016 20:39:35 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:19793 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755747AbcLCBjd (ORCPT ); Fri, 2 Dec 2016 20:39:33 -0500 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id uB31ckmh018063 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 3 Dec 2016 01:38:46 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id uB31ckFb006421 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 3 Dec 2016 01:38:46 GMT Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by aserv0121.oracle.com (8.13.8/8.13.8) with ESMTP id uB31ci8m006666; Sat, 3 Dec 2016 01:38:45 GMT Received: from localhost (/24.21.211.40) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 02 Dec 2016 17:38:44 -0800 Subject: [PATCH 32/55] xfs: scrub realtime bitmap/summary From: "Darrick J. Wong" To: david@fromorbit.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org Date: Fri, 02 Dec 2016 17:38:43 -0800 Message-ID: <148072912304.12995.11012040953176018422.stgit@birch.djwong.org> In-Reply-To: <148072891404.12995.15510849192837089093.stgit@birch.djwong.org> References: <148072891404.12995.15510849192837089093.stgit@birch.djwong.org> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Source-IP: aserv0022.oracle.com [141.146.126.234] Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org Perform simple tests of the realtime bitmap and summary. Signed-off-by: Darrick J. Wong --- fs/xfs/Makefile | 1 fs/xfs/libxfs/xfs_format.h | 5 ++ fs/xfs/libxfs/xfs_fs.h | 4 +- fs/xfs/libxfs/xfs_rtbitmap.c | 2 - fs/xfs/repair/agheader.c | 1 fs/xfs/repair/common.c | 28 +++++++++++ fs/xfs/repair/common.h | 2 + fs/xfs/repair/rtbitmap.c | 104 ++++++++++++++++++++++++++++++++++++++++++ fs/xfs/xfs_rtalloc.h | 3 + fs/xfs/xfs_trace.h | 4 +- 10 files changed, 151 insertions(+), 3 deletions(-) create mode 100644 fs/xfs/repair/rtbitmap.c -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile index f02b53c..e98adcf 100644 --- a/fs/xfs/Makefile +++ b/fs/xfs/Makefile @@ -115,6 +115,7 @@ xfs-$(CONFIG_XFS_ONLINE_REPAIR) += $(addprefix repair/, \ inode.o \ refcount.o \ rmap.o \ + rtbitmap.o \ symlink.o \ ) diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h index 301effc..cb00017 100644 --- a/fs/xfs/libxfs/xfs_format.h +++ b/fs/xfs/libxfs/xfs_format.h @@ -315,6 +315,11 @@ static inline bool xfs_sb_good_version(struct xfs_sb *sbp) return false; } +static inline bool xfs_sb_version_hasrealtime(struct xfs_sb *sbp) +{ + return sbp->sb_rblocks > 0; +} + /* * Detect a mismatched features2 field. Older kernels read/wrote * this into the wrong slot, so to be safe we keep them in sync. diff --git a/fs/xfs/libxfs/xfs_fs.h b/fs/xfs/libxfs/xfs_fs.h index 93a983c..122c31f 100644 --- a/fs/xfs/libxfs/xfs_fs.h +++ b/fs/xfs/libxfs/xfs_fs.h @@ -592,7 +592,9 @@ struct xfs_scrub_metadata { #define XFS_SCRUB_TYPE_DIR 15 /* directory */ #define XFS_SCRUB_TYPE_XATTR 16 /* extended attribute */ #define XFS_SCRUB_TYPE_SYMLINK 17 /* symbolic link */ -#define XFS_SCRUB_TYPE_MAX 17 +#define XFS_SCRUB_TYPE_RTBITMAP 18 /* realtime bitmap */ +#define XFS_SCRUB_TYPE_RTSUM 19 /* realtime summary */ +#define XFS_SCRUB_TYPE_MAX 19 #define XFS_SCRUB_FLAG_REPAIR 0x1 /* i: repair this metadata */ #define XFS_SCRUB_FLAG_CORRUPT 0x2 /* o: needs repair */ diff --git a/fs/xfs/libxfs/xfs_rtbitmap.c b/fs/xfs/libxfs/xfs_rtbitmap.c index ea45584..f4b68c0 100644 --- a/fs/xfs/libxfs/xfs_rtbitmap.c +++ b/fs/xfs/libxfs/xfs_rtbitmap.c @@ -70,7 +70,7 @@ const struct xfs_buf_ops xfs_rtbuf_ops = { * Get a buffer for the bitmap or summary file block specified. * The buffer is returned read and locked. */ -static int +int xfs_rtbuf_get( xfs_mount_t *mp, /* file system mount structure */ xfs_trans_t *tp, /* transaction pointer */ diff --git a/fs/xfs/repair/agheader.c b/fs/xfs/repair/agheader.c index f92bab8..07087f4 100644 --- a/fs/xfs/repair/agheader.c +++ b/fs/xfs/repair/agheader.c @@ -230,6 +230,7 @@ xfs_scrub_superblock( XFS_SCRUB_SB_FEAT(metauuid); XFS_SCRUB_SB_FEAT(rmapbt); XFS_SCRUB_SB_FEAT(reflink); + XFS_SCRUB_SB_FEAT(realtime); #undef XFS_SCRUB_SB_FEAT out: diff --git a/fs/xfs/repair/common.c b/fs/xfs/repair/common.c index c1a8ddd..a35a962 100644 --- a/fs/xfs/repair/common.c +++ b/fs/xfs/repair/common.c @@ -877,6 +877,32 @@ xfs_scrub_setup_inode_symlink( return 0; } +/* Set us up with the realtime metadata locked. */ +STATIC int +xfs_scrub_setup_rt( + struct xfs_scrub_context *sc, + struct xfs_inode *ip, + struct xfs_scrub_metadata *sm, + bool retry_deadlocked) +{ + struct xfs_mount *mp = ip->i_mount; + int lockmode; + int error = 0; + + if (sm->sm_agno || sm->sm_ino || sm->sm_gen) + return -EINVAL; + + error = xfs_scrub_setup(sc, ip, sm, retry_deadlocked); + if (error) + return error; + + lockmode = XFS_ILOCK_EXCL | XFS_ILOCK_RTBITMAP; + xfs_ilock(mp->m_rbmip, lockmode); + xfs_trans_ijoin(sc->tp, mp->m_rbmip, lockmode); + + return 0; +} + /* Scrubbing dispatch. */ struct xfs_scrub_meta_fns { @@ -906,6 +932,8 @@ static const struct xfs_scrub_meta_fns meta_scrub_fns[] = { {xfs_scrub_setup_inode, xfs_scrub_directory, NULL, NULL}, {xfs_scrub_setup_inode_xattr, xfs_scrub_xattr, NULL, NULL}, {xfs_scrub_setup_inode_symlink, xfs_scrub_symlink, NULL, NULL}, + {xfs_scrub_setup_rt, xfs_scrub_rtbitmap, NULL, xfs_sb_version_hasrealtime}, + {xfs_scrub_setup_rt, xfs_scrub_rtsummary, NULL, xfs_sb_version_hasrealtime}, }; /* Dispatch metadata scrubbing. */ diff --git a/fs/xfs/repair/common.h b/fs/xfs/repair/common.h index af0bfb2..13986cd 100644 --- a/fs/xfs/repair/common.h +++ b/fs/xfs/repair/common.h @@ -212,5 +212,7 @@ int xfs_scrub_bmap_cow(struct xfs_scrub_context *sc); int xfs_scrub_directory(struct xfs_scrub_context *sc); int xfs_scrub_xattr(struct xfs_scrub_context *sc); int xfs_scrub_symlink(struct xfs_scrub_context *sc); +int xfs_scrub_rtbitmap(struct xfs_scrub_context *sc); +int xfs_scrub_rtsummary(struct xfs_scrub_context *sc); #endif /* __XFS_REPAIR_COMMON_H__ */ diff --git a/fs/xfs/repair/rtbitmap.c b/fs/xfs/repair/rtbitmap.c new file mode 100644 index 0000000..e5c597c --- /dev/null +++ b/fs/xfs/repair/rtbitmap.c @@ -0,0 +1,104 @@ +/* + * Copyright (C) 2016-2017 Oracle. All Rights Reserved. + * + * Author: Darrick J. Wong + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it would be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + */ +#include "xfs.h" +#include "xfs_fs.h" +#include "xfs_shared.h" +#include "xfs_format.h" +#include "xfs_trans_resv.h" +#include "xfs_mount.h" +#include "xfs_defer.h" +#include "xfs_btree.h" +#include "xfs_bit.h" +#include "xfs_log_format.h" +#include "xfs_trans.h" +#include "xfs_trace.h" +#include "xfs_sb.h" +#include "xfs_alloc.h" +#include "xfs_rtalloc.h" +#include "repair/common.h" + +/* Realtime bitmap. */ + +#define XFS_SCRUB_RTBITMAP_CHECK(fs_ok) \ + XFS_SCRUB_CHECK(sc, bp, "rtbitmap", fs_ok); +#define XFS_SCRUB_RTBITMAP_OP_ERROR_GOTO(error, label) \ + XFS_SCRUB_OP_ERROR_GOTO(sc, 0, 0, "rtbitmap", error, label) +/* Scrub the realtime bitmap. */ +int +xfs_scrub_rtbitmap( + struct xfs_scrub_context *sc) +{ + struct xfs_mount *mp = sc->tp->t_mountp; + struct xfs_buf *bp = NULL; + xfs_rtblock_t rtstart; + xfs_rtblock_t rtend; + xfs_rtblock_t block; + xfs_rtblock_t rem; + int is_free; + int error = 0; + int err2 = 0; + + /* Iterate the bitmap, looking for discrepancies. */ + rtstart = 0; + rem = mp->m_sb.sb_rblocks; + while (rem) { + if (xfs_scrub_should_terminate(&error)) + break; + + /* Is the first block free? */ + err2 = xfs_rtcheck_range(mp, sc->tp, rtstart, 1, 1, &rtend, + &is_free); + XFS_SCRUB_RTBITMAP_OP_ERROR_GOTO(&err2, out); + + /* How long does the extent go for? */ + err2 = xfs_rtfind_forw(mp, sc->tp, rtstart, + mp->m_sb.sb_rblocks - 1, &rtend); + XFS_SCRUB_RTBITMAP_OP_ERROR_GOTO(&err2, out); + + /* Find the buffer for error reporting. */ + block = XFS_BITTOBLOCK(mp, rtstart); + err2 = xfs_rtbuf_get(mp, sc->tp, block, 0, &bp); + XFS_SCRUB_RTBITMAP_OP_ERROR_GOTO(&err2, out); + XFS_SCRUB_RTBITMAP_CHECK(rtend >= rtstart); + + xfs_trans_brelse(sc->tp, bp); + bp = NULL; + rem -= rtend - rtstart + 1; + rtstart = rtend + 1; + } + +out: + if (bp) + xfs_trans_brelse(sc->tp, bp); + if (!error && err2) + error = err2; + return error; +} +#undef XFS_SCRUB_RTBITMAP_OP_ERROR_GOTO +#undef XFS_SCRUB_RTBITMAP_CHECK + +/* Scrub the realtime summary. */ +int +xfs_scrub_rtsummary( + struct xfs_scrub_context *sc) +{ + /* XXX: implement this some day */ + return -ENOENT; +} diff --git a/fs/xfs/xfs_rtalloc.h b/fs/xfs/xfs_rtalloc.h index f798a3e..3036349 100644 --- a/fs/xfs/xfs_rtalloc.h +++ b/fs/xfs/xfs_rtalloc.h @@ -98,6 +98,8 @@ xfs_growfs_rt( /* * From xfs_rtbitmap.c */ +int xfs_rtbuf_get(struct xfs_mount *mp, struct xfs_trans *tp, + xfs_rtblock_t block, int issum, struct xfs_buf **bpp); int xfs_rtcheck_range(struct xfs_mount *mp, struct xfs_trans *tp, xfs_rtblock_t start, xfs_extlen_t len, int val, xfs_rtblock_t *new, int *stat); @@ -128,6 +130,7 @@ int xfs_rtfree_range(struct xfs_mount *mp, struct xfs_trans *tp, # define xfs_growfs_rt(mp,in) (ENOSYS) # define xfs_rtcheck_range(...) (ENOSYS) # define xfs_rtfind_forw(...) (ENOSYS) +# define xfs_rtbuf_get(m,t,b,i,p) (ENOSYS) static inline int /* error */ xfs_rtmount_init( xfs_mount_t *mp) /* file system mount structure */ diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h index 53d5451..5a9ac01 100644 --- a/fs/xfs/xfs_trace.h +++ b/fs/xfs/xfs_trace.h @@ -3479,7 +3479,9 @@ DEFINE_GETFSMAP_EVENT(xfs_getfsmap_mapping); { XFS_SCRUB_TYPE_BMBTC, "bmapbtc" }, \ { XFS_SCRUB_TYPE_DIR, "dir" }, \ { XFS_SCRUB_TYPE_XATTR, "xattr" }, \ - { XFS_SCRUB_TYPE_SYMLINK, "symlink" } + { XFS_SCRUB_TYPE_SYMLINK, "symlink" }, \ + { XFS_SCRUB_TYPE_RTBITMAP, "rtbitmap" }, \ + { XFS_SCRUB_TYPE_RTSUM, "rtsummary" } DECLARE_EVENT_CLASS(xfs_scrub_class, TP_PROTO(struct xfs_inode *ip, int type, xfs_agnumber_t agno, xfs_ino_t inum, unsigned int gen, unsigned int flags,