From nobody Fri Jun 24 19:37:06 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 63B57864E0F; Fri, 24 Jun 2022 19:37:07 +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 4LV6nt6JnTz4XHK; Fri, 24 Jun 2022 19:37:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656099427; 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=u526GkH43SGpB4B68yCYcfPpMBtrDDj5rHtlK8hzhGw=; b=kw2QVwK+dSyf/2YQhHoEn0KcjyUzppyQEoP0hUR0ReuS9xhXTqGAsKEyMGMrGib4Xk6xdn mDQD0lXs0Hurz7nDMaqsxPVjNWYjfQuao072Fs8Lr7woLCU9ot+rk/XzDJaFZE3a1IfTsS B0HkVI/dZwedOltbynypcOF4eVWB+YjA4oIcfduAxbD+6W+fBNU5+2OqP/zI2MsbORo1Ws +KB8suLrsCtuUCvaCrO0XO0a1MeL4R14yugtWvUbU3M52viiRvjyH5o/Z7oYvAS0HyYape 6OEvFrIGCJfwd7o40/jw2qG2n9O+Hd/yezhDph6xUiZShl/HcSCZTfOBnLKfww== 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 7EB3316316; Fri, 24 Jun 2022 19:37:06 +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 25OJb68n084413; Fri, 24 Jun 2022 19:37:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25OJb6DZ084412; Fri, 24 Jun 2022 19:37:06 GMT (envelope-from git) Date: Fri, 24 Jun 2022 19:37:06 GMT Message-Id: <202206241937.25OJb6DZ084412@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: 9644a36d95df - stable/13 - reap_kill_proc: do not retry on thread_single() failure 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: 9644a36d95df882dd563f36c7b3e915c60eacbc8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656099427; 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=u526GkH43SGpB4B68yCYcfPpMBtrDDj5rHtlK8hzhGw=; b=rhItJmb80VWSsSAN/eGI/bQda5Lv4SBnvQCeW9ERmLCE8sQi5cduCOD9uCQMFj9JOJEDO8 7Tbn5y0pVQqIjEJ3SCpeUVkonv5uenfE+N8iuCXe7I2e0A61hYedDK6MeCp7zNnGU/6f13 9CFsglgF/yun2J11CoYdHJGES/5BQmcVCJpCy420sFwtPsgIBX7KtoZSVzQDGzLEyoOe3S OM4b8ktP6gvpYfsr5EzoozivOCFEDVyWSaV6Bb/KEHUyAiWLd+G3g1/qzp6gayhltysrBd ITgaSl8ylLXV6S2NE6ly3XaKkRQe0qsOuOklJUaBe5t6hwl0NUKuOTENLG3SJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656099427; a=rsa-sha256; cv=none; b=rriPhp2p5oEfw0Mv9XT+PLNoQNVfb0Lycp+vLOb2bmtKhlPotZ01WUC9neYZrA8lVUnG7w 1vXeotNavbayRYNHV1No8grcJuWz4kg2Ykes1CAklI8efsIduoV+QXnijskUcjE/bBOS9b iI78dyZXM4iMOG+ADVlAV8jOkf3e8Xa3BMlk0HLUQTcAmhcDkZgPsiL532N6tsuGERqV9H uRxdHL+x9fL/8jZOo8OIEGTd7KhxZm7bUuYOaXJeAE0Z4F+nsbbXNv7IdmOuiwDqPEzu3P xkMf41BTTJJNGFKlgMd9tEdE3XWM7D5ymS33DoFp7HCxuBoHnRDJ//Qj1K37cQ== 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=9644a36d95df882dd563f36c7b3e915c60eacbc8 commit 9644a36d95df882dd563f36c7b3e915c60eacbc8 Author: Konstantin Belousov AuthorDate: 2022-05-03 19:49:37 +0000 Commit: Konstantin Belousov CommitDate: 2022-06-24 14:45:46 +0000 reap_kill_proc: do not retry on thread_single() failure (cherry picked from commit addf103ce6b38583762bcb066f6ac3b160e826bb) --- sys/kern/kern_procctl.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c index b6e48b46bb5c..d6c29ed5894a 100644 --- a/sys/kern/kern_procctl.c +++ b/sys/kern/kern_procctl.c @@ -254,7 +254,7 @@ reap_kill_proc_relock(struct proc *p, int xlocked) PROC_LOCK(p); } -static bool +static void reap_kill_proc_locked(struct thread *td, struct proc *p2, ksiginfo_t *ksi, struct procctl_reaper_kill *rk, int *error) { @@ -270,7 +270,7 @@ reap_kill_proc_locked(struct thread *td, struct proc *p2, rk->rk_fpid = p2->p_pid; *error = error1; } - return (true); + return; } /* @@ -291,47 +291,37 @@ reap_kill_proc_locked(struct thread *td, struct proc *p2, * race. */ need_stop = p2 != td->td_proc && - (p2->p_flag & (P_KPROC | P_SYSTEM)) == 0 && + (p2->p_flag & (P_KPROC | P_SYSTEM | P_STOPPED)) == 0 && (rk->rk_flags & REAPER_KILL_CHILDREN) == 0; if (need_stop) { - if (P_SHOULDSTOP(p2) == P_STOPPED_SINGLE) - return (false); /* retry later */ xlocked = sx_xlocked(&proctree_lock); sx_unlock(&proctree_lock); r = thread_single(p2, SINGLE_ALLPROC); - if (r != 0) { - reap_kill_proc_relock(p2, xlocked); - return (false); - } + reap_kill_proc_relock(p2, xlocked); + if (r != 0) + need_stop = false; } pksignal(p2, rk->rk_sig, ksi); rk->rk_killed++; *error = error1; - if (need_stop) { - reap_kill_proc_relock(p2, xlocked); + if (need_stop) thread_single_end(p2, SINGLE_ALLPROC); - } - return (true); } -static bool +static void reap_kill_proc(struct thread *td, struct proc *p2, ksiginfo_t *ksi, struct procctl_reaper_kill *rk, int *error) { - bool res; - - res = true; PROC_LOCK(p2); if ((p2->p_flag2 & P2_WEXIT) == 0) { _PHOLD_LITE(p2); - res = reap_kill_proc_locked(td, p2, ksi, rk, error); + reap_kill_proc_locked(td, p2, ksi, rk, error); _PRELE(p2); } PROC_UNLOCK(p2); - return (res); } struct reap_kill_tracker { @@ -391,8 +381,7 @@ reap_kill_subtree_once(struct thread *td, struct proc *p, struct proc *reaper, reap_kill_sched(&tracker, p2); if (alloc_unr_specific(pids, p2->p_pid) != p2->p_pid) continue; - if (!reap_kill_proc(td, p2, ksi, rk, error)) - free_unr(pids, p2->p_pid); + reap_kill_proc(td, p2, ksi, rk, error); res = true; } free(t, M_TEMP);