summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fs/xfs/xfs_icache.c53
-rw-r--r--fs/xfs/xfs_mount.c3
-rw-r--r--fs/xfs/xfs_mount.h4
-rw-r--r--fs/xfs/xfs_super.c1
4 files changed, 44 insertions, 17 deletions
diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
index e5a1cc598684..7693965164a5 100644
--- a/fs/xfs/xfs_icache.c
+++ b/fs/xfs/xfs_icache.c
@@ -33,7 +33,7 @@ static int xfs_blockgc_scan_inode(struct xfs_inode *ip,
static inline void xfs_blockgc_queue(struct xfs_perag *pag);
static bool xfs_reclaim_inode_grab(struct xfs_inode *ip);
static void xfs_reclaim_inode(struct xfs_inode *ip, struct xfs_perag *pag);
-static inline void xfs_inodegc_queue(struct xfs_mount *mp);
+static inline void xfs_inodegc_queue(struct xfs_perag *pag);
static int xfs_inodegc_inactivate(struct xfs_inode *ip, struct xfs_perag *pag,
struct xfs_eofblocks *eofb);
@@ -201,7 +201,7 @@ xfs_perag_set_ici_tag(
xfs_blockgc_queue(pag);
break;
case XFS_ICI_INODEGC_TAG:
- xfs_inodegc_queue(mp);
+ xfs_inodegc_queue(pag);
break;
}
@@ -302,14 +302,16 @@ xfs_inodegc_running(struct xfs_mount *mp)
/* Queue a new inode gc pass if there are inodes needing inactivation. */
static void
xfs_inodegc_queue(
- struct xfs_mount *mp)
+ struct xfs_perag *pag)
{
+ struct xfs_mount *mp = pag->pag_mount;
+
if (!xfs_inodegc_running(mp))
return;
rcu_read_lock();
if (radix_tree_tagged(&mp->m_perag_tree, XFS_ICI_INODEGC_TAG))
- queue_delayed_work(mp->m_gc_workqueue, &mp->m_inodegc_work,
+ queue_delayed_work(mp->m_gc_workqueue, &pag->pag_inodegc_work,
msecs_to_jiffies(xfs_inodegc_centisecs * 10));
rcu_read_unlock();
}
@@ -1909,28 +1911,38 @@ void
xfs_inodegc_worker(
struct work_struct *work)
{
- struct xfs_mount *mp = container_of(to_delayed_work(work),
- struct xfs_mount, m_inodegc_work);
+ struct xfs_perag *pag = container_of(to_delayed_work(work),
+ struct xfs_perag, pag_inodegc_work);
+ struct xfs_mount *mp = pag->pag_mount;
int error;
- error = xfs_inodegc_free_space(mp, NULL);
+ error = xfs_inode_walk_ag(pag, XFS_ICI_INODEGC_TAG, NULL);
if (error && error != -EAGAIN)
xfs_err(mp, "inode inactivation failed, error %d", error);
- xfs_inodegc_queue(mp);
+ xfs_inodegc_queue(pag);
}
-/* Force all currently queued inode inactivation work to run immediately. */
+/* Force all queued inode inactivation work to run immediately. */
void
xfs_inodegc_flush(
struct xfs_mount *mp)
{
- if (!xfs_inodegc_running(mp) ||
- !radix_tree_tagged(&mp->m_perag_tree, XFS_ICI_INODEGC_TAG))
+ struct xfs_perag *pag;
+ xfs_agnumber_t agno;
+ bool queued = false;
+
+ if (!xfs_inodegc_running(mp))
return;
- mod_delayed_work(mp->m_gc_workqueue, &mp->m_inodegc_work, 0);
- flush_delayed_work(&mp->m_inodegc_work);
+ for_each_perag_tag(mp, agno, pag, XFS_ICI_INODEGC_TAG) {
+ mod_delayed_work(mp->m_gc_workqueue, &pag->pag_inodegc_work, 0);
+ queued = true;
+ }
+ if (!queued)
+ return;
+
+ flush_workqueue(mp->m_gc_workqueue);
}
/* Stop all queued inactivation work. */
@@ -1938,8 +1950,15 @@ void
xfs_inodegc_stop(
struct xfs_mount *mp)
{
+ xfs_agnumber_t agno;
+
clear_bit(XFS_OPFLAG_INODEGC_RUNNING_BIT, &mp->m_opflags);
- cancel_delayed_work_sync(&mp->m_inodegc_work);
+ for (agno = 0; agno < mp->m_sb.sb_agcount; agno++) {
+ struct xfs_perag *pag = xfs_perag_get(mp, agno);
+
+ cancel_delayed_work_sync(&pag->pag_inodegc_work);
+ xfs_perag_put(pag);
+ }
}
/* Schedule deferred inode inactivation work. */
@@ -1947,6 +1966,10 @@ void
xfs_inodegc_start(
struct xfs_mount *mp)
{
+ struct xfs_perag *pag;
+ xfs_agnumber_t agno;
+
set_bit(XFS_OPFLAG_INODEGC_RUNNING_BIT, &mp->m_opflags);
- xfs_inodegc_queue(mp);
+ for_each_perag_tag(mp, agno, pag, XFS_ICI_INODEGC_TAG)
+ xfs_inodegc_queue(pag);
}
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index bb6637f93c65..3762b1b7d5a9 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -127,6 +127,7 @@ __xfs_free_perag(
struct xfs_perag *pag = container_of(head, struct xfs_perag, rcu_head);
ASSERT(!delayed_work_pending(&pag->pag_blockgc_work));
+ ASSERT(!delayed_work_pending(&pag->pag_inodegc_work));
ASSERT(atomic_read(&pag->pag_ref) == 0);
kmem_free(pag);
}
@@ -148,6 +149,7 @@ xfs_free_perag(
ASSERT(pag);
ASSERT(atomic_read(&pag->pag_ref) == 0);
cancel_delayed_work_sync(&pag->pag_blockgc_work);
+ cancel_delayed_work_sync(&pag->pag_inodegc_work);
xfs_iunlink_destroy(pag);
xfs_buf_hash_destroy(pag);
call_rcu(&pag->rcu_head, __xfs_free_perag);
@@ -204,6 +206,7 @@ xfs_initialize_perag(
pag->pag_mount = mp;
spin_lock_init(&pag->pag_ici_lock);
INIT_DELAYED_WORK(&pag->pag_blockgc_work, xfs_blockgc_worker);
+ INIT_DELAYED_WORK(&pag->pag_inodegc_work, xfs_inodegc_worker);
INIT_RADIX_TREE(&pag->pag_ici_root, GFP_ATOMIC);
error = xfs_buf_hash_init(pag);
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index 8cac7cbd5759..513d2a52b60d 100644
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -183,7 +183,6 @@ typedef struct xfs_mount {
uint64_t m_resblks_avail;/* available reserved blocks */
uint64_t m_resblks_save; /* reserved blks @ remount,ro */
struct delayed_work m_reclaim_work; /* background inode reclaim */
- struct delayed_work m_inodegc_work; /* background inode inactive */
struct xfs_kobj m_kobj;
struct xfs_kobj m_error_kobj;
struct xfs_kobj m_error_meta_kobj;
@@ -381,6 +380,9 @@ typedef struct xfs_perag {
/* background prealloc block trimming */
struct delayed_work pag_blockgc_work;
+ /* background inode inactivation */
+ struct delayed_work pag_inodegc_work;
+
/* reference count */
uint8_t pagf_refcount_level;
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index af21e4b6eb0c..a3e0fe696d82 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1907,7 +1907,6 @@ static int xfs_init_fs_context(
mutex_init(&mp->m_growlock);
INIT_WORK(&mp->m_flush_inodes_work, xfs_flush_inodes_worker);
INIT_DELAYED_WORK(&mp->m_reclaim_work, xfs_reclaim_worker);
- INIT_DELAYED_WORK(&mp->m_inodegc_work, xfs_inodegc_worker);
mp->m_kobj.kobject.kset = xfs_kset;
/*
* We don't create the finobt per-ag space reservation until after log
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-11 21:50:05 +0000