From patchwork Wed Oct 9 03:21:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Chinner X-Patchwork-Id: 11180337 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4FEAD17D4 for ; Wed, 9 Oct 2019 03:21:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 39A262133F for ; Wed, 9 Oct 2019 03:21:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730638AbfJIDVq (ORCPT ); Tue, 8 Oct 2019 23:21:46 -0400 Received: from mail104.syd.optusnet.com.au ([211.29.132.246]:46729 "EHLO mail104.syd.optusnet.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730593AbfJIDVo (ORCPT ); Tue, 8 Oct 2019 23:21:44 -0400 Received: from dread.disaster.area (pa49-181-226-196.pa.nsw.optusnet.com.au [49.181.226.196]) by mail104.syd.optusnet.com.au (Postfix) with ESMTPS id 2343643ECB7; Wed, 9 Oct 2019 14:21:29 +1100 (AEDT) Received: from discord.disaster.area ([192.168.253.110]) by dread.disaster.area with esmtp (Exim 4.92.2) (envelope-from ) id 1iI2XX-0006CH-Ks; Wed, 09 Oct 2019 14:21:27 +1100 Received: from dave by discord.disaster.area with local (Exim 4.92) (envelope-from ) id 1iI2XX-0003A9-IY; Wed, 09 Oct 2019 14:21:27 +1100 From: Dave Chinner To: linux-xfs@vger.kernel.org Cc: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 26/26] xfs: use xfs_ail_push_all_sync in xfs_reclaim_inodes Date: Wed, 9 Oct 2019 14:21:24 +1100 Message-Id: <20191009032124.10541-27-david@fromorbit.com> X-Mailer: git-send-email 2.23.0.rc1 In-Reply-To: <20191009032124.10541-1-david@fromorbit.com> References: <20191009032124.10541-1-david@fromorbit.com> MIME-Version: 1.0 X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.2 cv=FNpr/6gs c=1 sm=1 tr=0 a=dRuLqZ1tmBNts2YiI0zFQg==:117 a=dRuLqZ1tmBNts2YiI0zFQg==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=XobE76Q3jBoA:10 a=20KFwNOVAAAA:8 a=ZzdNmvoJkPJkjLTIc_MA:9 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org From: Dave Chinner If we are reclaiming all inodes, it is likely we need to flush the entire AIL to do that. We have mechanisms to do that without needing to push to a specific LSN. Convert xfs_relaim_inodes() to use xfs_ail_push_all variant so we can get rid of the hacky xfs_ail_push_sync() scaffolding we used to support the intermediate stages of the non-blocking reclaim changeset. Signed-off-by: Dave Chinner --- fs/xfs/xfs_icache.c | 17 +++++++++++------ fs/xfs/xfs_trans_ail.c | 33 --------------------------------- fs/xfs/xfs_trans_priv.h | 2 -- 3 files changed, 11 insertions(+), 41 deletions(-) diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c index 7a507aefeea6..c1cbef610081 100644 --- a/fs/xfs/xfs_icache.c +++ b/fs/xfs/xfs_icache.c @@ -25,6 +25,7 @@ #include "xfs_log.h" #include +#include /* for congestion_wait() */ /* * Allocate and initialise an xfs_inode. @@ -1092,6 +1093,10 @@ xfs_dispose_inodes( cond_resched(); } } + +/* + * Reclaim all unused inodes in the filesystem. + */ void xfs_reclaim_inodes( struct xfs_mount *mp) @@ -1106,6 +1111,9 @@ xfs_reclaim_inodes( /* push the AIL to clean dirty reclaimable inodes */ xfs_ail_push_all(mp->m_ail); + /* push the AIL to clean dirty reclaimable inodes */ + xfs_ail_push_all(mp->m_ail); + INIT_LIST_HEAD(&ra.freeable); ra.lowest_lsn = NULLCOMMITLSN; to_free = list_lru_count(&mp->m_inode_lru); @@ -1114,13 +1122,10 @@ xfs_reclaim_inodes( &ra, to_free); xfs_dispose_inodes(&ra.freeable); - if (freed == 0) { + if (freed == 0) xfs_log_force(mp, XFS_LOG_SYNC); - xfs_ail_push_all(mp->m_ail); - } else if (ra.lowest_lsn != NULLCOMMITLSN) { - xfs_ail_push_sync(mp->m_ail, ra.lowest_lsn); - } - cond_resched(); + else if (ra.dirty_skipped) + congestion_wait(BLK_RW_ASYNC, HZ/10); } } diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c index 5e500a75b62b..685a21cd24c0 100644 --- a/fs/xfs/xfs_trans_ail.c +++ b/fs/xfs/xfs_trans_ail.c @@ -662,37 +662,6 @@ xfs_ail_push_all( xfs_ail_push(ailp, threshold_lsn); } -/* - * Push the AIL to a specific lsn and wait for it to complete. - */ -void -xfs_ail_push_sync( - struct xfs_ail *ailp, - xfs_lsn_t threshold_lsn) -{ - struct xfs_log_item *lip; - DEFINE_WAIT(wait); - - spin_lock(&ailp->ail_lock); - while ((lip = xfs_ail_min(ailp)) != NULL) { - prepare_to_wait(&ailp->ail_push, &wait, TASK_UNINTERRUPTIBLE); - if (XFS_FORCED_SHUTDOWN(ailp->ail_mount) || - XFS_LSN_CMP(threshold_lsn, lip->li_lsn) <= 0) - break; - /* XXX: cmpxchg? */ - while (XFS_LSN_CMP(threshold_lsn, ailp->ail_target) > 0) - xfs_trans_ail_copy_lsn(ailp, &ailp->ail_target, &threshold_lsn); - wake_up_process(ailp->ail_task); - spin_unlock(&ailp->ail_lock); - schedule(); - spin_lock(&ailp->ail_lock); - } - spin_unlock(&ailp->ail_lock); - - finish_wait(&ailp->ail_push, &wait); -} - - /* * Push out all items in the AIL immediately and wait until the AIL is empty. */ @@ -733,7 +702,6 @@ xfs_ail_update_finish( if (!XFS_FORCED_SHUTDOWN(mp)) xlog_assign_tail_lsn_locked(mp); - wake_up_all(&ailp->ail_push); if (list_empty(&ailp->ail_head)) wake_up_all(&ailp->ail_empty); spin_unlock(&ailp->ail_lock); @@ -890,7 +858,6 @@ xfs_trans_ail_init( spin_lock_init(&ailp->ail_lock); INIT_LIST_HEAD(&ailp->ail_buf_list); init_waitqueue_head(&ailp->ail_empty); - init_waitqueue_head(&ailp->ail_push); ailp->ail_task = kthread_run(xfsaild, ailp, "xfsaild/%s", ailp->ail_mount->m_fsname); diff --git a/fs/xfs/xfs_trans_priv.h b/fs/xfs/xfs_trans_priv.h index 1b6f4bbd47c0..35655eac01a6 100644 --- a/fs/xfs/xfs_trans_priv.h +++ b/fs/xfs/xfs_trans_priv.h @@ -61,7 +61,6 @@ struct xfs_ail { int ail_log_flush; struct list_head ail_buf_list; wait_queue_head_t ail_empty; - wait_queue_head_t ail_push; }; /* @@ -114,7 +113,6 @@ xfs_trans_ail_remove( } void xfs_ail_push(struct xfs_ail *, xfs_lsn_t); -void xfs_ail_push_sync(struct xfs_ail *, xfs_lsn_t); void xfs_ail_push_all(struct xfs_ail *); void xfs_ail_push_all_sync(struct xfs_ail *); struct xfs_log_item *xfs_ail_min(struct xfs_ail *ailp);