From nobody Fri Jun 24 19:36:51 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 31C73863EAE; Fri, 24 Jun 2022 19:36:52 +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 4LV6nb65vBz4X6R; Fri, 24 Jun 2022 19:36:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656099412; 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=4YOXxzSOXZH1KrLLD1g7H5P6w0QpHF00vPddd6FKoPQ=; b=BgXgxLSK1L+JuZgh48zr9iXMk6cqxq2wVUc3/JY70yWSfDzA72veSUAwiglF0aT5bO3Vlw iNoo7Gn20fIcof97gazdy4O3ich/4kiObbTrXEXnkXqAh36v5Xlskw/KFCpz4q96xyQVRp P216VAiSzJioR5Mi/3tgFH4HeTSJ/4o2/KSSqr1FUc9gW5OHJxP+mnrISNmA/mmkGd4p7a bc8RR7VWMjrGRpeW8JSXqCa3QL1s4cV7ojANI/1EnorHQjlqBZwSM4UFuS6nX6O0fhLupe k335ZnS6koHM9ugKqv5BcoYyqq9SKshODps4yC/8Mm5Ao0Ep3xviOdrX7Uvn/Q== 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 867EA15F6F; Fri, 24 Jun 2022 19:36:51 +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 25OJapMN084085; Fri, 24 Jun 2022 19:36:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25OJapkP084084; Fri, 24 Jun 2022 19:36:51 GMT (envelope-from git) Date: Fri, 24 Jun 2022 19:36:51 GMT Message-Id: <202206241936.25OJapkP084084@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: 034c2787d229 - stable/13 - kern_procctl: add possibility to take stop_all_proc_block() around exec 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: 034c2787d22975f3cc3ba11d4b3a72271ac268db Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656099412; 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=4YOXxzSOXZH1KrLLD1g7H5P6w0QpHF00vPddd6FKoPQ=; b=RU2PHtXwj+Irr/Of3TkurKHo+hVxy0PsCNbjmrHm7NuQfYHJpTTQvwXIQJMXAzb01jZffc o9Fslz+Bk+KZXk36S4pnK5ZOFv1rXtThA0TALiP0ysxgIh/C7u8/Zin7WOeuStLjeW18NB DIj0iuhjAS70G6FQOBL6xb/OaYSEuRI6QuTRNnNfIpw/rO9CmJ95e3hdetrBB3o9ya2KVi m5VFmIXZ7lzfWAbiu+r6U6lGDB8NZw4DYb9ZjDC05lA0DVk+4/4oa7+IHLl+bikieQ/R2m Vxqk2kWxSk30Gtz7LQQNnB6OOZx2YK3QnSkO/wgWiaqfOxxVFBGpgIgbKqY0Sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656099412; a=rsa-sha256; cv=none; b=NTsn+3N+7o7LohtJcRVMQMwZLHKZ7xp2IXFzBJ6ASB0v8PaRuuuZYJNAZxioapy5QkbT+w K94RuI1gqfPzmmSKiRtIroTYfTPJ/ceXYyFaLUhXQYvFs7a3UJUpjHzYNe3vSwD1Y2dcXO p6P1vjAp42uZlqUTyavHSa0DoKejDc3MkmRGWBZoKHXvpvmiq2+a/my49SjQIPMYIKxENo uNTJsS43mIX/yTjP5sb8JnrYqGomDlkJik8EE2pwGyiR6cWpTz4YU9tAep5ZLuJtyI4IN/ XTfDc7VAy7MF0MukaJ6n0iR7WYuA67rZxadFnzoikfArxQ4I8iJ7tMFnSyWt9g== 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=034c2787d22975f3cc3ba11d4b3a72271ac268db commit 034c2787d22975f3cc3ba11d4b3a72271ac268db Author: Konstantin Belousov AuthorDate: 2022-04-27 21:18:34 +0000 Commit: Konstantin Belousov CommitDate: 2022-06-24 14:45:45 +0000 kern_procctl: add possibility to take stop_all_proc_block() around exec (cherry picked from commit d1df34736888f43e8fe1cdc460eac134d625c777) --- sys/kern/kern_procctl.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c index bc7ba14a6f97..1a9f17de2d7a 100644 --- a/sys/kern/kern_procctl.c +++ b/sys/kern/kern_procctl.c @@ -319,6 +319,15 @@ reap_kill_subtree(struct thread *td, struct proc *p, struct proc *reaper, } } +static bool +reap_kill_sapblk(struct thread *td __unused, void *data) +{ + struct procctl_reaper_kill *rk; + + rk = data; + return ((rk->rk_flags & REAPER_KILL_CHILDREN) == 0); +} + static int reap_kill(struct thread *td, struct proc *p, void *data) { @@ -737,6 +746,7 @@ struct procctl_cmd_info { int copyin_sz; int copyout_sz; int (*exec)(struct thread *, struct proc *, void *); + bool (*sapblk)(struct thread *, void *); }; static const struct procctl_cmd_info procctl_cmds_info[] = { [PROC_SPROTECT] = @@ -777,7 +787,8 @@ static const struct procctl_cmd_info procctl_cmds_info[] = { .need_candebug = false, .copyin_sz = sizeof(struct procctl_reaper_kill), .copyout_sz = sizeof(struct procctl_reaper_kill), - .exec = reap_kill, .copyout_on_error = true, }, + .exec = reap_kill, .copyout_on_error = true, + .sapblk = reap_kill_sapblk, }, [PROC_TRACE_CTL] = { .lock_tree = PCTL_SLOCKED, .one_proc = false, .esrch_is_einval = false, .no_nonnull_data = false, @@ -930,12 +941,20 @@ kern_procctl(struct thread *td, idtype_t idtype, id_t id, int com, void *data) struct proc *p; const struct procctl_cmd_info *cmd_info; int error, first_error, ok; + bool sapblk; MPASS(com > 0 && com < nitems(procctl_cmds_info)); cmd_info = &procctl_cmds_info[com]; if (idtype != P_PID && cmd_info->one_proc) return (EINVAL); + sapblk = false; + if (cmd_info->sapblk != NULL) { + sapblk = cmd_info->sapblk(td, data); + if (sapblk) + stop_all_proc_block(); + } + switch (cmd_info->lock_tree) { case PCTL_XLOCKED: sx_xlock(&proctree_lock); @@ -1024,5 +1043,7 @@ kern_procctl(struct thread *td, idtype_t idtype, id_t id, int com, void *data) default: break; } + if (sapblk) + stop_all_proc_unblock(); return (error); }