From 0a252daed3bafb71740ed37bd039bd421277bc82 Mon Sep 17 00:00:00 2001 From: George Melikov Date: Sat, 4 Feb 2017 20:21:25 +0300 Subject: [PATCH] OpenZFS 7504 - kmem_reap hangs spa_sync and administrative tasks Authored by: Matthew Ahrens Reviewed by: George Wilson Reviewed by: Prakash Surya Approved by: Dan McDonald Reviewed-by: Brian Behlendorf Reviewed-by: Tim Chase Ported-by: George Melikov OpenZFS-issue: https://www.illumos.org/issues/7504 OpenZFS-commit: https://github.com/openzfs/openzfs/commit/405a5a0 Closes #5736 --- module/zfs/arc.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/module/zfs/arc.c b/module/zfs/arc.c index 351e50e40..2a3913239 100644 --- a/module/zfs/arc.c +++ b/module/zfs/arc.c @@ -4193,7 +4193,6 @@ arc_reclaim_thread(void) mutex_enter(&arc_reclaim_lock); while (!arc_reclaim_thread_exit) { int64_t to_free; - int64_t free_memory = arc_available_memory(); uint64_t evicted = 0; arc_tuning_update(); @@ -4215,6 +4214,14 @@ arc_reclaim_thread(void) #endif mutex_exit(&arc_reclaim_lock); + /* + * We call arc_adjust() before (possibly) calling + * arc_kmem_reap_now(), so that we can wake up + * arc_get_data_buf() sooner. + */ + evicted = arc_adjust(); + + int64_t free_memory = arc_available_memory(); if (free_memory < 0) { arc_no_grow = B_TRUE; @@ -4247,8 +4254,6 @@ arc_reclaim_thread(void) arc_no_grow = B_FALSE; } - evicted = arc_adjust(); - mutex_enter(&arc_reclaim_lock); /*