From patchwork Mon Feb 4 17:59:14 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: 10796263 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 D420E746 for ; Mon, 4 Feb 2019 17:59:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C125C2BBC3 for ; Mon, 4 Feb 2019 17:59:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B57592BBC4; Mon, 4 Feb 2019 17:59:24 +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 2AFC12BBB0 for ; Mon, 4 Feb 2019 17:59:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728482AbfBDR7X (ORCPT ); Mon, 4 Feb 2019 12:59:23 -0500 Received: from aserp2130.oracle.com ([141.146.126.79]:54506 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727691AbfBDR7X (ORCPT ); Mon, 4 Feb 2019 12:59:23 -0500 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x14HnJTf039274 for ; Mon, 4 Feb 2019 17:59:22 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=u0Z8Uw2RrhrQ/SGdFwlzF4+SyilH+dCq7/p5xnq79wM=; b=Dh0qwSAGqY0Aq/5S8cNV3PYn3r1iCVh18vEvjyODpqkfK97UehuItcnqpNerjSdfophf dUXyWuYlTHIv7NxW96v31lD9eUQQxSc08tKe+fXGmn8Jc9nBfva3gxe2X1YJL6QhAFs+ Ui/MbXDDSQuKOjo1vh3fJQw9GZ3cnL6iaVR0t78B5zZzMxVkzgrr9sz1VXRMl75ZwPAA HXZfQudvks8vMv6q7vpfUn3uTNlgAEykW2U/9lMCw1HUuNFDP0momwNxj2y0vskijAc1 kgjj+vTw4vOMI4RLhh922ynLkReRiqpNOOg5+HeIklSD3HCquVMf+JMI68irLP/yo7sM Sg== Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp2130.oracle.com with ESMTP id 2qd97eppft-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 04 Feb 2019 17:59:22 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id x14HxGH1032456 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 4 Feb 2019 17:59:16 GMT Received: from abhmp0020.oracle.com (abhmp0020.oracle.com [141.146.116.26]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x14HxGDT024135 for ; Mon, 4 Feb 2019 17:59:16 GMT Received: from localhost (/10.159.141.78) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 04 Feb 2019 17:59:15 +0000 Subject: [PATCH 02/10] 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: Mon, 04 Feb 2019 09:59:14 -0800 Message-ID: <154930315478.31814.9792968910867944759.stgit@magnolia> In-Reply-To: <154930313674.31814.17994684613232167921.stgit@magnolia> References: <154930313674.31814.17994684613232167921.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9157 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-1902040138 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 | 35 ++++++++++++++++++++++++----------- fs/xfs/xfs_log_recover.c | 6 ++++++ fs/xfs/xfs_mount.c | 2 ++ fs/xfs/xfs_mount.h | 3 +++ 4 files changed, 35 insertions(+), 11 deletions(-) diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 2367cdfcd90b..435901c7c674 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_INO_TO_AGNO(mp, ip->i_ino); xfs_agino_t agino = XFS_INO_TO_AGINO(mp, ip->i_ino); short bucket_index = agino % XFS_AGI_UNLINKED_BUCKETS; @@ -1907,11 +1908,12 @@ xfs_iunlink( int error; ASSERT(VFS_I(ip)->i_mode != 0); + pag = xfs_perag_get(mp, agno); /* Get the agi buffer first. It ensures lock ordering on the list. */ error = xfs_read_agi(mp, tp, agno, &agibp); if (error) - return error; + goto out; agi = XFS_BUF_TO_AGI(agibp); /* @@ -1931,7 +1933,7 @@ xfs_iunlink( error = xfs_imap_to_bp(mp, tp, &ip->i_imap, &dip, &ibp, 0, 0); if (error) - return error; + goto out; ASSERT(dip->di_next_unlinked == cpu_to_be32(NULLAGINO)); dip->di_next_unlinked = agi->agi_unlinked[bucket_index]; @@ -1956,7 +1958,10 @@ 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: + xfs_perag_put(pag); + return error; } /* @@ -1974,6 +1979,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_INO_TO_AGNO(mp, ip->i_ino); xfs_agino_t agino = XFS_INO_TO_AGINO(mp, ip->i_ino); @@ -1983,10 +1989,12 @@ xfs_iunlink_remove( int last_offset = 0; int error; + pag = xfs_perag_get(mp, agno); + /* Get the agi buffer first. It ensures lock ordering on the list. */ error = xfs_read_agi(mp, tp, agno, &agibp); if (error) - return error; + goto out; agi = XFS_BUF_TO_AGI(agibp); /* @@ -1997,7 +2005,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; } if (be32_to_cpu(agi->agi_unlinked[bucket_index]) == agino) { @@ -2013,7 +2022,7 @@ xfs_iunlink_remove( if (error) { xfs_warn(mp, "%s: xfs_imap_to_bp returned error %d.", __func__, error); - return error; + goto out; } next_agino = be32_to_cpu(dip->di_next_unlinked); ASSERT(next_agino != 0); @@ -2062,7 +2071,7 @@ xfs_iunlink_remove( xfs_warn(mp, "%s: xfs_imap returned error %d.", __func__, error); - return error; + goto out; } error = xfs_imap_to_bp(mp, tp, &imap, &last_dip, @@ -2071,7 +2080,7 @@ xfs_iunlink_remove( xfs_warn(mp, "%s: xfs_imap_to_bp returned error %d.", __func__, error); - return error; + goto out; } last_offset = imap.im_boffset; @@ -2080,7 +2089,8 @@ xfs_iunlink_remove( XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, last_dip, sizeof(*last_dip)); - return -EFSCORRUPTED; + error = -EFSCORRUPTED; + goto out; } } @@ -2093,7 +2103,7 @@ xfs_iunlink_remove( if (error) { xfs_warn(mp, "%s: xfs_imap_to_bp(2) returned error %d.", __func__, error); - return error; + goto out; } next_agino = be32_to_cpu(dip->di_next_unlinked); ASSERT(next_agino != 0); @@ -2128,7 +2138,10 @@ xfs_iunlink_remove( (offset + sizeof(xfs_agino_t) - 1)); xfs_inobp_check(mp, last_ibp); } - return 0; + pag->pagi_unlinked_count--; +out: + xfs_perag_put(pag); + return error; } /* diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index ff9a27834c50..c634fbfea4a8 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,11 @@ 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); + pag->pagi_unlinked_count++; + 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..6ca92a71c233 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c @@ -149,6 +149,8 @@ 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)); xfs_buf_hash_destroy(pag); mutex_destroy(&pag->pag_ici_reclaim_lock); call_rcu(&pag->rcu_head, __xfs_free_perag); diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index e344b1dfde63..169069a01f3c 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h @@ -388,6 +388,9 @@ typedef struct xfs_perag { /* reference count */ uint8_t pagf_refcount_level; + + /* unlinked inode info; lock AGI to access */ + unsigned int pagi_unlinked_count; } xfs_perag_t; static inline struct xfs_ag_resv *