From nobody Mon Jun 13 19:33:30 2022 X-Original-To: dev-commits-src-main@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 88C6D854C3E; Mon, 13 Jun 2022 19:33:31 +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 4LMMDq0vZkz3qCW; Mon, 13 Jun 2022 19:33:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655148811; 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=Q457GhMbxwU0KabcoHioWHOg923nTRqT6WhPDuFFjrk=; b=h3Uw8qdaSN3Poonn4gEdtkqFofBlrWXIbKTuwBXY/vxFuRe9AD539Z/QSau6eZ4s4KVtfQ q1ckYQu9se7ORlg+YGEC6d4v61xeWwExecSIeCBPVoLKJGefYGs9fi1K6tjqraw4jm8K5+ a9a1Gwao/6TJYoMUWRyc3de9voktcTt0sKfLQzmF9AJ8t1C6JY6sVtKneQ4vsqJsX5agWc iNI13KW6U/LmjuChmwwZf2ijubyMtg6IaoE9vW9qnAcuaeQ4+a13r8dptZ4Q9aiEnbXLxh IRspMya/Bh5ZFMtPqw9izswH+oPcqOTFHaed9anIELRdwwePn+njgiM8VWH7Sw== 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 CC1B81BDBE; Mon, 13 Jun 2022 19:33:30 +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 25DJXU6C023564; Mon, 13 Jun 2022 19:33:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25DJXUDn023563; Mon, 13 Jun 2022 19:33:30 GMT (envelope-from git) Date: Mon, 13 Jun 2022 19:33:30 GMT Message-Id: <202206131933.25DJXUDn023563@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: d7a9e6e74067 - main - thread_single: wait for P_STOPPED_SINGLE to pass List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: d7a9e6e74067f70eeec74dcd64a9bcc851503a6e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655148811; 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=Q457GhMbxwU0KabcoHioWHOg923nTRqT6WhPDuFFjrk=; b=Ic7UfpZ2e2SnxDiQ6PdXBjy9u5pt+E/DfyN27xyX97j8nC3BDihJUpz4odxXK6ljqhzsA/ ctmxrc5+LKSCyGjLniKfuiG0DZ9BJ0bj7az7D7fUnnsxP/m+MQILZhNI68SfAlxAhH58O2 NFx2wL9Y5K+X/uUB1PgwwxxjLOfurPT9Ic0gY019+F6SpvMasytQSKsdk8nVA0AvN4vZ10 +HsrYUTOouhe7syfOp+HNV6Xc1eZClj3suOD+doOZx46ZVnZj2Ox1jbZsGBmarQvecFYmY cjNrjOc/yYZFRdBkSwRuMaCOufmh9h+iELf6CsBQ8dXQ9ZIC/ZVMbNiMNnTFZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655148811; a=rsa-sha256; cv=none; b=ymZdTqc0oZ5k1Spk7MNcYsGdPB387N6GPdB7eIK8rTYWd1aj34p9Fxi1TKpt1He/SglUBC R9ybzuZOAKAVYjq4A4G/5hwi+wzh+1jmRQVcER+40FRHFWS6g9wLKysmDVEaKuy3i6Tz0m +n+FYjJ1BTDBj7X+zG9bDCD23XUCN/fichO1fjhzn2y+sktCQYop5VvbHF+SY3Pu3QHmL8 t0EzdNZFL6EFmZ0WlIax1IsxvuyxIcsAqxFcPHognoVSSgH4H71Enh8dhDRqLp6fa9gT+L tllHcQnR5W3Jf2YEthqweHbyG9BhaZk3CX8zPB0y0bFpFmiUiz6+mhkL3FPYeg== 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=d7a9e6e74067f70eeec74dcd64a9bcc851503a6e commit d7a9e6e74067f70eeec74dcd64a9bcc851503a6e Author: Konstantin Belousov AuthorDate: 2022-05-03 19:48:50 +0000 Commit: Konstantin Belousov CommitDate: 2022-06-13 19:30:02 +0000 thread_single: wait for P_STOPPED_SINGLE to pass to avoid ALLPROC mode to try to race with any other single-threading mode. In collaboration with: pho Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D35310 --- sys/kern/kern_thread.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index 57d235c002f0..4dd8dbdfb5a7 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -1207,10 +1207,18 @@ thread_single(struct proc *p, int mode) mtx_assert(&Giant, MA_NOTOWNED); PROC_LOCK_ASSERT(p, MA_OWNED); - if ((p->p_flag & P_HADTHREADS) == 0 && mode != SINGLE_ALLPROC) + /* + * Is someone already single threading? + * Or may be singlethreading is not needed at all. + */ + if (mode == SINGLE_ALLPROC) { + while ((p->p_flag & P_STOPPED_SINGLE) != 0) { + if ((p->p_flag2 & P2_WEXIT) != 0) + return (1); + msleep(&p->p_flag, &p->p_mtx, PCATCH, "thrsgl", 0); + } + } else if ((p->p_flag & P_HADTHREADS) == 0) return (0); - - /* Is someone already single threading? */ if (p->p_singlethread != NULL && p->p_singlethread != td) return (1); @@ -1669,6 +1677,7 @@ thread_single_end(struct proc *p, int mode) PROC_SUNLOCK(p); if (wakeup_swapper) kick_proc0(); + wakeup(&p->p_flag); } /*