diff options
| author | Alexander Motin <[email protected]> | 2022-09-02 16:21:18 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-09-02 13:21:18 -0700 |
| commit | f933b3fd4dda8b37aa37aeae05951b76f51ddae7 (patch) | |
| tree | 5856598fe904392d772472175863fe89e02da215 | |
| parent | 0b30dc484f7e70bc8bfe53fefc8581d181044efa (diff) | |
Apply arc_shrink_shift to ARC above arc_c_min
It makes sense to free memory in smaller chunks when approaching
arc_c_min to let other kernel subsystems to free more, since after
that point we can't free anything. This also matches behavior on
Linux, where to shrinker reported only the size above arc_c_min.
Reviewed-by: Ryan Moeller <[email protected]>
Reviewed-by: Allan Jude <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Alexander Motin <[email protected]>
Closes #13794
| -rw-r--r-- | module/os/freebsd/zfs/arc_os.c | 5 | ||||
| -rw-r--r-- | module/zfs/arc.c | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/module/os/freebsd/zfs/arc_os.c b/module/os/freebsd/zfs/arc_os.c index ca2bf8842..dbd71ea43 100644 --- a/module/os/freebsd/zfs/arc_os.c +++ b/module/os/freebsd/zfs/arc_os.c @@ -221,7 +221,10 @@ arc_lowmem(void *arg __unused, int howto __unused) arc_warm = B_TRUE; arc_growtime = gethrtime() + SEC2NSEC(arc_grow_retry); free_memory = arc_available_memory(); - to_free = (arc_c >> arc_shrink_shift) - MIN(free_memory, 0); + int64_t can_free = arc_c - arc_c_min; + if (can_free <= 0) + return; + to_free = (can_free >> arc_shrink_shift) - MIN(free_memory, 0); DTRACE_PROBE2(arc__needfree, int64_t, free_memory, int64_t, to_free); arc_reduce_target_size(to_free); diff --git a/module/zfs/arc.c b/module/zfs/arc.c index 579e78bef..980dc60d0 100644 --- a/module/zfs/arc.c +++ b/module/zfs/arc.c @@ -5051,10 +5051,11 @@ arc_reap_cb(void *arg, zthr_t *zthr) */ free_memory = arc_available_memory(); - int64_t to_free = - (arc_c >> arc_shrink_shift) - free_memory; - if (to_free > 0) { - arc_reduce_target_size(to_free); + int64_t can_free = arc_c - arc_c_min; + if (can_free > 0) { + int64_t to_free = (can_free >> arc_shrink_shift) - free_memory; + if (to_free > 0) + arc_reduce_target_size(to_free); } spl_fstrans_unmark(cookie); } |