From nobody Wed Oct 4 12:09:01 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 4S0tlL1nX3z4vpFD; Wed, 4 Oct 2023 12:09:02 +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 4S0tlL0XkJz3JVl; Wed, 4 Oct 2023 12:09:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696421342; 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=W04a02gVMJZMWWAcDO2ZFRnlrsoSdTuJi7cBu7S6UAk=; b=WU5NS5H2sMYBctGnhu/Ruz8+sud5aAoFzKsJgxN/6hKBw86aGuOyCWg5ARwQfPAxsmlxsT 1bu/e5ifNjbfs+nQhJD59NBXwnwNujByY6Y33EQNpjv8dxV3dtoeqt7aJ+qu4JdFy6DFLG tkdZPsDVNcXKwOooZLymBxQRpzAbrpXZxp7X/rmpAaIbbXZsx+te6zEnxAoPbKxX1oVftd 2f9wE8143v2oUlAFMmcYdIrBb3irtVWqj+StsTjpmGk0WAnjamCuK9ecY3RmSTTG2prKx+ tnn6cVaqRbxH4Iz0gSapxp/CVCnFZO1MqXMfbJoNyieUjBBTXjtLYuw7DL0bFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696421342; a=rsa-sha256; cv=none; b=vg05RT1ozFkFbpnpesaV3SJ7SZ8C1lgkb4cc5uDe8nB8ybng+/tCkbk+ELAO7DZgra+5rP 0oUIoZWPJssWzdjhWWly2q6gTY9nhXTojzoH+taRytXMiGDlw2u27d/oZgVarivIQF8yH3 QB1j89UqFzWyWZoiC1eJttWI37y6Dp3jGRp1ezUg52HjM99TBZ6KazZi/XzEf3OiRmdf+4 CNGT1MMNeLZcXX69KF4i/vNduRjx1jmqJHofIC7jUajnlE7VWr7guTGcFcZKlFEg+xWsUQ OCGipZgNLkXqaZyZQl2EZNAUPx+Z0qqPB9HNf7GgV91cz8Mx8qOoSaVCwkUCjw== 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=1696421342; 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=W04a02gVMJZMWWAcDO2ZFRnlrsoSdTuJi7cBu7S6UAk=; b=DPcts7CCVfU7xcEazWVb+gQTZWpYiA0dBqVMHMYVTRLVfab63IS5STyiz9sJ8EUTGimQMM lcdCqW9xTpldN9FPzRoHkmQLDGycL72CrdfE3aNNik0H8LjOus+ZGYi/RyZP3P0FcdstJT tugPchYT1l3p/b5d24MkizzvyzUr/I1jwVDtoRzn/za5J9Wli/7UBZiPAoYS7jheXNdsTQ uMNvhbdKFt/DML5XQvirR479/dlHQvwxQYbijBS0y2ebQ7Dw46lL3YnTf+RTYW+vxaspov qYTnvSBOOTr02ZP87bBItXCnRKWXpAZE/d/pILCTZgFS8m0DCW7BFAefKRSRag== 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 4S0tlK6mNrzcJH; Wed, 4 Oct 2023 12:09:01 +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 394C91JJ053679; Wed, 4 Oct 2023 12:09:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 394C91de053676; Wed, 4 Oct 2023 12:09:01 GMT (envelope-from git) Date: Wed, 4 Oct 2023 12:09:01 GMT Message-Id: <202310041209.394C91de053676@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: 46cc15529fbf - stable/13 - vfs cache: garbage collect the fullpathfail2 counter 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: 46cc15529fbfee0df5a124a3221c4446f0902fe3 Auto-Submitted: auto-generated The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=46cc15529fbfee0df5a124a3221c4446f0902fe3 commit 46cc15529fbfee0df5a124a3221c4446f0902fe3 Author: Mateusz Guzik AuthorDate: 2023-09-14 20:25:54 +0000 Commit: Mateusz Guzik CommitDate: 2023-10-04 12:05:59 +0000 vfs cache: garbage collect the fullpathfail2 counter The conditions it checks cannot legally be true (modulo races against forced unmount), so assert on it instead. (cherry picked from commit 07f52c4b5a4f7a658bf7ed29eadd5c4d52a4f3b2) --- sys/kern/vfs_cache.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 151d0d2ac8a1..a50e8010fb88 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -546,7 +546,6 @@ STATNODE_COUNTER(negzaps, numnegzaps, STATNODE_COUNTER(neghits, numneghits, "Number of cache hits (negative)"); /* These count for vn_getcwd(), too. */ STATNODE_COUNTER(fullpathcalls, numfullpathcalls, "Number of fullpath search calls"); -STATNODE_COUNTER(fullpathfail1, numfullpathfail1, "Number of fullpath search errors (ENOTDIR)"); STATNODE_COUNTER(fullpathfail2, numfullpathfail2, "Number of fullpath search errors (VOP_VPTOCNP failures)"); STATNODE_COUNTER(fullpathfail4, numfullpathfail4, "Number of fullpath search errors (ENOMEM)"); @@ -3384,14 +3383,7 @@ vn_fullpath_dir(struct vnode *vp, struct vnode *rdir, char *buf, char **retbuf, vp = vp1; continue; } - if (vp->v_type != VDIR) { - vrele(vp); - counter_u64_add(numfullpathfail1, 1); - error = ENOTDIR; - SDT_PROBE3(vfs, namecache, fullpath, return, - error, vp, NULL); - break; - } + VNPASS(vp->v_type == VDIR || VN_IS_DOOMED(vp), vp); error = vn_vptocnp(&vp, buf, &buflen); if (error) break;