From nobody Fri Mar 25 14:04:13 2022 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 2831D1A3F65A; Fri, 25 Mar 2022 14:04:15 +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 4KQ3jp1KnNz3skT; Fri, 25 Mar 2022 14:04:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648217054; 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=273WoCMcoJGc0hSmvEKzzPmbKAky3ZqlT9bhloW91nE=; b=LaDLxf4vc1vorZyR7QFpU//Ea+JY0XoIGG2+gGmLzamWrQjQidsBqPzeuucro12IbXjnqR XgV9PuNMcR7tAy7V8ijs0RLSSOAKS2nJWt0dfj7AqQ3Dl2c5h/i/1PYMqcDd0O95KrKIzs 5ZpvYSflWqRtetWhuMrcF72L150QwSQAk9TP2VposArEEJgHdaXxZTrqXJpUV/d3dW2OUS akJ9CaD5xcEwCRM12fG3T5OzJBXaMWugcFxa3AWwN4prJaOSFQL8szs9Z8sKiGuuanHQL9 cq7ddeE1bGhh89jwa4xCC611jQ7K8EefkaO6eiS+mfa7ONmuP+gxvpSVAwSoCQ== 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 0134D5BED; Fri, 25 Mar 2022 14:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22PE4D5p059194; Fri, 25 Mar 2022 14:04:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22PE4DSc059193; Fri, 25 Mar 2022 14:04:13 GMT (envelope-from git) Date: Fri, 25 Mar 2022 14:04:13 GMT Message-Id: <202203251404.22PE4DSc059193@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: b2516d2f7dcf - releng/13.1 - vfs: [1/2] fix stalls in vnode reclaim by not requeieing from vnlru 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/13.1 X-Git-Reftype: branch X-Git-Commit: b2516d2f7dcf15ec090373257417a77bf77c7009 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648217054; 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=273WoCMcoJGc0hSmvEKzzPmbKAky3ZqlT9bhloW91nE=; b=NRtzyirhbkj/ULNlK6hi6W7Z3+MacXTSWjY+F3eBizLTguyCwxTBUl7EeLdbamk9MtpR+P RxJu5BWMPA0nBwuyXPCAPvk7ETX9BLrE1q+99CeDcRQMbSI+0HCD+JmGKmFapQcDI9HjsK dKBwad0an711H9TsyoqEwEE8bNOtxdeAJTYOnJlXDLZ1aH/485wLfbaniEJpt3ahJe5IMN 2alaNG67VrDRJ7XTe92IObekTd1AMhvHVPivIYkhpRDOakhYBIn5GBbcHNupL0o+F8EaE/ pcvJZW8asSsCRtLucDlElsFefiKKucI3+U8HxzOMz84WcfJU23bhwT/Kj+yYIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648217054; a=rsa-sha256; cv=none; b=Y34ncrS3QiZrmA9JleNQCEKcX67vuFpo0sMotb6BHakKl3Dz7Let3dHoApk7OW7hDijICV drZQcQnmSPtqDYIoan6xxXlHQQjfBm3CpWbryXdGiN5MAiDXOhq5XUTotVxub8g8eGsGas o/QnIa1RgWqj8Bz5ANtWwrLlKdUa/uVkD0cJvKxNxeJHTv6YNmzpyvWaDB59fRHhBjR5XF yYJHvmSYaqNsOtYSNNXqwz3iCmOeZHR7llFwVbP0j8k2QGOOWFsxTiastaO749SNuaOdOd uIhojW7cNg4cGtbE5EjY6Gwy4/l8KPn1sBVPHM2yJJqqLaiuB1PyGj6GdBMDaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=b2516d2f7dcf15ec090373257417a77bf77c7009 commit b2516d2f7dcf15ec090373257417a77bf77c7009 Author: Mateusz Guzik AuthorDate: 2022-03-07 10:33:59 +0000 Commit: Mateusz Guzik CommitDate: 2022-03-25 14:03:46 +0000 vfs: [1/2] fix stalls in vnode reclaim by not requeieing from vnlru Reported by: pho Approved by: re (gjb) (cherry picked from commit c35ec1efdcb2978bc3b6a0098c2b412be8d33e39) --- sys/kern/vfs_subr.c | 55 +++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 45 insertions(+), 10 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index a7a432d31a55..5c5faf455f2b 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -113,6 +113,8 @@ static void vn_seqc_init(struct vnode *); static void vn_seqc_write_end_free(struct vnode *vp); static void vgonel(struct vnode *); static bool vhold_recycle_free(struct vnode *); +static void vdropl_recycle(struct vnode *vp); +static void vdrop_recycle(struct vnode *vp); static void vfs_knllock(void *arg); static void vfs_knlunlock(void *arg); static void vfs_knl_assert_lock(void *arg, int what); @@ -1203,11 +1205,11 @@ restart: mtx_unlock(&vnode_list_mtx); if (vn_start_write(vp, &mp, V_NOWAIT) != 0) { - vdrop(vp); + vdrop_recycle(vp); goto next_iter_unlocked; } if (VOP_LOCK(vp, LK_EXCLUSIVE|LK_NOWAIT) != 0) { - vdrop(vp); + vdrop_recycle(vp); vn_finished_write(mp); goto next_iter_unlocked; } @@ -1218,14 +1220,14 @@ restart: (vp->v_object != NULL && vp->v_object->handle == vp && vp->v_object->resident_page_count > trigger)) { VOP_UNLOCK(vp); - vdropl(vp); + vdropl_recycle(vp); vn_finished_write(mp); goto next_iter_unlocked; } counter_u64_add(recycles_count, 1); vgonel(vp); VOP_UNLOCK(vp); - vdropl(vp); + vdropl_recycle(vp); vn_finished_write(mp); done++; next_iter_unlocked: @@ -1636,7 +1638,7 @@ vtryrecycle(struct vnode *vp) CTR2(KTR_VFS, "%s: impossible to recycle, vp %p lock is already held", __func__, vp); - vdrop(vp); + vdrop_recycle(vp); return (EWOULDBLOCK); } /* @@ -1647,7 +1649,7 @@ vtryrecycle(struct vnode *vp) CTR2(KTR_VFS, "%s: impossible to recycle, cannot start the write for %p", __func__, vp); - vdrop(vp); + vdrop_recycle(vp); return (EBUSY); } /* @@ -1659,7 +1661,7 @@ vtryrecycle(struct vnode *vp) VI_LOCK(vp); if (vp->v_usecount) { VOP_UNLOCK(vp); - vdropl(vp); + vdropl_recycle(vp); vn_finished_write(vnmp); CTR2(KTR_VFS, "%s: impossible to recycle, %p is already referenced", @@ -1671,7 +1673,7 @@ vtryrecycle(struct vnode *vp) vgonel(vp); } VOP_UNLOCK(vp); - vdropl(vp); + vdropl_recycle(vp); vn_finished_write(vnmp); return (0); } @@ -3624,8 +3626,8 @@ vdrop(struct vnode *vp) vdropl(vp); } -void -vdropl(struct vnode *vp) +static void __always_inline +vdropl_impl(struct vnode *vp, bool enqueue) { ASSERT_VI_LOCKED(vp, __func__); @@ -3653,6 +3655,39 @@ vdropl(struct vnode *vp) vdbatch_enqueue(vp); } +void +vdropl(struct vnode *vp) +{ + + vdropl_impl(vp, true); +} + +/* + * vdrop a vnode when recycling + * + * This is a special case routine only to be used when recycling, differs from + * regular vdrop by not requeieing the vnode on LRU. + * + * Consider a case where vtryrecycle continuously fails with all vnodes (due to + * e.g., frozen writes on the filesystem), filling the batch and causing it to + * be requeued. Then vnlru will end up revisiting the same vnodes. This is a + * loop which can last for as long as writes are frozen. + */ +static void +vdropl_recycle(struct vnode *vp) +{ + + vdropl_impl(vp, false); +} + +static void +vdrop_recycle(struct vnode *vp) +{ + + VI_LOCK(vp); + vdropl_recycle(vp); +} + /* * Call VOP_INACTIVE on the vnode and manage the DOINGINACT and OWEINACT * flags. DOINGINACT prevents us from recursing in calls to vinactive.