From nobody Fri Jun 24 19:37:09 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 97CD6865110; Fri, 24 Jun 2022 19:37:11 +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 4LV6ny1KdXz4XTH; Fri, 24 Jun 2022 19:37:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656099430; 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=ycwQ4nA95pErpXQ9wLVjUEmkwY4XWPUK1kXsZDssrC8=; b=s55NANsm6jci1vgE/QLeWZBhYjXRBttyGSwPXU5If+lZEG0nF8rlt+qEo/62uNuoe4JylV 05k4tz10YA32MiOXQhNQwqWcJTeRpSEk8FZbVS8ShQxn0w88mx5C/XxlekBQF9nYllTtcs LIT1zv1GgX92WWv/UALRg3rDpSd+T3OexlwtbbK31JB5s1MQecy6wEPEo91mBZPgNiqHP0 ihsMm+L687G6L7W/BfZtElKe1gjqTAoXM7hBldtKEx9gtfXUyL2a5IXpvkTD6BNP9ICvK1 VPKfztEYPUXPlJrg/I3tvFbbTU6WOhsdcn4qH6QcfGYaCnfYktQhbvqb0z4rPQ== 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 F2D0B16385; Fri, 24 Jun 2022 19:37:09 +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 25OJb9WY084491; Fri, 24 Jun 2022 19:37:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25OJb9Fq084490; Fri, 24 Jun 2022 19:37:09 GMT (envelope-from git) Date: Fri, 24 Jun 2022 19:37:09 GMT Message-Id: <202206241937.25OJb9Fq084490@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: 9a24a80a17be - stable/13 - reap_kill_proc(): avoid singlethreading any other process if we are exiting 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: 9a24a80a17be36eb63caeb9ef189b0ce0048246f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656099430; 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=ycwQ4nA95pErpXQ9wLVjUEmkwY4XWPUK1kXsZDssrC8=; b=KxlzfHpYTlNmER+eD/gXi/tR/Q/lLPEcViQdEU2dSjmgamK8xZrf3HrqtQJcr3RthEvogx 5pcK2Tay5+bJZaOA8BJx7VjLuvD9zpes1zvi0S1qxbBAqerbiW29LnD++qMVNqpiVo2zVP CBr/swWJC0bXNO3ELwR5CtwU5LNqI+/xhWUo1yhJYynlHwRSgBWtDXugMjm+QuyLnW/r0t 1AfSahzlLtuMHVbeQCgSjwdMhXbJQ/PTjF8h1Nbf6VuiIQhrwbEtEBuDvhOwS1NnIrEeIk 2mcNu+gF9pfRMWTX6nw2fYO6DqGxWd44T4ZYLCZ1D4wcjv2uuBEYFY5DxU2nvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656099430; a=rsa-sha256; cv=none; b=DUGOjeEKa7YtxP4AlqHXYnGK7Kd0SZnyupaOB9o6X2dHHOrQZDfTOD2/BwmqfGqd1nk/vi LZ9SxCMGmfqxduyEgZOzdKatH5P+7ktw5y5BOvvFKr9D8UJ1YKXJdIgZQe21GpN6ATcIWO qxHyZ8dRymXFfqdfaEV+SbT1Bx9DDkK27CPMGEfDxsRwYyncykMIwXKruMiEdLUyeEn5tX 4U0pYCay+pCA45MEohPBh/i8uv99nhwzBNkzLsfQWzeuwQPDPLA4tTMxFIOCrjjh/DGHAH tsVFe3sgg28xRnUSwO3OMjGGw72gMpTnRd4R8QC25gX69bYEd6qNJGSWSiDl7Q== 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=9a24a80a17be36eb63caeb9ef189b0ce0048246f commit 9a24a80a17be36eb63caeb9ef189b0ce0048246f Author: Konstantin Belousov AuthorDate: 2022-05-16 23:47:20 +0000 Commit: Konstantin Belousov CommitDate: 2022-06-24 14:45:50 +0000 reap_kill_proc(): avoid singlethreading any other process if we are exiting Tested by: pho (whole series MFC) (cherry picked from commit 1575804961d2ba1768c9a6b28438d364421718f3) --- sys/kern/kern_procctl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c index b32a4156dafb..79725686bc44 100644 --- a/sys/kern/kern_procctl.c +++ b/sys/kern/kern_procctl.c @@ -291,6 +291,7 @@ reap_kill_proc_locked(struct thread *td, struct proc *p2, * race. */ need_stop = p2 != td->td_proc && + (td->td_proc->p_flag2 & P2_WEXIT) == 0 && (p2->p_flag & (P_KPROC | P_SYSTEM | P_STOPPED)) == 0 && (rk->rk_flags & REAPER_KILL_CHILDREN) == 0;