From patchwork Thu Jan 31 23:18:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10791557 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4E695184E for ; Thu, 31 Jan 2019 23:18:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 44A1F2850F for ; Thu, 31 Jan 2019 23:18:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3908F31A59; Thu, 31 Jan 2019 23:18:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B2022850F for ; Thu, 31 Jan 2019 23:18:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727637AbfAaXSH (ORCPT ); Thu, 31 Jan 2019 18:18:07 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:44416 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726622AbfAaXSG (ORCPT ); Thu, 31 Jan 2019 18:18:06 -0500 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id x0VNEaJM047797 for ; Thu, 31 Jan 2019 23:18:05 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2018-07-02; bh=MZRh1JfgkzzbqMYvJybxv/ICeo3gy3hc1RjlFXT390c=; b=FnvQPgHvjtu5wbsKcSUbfPSPIBRtCzm4BBKmNooOe+8EXyinFCEhmrgi8q4s4FjQp6ZV lVoI72Hl4SVXXgFUmwaPyKhcQ/iV9Lt8bvQRq/cSUg6UxbnZDbXFvpVpJcJ+hYNidT4z Etw6Bg39nc+92Nwdu338v/9qgb7p/5bt27ZrWHZn+lDuaVTSH1pfIj7Bk+W4jHthlchv S9gG9o7AtNgp2yRkvWtO9rSepYgsx0q/NDRf9Berh59h0Fs2xWebaufRrSZot4l7jNnm pT/8dJ852/aQQCEv5MYjqiDkH0GC4oG8+jMMLPwn0SMQq+x6ShQBa75eJTO6wAlJLzl5 Kw== Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp2120.oracle.com with ESMTP id 2q8g6rkj9g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 31 Jan 2019 23:18:04 +0000 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 x0VNI4Zi029122 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 31 Jan 2019 23:18:04 GMT Received: from abhmp0004.oracle.com (abhmp0004.oracle.com [141.146.116.10]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x0VNI3VL029336 for ; Thu, 31 Jan 2019 23:18:04 GMT Received: from localhost (/10.159.246.84) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 31 Jan 2019 15:18:03 -0800 Subject: [PATCH 2/8] xfs: track unlinked inode counts in per-ag data From: "Darrick J. Wong" To: darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org Date: Thu, 31 Jan 2019 15:18:03 -0800 Message-ID: <154897668290.26065.2216454639188570690.stgit@magnolia> In-Reply-To: <154897667054.26065.13164381203002725289.stgit@magnolia> References: <154897667054.26065.13164381203002725289.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9153 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=3 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1901310167 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong Track the number of unlinked inodes in each AG so that we can use these decisions to throttle inactivations when the unlinked list gets long. Signed-off-by: Darrick J. Wong --- fs/xfs/xfs_inode.c | 40 +++++++++++++++++++++++++++++----------- fs/xfs/xfs_log_recover.c | 8 ++++++++ fs/xfs/xfs_mount.c | 5 +++++ fs/xfs/xfs_mount.h | 4 ++++ 4 files changed, 46 insertions(+), 11 deletions(-) diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index d18354517320..98355f5f9253 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -1900,6 +1900,7 @@ xfs_iunlink( struct xfs_dinode *dip; struct xfs_buf *agibp; struct xfs_buf *ibp; + struct xfs_perag *pag; xfs_agnumber_t agno; xfs_agino_t agino; short bucket_index; @@ -1912,6 +1913,8 @@ xfs_iunlink( agno = XFS_INO_TO_AGNO(mp, ip->i_ino); agino = XFS_INO_TO_AGINO(mp, ip->i_ino); bucket_index = agino % XFS_AGI_UNLINKED_BUCKETS; + pag = xfs_perag_get(mp, agno); + mutex_lock(&pag->pagi_unlinked_lock); /* * Get the agi buffer first. It ensures lock ordering @@ -1919,7 +1922,7 @@ xfs_iunlink( */ error = xfs_read_agi(mp, tp, agno, &agibp); if (error) - return error; + goto out_unlock; agi = XFS_BUF_TO_AGI(agibp); /* @@ -1939,7 +1942,7 @@ xfs_iunlink( error = xfs_imap_to_bp(mp, tp, &ip->i_imap, &dip, &ibp, 0, 0); if (error) - return error; + goto out_unlock; ASSERT(dip->di_next_unlinked == cpu_to_be32(NULLAGINO)); dip->di_next_unlinked = agi->agi_unlinked[bucket_index]; @@ -1964,7 +1967,12 @@ xfs_iunlink( (sizeof(xfs_agino_t) * bucket_index); xfs_trans_log_buf(tp, agibp, offset, (offset + sizeof(xfs_agino_t) - 1)); - return 0; + pag->pagi_unlinked_count++; + +out_unlock: + mutex_unlock(&pag->pagi_unlinked_lock); + xfs_perag_put(pag); + return error; } /* @@ -1982,6 +1990,7 @@ xfs_iunlink_remove( struct xfs_buf *ibp; struct xfs_buf *last_ibp; struct xfs_dinode *last_dip = NULL; + struct xfs_perag *pag; xfs_ino_t next_ino; xfs_agnumber_t agno; xfs_agino_t agino; @@ -1997,6 +2006,8 @@ xfs_iunlink_remove( agno = XFS_INO_TO_AGNO(mp, ip->i_ino); agino = XFS_INO_TO_AGINO(mp, ip->i_ino); bucket_index = agino % XFS_AGI_UNLINKED_BUCKETS; + pag = xfs_perag_get(mp, agno); + mutex_lock(&pag->pagi_unlinked_lock); /* * Get the agi buffer first. It ensures lock ordering @@ -2004,7 +2015,7 @@ xfs_iunlink_remove( */ error = xfs_read_agi(mp, tp, agno, &agibp); if (error) - return error; + goto out_unlock; agi = XFS_BUF_TO_AGI(agibp); /* @@ -2015,7 +2026,8 @@ xfs_iunlink_remove( be32_to_cpu(agi->agi_unlinked[bucket_index]))) { XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, agi, sizeof(*agi)); - return -EFSCORRUPTED; + error = -EFSCORRUPTED; + goto out_unlock; } if (be32_to_cpu(agi->agi_unlinked[bucket_index]) == agino) { @@ -2031,7 +2043,7 @@ xfs_iunlink_remove( if (error) { xfs_warn(mp, "%s: xfs_imap_to_bp returned error %d.", __func__, error); - return error; + goto out_unlock; } next_agino = be32_to_cpu(dip->di_next_unlinked); ASSERT(next_agino != 0); @@ -2080,7 +2092,7 @@ xfs_iunlink_remove( xfs_warn(mp, "%s: xfs_imap returned error %d.", __func__, error); - return error; + goto out_unlock; } error = xfs_imap_to_bp(mp, tp, &imap, &last_dip, @@ -2089,7 +2101,7 @@ xfs_iunlink_remove( xfs_warn(mp, "%s: xfs_imap_to_bp returned error %d.", __func__, error); - return error; + goto out_unlock; } last_offset = imap.im_boffset; @@ -2098,7 +2110,8 @@ xfs_iunlink_remove( XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, last_dip, sizeof(*last_dip)); - return -EFSCORRUPTED; + error = -EFSCORRUPTED; + goto out_unlock; } } @@ -2111,7 +2124,7 @@ xfs_iunlink_remove( if (error) { xfs_warn(mp, "%s: xfs_imap_to_bp(2) returned error %d.", __func__, error); - return error; + goto out_unlock; } next_agino = be32_to_cpu(dip->di_next_unlinked); ASSERT(next_agino != 0); @@ -2146,7 +2159,12 @@ xfs_iunlink_remove( (offset + sizeof(xfs_agino_t) - 1)); xfs_inobp_check(mp, last_ibp); } - return 0; + pag->pagi_unlinked_count--; + +out_unlock: + mutex_unlock(&pag->pagi_unlinked_lock); + xfs_perag_put(pag); + return error; } /* diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index ff9a27834c50..c920b8aeba01 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c @@ -5054,6 +5054,7 @@ xlog_recover_process_one_iunlink( struct xfs_buf *ibp; struct xfs_dinode *dip; struct xfs_inode *ip; + struct xfs_perag *pag; xfs_ino_t ino; int error; @@ -5077,6 +5078,13 @@ xlog_recover_process_one_iunlink( agino = be32_to_cpu(dip->di_next_unlinked); xfs_buf_relse(ibp); + /* Make sure the in-core data knows about this unlinked inode. */ + pag = xfs_perag_get(mp, agno); + mutex_lock(&pag->pagi_unlinked_lock); + pag->pagi_unlinked_count++; + mutex_unlock(&pag->pagi_unlinked_lock); + xfs_perag_put(pag); + /* * Prevent any DMAPI event from being sent when the reference on * the inode is dropped. diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index 10be706ec72e..6bfc985669e0 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c @@ -149,6 +149,9 @@ xfs_free_perag( spin_unlock(&mp->m_perag_lock); ASSERT(pag); ASSERT(atomic_read(&pag->pag_ref) == 0); + ASSERT(pag->pagi_unlinked_count == 0 || + XFS_FORCED_SHUTDOWN(mp)); + mutex_destroy(&pag->pagi_unlinked_lock); xfs_buf_hash_destroy(pag); mutex_destroy(&pag->pag_ici_reclaim_lock); call_rcu(&pag->rcu_head, __xfs_free_perag); @@ -227,6 +230,7 @@ xfs_initialize_perag( /* first new pag is fully initialized */ if (first_initialised == NULLAGNUMBER) first_initialised = index; + mutex_init(&pag->pagi_unlinked_lock); } index = xfs_set_inode_alloc(mp, agcount); @@ -249,6 +253,7 @@ xfs_initialize_perag( if (!pag) break; xfs_buf_hash_destroy(pag); + mutex_destroy(&pag->pagi_unlinked_lock); mutex_destroy(&pag->pag_ici_reclaim_lock); kmem_free(pag); } diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index e344b1dfde63..0fcc6b6a4f67 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h @@ -388,6 +388,10 @@ typedef struct xfs_perag { /* reference count */ uint8_t pagf_refcount_level; + + /* unlinked inodes */ + struct mutex pagi_unlinked_lock; + uint32_t pagi_unlinked_count; } xfs_perag_t; static inline struct xfs_ag_resv *