From nobody Wed Dec 24 00:46:53 2025 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 4dbY9Z5q9xz6LBDw for ; Wed, 24 Dec 2025 00:46:58 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbY9Z3FRxz3bh4 for ; Wed, 24 Dec 2025 00:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766537218; 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=pPg3njn66NniF9Von1+2s8AKygi2ZDN6g244Hn16ews=; b=IfK8ULrpyXRRQiAqFmkdPkxjF8ibhTkTyHE4lqu3jKptmOqLoG8JOORepcuSsL6TTLC/rO JHZFiooXRUAfoljZhXiNrSIlAN2aOnMduUUquswdy86PNITN7yXMYjV89+CCn7wUE+R2Pb 0Wo5xW0qi5/+Lyc0GVbEChcxUuTXNXFrXw1e6cmICJ5olfYuQyLUsiodSfBbBqiG91aw/y Dup3287nf3iop/GXkGSKzzEixER8H4LbAHLM+i+79WBgRt+WZK4U9R0xD4oz9gfeGGveX7 +7Y5TwrqNGklPU56M0BD64WpGXst6vDV5SGhdQ7J0WjyC7ZD+CNTuCfpRbd7Mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766537218; 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=pPg3njn66NniF9Von1+2s8AKygi2ZDN6g244Hn16ews=; b=tuPf5yg5wdko1hTifyTwas+N80xoQPdz8fGQ2kyGPNyytsxhP9KrfbMdj8sveeDt/VjJ6Y PeKAFMKoj01sVT9PMBegOhIHC4xh+zwPUgoHyiaZyJdFdHJywiDI4vv4n/FVijdjj46Njr TXGuAXu1M33rY4MNcMGJCj8+DiNJ2gsAyyKXkywA7IuuxuM1mxzG7vWapTsrRE2KtdlYrf ZbK+J5gEt+Ls7zriuoaD5ElRNDSA/l9kodeKI4F0cMzWWUq73f458vw/8zhxi4Jr381MeD RqVbSd1HpITlL+6xnhFak3gJRzgZPPuKGfuY38FGYTyHAJOOq9jpakATJGOpHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766537218; a=rsa-sha256; cv=none; b=NNB8nTOHzxeQZsjAoAAZFwWK0BncFLugQ9JdzfP6PHyfBa85AJ0h0KmydhC5Gvmzsp3F+a lJg/toVqz8Oeijcv3n0lzYOg2yi1zi1OD96Nh+Gkp8ETlDgA9KFnFgbNmUybJdaY9vkIUR bw/OcST236gMPFpN5dYS8kuLOAefYb2eq/w9QDrKQzWBhZMXJa8z1+NFql+V+FJL2FesM5 bPyWtMTYolpB8w674jjeWR5+JD/uIHSZGwWDLLdxoadsFJ3iEj2HADlExvwb2/bsWqj/hg rgHkJ/tYBL+xzFt1FsSTR582apSHHS7n/hydO0IH+s7+RLDcvnnoh3MDNd8Nfw== 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 4dbY9Z25kgz4TG for ; Wed, 24 Dec 2025 00:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31a42 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Dec 2025 00:46:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b29fb0b5259c - stable/14 - devfs: make destroy_dev() a release barrier for cdevpriv destructors runs 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b29fb0b5259cc991d6e51e0de53455701014858e Auto-Submitted: auto-generated Date: Wed, 24 Dec 2025 00:46:53 +0000 Message-Id: <694b37fd.31a42.677655fb@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b29fb0b5259cc991d6e51e0de53455701014858e commit b29fb0b5259cc991d6e51e0de53455701014858e Author: Konstantin Belousov AuthorDate: 2025-10-23 18:37:00 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-24 00:43:07 +0000 devfs: make destroy_dev() a release barrier for cdevpriv destructors runs (cherry picked from commit 4dbe6628179d8e6bf400bfdb4bfa869bdc102a56) --- sys/fs/devfs/devfs_int.h | 1 + sys/fs/devfs/devfs_vnops.c | 17 ++++++++++++++--- sys/kern/kern_conf.c | 3 +++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/sys/fs/devfs/devfs_int.h b/sys/fs/devfs/devfs_int.h index 916297425b53..9fa75c0e90ad 100644 --- a/sys/fs/devfs/devfs_int.h +++ b/sys/fs/devfs/devfs_int.h @@ -67,6 +67,7 @@ struct cdev_priv { void *cdp_dtr_cb_arg; LIST_HEAD(, cdev_privdata) cdp_fdpriv; + u_int cdp_fdpriv_dtrc; struct mtx cdp_threadlock; }; diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index 2a4576320286..1ff24b54cbf0 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -202,14 +202,25 @@ devfs_foreach_cdevpriv(struct cdev *dev, int (*cb)(void *data, void *arg), void devfs_destroy_cdevpriv(struct cdev_privdata *p) { + struct file *fp; + struct cdev_priv *cdp; mtx_assert(&cdevpriv_mtx, MA_OWNED); - KASSERT(p->cdpd_fp->f_cdevpriv == p, - ("devfs_destoy_cdevpriv %p != %p", p->cdpd_fp->f_cdevpriv, p)); - p->cdpd_fp->f_cdevpriv = NULL; + fp = p->cdpd_fp; + KASSERT(fp->f_cdevpriv == p, + ("devfs_destoy_cdevpriv %p != %p", fp->f_cdevpriv, p)); + cdp = cdev2priv((struct cdev *)fp->f_data); + cdp->cdp_fdpriv_dtrc++; + fp->f_cdevpriv = NULL; LIST_REMOVE(p, cdpd_list); mtx_unlock(&cdevpriv_mtx); (p->cdpd_dtr)(p->cdpd_data); + mtx_lock(&cdevpriv_mtx); + MPASS(cdp->cdp_fdpriv_dtrc >= 1); + cdp->cdp_fdpriv_dtrc--; + if (cdp->cdp_fdpriv_dtrc == 0) + wakeup(&cdp->cdp_fdpriv_dtrc); + mtx_unlock(&cdevpriv_mtx); free(p, M_CDEVPDATA); } diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index db5fe7a6a373..dcc7ebafb13c 100644 --- a/sys/kern/kern_conf.c +++ b/sys/kern/kern_conf.c @@ -1164,6 +1164,9 @@ destroy_devl(struct cdev *dev) devfs_destroy_cdevpriv(p); mtx_lock(&cdevpriv_mtx); } + while (cdp->cdp_fdpriv_dtrc != 0) { + msleep(&cdp->cdp_fdpriv_dtrc, &cdevpriv_mtx, 0, "cdfdpc", 0); + } mtx_unlock(&cdevpriv_mtx); dev_lock();