From nobody Wed Apr 27 23:27:48 2022 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 5199C1AA90A2; Wed, 27 Apr 2022 23:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KpZfr6Tb7z4YQB; Wed, 27 Apr 2022 23:27:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651102069; 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=4kyJa9/Uve9gGNcTZjuNxGp9Y88zFv0kA2utiZ0j/AQ=; b=W3p0LHcGhJaMTNmujo3nvkzLnn7NsSXBCZPzOEX4gVUD49o+itq57enXuYXijCmAGeEZej mS0efgOv6ZbDabFYicjOYjvrkpwSZ4huT01S66wCA/QGXacVoSRKxia6VX87w3avkgQozm jS+FOb/G+m5/Zh9Gf/iLDwQSICke6BGCbGifVdGQ88F2uXi/TyQlYV1ZMRdXI/6JMvqOz0 vGc4PmGSFy71ROMQTr97NShsSIPFZBeg6gFA7KCr9l8m8sNCeg2O8hoZ9ehMpbsSDYWNVi HUM8Vzy9eQfqJ1cBrQAXVRzidOBjdmFMejybYmqTxXG44FIg+aBihVE/3oMm1A== 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 6798B5881; Wed, 27 Apr 2022 23:27:48 +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 23RNRmEH071815; Wed, 27 Apr 2022 23:27:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23RNRm0H071814; Wed, 27 Apr 2022 23:27:48 GMT (envelope-from git) Date: Wed, 27 Apr 2022 23:27:48 GMT Message-Id: <202204272327.23RNRm0H071814@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: b9294a3e152b - main - reaper_abandon_children(): upgrade proctree_lock assert to exclusive 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b9294a3e152b2524497678c8089e2c4abbdceb31 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651102069; 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=4kyJa9/Uve9gGNcTZjuNxGp9Y88zFv0kA2utiZ0j/AQ=; b=kDl4IWLrG0InFFSvk2wvsEqxZgrmbXKgmZkJ1REp9NvmOXFLdvVwYKHK4Pv/zWu8OjGQa/ zBqEeWsCjdpt9xnBNK5TkoeAoCBPZKjJ2aRIOWxgZ1/2Qc92GX3ys/MF5Uu8ohT0g9VjKi kTMGqVUgygvkn3YzLOU1CyK9AbxkM/Ve8F4zABr63LaVGBy7i+pRBm0EIEyVIaSxZ9zpjj ZSVQT5dxdVTh9fpZuiFx8sP798J1piyeijvi4XSKLHA7easOTsfMto1vvKa/94Q+AJKYt2 iBLf+HiN3MvKLA4B+lTjoP8z9gk+ayXpUc/q85P6i+5PA48XGdGxzLG02fWSAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651102069; a=rsa-sha256; cv=none; b=RzmMc4RD8GOZuJ8CaBrV0i00XjdThkje0eL40hPK7Ryv08awkrbCRS+S+/ZWn31PGApFgs GqjpfjzwdwhJgNU+i+RJcgJb5G/xNgy5g0HSnnub60G7x4nRETYz/mPvzHDmdhiRACLDo4 d1RJRAda54Gu8oOVv6nM2IBG33b80hWD+bd0zPt8wHsyG64Lj11Z2+prwqflQteQ8vAaXF jZqmr020HkYjsMae+ODBvXuwYyVc92iA+3qoAdAeCnW9nL+PgIIV1PM8qhfX6sc4ArQ0M1 UldAoPpq6tTWpXb455+LKMxD4EL4m6lxxIoWVAqnvl6sM/vo+G3GhPhwdm4ceg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b9294a3e152b2524497678c8089e2c4abbdceb31 commit b9294a3e152b2524497678c8089e2c4abbdceb31 Author: Konstantin Belousov AuthorDate: 2022-04-26 14:44:48 +0000 Commit: Konstantin Belousov CommitDate: 2022-04-27 23:27:34 +0000 reaper_abandon_children(): upgrade proctree_lock assert to exclusive p_reapsibling linkage is protected by proctree_lock, and it is modified there. Suggested and reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D35014 --- sys/kern/kern_exit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 7215aed60c83..0fc7a471f3f0 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -136,7 +136,7 @@ reaper_abandon_children(struct proc *p, bool exiting) { struct proc *p1, *p2, *ptmp; - sx_assert(&proctree_lock, SX_LOCKED); + sx_assert(&proctree_lock, SX_XLOCKED); KASSERT(p != initproc, ("reaper_abandon_children for initproc")); if ((p->p_treeflag & P_TREE_REAPER) == 0) return;