From nobody Fri Jun 24 19:36:49 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 244F8863D91; Fri, 24 Jun 2022 19:36:50 +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 4LV6nY626lz4X3N; Fri, 24 Jun 2022 19:36:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656099410; 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=/q1DMLwDeRklNH0utlB2kYuRf0QuzHArmLDlVjX8rRY=; b=O02E8C9rVPlaTsujv8pEHoyPqvJHYuqCI5vlAGjZgaNTp6ACSgi4m/8ZMW78Ucy1mhFBYT TUHnXnrYdXv034Wf0dPWg6iwmqDiNiodl12syoH6AmRUAFj2f2lHS9S/kdSwQDHLI97IKl fFzDZvyQ7X0WZD5W/OKRr/YgPpKhpAHeDfQpoEDcWNOUuVdfbep9yOrmu8LBEyznhqKXU/ RI4OmYF41BH3NJfRT3+Mb9QQSy/y15sGWmPHQfMz3RHjqK+6Ed1hm7e2IV0pZ8y8Z4vkSG I9U3GbBeFGmZBeYa0aPl8fsHA+UpkjjN6HrMpvZ1ScsMUNUxwAQHZmaSBIbPQA== 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 455B315D77; Fri, 24 Jun 2022 19:36:49 +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 25OJan6q084030; Fri, 24 Jun 2022 19:36:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25OJancs084029; Fri, 24 Jun 2022 19:36:49 GMT (envelope-from git) Date: Fri, 24 Jun 2022 19:36:49 GMT Message-Id: <202206241936.25OJancs084029@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: ccba0468b869 - stable/13 - reap_kill(): split children and subtree killers into helpers 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: ccba0468b869c15daec96fcf91e219a7f38fcd0f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656099410; 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=/q1DMLwDeRklNH0utlB2kYuRf0QuzHArmLDlVjX8rRY=; b=UUrDvsjFw1uNvtwNLq/ANnZtovpox1tEeuCoM+szRxxI+2fnbLJcrBLzhkPfX5iSuNs4VT 99V9G9huPLV78lMbiACp4FVjDeOfCq4O8R008HhZ+sYLin4qg+SkOZjZVHOtoolPMs14sr L58FE0EE1RqjuesqNBma+tCnOUL5Y3yosBB3fg5XnSRxsdWAgdfoDwLfPyINlRQdssg2MK nuwG1eT72vIA3xuHZvLecgJMAvoaNEc/hOirpKdvfkwdbxmz4SCIOl+epHaoJoZ7ZA+u1O iTR4BUSeUkBfzOyThjpyfr32oRJThY094lY+A4WTxG6JCfnhjv421AJ7bkb0+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656099410; a=rsa-sha256; cv=none; b=m4mxRq3WAZGPKH0d04xW2zCGOklmNXdZieM68GFpur1YuJpi76Gta/sDusapRzYCJ2JeJH AjWBfb0vXGh4c8wWGfwXx72UdSjcZy4xFX9nWxE99y8NnIQfKt0uBUkXJrHtPSYUzyOdx1 9lrQvGMSlyHKP4ATi5mZGzXmaUmAfHcHOciB/acoJ0cfRCwzmVjXsjfvPY6jcSdLwxSKil peX3EhbPr6QeUg9p65ltikonlk3ndRUKXIDu/oxIivGIneYN+nqAZ1WlZAr6N9jTC2SJfZ Ph98GKYcH0ljeDXWv3hCxqMevXvBT0Y/PuRJJ13BhlSXotN1Gb/LGIMCDFDyMg== 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=ccba0468b869c15daec96fcf91e219a7f38fcd0f commit ccba0468b869c15daec96fcf91e219a7f38fcd0f Author: Konstantin Belousov AuthorDate: 2022-04-20 21:12:05 +0000 Commit: Konstantin Belousov CommitDate: 2022-06-24 14:45:45 +0000 reap_kill(): split children and subtree killers into helpers (cherry picked from commit 54a11adbd9c2b1fa9b42181ac883ed6ed2a6998c) --- sys/kern/kern_procctl.c | 71 ++++++++++++++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 27 deletions(-) diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c index a8c56f7ae8ff..bc7ba14a6f97 100644 --- a/sys/kern/kern_procctl.c +++ b/sys/kern/kern_procctl.c @@ -278,13 +278,52 @@ reap_kill_sched(struct reap_kill_tracker_head *tracker, struct proc *p2) TAILQ_INSERT_TAIL(tracker, t, link); } +static void +reap_kill_children(struct thread *td, struct proc *reaper, + struct procctl_reaper_kill *rk, ksiginfo_t *ksi, int *error) +{ + struct proc *p2; + + LIST_FOREACH(p2, &reaper->p_children, p_sibling) { + reap_kill_proc(td, p2, ksi, rk, error); + /* + * Do not end the loop on error, signal everything we + * can. + */ + } +} + +static void +reap_kill_subtree(struct thread *td, struct proc *p, struct proc *reaper, + struct procctl_reaper_kill *rk, ksiginfo_t *ksi, int *error) +{ + struct reap_kill_tracker_head tracker; + struct reap_kill_tracker *t; + struct proc *p2; + + TAILQ_INIT(&tracker); + reap_kill_sched(&tracker, reaper); + while ((t = TAILQ_FIRST(&tracker)) != NULL) { + MPASS((t->parent->p_treeflag & P_TREE_REAPER) != 0); + TAILQ_REMOVE(&tracker, t, link); + LIST_FOREACH(p2, &t->parent->p_reaplist, p_reapsibling) { + if (t->parent == reaper && + (rk->rk_flags & REAPER_KILL_SUBTREE) != 0 && + p2->p_reapsubtree != rk->rk_subtree) + continue; + if ((p2->p_treeflag & P_TREE_REAPER) != 0) + reap_kill_sched(&tracker, p2); + reap_kill_proc(td, p2, ksi, rk, error); + } + free(t, M_TEMP); + } +} + static int reap_kill(struct thread *td, struct proc *p, void *data) { - struct proc *reaper, *p2; + struct proc *reaper; ksiginfo_t ksi; - struct reap_kill_tracker_head tracker; - struct reap_kill_tracker *t; struct procctl_reaper_kill *rk; int error; @@ -309,31 +348,9 @@ reap_kill(struct thread *td, struct proc *p, void *data) rk->rk_killed = 0; rk->rk_fpid = -1; if ((rk->rk_flags & REAPER_KILL_CHILDREN) != 0) { - LIST_FOREACH(p2, &reaper->p_children, p_sibling) { - reap_kill_proc(td, p2, &ksi, rk, &error); - /* - * Do not end the loop on error, signal - * everything we can. - */ - } + reap_kill_children(td, reaper, rk, &ksi, &error); } else { - TAILQ_INIT(&tracker); - reap_kill_sched(&tracker, reaper); - while ((t = TAILQ_FIRST(&tracker)) != NULL) { - MPASS((t->parent->p_treeflag & P_TREE_REAPER) != 0); - TAILQ_REMOVE(&tracker, t, link); - LIST_FOREACH(p2, &t->parent->p_reaplist, - p_reapsibling) { - if (t->parent == reaper && - (rk->rk_flags & REAPER_KILL_SUBTREE) != 0 && - p2->p_reapsubtree != rk->rk_subtree) - continue; - if ((p2->p_treeflag & P_TREE_REAPER) != 0) - reap_kill_sched(&tracker, p2); - reap_kill_proc(td, p2, &ksi, rk, &error); - } - free(t, M_TEMP); - } + reap_kill_subtree(td, p, reaper, rk, &ksi, &error); } PROC_LOCK(p); return (error);