From nobody Fri Nov 20 15:10:44 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 4jWJgS60WKz71yH3 for ; Fri, 20 Nov 2026 15:10:44 +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 4jWJgS4Xlcz4j63 for ; Fri, 20 Nov 2026 15:10:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795187444; 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=tcz5cB/zEDeYAHBlnpAYgLRxptBOIIOdTsM9Mmg1Zqo=; b=Eu8CKrn5dzMq9XbSmLzHCoyfDkNTqYIQE5tk4D29bM6acwM9Iaqdem7sY4yF+gB7K+dHfZ XlY2p8tisAdPNerH2sMgeXWR+84IhcEtVjKrpCOtvJ94Cu1nTtUHODyT4WtzfCQof0M4m+ uQV67WnhM7kCrENYNIS64CqOLwTkg+CyoUDIqP5Wg8MajN1sBSAj0q83rlES/DLjjwjmnR v8ajNKo9GTg1gn+EP/7XjNJYiskXKsKYmNODbfsD0KaL7JLg/qKFTNrZ73pjvD0jHl2FeV G27oyjRrxT61eCSPOOLsGVcTmLNxu0n2n1SxmFN8w7a2ezBuXT72HnSrba02LQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795187444; b=k0vTmTgt/9pj92qdEQiDvm/H59C8kmH8dqDwa6mPNIC5BVYlZiJCByaHJ6QApPR1zcujMt JcD+4duADTuc0LuuKEDo+3Eu14App1IRWJUerSXLCx2hNCICK2dwtpO+DJiZhDAddmJIy/ WNF5Ej1mJndBMxShzUHeGHRpEaMxeB/Zc1RoU4Q5+dz1VaARer/TYUhsTZ8ovexK6V3jAD TnAbALU8lMEVurIufTpLDY5ABJkoBpsxcamhHZJ6T5MvNvaShIkoyN5XMxwYN0zeYfVAyR vBSMtgbDFmU5hSm+/CNZT0ffx4QyF4bUTNAAwz+LvXorD689JGAmSjWg08Yppg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795187444; 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=tcz5cB/zEDeYAHBlnpAYgLRxptBOIIOdTsM9Mmg1Zqo=; b=Udgu/Jf21l5yq2z7frSIADt3PbgmGd0QFrg3BUhQGBuy4+XOaLpCoh6jBwv5hvp9sYt2qs fKKccP+pe48n5fJsAHvmDj3uhNqVWyREmk8jqOe4Ca2pS4A8U7LVDLwktwpnTKES3ZPY52 +dZA0DQFo5OOzlwJqvJslRlhnp+6KeOjF80D1biNuAFwipQO7h74zbaEPSj7naV6/BcemQ Q7HoSSqUDjcNimqZASMZ0goqmwid+eqZxepikxhcCwF8YS10RNozr9YQVy/JxAZEEgUWon zzvonBCmYgLKZWD5XSrQ62mc582gPNsrClWVRMmutLvkfSRwct/+BLldy2hveg== 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 4jWJgS4CL0zsqQ for ; Fri, 20 Nov 2026 15:10:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18864 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Nov 2026 15:10:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 43339648088b - main - pwd_altroot(): avoid creating new pwd structure if altroot does not change 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/main X-Git-Reftype: branch X-Git-Commit: 43339648088b5fb71ff5e05c5b2937950f849654 Auto-Submitted: auto-generated Date: Fri, 20 Nov 2026 15:10:44 +0000 Message-Id: <6b0062f4.18864.784afd9e@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=43339648088b5fb71ff5e05c5b2937950f849654 commit 43339648088b5fb71ff5e05c5b2937950f849654 Author: Konstantin Belousov AuthorDate: 2026-09-25 23:48:49 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-20 15:10:26 +0000 pwd_altroot(): avoid creating new pwd structure if altroot does not change Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D60035 --- sys/kern/kern_descrip.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index de49d738c6d0..d7e16db12a05 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -4416,6 +4416,7 @@ pwd_altroot(struct thread *td, struct vnode *altroot_vp) { struct pwddesc *pdp; struct pwd *newpwd, *oldpwd; + struct vnode *vp; if (altroot_vp != NULL && altroot_vp->v_type != VDIR) return (ENOTDIR); @@ -4423,25 +4424,21 @@ pwd_altroot(struct thread *td, struct vnode *altroot_vp) pdp = td->td_proc->p_pd; PWDDESC_XLOCK(pdp); oldpwd = PWDDESC_XLOCKED_LOAD_PWD(pdp); - if (altroot_vp != NULL) { - /* - * Native process to a non-native ABI. - */ - - vrefact(altroot_vp); - newpwd->pwd_adir = altroot_vp; + vp = altroot_vp != NULL ? altroot_vp : oldpwd->pwd_rdir; + if (vp != oldpwd->pwd_adir) { + vrefact(vp); + newpwd->pwd_adir = vp; + pwd_fill(oldpwd, newpwd); + pwd_set(pdp, newpwd); + newpwd = NULL; } else { - /* - * Non-native process to the native ABI. - */ - - vrefact(oldpwd->pwd_rdir); - newpwd->pwd_adir = oldpwd->pwd_rdir; + oldpwd = NULL; } - pwd_fill(oldpwd, newpwd); - pwd_set(pdp, newpwd); PWDDESC_XUNLOCK(pdp); - pwd_drop(oldpwd); + if (oldpwd != NULL) + pwd_drop(oldpwd); + if (newpwd != NULL) + pwd_drop(newpwd); return (0); }