From nobody Sat Oct 14 01:08:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S6lcv3NKCz4x4GZ; Sat, 14 Oct 2023 01:08:47 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S6lcv1WGNz3XTS; Sat, 14 Oct 2023 01:08:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697245727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qMFlcS/Vo96edUmo6HKvWpG2Ss/UuTh1M5DNUStRc5g=; b=QQ2PfJpI49lPBbXRyP8PJXncjjjG79E1lD5T3NZ7Ey+tWfk6V5i88JWbQYRKpZ2vfSg36K rUvMXniK1hHfg3w4/EnP10zR1HdzlGbVH4+O+TXZ5kT4nNQhDGYYefJQkfOvqyHBGjeO1n 0IHpNJAjcZUlaWGLJnIz2QDqfrEMJEN7L12ajiCTbgCUPaDmyYBY1fNr2phfDs5reDPDp1 lk9OBr3m8DV2Lljoje5ttBC+Eu/bNhHsbdigyQUle+c7YdJIt54Xw1u0gzD5OjuRdUZews mr2deBfmJDezBsginpUetdUNhC5nP90YogIiyZWOIxwXYHwYGDq/dnwyv4CWLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697245727; a=rsa-sha256; cv=none; b=ZT4+PrEMRlkYhlJ7KLF3BuX+VUhtnN5c1AqFb7Tnxouk3X2fyRVno+VlbIO5y6duf+UBgn N94Aucfpo3PuIQCoYl08W5iAOMhWgmHYvInN+kcghrcXgtZMKYBUMZ8mt5RUVkpxRVw3xH G+7WvqqTxg3mXeyiaCt6nZfVX4S7vMGh1yuSjVUMh+wf8o2/M298Ybv+1+FwAnQ6aLIHOS f3RjMXUNs6ck55ddo2G5er+4B6e7fUsC/gDHfxYb9F3J5JKM7i69OYBjClE5SWVtGF5YV0 uvgfobm6CNur6l4uQoKBpqZLCN6Cm/rAu1w6IK2JSJt1YaPhugU+PKbW4AS8cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697245727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qMFlcS/Vo96edUmo6HKvWpG2Ss/UuTh1M5DNUStRc5g=; b=vnYthO4AbLrtyZBERgkUuxDWbr3N1cT5u7ozGi/98dj/S/tCqP1/XCT0y05ptEDZrK3Aei Qvd5Ctqee5Ib8p7crlZeQlv3iPRSaC0ctLSi7gHlcAcoz1E7yWG+VJb5MhCHqP/7UawY2T SCw9pMU8tGW3ONjpic+owaDPUeZrGn0t45hPgVvhyQcajTcXfSYteYWvAZTKJ6GXFM5mVG 8bHszau0FFbd94OSt/GKBVdFvFHWAD2ol+uY5zLWDtZYHYU27bAu+A7yzV282JO9/UCmdx hJlwnNq3A8+XbzZSW4glDD2ZOV+kOhJDYOeJsJ5EPk5NvjaZuG+Kp0o2Fxxbww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S6lcv0c88z19Fl; Sat, 14 Oct 2023 01:08:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39E18ksF052133; Sat, 14 Oct 2023 01:08:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39E18kXN052129; Sat, 14 Oct 2023 01:08:46 GMT (envelope-from git) Date: Sat, 14 Oct 2023 01:08:46 GMT Message-Id: <202310140108.39E18kXN052129@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: dcee98fcb76c - releng/14.0 - vfs cache: sanitize debug counters List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: dcee98fcb76cd59ddb60a5cd48ec266d9f444cea Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=dcee98fcb76cd59ddb60a5cd48ec266d9f444cea commit dcee98fcb76cd59ddb60a5cd48ec266d9f444cea Author: Mateusz Guzik AuthorDate: 2023-10-05 12:16:18 +0000 Commit: Mateusz Guzik CommitDate: 2023-10-14 01:06:29 +0000 vfs cache: sanitize debug counters They are very rarely triggered, so no need for per-cpu distribution. At the same time the non-cpu ones still should use atomics to not lose any updates. (cherry picked from commit 2749c222da8a6325d39c0571f72b1dbed2f7d583) (cherry picked from commit 75b03f73b4a0f94090aa9fd050e82089c83fe2bb) Approved by:re (gjb) --- sys/kern/vfs_cache.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 370236faa723..d6ff7af97435 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -553,17 +553,14 @@ static SYSCTL_NODE(_vfs_cache, OID_AUTO, debug, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "Name cache debugging"); #define DEBUGNODE_ULONG(name, varname, descr) \ SYSCTL_ULONG(_vfs_cache_debug, OID_AUTO, name, CTLFLAG_RD, &varname, 0, descr); -#define DEBUGNODE_COUNTER(name, varname, descr) \ - static COUNTER_U64_DEFINE_EARLY(varname); \ - SYSCTL_COUNTER_U64(_vfs_cache_debug, OID_AUTO, name, CTLFLAG_RD, &varname, \ - descr); -DEBUGNODE_COUNTER(zap_bucket_relock_success, zap_bucket_relock_success, +static u_long zap_bucket_relock_success; +DEBUGNODE_ULONG(zap_bucket_relock_success, zap_bucket_relock_success, "Number of successful removals after relocking"); -static long zap_bucket_fail; +static u_long zap_bucket_fail; DEBUGNODE_ULONG(zap_bucket_fail, zap_bucket_fail, ""); -static long zap_bucket_fail2; +static u_long zap_bucket_fail2; DEBUGNODE_ULONG(zap_bucket_fail2, zap_bucket_fail2, ""); -static long cache_lock_vnodes_cel_3_failures; +static u_long cache_lock_vnodes_cel_3_failures; DEBUGNODE_ULONG(vnodes_cel_3_failures, cache_lock_vnodes_cel_3_failures, "Number of times 3-way vnode locking failed"); @@ -1664,7 +1661,7 @@ cache_zap_unlocked_bucket(struct namecache *ncp, struct componentname *cnp, cache_zap_locked(rncp); mtx_unlock(blp); cache_unlock_vnodes(dvlp, vlp); - counter_u64_add(zap_bucket_relock_success, 1); + atomic_add_long(&zap_bucket_relock_success, 1); return (0); } @@ -1760,7 +1757,7 @@ retry: error = cache_zap_locked_bucket(ncp, cnp, hash, blp); if (__predict_false(error != 0)) { - zap_bucket_fail++; + atomic_add_long(&zap_bucket_fail, 1); goto retry; } counter_u64_add(numposzaps, 1); @@ -1986,7 +1983,7 @@ negative_success: counter_u64_add(numnegzaps, 1); error = cache_zap_locked_bucket(ncp, cnp, hash, blp); if (__predict_false(error != 0)) { - zap_bucket_fail2++; + atomic_add_long(&zap_bucket_fail2, 1); goto retry; } cache_free(ncp); @@ -2184,8 +2181,8 @@ cache_lock_vnodes_cel_3(struct celockstate *cel, struct vnode *vp) } else { if (mtx_trylock(vlp)) goto out; - cache_lock_vnodes_cel_3_failures++; cache_unlock_vnodes_cel(cel); + atomic_add_long(&cache_lock_vnodes_cel_3_failures, 1); if (vlp < cel->vlp[0]) { mtx_lock(vlp); mtx_lock(cel->vlp[0]);