From owner-svn-src-user@FreeBSD.ORG Fri Apr 17 00:38:21 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3EECE99; Fri, 17 Apr 2015 00:38:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 29EAFF0B; Fri, 17 Apr 2015 00:38:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3H0cLbG087127; Fri, 17 Apr 2015 00:38:21 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3H0cLmg087126; Fri, 17 Apr 2015 00:38:21 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201504170038.t3H0cLmg087126@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 17 Apr 2015 00:38:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281635 - user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Apr 2015 00:38:21 -0000 Author: delphij Date: Fri Apr 17 00:38:20 2015 New Revision: 281635 URL: https://svnweb.freebsd.org/changeset/base/281635 Log: Fixup r281634 by adapting r281026 to the form of r280198 (MFV r280198). Modified: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Modified: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c ============================================================================== --- user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Fri Apr 17 00:28:35 2015 (r281634) +++ user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Fri Apr 17 00:38:20 2015 (r281635) @@ -3006,11 +3006,15 @@ arc_available_memory(void) * Above limits know nothing about real level of KVA fragmentation. * Start aggressive reclamation if too little sequential KVA left. */ - if (vmem_size(heap_arena, VMEM_MAXFREE) < zfs_max_recordsize) { + n = vmem_size(heap_arena, VMEM_MAXFREE) - zfs_max_recordsize; + if (n < 0) { DTRACE_PROBE2(arc__reclaim_maxfree, uint64_t, vmem_size(heap_arena, VMEM_MAXFREE), uint64_t, zfs_max_recordsize); - return (1); + if (n < lowest) { + lowest = n; + r = FMR_ZIO_ARENA; + } } #else /* _KERNEL */