From nobody Mon Sep 21 14:23:47 2026 X-Original-To: dev-commits-src-main@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 4hpQT13Wdsz6sQsB for ; Mon, 21 Sep 2026 14:23:49 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hpQT11Zgtz4S71 for ; Mon, 21 Sep 2026 14:23:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790000629; 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=DcSbdKAPyWmuItG0TigXq/spnkFJ4k/JSZNddkKDPc0=; b=GI7b7SVk/zvGtsK4mGP5dvl/vlFkHXZkWIT8+gZqzBR+8ykSFW7xcklkOm3DSjHKjBc+KV IQFW3qqDoPU2RlDkNwAN50v52/2CNA4kpL+1Li9ZmpHQ1PASdGGPBuzrCmoempB0XoRWx+ hXy/YGfuEMBX1zrCorJfKMOxITDGP1SypzYBbFEJV1qbb43pGCas6+sXo09/bIGsXpuY8W nmsDxfZzsCLPxF4A15E0EWJ1+IbWcrsoBnLcjap9CEO9lQ2/uhcFtFJ/3iSTy7a/qNVkAC 0tim6v7cAamTbt3Rx0w27JxxofWnWu92GQwAF0sHN78P33gNEe+9ctvaFlkSdg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790000629; b=bkx1z9pVfWUtZNF75rL20OQa6NkRIv602z+t+OtovcsSJiK9C6iZHe61zwdAsp9tNUNyop Cixcylr6JgxvPnvA3tdwPkTHYa8CkkbdcqA+blTLwEuwrKYbYqOJUKOxSAN0/6rfs1g+z4 1AkCmkE5JVaggQqhoPg1Yl77UN1zydGzzwloyWPlygulf5wlwokL1xRMIDF/9G9rRJbB/8 XF7LAyhOUHYWxurPLV8fjEFX0zXznPWp4LqckaHh9T/nPm2B0eHPOVdOgfRVC6l3Wqpu7E obx2s36iTwaezHkupbUEBAhb1dljP7pfA6dipjFEXxKL8/v54bOYa+4UyfflqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790000629; 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=DcSbdKAPyWmuItG0TigXq/spnkFJ4k/JSZNddkKDPc0=; b=LOIO8fj6+MU6Nk+O240WNPARqRrHniqMeGwsCQ614TU3Ldfri+WBsBIZ7SADmsdLiUr9bF U0TrHrfIEeDk7AJps01c+wgtl3DawhxoZPoid7z2+oTbXI6oQzff5WmSeHkoxh3a8D/SQT TbhZ8eZMAuiw/noH7xBM7OZ2P2MDktOi+dzOu+LQzRM9ICRqLLLk+PJI0xLx0UT1QDIEXP 8/T6gQGM9gQhhbvuppUKuPjc5IwCqPJ9KagH6mH/Wa4OY2q4EfDQ1deh0hMKjJFuap6av3 GrWDFX4LHCHg4CbQmvUhdVPhEDlHk+oKM0WXDdYjJS+kyVm28yDrJsVhP+yxlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hpQSz3HhRzMpH for ; Mon, 21 Sep 2026 14:23:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22c2c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 21 Sep 2026 14:23:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: e20ed58d265c - main - lockf: Truncate the active lock list earlier in lf_purgelocks() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e20ed58d265cd6eba9b28efc8e8956324937d4c3 Auto-Submitted: auto-generated Date: Mon, 21 Sep 2026 14:23:47 +0000 Message-Id: <6ab13df3.22c2c.a5b5eab@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e20ed58d265cd6eba9b28efc8e8956324937d4c3 commit e20ed58d265cd6eba9b28efc8e8956324937d4c3 Author: Mark Johnston AuthorDate: 2026-09-21 14:14:45 +0000 Commit: Mark Johnston CommitDate: 2026-09-21 14:14:45 +0000 lockf: Truncate the active lock list earlier in lf_purgelocks() Otherwise vfs_report_lockf() can race with lf_purgelocks() while the latter is freeing active lock entries without any locks held. Reviewed by: kib MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D59768 --- sys/kern/kern_lockf.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c index a1aee233fdbd..a318c26484b4 100644 --- a/sys/kern/kern_lockf.c +++ b/sys/kern/kern_lockf.c @@ -752,6 +752,7 @@ lf_purgelocks(struct vnode *vp, struct lockf **statep) { struct lockf *state; struct lockf_entry *lock, *nlock; + struct lockf_entry_list active; /* * For this to work correctly, the caller must ensure that no @@ -778,6 +779,7 @@ lf_purgelocks(struct vnode *vp, struct lockf **statep) state->ls_threads++; VI_UNLOCK(vp); + LIST_INIT(&active); sx_xlock(&state->ls_lock); sx_xlock(&lf_owner_graph_lock); LIST_FOREACH_SAFE(lock, &state->ls_pending, lf_link, nlock) { @@ -797,6 +799,7 @@ lf_purgelocks(struct vnode *vp, struct lockf **statep) wakeup(lock); } } + LIST_SWAP(&active, &state->ls_active, lockf_entry, lf_link); sx_xunlock(&lf_owner_graph_lock); sx_xunlock(&state->ls_lock); @@ -810,19 +813,17 @@ lf_purgelocks(struct vnode *vp, struct lockf **statep) VI_UNLOCK(vp); /* - * We can just free all the active locks since they - * will have no dependencies (we removed them all - * above). We don't need to bother locking since we - * are the last thread using this state structure. + * We can just free all the active locks since they will have no + * dependencies (we removed them all above). */ - KASSERT(LIST_EMPTY(&state->ls_pending), - ("lock pending for %p", state)); - LIST_FOREACH_SAFE(lock, &state->ls_active, lf_link, nlock) { + LIST_FOREACH_SAFE(lock, &active, lf_link, nlock) { LIST_REMOVE(lock, lf_link); lf_free_lock(lock); } out_free: sx_xlock(&lf_lock_states_lock); + KASSERT(LIST_EMPTY(&state->ls_pending), ("lock pending for %p", state)); + KASSERT(LIST_EMPTY(&state->ls_active), ("lock active for %p", state)); LIST_REMOVE(state, ls_link); sx_xunlock(&lf_lock_states_lock); sx_destroy(&state->ls_lock);