From nobody Fri Jun 24 19:37:05 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 73C48864BBE; Fri, 24 Jun 2022 19:37:06 +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 4LV6ns4fhYz4XWS; Fri, 24 Jun 2022 19:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656099426; 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=5zgkWbV89YF7UICFPKfjqvOOICL3ZZBV7bR6PragKoI=; b=SgqwsZijG6qQA2AUH3fM1H+CkofyKydeszx4E9WypebEf15BaJsyRUkcfDE5ciRkwRxNpM NFtOsdQOdhYoJqbNAMGP+9AkR/pXvegt3tWwITx1hzPBVitOETrMjA4LVBNdoA7s4Q/huE uXsQXi87u3/iPHrKC6+HjfR+KqfHBCmGLYi4Lgje0C1ZZGq5fcbdMwBbiTp5/gjFxK4c2H 1CIc0AgqlsFGhxL2iyM6mqyxbyWaeQ8RwjYW6cQBPF1+o94UZWwtjm5JKAx8nYJ5VMbh30 xbzz2VIfARMo8fizXe/nRbGOXMZrKtmde1sHbSHJ/OaOxjZ5eszqS/8xjsHSRw== 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 5A33916315; Fri, 24 Jun 2022 19:37:05 +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 25OJb5Xc084389; Fri, 24 Jun 2022 19:37:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25OJb5DF084388; Fri, 24 Jun 2022 19:37:05 GMT (envelope-from git) Date: Fri, 24 Jun 2022 19:37:05 GMT Message-Id: <202206241937.25OJb5DF084388@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: 6a0a83e5ccbc - stable/13 - Make stop_all_proc_block interruptible to avoid deadlock with parallel suspension 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: 6a0a83e5ccbcce3016dfc8e389a5f40f6e3b0a24 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656099426; 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=5zgkWbV89YF7UICFPKfjqvOOICL3ZZBV7bR6PragKoI=; b=XkYbKlVdqiK/dT1i7KDioSp7ohtyeZS+Wxg2nSydqh1c4oGfxQHChqM97EcBoEYnL3leHG jS1pYuxnb5AsyCtxnIRrfB8kvtY5ZeIbsd8kiqytFQIY8U4jaxocFMBTwnSFDDX9zQY0wE KGrjylwFmt9VXvQNfsI2TH9ZI7brPm1lB6l53xCTj3WfzRfIzCSRFfVT4VgfgUyZNvGrrb 9qwjD8zRhm5L8sdKF47in1R03gy1jFGVfuKDJ5MprcMTrgeTlw4mdrgZS9OktZyBUvyCN1 D6p+pvAFd4uO12xoTFpEJbnBKNYQAm8RodWXULRqYJBNXp9ziZb62U9QccRzXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656099426; a=rsa-sha256; cv=none; b=cu9NPvqRIOjxsYktrRr85qNBD5bVqvGvziDMzP2/WHFuuVRJD7QipvQpwQwb0eR488u1WX /mivOEmLA/CjYHj4l4QHxtGRWbyqQVoFZrDyRE045J+i4MQAAtxG3kKkEFeo2W3I62eLPN 6BBdWtObzWS5KMPWe/bgBbnqozQRJdsVq/TTHQWnmELQWvVdMImsEyfkIvag5mbyfLPYx0 w3XhcpWm6ajKTV4IIs9y1zL70uxMpk72WGRGZlgMeH40m8b7J1HmwW+dPEk9BOJ26qaDnc BEtBnJV0P5Ytnw/T7YIsFoV1f1NIlI5OdIbp1bKwOzEQNYD1v9algjx12uKgrw== 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=6a0a83e5ccbcce3016dfc8e389a5f40f6e3b0a24 commit 6a0a83e5ccbcce3016dfc8e389a5f40f6e3b0a24 Author: Konstantin Belousov AuthorDate: 2022-04-30 23:29:25 +0000 Commit: Konstantin Belousov CommitDate: 2022-06-24 14:45:46 +0000 Make stop_all_proc_block interruptible to avoid deadlock with parallel suspension (cherry picked from commit 008b2e65442a0d65bc5be9ca625616ddfa6f9ce2) --- sys/kern/kern_proc.c | 7 ++++--- sys/kern/kern_procctl.c | 4 ++-- sys/sys/proc.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 29e710176897..2879af8f9335 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -3322,10 +3322,10 @@ static SYSCTL_NODE(_kern_proc, KERN_PROC_SIGFASTBLK, sigfastblk, CTLFLAG_RD | static struct sx stop_all_proc_blocker; SX_SYSINIT(stop_all_proc_blocker, &stop_all_proc_blocker, "sapblk"); -void +bool stop_all_proc_block(void) { - sx_xlock(&stop_all_proc_blocker); + return (sx_xlock_sig(&stop_all_proc_blocker) == 0); } void @@ -3349,7 +3349,8 @@ stop_all_proc(void) int r, gen; bool restart, seen_stopped, seen_exiting, stopped_some; - stop_all_proc_block(); + if (!stop_all_proc_block()) + return; cp = curproc; allproc_loop: diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c index 6919fac71c5a..b6e48b46bb5c 100644 --- a/sys/kern/kern_procctl.c +++ b/sys/kern/kern_procctl.c @@ -1063,8 +1063,8 @@ kern_procctl(struct thread *td, idtype_t idtype, id_t id, int com, void *data) sapblk = false; if (cmd_info->sapblk != NULL) { sapblk = cmd_info->sapblk(td, data); - if (sapblk) - stop_all_proc_block(); + if (sapblk && !stop_all_proc_block()) + return (ERESTART); } switch (cmd_info->lock_tree) { diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 26280998f00b..686a9aacdfdd 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1211,7 +1211,7 @@ void thread_unlink(struct thread *td); void thread_unsuspend(struct proc *p); void thread_wait(struct proc *p); -void stop_all_proc_block(void); +bool stop_all_proc_block(void); void stop_all_proc_unblock(void); void stop_all_proc(void); void resume_all_proc(void);