From nobody Sat Sep 03 01:29:26 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 4MKHJ64Cn6z4bw8R; Sat, 3 Sep 2022 01:29:26 +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 4MKHJ63hwnz3NQv; Sat, 3 Sep 2022 01:29:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662168566; 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=ssLZF3LCtwm8WXClRCxP4ZApzW7RiPSVSNB1UwXiAz0=; b=wHT0S1yavrglQwpRjd2ZW9xHauwAaTGx/NFqnvtsIJRWzRYa1n/51fue6+loe5dqINIXee lzpYT6K4uqTOMxFnmaG2DARHGmz+ugShZZz1Ujkj9b/oYa++f1MG0ud3vPTxniG+cWBeZh Bub2jmyqRLvu+Aal1rP+99JOLoNLS3K6zgVQrMoRf7HpCDHzVCRJ7PU16ElAaNxJrX0ZwV b2ukKU1VeNkQ2ac9afnOOUu6lJ49FbFAoINbAft2e1sS8dNyKiqps0b5BvAzGTrhTivuPX mtnn2wEnHoTe4Uvx2xQk1hmPSvL2mzeI5rxpnoINQXwwKNOIJ3Uztbb6o370dA== 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 4MKHJ62gxtz10hq; Sat, 3 Sep 2022 01:29:26 +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 2831TQGp002705; Sat, 3 Sep 2022 01:29:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2831TQJi002704; Sat, 3 Sep 2022 01:29:26 GMT (envelope-from git) Date: Sat, 3 Sep 2022 01:29:26 GMT Message-Id: <202209030129.2831TQJi002704@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: 5ae39c02f22c - stable/13 - Remove TDF_DOING_SA 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: 5ae39c02f22c08f65bb216b6449133fa45084349 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662168566; 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=ssLZF3LCtwm8WXClRCxP4ZApzW7RiPSVSNB1UwXiAz0=; b=FvdS1ZwwcbspcvFQtDeIFg65XKpmysKBG7EKEW4FiJWaop/x6mFlmPynfNFmULwAzcDYRy Ma4yA0QxvXiY7opS4gC1V+juSRCZNULR3FtKAgzPKKOILCj6/+wfFFVjhxtwEx/l93idnO X0ruCc+JLkYKB9+L1OfmeWtkjnjIr4oAZyAzdgcekGhsDZz6kIW5yhoxVHjuq0wtC/3Mqw 6Om7twcOBtM7bai7srso68eE+0Ek/qQAkzjheUCzYYEPphEszCsKv1495LnqqlalVWMQIo ur64GUebuOo7AHbJJRakuNk2T8FaGe4uO9Y505ekDpfvKclO0V+XLROgUhGV4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662168566; a=rsa-sha256; cv=none; b=o2xI4MzRzT+zrDq5kN8UyzsHbcZ2HcoRxPHWKJkoBVpF5QpuLFnaFFB166ZB07d7z+jif/ IupKxEI0/zVBHl7szcD4qTqsTtSE66ceebLPhQ0Qyd40HV3bCJMhMHQ613laptKrTOq90H wx91OQcOQtoBgxXa0M4LeVRopQ8gThcNsA3LLlBUq1GVvt+8iyoxEM62DLzbZYLFwquJYn 48ubptlXRa+jkc1RRKKnktmkkfXBJAwkzRXX6QKPnA6/0JNqO7O8L/WMhHx0z6SQIJQGoU Zgn+R4HYqqeDIqwi7UvPUCGpdQutf9vk7mHGeR7dEqIWxXOp5mG1GyKFVMeAyg== 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=5ae39c02f22c08f65bb216b6449133fa45084349 commit 5ae39c02f22c08f65bb216b6449133fa45084349 Author: Konstantin Belousov AuthorDate: 2022-08-12 20:25:00 +0000 Commit: Konstantin Belousov CommitDate: 2022-09-03 01:17:36 +0000 Remove TDF_DOING_SA (cherry picked from commit f829268bcc89bdede5e28044bfb6dc04fb0e9f8a) --- sys/kern/kern_thread.c | 16 +++------------- sys/sys/proc.h | 2 +- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index 28de25d1ba18..846d3dafb5ac 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -1216,12 +1216,8 @@ thread_single(struct proc *p, int mode) else p->p_flag &= ~P_SINGLE_BOUNDARY; } - if (mode == SINGLE_ALLPROC) { + if (mode == SINGLE_ALLPROC) p->p_flag |= P_TOTAL_STOP; - thread_lock(td); - td->td_flags |= TDF_DOING_SA; - thread_unlock(td); - } p->p_flag |= P_STOPPED_SINGLE; PROC_SLOCK(p); p->p_singlethread = td; @@ -1308,11 +1304,6 @@ stopme: } } PROC_SUNLOCK(p); - if (mode == SINGLE_ALLPROC) { - thread_lock(td); - td->td_flags &= ~TDF_DOING_SA; - thread_unlock(td); - } return (0); } @@ -1599,11 +1590,10 @@ thread_unsuspend(struct proc *p) if (!P_SHOULDSTOP(p)) { FOREACH_THREAD_IN_PROC(p, td) { thread_lock(td); - if (TD_IS_SUSPENDED(td) && (td->td_flags & - TDF_DOING_SA) == 0) { + if (TD_IS_SUSPENDED(td)) wakeup_swapper |= thread_unsuspend_one(td, p, true); - } else + else thread_unlock(td); } } else if (P_SHOULDSTOP(p) == P_STOPPED_SINGLE && diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 50e99d5a94c8..cd1b530095e9 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -460,7 +460,7 @@ do { \ #define TDF_THRWAKEUP 0x00100000 /* Libthr thread must not suspend itself. */ #define TDF_SEINTR 0x00200000 /* EINTR on stop attempts. */ #define TDF_SWAPINREQ 0x00400000 /* Swapin request due to wakeup. */ -#define TDF_DOING_SA 0x00800000 /* Doing SINGLE_ALLPROC, do not unsuspend me */ +#define TDF_UNUSED6 0x00800000 /* Available */ #define TDF_SCHED0 0x01000000 /* Reserved for scheduler private use */ #define TDF_SCHED1 0x02000000 /* Reserved for scheduler private use */ #define TDF_SCHED2 0x04000000 /* Reserved for scheduler private use */