From nobody Fri Jun 24 19:37:08 2022 X-Original-To: dev-commits-src-branches@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 C864B864EF7; Fri, 24 Jun 2022 19:37:09 +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 4LV6nx0dPrz4XCW; Fri, 24 Jun 2022 19:37:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656099429; 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=xPM5mT83HMibmEmCZxnFqweNi4FhtRuFnEcJVtOL1rs=; b=Bi+GwmeIxs8u4gGFRBu1vcpSLCXHcBQ0e3MIC5j/ejPmZONHEMPSmWCizGo3qYk1hvY8zq GxlasoMBefSGVRXpCt3hzWNKQeA1e/RzrPkRPmAz0jv9QT/5eGk3qWdbU3NCD/joLphS+9 bAYcTTSukkau/YOj+6Zyv5Uf3EhSM2bu5mrb2gH+s0ffuK+fWazpRbVxPMAcuJ+Nvw4T0Z gCXxumXL9agqZO7jD8xsLdF58hC9LyI1FkvlLiZJ75Kf6TkoXwuSWQyA354QzefXFNOHle rGw1u1qfWnk72KIE4WEjXo2i/gyPdNorXY7TBsPNGWMBw2YnMR3wmuBiVPoN+g== 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 C9E7C16480; Fri, 24 Jun 2022 19:37:08 +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 25OJb8mf084467; Fri, 24 Jun 2022 19:37:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25OJb8S8084466; Fri, 24 Jun 2022 19:37:08 GMT (envelope-from git) Date: Fri, 24 Jun 2022 19:37:08 GMT Message-Id: <202206241937.25OJb8S8084466@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: b18df35be042 - stable/13 - reap_kill_subtree(): hold the reaper when entering it into the queue to handle later List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: b18df35be04213e6a603b54d404215a923fe66e2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656099429; 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=xPM5mT83HMibmEmCZxnFqweNi4FhtRuFnEcJVtOL1rs=; b=ikOxV0kJa/9hwW/Jbg9Le7yVZFnNyrnlljB5uem9rwbd/T09+6FmO3TTtfrxXgWtaDKBGu 6Ai7ayPIH0JnzlNWjkTU3kqrn6tGBtiOyDllE0OA6WxA3Y9ANlPmE/V0C1M+4fl6Cy8uKb i3IDKU0xkwfMjye/68JelZR2ntFZoIFzaIngfoHeA4e1ZELPBUsXoT4DOMpZHLguy2DbfC IRkPGCU766C5kQ4ORETAQ5yCBNV7H5PN/DG0kVE1wb9QhTFCfPm4pOmtLSOjM5/w8X5cD9 RUQRTIAxYUhSFwSYC2W5BP+fmat/v5QaU5zY69N+PkGMGu7aX0yqVDIKvwFWlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656099429; a=rsa-sha256; cv=none; b=WlAowhPNOrRoT0ZL9KwqQXbhSNiHGJMoY2Wu1H28XeHHmMUsbpT6C6BCdIZNwxC+PgPULh MHpuqX7hGWzsmv1az42isYW3VQo1kFJH6Q7bJyZokiXL3Mjmfk00pEyJko5eeR/Lii+Mm5 dGlALkzjo6Rkd/QjzYNKNO13A57ckjjSHK4tWuRfhlLw36vk9Hkab33vWPjjHNIWg1iLTC J86U/cfLt6x1Sz9GGnUNJPcyDiiTx7l9VybAa+Qq3pmnw6CVxEbJZohOnnWBElelMU0P2d sTKTokfHv5/vjr4F2FOuT43vbgVofqKGFHUteudrz/MTJ6dnvS1U373vB2tz2A== 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=b18df35be04213e6a603b54d404215a923fe66e2 commit b18df35be04213e6a603b54d404215a923fe66e2 Author: Konstantin Belousov AuthorDate: 2022-05-15 22:52:09 +0000 Commit: Konstantin Belousov CommitDate: 2022-06-24 14:45:46 +0000 reap_kill_subtree(): hold the reaper when entering it into the queue to handle later (cherry picked from commit e0343eacf36588bf503c7a59c0cc436294223839) --- sys/kern/kern_procctl.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c index 02469f25bc3d..b32a4156dafb 100644 --- a/sys/kern/kern_procctl.c +++ b/sys/kern/kern_procctl.c @@ -336,11 +336,25 @@ reap_kill_sched(struct reap_kill_tracker_head *tracker, struct proc *p2) { struct reap_kill_tracker *t; + PROC_LOCK(p2); + if ((p2->p_flag2 & P2_WEXIT) != 0) { + PROC_UNLOCK(p2); + return; + } + _PHOLD_LITE(p2); + PROC_UNLOCK(p2); t = malloc(sizeof(struct reap_kill_tracker), M_TEMP, M_WAITOK); t->parent = p2; TAILQ_INSERT_TAIL(tracker, t, link); } +static void +reap_kill_sched_free(struct reap_kill_tracker *t) +{ + PRELE(t->parent); + free(t, M_TEMP); +} + static void reap_kill_children(struct thread *td, struct proc *reaper, struct procctl_reaper_kill *rk, ksiginfo_t *ksi, int *error) @@ -379,7 +393,7 @@ reap_kill_subtree_once(struct thread *td, struct proc *p, struct proc *reaper, * reaper, which should handle it. */ if ((t->parent->p_treeflag & P_TREE_REAPER) == 0) { - free(t, M_TEMP); + reap_kill_sched_free(t); res = true; continue; } @@ -396,7 +410,7 @@ reap_kill_subtree_once(struct thread *td, struct proc *p, struct proc *reaper, reap_kill_proc(td, p2, ksi, rk, error); res = true; } - free(t, M_TEMP); + reap_kill_sched_free(t); } return (res); }