From nobody Fri Oct 13 23:53:48 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 4S6jyN6nrPz4wyRV; Fri, 13 Oct 2023 23:53:48 +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 4S6jyN61pWz3JbH; Fri, 13 Oct 2023 23:53:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697241228; 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=o3Vn6FfZZFYkD8BDjdgpfPfUwUgoBnX6+/4MLnKXZqM=; b=VFGXwwMUtDPz/Xfy/96tcMXcn3Tvg0FxpPxmckFuTVAkale3uHU+sCDxwysOCJD3XvZkUs A70BMR5nuVddCZ0+y9OOFYq4hHyYBjtucvV+truCT5ztwu03z+rRyv/KeDKyzSBIsY+Sct LRLB8zrsbTon17qDJlpTeJv6AZUmmtq5LKbLP49wyzMFH9OnarFHIznVSeLyjrBTXYAQa+ 8+1jKK7gEL0QR4qCix2s4DvTLRHb+x81dRl3LA4TbmpMW7cTBqDu31ONzYtghRNyGdl3QE 0zLzrlAfQ+cstmdb4i2LDenitHkXkNTe6rPxQzWRsptLvXRDEnRJuApQH3Yo6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697241228; a=rsa-sha256; cv=none; b=Zdscv/Aq/UsLB+DhCAGxou05MKHTlWTY1BZkKA+cfK+cLfocfujATPLLMiMTMypGImtdz1 bK1h2+6gX9h3WVGlBHoYdJKKQwB7bdXLK4DrqCYrM/J/cnYypIS9w9S8OyjSckKXLE0wB0 mZZB23GbXUq6JHxhGtN+FULgQZdsFTh+5/Rk4pzxldN72AgGpz4viJvlHouWhBAJDZPX5t lNb47nBmBp9O1IFjcsXsMDeLFkD9e7SwRDxGpZDfO3cvlxXO13Fw6GKmLOGJqNYdHGWWL5 nfhLK7AujeTf4jjul4GpeIc2swH1keGL0C063Hbd1otDN3eTGm8ukBVxV9wuDA== 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=1697241228; 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=o3Vn6FfZZFYkD8BDjdgpfPfUwUgoBnX6+/4MLnKXZqM=; b=wlFtfoukVbMhmWmxhdYSRh8hwnbJHAAI6iWzJWqFPhvmCZs2zZ9SjtY2UzPBALfOmet2uR 45GxUwZQKVhuhrWmzaKtIZvLe2rFTpjJoRr3FQ2eLqD88Kig/ZbozI9nJ/XIK6lyediPXN x6c9ww6SG3SuOWAT6TRPxD2y3PWO4q9vMMel91yi6xxUU8yFbeYYG8DNcTd4DKIiKVaUSh 0L7ehHLpovevd13CRzao6j/kok0+UlpW5IqtFtfo9xgCXV+GwMVKLTn6dhLOhvEorQO4EN Lmh2aAHtdoPGsRpdeG2D1DQM1vK1ndAw42aqabyV3fDSu+KdQj+/5SUPa2jD7g== 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 4S6jyN4wwSz17Gc; Fri, 13 Oct 2023 23:53:48 +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 39DNrmVn031950; Fri, 13 Oct 2023 23:53:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39DNrmAL031947; Fri, 13 Oct 2023 23:53:48 GMT (envelope-from git) Date: Fri, 13 Oct 2023 23:53:48 GMT Message-Id: <202310132353.39DNrmAL031947@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: bb84ee652edc - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: bb84ee652edc233b5796f07a8b44a6b2f9221b0a Auto-Submitted: auto-generated The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=bb84ee652edc233b5796f07a8b44a6b2f9221b0a commit bb84ee652edc233b5796f07a8b44a6b2f9221b0a Author: Mateusz Guzik AuthorDate: 2023-10-05 12:16:18 +0000 Commit: Mateusz Guzik CommitDate: 2023-10-13 23:48:12 +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) --- 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 29f14fb931e6..1d52b2e63169 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -557,17 +557,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"); @@ -1668,7 +1665,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); } @@ -1764,7 +1761,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); @@ -1990,7 +1987,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); @@ -2188,8 +2185,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]);