From nobody Sat Aug 20 17:35:03 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 4M95Nm0Rbhz4Zps3; Sat, 20 Aug 2022 17:35:04 +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 4M95Nl4PxMz3Y0Z; Sat, 20 Aug 2022 17:35:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661016903; 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=mNVg/EtLdfqHG5/Hjln2HyX/21dkKcHToMKQGs+TCYo=; b=AH4pLEOljY0JFCkeUcO6mOhxZokwOq7/R/Z8x92erOnDHJCUOn1sOi6NioocgScbKkFtQ+ yz3TZzLjGK/E0xGct9tgr4nGtF1JwTRSZsRK6EGzWSXqRTdOepxmkc9lkhk46+lywoVCDA H6245vzNcsOIIvOuxRt4pJ7cVCja+P0sRnddAe2IE1B0V5OLCWSKG4bcbir4SBUlyP/dOo TPKFEuGQY9z3CKsuMBLD7eTwtDmbx4aLe8GRMB85NHOUxFp9VQxRb1KGda5CEKltq73LaC haZxQwa2FHEW3E+lT02XLybJPfuMj8NIZL+67QLGCdb3IhFGD1u5gJhoQNpAxw== 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 4M95Nl3W40zgL0; Sat, 20 Aug 2022 17:35:03 +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 27KHZ3Fj093583; Sat, 20 Aug 2022 17:35:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27KHZ3gJ093582; Sat, 20 Aug 2022 17:35:03 GMT (envelope-from git) Date: Sat, 20 Aug 2022 17:35:03 GMT Message-Id: <202208201735.27KHZ3gJ093582@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: f829268bcc89 - main - Remove TDF_DOING_SA 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: f829268bcc89bdede5e28044bfb6dc04fb0e9f8a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661016903; 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=mNVg/EtLdfqHG5/Hjln2HyX/21dkKcHToMKQGs+TCYo=; b=SzJzD7Y3msUJTJWP1SndTLLZ1sXKPJdnmZa4zUoijpuzSXPPtFJk4KoHMxVKe5dTKLSIZ/ OvSXm/kWYE+oysAUHg5edil021MMfl4gQD7GLmOn7VHZ9rg+VVmVuPoxsD1Tv8m6bnZ2Jr kCPAJtQNwB1mCzplYwgnpW+W3Ctng08Ze29X1GO+pSHFmi19G+AAPuiJSGzwbTXkrVHkn7 +jVkTKNjMw60TEW4aQ9agyxiwm8pIBk7gQgfUt3JcRfSEfsCg7c8ufGQt20TERSxkAvODF kixvB6BEhYaV0nW2s95r/6LvYUsgAV5ZodZKruD9WTbDHOOEVCTiymBOmSK57g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661016903; a=rsa-sha256; cv=none; b=sk17yrgFC5/jpVmXT7jzTNXdnJwEYd1C4YRJFLjkWtT7QTmKKlaZXOFg8qZuZ+oB87KG4u UQSh1GEotkOfMemQfjAoyajHenTYhDgtsfiri/Adfc48IGet7BO8s+rRLquaz4aaMoRpYh STZd6PkBVtMeUefRsiaxxWFm0LaBu3Q5bwoWiOV+aozlrItZWGbdk1nxXv3yEWeXJYs2EJ BUKcjAFHYn8yYea+1UNAWL7X23cCAtcuumryDPvZCrgZXRXAeyjV6GgfpAhE2Tm1upS2V8 TtLknFXIyntr/gm9VO/CQcDHwrXOMA/ZuquqVF7/mKToYzvhXLHoAmWNfZCJWw== 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=f829268bcc89bdede5e28044bfb6dc04fb0e9f8a commit f829268bcc89bdede5e28044bfb6dc04fb0e9f8a Author: Konstantin Belousov AuthorDate: 2022-08-12 20:25:00 +0000 Commit: Konstantin Belousov CommitDate: 2022-08-20 17:34:30 +0000 Remove TDF_DOING_SA We cannot see a thread with the flag set in unsuspend, after we stopped doing SINGLE_ALLPROC from user processes. Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D36207 --- sys/kern/kern_thread.c | 16 +++------------- sys/sys/proc.h | 10 +++++----- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index bfd153844464..39bda326dc0d 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -1243,12 +1243,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; @@ -1335,11 +1331,6 @@ stopme: } } PROC_SUNLOCK(p); - if (mode == SINGLE_ALLPROC) { - thread_lock(td); - td->td_flags &= ~TDF_DOING_SA; - thread_unlock(td); - } return (0); } @@ -1626,11 +1617,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 8c2aa6391d69..fb1553539b1c 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -470,15 +470,15 @@ 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 */ #define TDF_SCHED3 0x08000000 /* Reserved for scheduler private use */ -#define TDF_UNUSED6 0x10000000 /* Available */ -#define TDF_UNUSED7 0x20000000 /* Available */ -#define TDF_UNUSED8 0x40000000 /* Available */ -#define TDF_UNUSED9 0x80000000 /* Available */ +#define TDF_UNUSED7 0x10000000 /* Available */ +#define TDF_UNUSED8 0x20000000 /* Available */ +#define TDF_UNUSED9 0x40000000 /* Available */ +#define TDF_UNUSED10 0x80000000 /* Available */ enum { TDA_AST = 0, /* Special: call all non-flagged AST handlers */