From nobody Fri Jun 24 19:36:45 2022 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 17165863C98; Fri, 24 Jun 2022 19:36:46 +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 4LV6nV05prz4X0p; Fri, 24 Jun 2022 19:36:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656099406; 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=dH3ZohZGBYkyjYAmw7z7ylAnVWH2psuaSM/iXLbdiWA=; b=A0nir2fCrOQcjkTJe8qf2bKhjAnl+JBrxmdMKNLyAvtN/5l2r8fOQBxoZkRXdD82/Qq6uV m+zzzxZHbCkQGsdtxi0CFPPRdKSaURNn1FdIvzlkqLyHBV1+WaOzcgWbOQkmIq7kFUAb1c rJFWc5yMIzE4tMRRKUeskD41cnZ+gDNHVuihiV4QqGvqNAAQM9e/W6yI2VCNLzvZKlDG1a X0mbK8GehAlE/9wBGWGEIr/hDpXIiZE68sWZdd+djhB9wIEpg0THVOk3EarpIDH3BPhsah e5+0T8tTI/A9/XCPCZ0zsJ6mZvEIRpFstOf2YUKsKcsQAcETa76BgoQDkNNHhQ== 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 D393216383; Fri, 24 Jun 2022 19:36:45 +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 25OJaj80083958; Fri, 24 Jun 2022 19:36:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25OJajdq083957; Fri, 24 Jun 2022 19:36:45 GMT (envelope-from git) Date: Fri, 24 Jun 2022 19:36:45 GMT Message-Id: <202206241936.25OJajdq083957@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e6e9b3d7361a - stable/13 - reaper_abandon_children(): upgrade proctree_lock assert to exclusive List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: e6e9b3d7361a4abf666ccc53a08da26d51934b10 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656099406; 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=dH3ZohZGBYkyjYAmw7z7ylAnVWH2psuaSM/iXLbdiWA=; b=B6CgQyL+5s5ce2Hn2Ez1VPf9kMAPwQ0UabwJ/5aqWYtnrGrtC3mRl1M3HacLsgT5DST5QA dZoBsZCnG4E57a0EHGhYTB/85jEhT4G6PjCvekjmhqZfP3p/4CA+QEPtfpmfx2YZhj49i6 0GLXYQt2g6QPjk9HYHILgqZ8mRUBpUjfZmIayXDOx6NbyV0cDViRgLMuRlht5Ns2IqwoMw 7+czG4KvIqYWFPfymA01zv33RQbpiLhQiquZkfA45KGXHsg9jdcXre4dzUOlJr3mwOKy3e Nhm2R10mnEmtxMvnAZkr8lZXev4clWEYFiyIjbDPN7goZ+mDbRxsyw2oRrRcsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656099406; a=rsa-sha256; cv=none; b=LOmqT6d+uvFDpGo7DhvfD840/Ho7DHg8vPGUKrzSWuGeJLtoFM8c+ufuKoH6kebbVSxtvU eW7c5PGDTPm/2C68Gcm6W8przb47lv/lZxk3f7A2rWUJnVuRiRm3pH+BYtb8d23twnTjn/ /iGynkn++GpKV39jFRP/SB309DQR+bgmjGmodSmOinFt4dFkQUyTEyT+gjNdKcAHAiDgX5 Mz602dRO1XXobbF0WGbHHpB7a1QYZvJ32l0WNsQ9A6CFrE450LDcZQgVJtKyP54qUr+0cj HPt906m/6ZicDpFFAnTB4UxeruJIBGDaPEeL7PtruyORFlbWFYmZDZKMCsVegg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e6e9b3d7361a4abf666ccc53a08da26d51934b10 commit e6e9b3d7361a4abf666ccc53a08da26d51934b10 Author: Konstantin Belousov AuthorDate: 2022-04-26 14:44:48 +0000 Commit: Konstantin Belousov CommitDate: 2022-06-24 14:45:44 +0000 reaper_abandon_children(): upgrade proctree_lock assert to exclusive (cherry picked from commit b9294a3e152b2524497678c8089e2c4abbdceb31) --- 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 09bad7873ff5..27c7f00130f8 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;