Date: Fri, 24 Jun 2022 19:37:05 GMT From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 6a0a83e5ccbc - stable/13 - Make stop_all_proc_block interruptible to avoid deadlock with parallel suspension Message-ID: <202206241937.25OJb5DF084388@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6a0a83e5ccbcce3016dfc8e389a5f40f6e3b0a24 commit 6a0a83e5ccbcce3016dfc8e389a5f40f6e3b0a24 Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2022-04-30 23:29:25 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> 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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206241937.25OJb5DF084388>