From nobody Mon Jun 13 19:33:39 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 87CCC85530B; Mon, 13 Jun 2022 19:33:40 +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 4LMMF00VNBz3qPG; Mon, 13 Jun 2022 19:33:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655148820; 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=VO7N4+6lFSDK0PfJYDJ0qDgj0+cg05B/QyyZjOAXsvE=; b=l2uIVkHo1xgRqe1FE8OmonkCNLKgrFz4GLmzfq3jO+yXQvgZbZlrQIO3cndsWMyL8AekgK TJLbYQyBNXeCqhre7O0QMb++sK3Jo+yFJY+eeNKnU0BtXEW8sduDvAuLxeZ51AI9zPtC/1 BdbMZmsiRdcxAN4IuWAmEu9JmEWPlhx/M2rknHix9Vfjz2BqUqo0gtsBPeSsaZTal7ssE+ UgiKKnMKKg0bZZG0iQP5Fn0CNkYTtci/9CPzimz86O7AdWN70frthash2FgxTVWX4nxmic hWxjRE9O1K+DvazTYEaYKYQl4f5PUtdVpc9A4705gEhrNzABts13+XUD/yxRvQ== 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 B55AE1BC9D; Mon, 13 Jun 2022 19:33:39 +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 25DJXdLx023762; Mon, 13 Jun 2022 19:33:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25DJXdVl023761; Mon, 13 Jun 2022 19:33:39 GMT (envelope-from git) Date: Mon, 13 Jun 2022 19:33:39 GMT Message-Id: <202206131933.25DJXdVl023761@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: addf103ce6b3 - main - 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/main X-Git-Reftype: branch X-Git-Commit: addf103ce6b38583762bcb066f6ac3b160e826bb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655148820; 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=VO7N4+6lFSDK0PfJYDJ0qDgj0+cg05B/QyyZjOAXsvE=; b=PzOwgFRlLFLhlp76uQ/mkuivEUdeTx5Vi9GaPdi6MNzQYhDj8yezi1KdjjmjSt36jNHjMH uCBi0kYxjJpgW3co1ZvGIhU3XCHZbONJgeVI+8V4DC4Y1tzbmvbXj4fsj/6cXiSJYmO7Ox QM8MllTFuZqAvizh+4mY84E642z9f8kQflHHtSQzrSEvHmx0ktjXP2Cp901+T5Ig8viKuT Xu21wWhD/tcZyHq7BV51StsNmw7hET5CQCi1ap8pIZF44PJMhxsGTWyGl8fBV9CsKijKDe abHXIaezfz0XxHsv2ekfmn4BsZ8CY18unMUafUPLoAs3+ZdWZCNKKk51tPb7dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655148820; a=rsa-sha256; cv=none; b=t9I+KhwGWosZPVerNLPk4IaKOsf0a3gVqWnarLt//v75VWPWBlANjtCS32NOrICaDYxH3k 1UouBH4GXiFx2QJX/G3E6PITiK5JDe2YxWSFRIHtxa8KzFP47Q1t0DNM9K2ln7Rj/GDCvI kFnNgSzDENDWM+dc+oosiLFuGzZgqZJjdGvE9i5/ZkxXSax/QbRKuWUq0vrYv+0Oy5OoKP hu+at4vI2NCOwJ6dJIliLyqTGKBumEG42m6YJ2Ur5LdIS7m5kBRvcyEgIlU/zlSdE/Wcc7 huw9Ry6QJPbso2GqypKt3PIdAU/eCNHFMDR8vGCkVabf3FoMIgWCQuWnnugRJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=addf103ce6b38583762bcb066f6ac3b160e826bb commit addf103ce6b38583762bcb066f6ac3b160e826bb Author: Konstantin Belousov AuthorDate: 2022-05-03 19:49:37 +0000 Commit: Konstantin Belousov CommitDate: 2022-06-13 19:30:03 +0000 reap_kill_proc: do not retry on thread_single() failure The failure means that the process does single-threading itself, which makes our action not needed. Reported and tested by: pho Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D35310 --- 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);