From owner-svn-src-all@freebsd.org Mon Nov 2 17:40:00 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 456534566FA; Mon, 2 Nov 2020 17:40:00 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CQ0YD1DJ8z3WdM; Mon, 2 Nov 2020 17:40:00 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0BBBDCAF5; Mon, 2 Nov 2020 17:40:00 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0A2Hdxx9054783; Mon, 2 Nov 2020 17:39:59 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0A2HdxI5054782; Mon, 2 Nov 2020 17:39:59 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202011021739.0A2HdxI5054782@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Mon, 2 Nov 2020 17:39:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367276 - head/sys/contrib/openzfs/module/zstd X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/contrib/openzfs/module/zstd X-SVN-Commit-Revision: 367276 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Nov 2020 17:40:00 -0000 Author: mjg Date: Mon Nov 2 17:39:59 2020 New Revision: 367276 URL: https://svnweb.freebsd.org/changeset/base/367276 Log: zfs: zstd: short-circuit cleaning buffers if none exist This avoids a barrage of locking every minute. Modified: head/sys/contrib/openzfs/module/zstd/zfs_zstd.c Modified: head/sys/contrib/openzfs/module/zstd/zfs_zstd.c ============================================================================== --- head/sys/contrib/openzfs/module/zstd/zfs_zstd.c Mon Nov 2 17:39:15 2020 (r367275) +++ head/sys/contrib/openzfs/module/zstd/zfs_zstd.c Mon Nov 2 17:39:59 2020 (r367276) @@ -700,6 +700,13 @@ zstd_mempool_deinit(void) void zfs_zstd_cache_reap_now(void) { + + /* + * Short-circuit if there are no buffers to begin with. + */ + if (ZSTDSTAT(zstd_stat_buffers) == 0) + return; + /* * calling alloc with zero size seeks * and releases old unused objects