From nobody Fri Oct 13 23:43:18 2023 X-Original-To: dev-commits-src-branches@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 4S6jkG5nKXz4wxvM; Fri, 13 Oct 2023 23:43:18 +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 4S6jkG3X0yz3G76; Fri, 13 Oct 2023 23:43:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697240598; 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=HxblIl26AyGCzcskDky8h439kTSLuvcpeAFD2FATxhM=; b=PW+Mdr0hBPpv18l0ZMA/JmprWuV5OO5idpaBSmOhlaqRphUVliOV8HVHr2iM48qJZ7VEny PJWfz6HO7jVUqtZlNm9CMGtKs21ewi+SwBclo3Ej2WErls3MhbQajrSdfktfg3uoo7wI68 9dU6XHvT1XAkuFHEAwzC4Nl5yMDYP0t+DzVyFN9p2fRiv4fz8x0YOc9eThwsDYX6Ciq7oU sPUpgQtVgC03U5ZdNXG4t5/S1e3tWW362QmR09LcrlEDtvXhGzRIhpFjx0IJ9E6Q5HGB4l enzGREf7X9aV4h0N3yS43LcI9n0G82J9OAax/O+nX1HNuEjLsQb5EPgNNhX4NA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697240598; a=rsa-sha256; cv=none; b=RhYVc55se8OwQ4uSqn1ZMA4dTHgfL3utEDuHH/Ybn/UKLGFtAhESlLRDzHWWxoqV9HJg6Q QPcsbZ15mFKfmGDcJlDctxluGKwCZ614AglmaBGExs5xfc/jIuo4KdjfZQubEve4Tl3nOi t0R2pbZVTWQa9b+dlzpbJPQx1M4vZ3tlTVIkojMK88wtSFblMMR+H0iO9kyGnOkjlIOjDc +Lk6hQYZYR0/tLdhlQYdQq6i2rwMH/gyKKxFzhyHKb8mxvOtqvC2anOjGrRZuPvl0cJybV Haijnj6RXMnTKeExlD/PpTNtVbKklFVUDzq7Da1vMv4y48oosXNziO0tIGQG2g== 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=1697240598; 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=HxblIl26AyGCzcskDky8h439kTSLuvcpeAFD2FATxhM=; b=ZFV0W/tA6mo6vEvpK6jK+/WyRmYVWDVraedOiQhtMWVYVC6VHY4Dt07JbiLeOYM3SNnTYN IRqDPxUAJIgBS6SjYGFY1U0s168f6idVnoGCVkIfIQ31lerUt4zZgSSvWzY20QF3ZkG3Ks VChR3rdBLUHwKkdFABNV6WLsOEDSL9uKY3fFUH6tMSNFs0XtTVf9IfGESdDarp3ElN7nME VqKuHEGDL3D5B4JPqQEksgo2sWMNeksK+YKjGLEsMwOdCOsYsuiOJIzOjo/yl2szyj1pEm dKpNL6CxrQE+7hc5KP+ekZfYd05eIOPm2arCNszwPTdIjnlPOIB6KOgNdU1lWg== 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 4S6jkG2cCrz17K5; Fri, 13 Oct 2023 23:43:18 +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 39DNhIBW015092; Fri, 13 Oct 2023 23:43:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39DNhIaC015088; Fri, 13 Oct 2023 23:43:18 GMT (envelope-from git) Date: Fri, 13 Oct 2023 23:43:18 GMT Message-Id: <202310132343.39DNhIaC015088@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: e4f85a24f9ba - stable/14 - vfs: count recycles by vnlru and by vn_alloc separately List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: e4f85a24f9baf7a6c31853ddad03a0f15028158f Auto-Submitted: auto-generated The branch stable/14 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=e4f85a24f9baf7a6c31853ddad03a0f15028158f commit e4f85a24f9baf7a6c31853ddad03a0f15028158f Author: Mateusz Guzik AuthorDate: 2023-10-12 06:47:45 +0000 Commit: Mateusz Guzik CommitDate: 2023-10-13 23:41:48 +0000 vfs: count recycles by vnlru and by vn_alloc separately Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit a92fc3122d2becfbf5a627af6eda5cedfac57c31) --- sys/kern/vfs_subr.c | 48 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 01585ac9eefd..b14793ccd84e 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -110,7 +110,7 @@ static void delmntque(struct vnode *vp); static int flushbuflist(struct bufv *bufv, int flags, struct bufobj *bo, int slpflag, int slptimeo); static void syncer_shutdown(void *arg, int howto); -static int vtryrecycle(struct vnode *vp); +static int vtryrecycle(struct vnode *vp, bool isvnlru); static void v_init_counters(struct vnode *); static void vn_seqc_init(struct vnode *); static void vn_seqc_write_end_free(struct vnode *vp); @@ -211,6 +211,11 @@ SYSCTL_COUNTER_U64(_vfs, OID_AUTO, recycles_free, CTLFLAG_RD, &recycles_free_cou SYSCTL_COUNTER_U64(_vfs_vnode_vnlru, OID_AUTO, recycles_free, CTLFLAG_RD, &recycles_free_count, "Number of free vnodes recycled to meet vnode cache targets"); +static counter_u64_t direct_recycles_free_count; +SYSCTL_COUNTER_U64(_vfs_vnode_vnlru, OID_AUTO, direct_recycles_free, CTLFLAG_RD, + &direct_recycles_free_count, + "Number of free vnodes recycled by vn_alloc callers to meet vnode cache targets"); + static counter_u64_t vnode_skipped_requeues; SYSCTL_COUNTER_U64(_vfs_vnode_stats, OID_AUTO, skipped_requeues, CTLFLAG_RD, &vnode_skipped_requeues, "Number of times LRU requeue was skipped due to lock contention"); @@ -771,6 +776,7 @@ vntblinit(void *dummy __unused) vnodes_created = counter_u64_alloc(M_WAITOK); recycles_count = counter_u64_alloc(M_WAITOK); recycles_free_count = counter_u64_alloc(M_WAITOK); + direct_recycles_free_count = counter_u64_alloc(M_WAITOK); vnode_skipped_requeues = counter_u64_alloc(M_WAITOK); /* @@ -1317,7 +1323,7 @@ SYSCTL_INT(_vfs_vnode_vnlru, OID_AUTO, max_free_per_call, CTLFLAG_RW, * Attempt to reduce the free list by the requested amount. */ static int -vnlru_free_impl(int count, struct vfsops *mnt_op, struct vnode *mvp) +vnlru_free_impl(int count, struct vfsops *mnt_op, struct vnode *mvp, bool isvnlru) { struct vnode *vp; struct mount *mp; @@ -1403,7 +1409,7 @@ vnlru_free_impl(int count, struct vfsops *mnt_op, struct vnode *mvp) * * Check nullfs for one example (null_getwritemount). */ - vtryrecycle(vp); + vtryrecycle(vp, isvnlru); count--; if (count == 0) { break; @@ -1419,22 +1425,33 @@ vnlru_free_impl(int count, struct vfsops *mnt_op, struct vnode *mvp) * XXX: returns without vnode_list_mtx locked! */ static int -vnlru_free_locked(int count) +vnlru_free_locked_direct(int count) { int ret; mtx_assert(&vnode_list_mtx, MA_OWNED); - ret = vnlru_free_impl(count, NULL, vnode_list_free_marker); + ret = vnlru_free_impl(count, NULL, vnode_list_free_marker, false); mtx_assert(&vnode_list_mtx, MA_NOTOWNED); return (ret); } static int -vnlru_free(int count) +vnlru_free_locked_vnlru(int count) +{ + int ret; + + mtx_assert(&vnode_list_mtx, MA_OWNED); + ret = vnlru_free_impl(count, NULL, vnode_list_free_marker, true); + mtx_assert(&vnode_list_mtx, MA_NOTOWNED); + return (ret); +} + +static int +vnlru_free_vnlru(int count) { mtx_lock(&vnode_list_mtx); - return (vnlru_free_locked(count)); + return (vnlru_free_locked_vnlru(count)); } void @@ -1445,7 +1462,7 @@ vnlru_free_vfsops(int count, struct vfsops *mnt_op, struct vnode *mvp) MPASS(mvp != NULL); VNPASS(mvp->v_type == VMARKER, mvp); mtx_lock(&vnode_list_mtx); - vnlru_free_impl(count, mnt_op, mvp); + vnlru_free_impl(count, mnt_op, mvp, true); mtx_assert(&vnode_list_mtx, MA_NOTOWNED); } @@ -1702,7 +1719,7 @@ vnlru_proc_light(void) return (false); if (freecount != 0) { - vnlru_free(freecount); + vnlru_free_vnlru(freecount); } mtx_lock(&vnode_list_mtx); @@ -1748,7 +1765,7 @@ vnlru_proc(void) * try to reduce it by discarding from the free list. */ if (rnumvnodes > desiredvnodes + 10) { - vnlru_free_locked(rnumvnodes - desiredvnodes); + vnlru_free_locked_vnlru(rnumvnodes - desiredvnodes); mtx_lock(&vnode_list_mtx); rnumvnodes = atomic_load_long(&numvnodes); } @@ -1848,7 +1865,7 @@ SYSINIT(vnlru, SI_SUB_KTHREAD_UPDATE, SI_ORDER_FIRST, kproc_start, * through vgone(). */ static int -vtryrecycle(struct vnode *vp) +vtryrecycle(struct vnode *vp, bool isvnlru) { struct mount *vnmp; @@ -1893,7 +1910,10 @@ vtryrecycle(struct vnode *vp) return (EBUSY); } if (!VN_IS_DOOMED(vp)) { - counter_u64_add(recycles_free_count, 1); + if (isvnlru) + counter_u64_add(recycles_free_count, 1); + else + counter_u64_add(direct_recycles_free_count, 1); vgonel(vp); } VOP_UNLOCK(vp); @@ -1966,7 +1986,7 @@ vn_alloc_hard(struct mount *mp, u_long rnumvnodes, bool bumped) * should be chosen so that we never wait or even reclaim from * the free list to below its target minimum. */ - if (vnlru_free_locked(1) > 0) + if (vnlru_free_locked_direct(1) > 0) goto alloc; mtx_assert(&vnode_list_mtx, MA_NOTOWNED); if (mp == NULL || (mp->mnt_kern_flag & MNTK_SUSPEND) == 0) { @@ -1983,7 +2003,7 @@ vn_alloc_hard(struct mount *mp, u_long rnumvnodes, bool bumped) msleep(&vnlruproc_sig, &vnode_list_mtx, PVFS, "vlruwk", hz); if (atomic_load_long(&numvnodes) + 1 > desiredvnodes && vnlru_read_freevnodes() > 1) - vnlru_free_locked(1); + vnlru_free_locked_direct(1); else mtx_unlock(&vnode_list_mtx); }