From nobody Fri Jun 24 19:36:46 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 C2955863D17; Fri, 24 Jun 2022 19:36:47 +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 4LV6nW1Mxbz4WpJ; Fri, 24 Jun 2022 19:36:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656099407; 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=FZ9ASmrmTP+BetNnrcu2Zay2uMtduLb5N/O5QmhUPAs=; b=TRAqR7xG2ZjGUitFOzXtG8dFj1OJcjvNM4kA604Wyh76m4NrVAbgc0xWzP/FBfYo3UWPlY qb79ix2n7ljAMFYWRS0Y3/+akkbpnuTAsFWqOnZv8gKw1bkUrcmQdodcAPimFQdzyFXLvW u95DaAO5RfWgbT6pLycYsa6QM5bdD/eK/GyZK0K01voBaNTqib1/cLtOo25/zPzBTT07yL BMgEjKruCgzrWyweAtOD2hb18g3kyNGKRa1FRa3XvZ0EiJ29YNUkPU2PqyrPiYN7SIh93x FZsv0+ovgNpw44WXXHjAh9cHhA4lfcpFXzaBEC7whWjAqf0tVdJrMHrniomHDg== 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 EDD7C15D76; Fri, 24 Jun 2022 19:36:46 +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 25OJakML083982; Fri, 24 Jun 2022 19:36:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25OJakbT083981; Fri, 24 Jun 2022 19:36:46 GMT (envelope-from git) Date: Fri, 24 Jun 2022 19:36:46 GMT Message-Id: <202206241936.25OJakbT083981@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: 70f54bc4f3d4 - stable/13 - reap_kill(): de-inline LIST_FOREACH(), twice 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: 70f54bc4f3d4a8796851c6f1f6cc7e86003905ac Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656099407; 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=FZ9ASmrmTP+BetNnrcu2Zay2uMtduLb5N/O5QmhUPAs=; b=X+XXObo5TMEosP7IdEzbXKcGiK9yOFfjS/YG0LjsIqGbRbm4YTxVAEYomNdSFSGNnJEFGI K8XHM1+OgAK1WjfKRsBXjtytAD8NypM6agsbUkpQ/T9ZKqyVqNZb2QTNkNjL4yK4CORq5n tYse2wT/m4qtQPSLj6qYD1ClMUz0DVcEiT15/KrtVcTfQGH9Az725hxk2hdVFaB0J3y2ta 60lrYt9LsWpX51D5wk2NX5jKv0VPsDwfmrFv73Pr0AwsqYF5Vs8P49rAQx3OuBEGtCNk9K XME+I+p04dFdx2X2CoMwBubfC19DGtuDrMYLr9gTAgFk1W2xZKqgodtBkgHP4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656099407; a=rsa-sha256; cv=none; b=wclk9ekTzPVWT4CCdVF3wTjVzJKdZ5KGFOne8AyNMTOWY4hlPPenM7gSAKSezGMiXidO0U RG1uCzchQWRHYOGsZkZV5mdOQqQo28rqjS+V/VGfUmlw7VHADBcGVDIP2eyey5s/N7ZLW8 nvRWHQyGFQA68u5gV5BPDsoFkP2yPDMLRw0JBd3CFzltg99A9DDsjBetCogP3kk7CjYvlB gt10smXjo4F7cuHZzWjDw2cXJm0Wh1LDqPyoVIfDwSwWphMZIZ6EC6nRZU/BdoJJhy1JND n1GSNRGRUOpeAkDRAtUx63N7or1CynAyHi447RBgoe/JlXuWxGhbSCBbJLHQDA== 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=70f54bc4f3d4a8796851c6f1f6cc7e86003905ac commit 70f54bc4f3d4a8796851c6f1f6cc7e86003905ac Author: Konstantin Belousov AuthorDate: 2022-04-25 21:57:13 +0000 Commit: Konstantin Belousov CommitDate: 2022-06-24 14:45:44 +0000 reap_kill(): de-inline LIST_FOREACH(), twice (cherry picked from commit e4ce431e2a0255751fee0ad14b08bd006759ce4f) --- sys/kern/kern_procctl.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c index f90c0e146e2b..96748e27f57c 100644 --- a/sys/kern/kern_procctl.c +++ b/sys/kern/kern_procctl.c @@ -309,8 +309,7 @@ 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) { - for (p2 = LIST_FIRST(&reap->p_children); p2 != NULL; - p2 = LIST_NEXT(p2, p_sibling)) { + LIST_FOREACH(p2, &reap->p_children, p_sibling) { reap_kill_proc(td, p2, &ksi, rk, &error); /* * Do not end the loop on error, signal @@ -323,8 +322,8 @@ reap_kill(struct thread *td, struct proc *p, void *data) while ((t = TAILQ_FIRST(&tracker)) != NULL) { MPASS((t->parent->p_treeflag & P_TREE_REAPER) != 0); TAILQ_REMOVE(&tracker, t, link); - for (p2 = LIST_FIRST(&t->parent->p_reaplist); p2 != NULL; - p2 = LIST_NEXT(p2, p_reapsibling)) { + LIST_FOREACH(p2, &t->parent->p_reaplist, + p_reapsibling) { if (t->parent == reap && (rk->rk_flags & REAPER_KILL_SUBTREE) != 0 && p2->p_reapsubtree != rk->rk_subtree)