From nobody Wed Nov 11 01:06:59 2026 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 4jPQN43Fbsz6y1sp for ; Wed, 11 Nov 2026 01:07:00 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jPQN36sFtz4nR8 for ; Wed, 11 Nov 2026 01:06:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794359220; 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=4GqE4mIxVyhx47Ykt4E5e2rT+9a8ICncLvO/zVwnzAM=; b=lENdSKdAn1aPauk6uhj5R0GgAHteC5Yr0/qIGYvH5yN5BuNyp1eNpL0zesT83asRHF/nUi tOxUn0foTl6bZz772QflhtHqdm7LPuZNB37ycQ9tZq2JpmjPF8+kvW/KWQLKxuw6GXFiJq pGt18MtwgkwxQg1+cmdHMhgSXwu7DPgy/dNP5CYI2LJyFHatxm8AdVOYF5BC8JhD/fXkaq +A3iXIssMYFzkf+o64Utm3BlZeRy974B2aLiYF2J9SLE6DzBlZgQ6KyCWH7r07e9h4flqb 0IcVtnNSr7n6XG/8GrwItSKgu9cNl60pUJZKHLZrWlUlaageCq9L3ohgm4gf1g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794359220; b=at4XDzZ52MsR1+SnmMz8Zt9LbpP0ytAccYSPHj0gukdcETDUQr5n1GlB1nux2mrQYMjR3t /smfUsgEq1vExSTo1Wj9OJc2HXFYZXan+VzDdsCI8WdJ2SSw+qLDLvvNtB0JmmPislhyP0 0t9j109t6PUbbXtdu+lDyrbvI7PhtWz+p2nNrUD8ThsgOaNFRski8WnqTmlxKk8B9NMcyS fwoa7mpz8m//kGumMLIAjxReYQvZu+cK9VIPoCM57/+Y3bBY1r4i8eszfu/9J3dDA3ID+P U0aap8E7oAZ5j4BHmoRbVMjrYtwMWVTrhRTeNR/DXhXkipqJ+WpYEP6uvGfNYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794359220; 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=4GqE4mIxVyhx47Ykt4E5e2rT+9a8ICncLvO/zVwnzAM=; b=cUtuvNOeZo2Xct67jQt2jYkcbwU6DkXBmgr0SFg87lXXWjhsBojxPCUviRmlr66NdtOXs2 fEvR0yPw5YlmCb+icw2P0WHOtSHwk9NTlHplYXwSPO0N0uSn62eNQFYwxOPY1zzrmfVoVS nw7NhVN59y2la6F9VVrhAFMM1Utj3fUEbfWhuu7FWBwNbLHelbc59RFPNifm5aDr3nI1A9 m6pSrkEaN5CobszfCnyirFTDxtkWfwkdDAgfpFymttGB9IBe24dRulflkw9WrIVMk4q9Lz XBL85GWJJSDFsYQN8VXPBkmi4wpXGkxDu+ud0DqPL4uLBlFEDmfktF/m1X2yQw== 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 4jPQN36XFJzsJM for ; Wed, 11 Nov 2026 01:06:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 228f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Nov 2026 01:06:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 45f988b6abfd - stable/15 - pwddesc: add sharecount List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 45f988b6abfdf1b7b62f429f5fc1eb89296c1327 Auto-Submitted: auto-generated Date: Wed, 11 Nov 2026 01:06:59 +0000 Message-Id: <6af3bfb3.228f3.5fcf51a8@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=45f988b6abfdf1b7b62f429f5fc1eb89296c1327 commit 45f988b6abfdf1b7b62f429f5fc1eb89296c1327 Author: Konstantin Belousov AuthorDate: 2026-10-21 22:54:59 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-10 19:53:56 +0000 pwddesc: add sharecount (cherry picked from commit 5276fba9fd55bf2e79c54df18a70b46d11cc15a1) --- sys/kern/kern_descrip.c | 9 ++++++++- sys/sys/filedesc.h | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 764368b36cd3..ea033a7f598a 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -2418,6 +2418,7 @@ pdinit(struct pwddesc *pdp, bool keeplock) PWDDESC_LOCK_INIT(newpdp); refcount_init(&newpdp->pd_refcount, 1); + refcount_init(&newpdp->pd_sharecount, 1); newpdp->pd_cmask = CMASK; if (pdp == NULL) { @@ -2499,6 +2500,7 @@ pddrop(struct pwddesc *pdp) PWDDESC_XUNLOCK(pdp); return; } + MPASS(refcount_load(&pdp->pd_sharecount) == 0); pwd = PWDDESC_XLOCKED_LOAD_PWD(pdp); pwd_set(pdp, NULL); PWDDESC_XUNLOCK(pdp); @@ -2525,7 +2527,11 @@ fdshare(struct filedesc *fdp) struct pwddesc * pdshare(struct pwddesc *pdp) { + u_int old __diagused; + refcount_acquire(&pdp->pd_refcount); + old = refcount_acquire(&pdp->pd_sharecount); + MPASS(old > 0); return (pdp); } @@ -2557,7 +2563,7 @@ pdunshare(struct thread *td) p = td->td_proc; /* Not shared. */ - if (refcount_load(&p->p_pd->pd_refcount) == 1) + if (refcount_load(&p->p_pd->pd_sharecount) == 1) return; pdp = pdcopy(p->p_pd); @@ -2843,6 +2849,7 @@ pdescfree(struct thread *td) atomic_thread_fence_seq_cst(); PROC_WAIT_UNLOCKED(p); + (void)refcount_release(&pdp->pd_sharecount); pddrop(pdp); } diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h index a2bb6c671dbb..d985641eb475 100644 --- a/sys/sys/filedesc.h +++ b/sys/sys/filedesc.h @@ -103,7 +103,8 @@ typedef SMR_POINTER(struct pwd *) smrpwd_t; struct pwddesc { struct mtx pd_lock; /* protects members of this struct */ smrpwd_t pd_pwd; /* directories */ - u_int pd_refcount; + u_int pd_refcount; /* lifetime */ + u_int pd_sharecount; /* processes sharing the descriptor */ u_short pd_cmask; /* mask for file creation */ };