From nobody Fri Jun 24 19:36:56 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 5D93C864428; Fri, 24 Jun 2022 19:36:57 +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 4LV6nh6LHbz4XGg; Fri, 24 Jun 2022 19:36:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656099417; 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=D6CnjpX0lHOXVMZVM4lFbQCt+9kyykuwNhVGyE8Ndg4=; b=KfyNrWswu+Wl8JNeF1SmJg7myzQ+ZT1obT7tZyntm7Y9lLnoYJcmFr1KNp8eiFN1B6kLSy I3ya5Oib5jVG+nn0lfC+bxNCR+eqx/QzogQaUT7FRIWNjwsOPQ3gldTcGtvIzwETRK+nyN wlpG0THGrXYZ4gkp1r8RnYzpiunMdHBsMVJeW3U2YN0eryBm3L88SFUluRCazeBrjs3bFl gD0ouALWthv+b0G3c9JDTPeDaCzwxTV6osrZrjxDCZcwYVtnNimgXtFFL2Svbqxh87JXTB 8R2hMyiCoMLedSdiwxyQgxcfPktpZSatOcnPqhS/eEsQ72prGaYBJF3dp7zMIw== 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 234E215D79; Fri, 24 Jun 2022 19:36:56 +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 25OJauM0084187; Fri, 24 Jun 2022 19:36:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25OJau3O084186; Fri, 24 Jun 2022 19:36:56 GMT (envelope-from git) Date: Fri, 24 Jun 2022 19:36:56 GMT Message-Id: <202206241936.25OJau3O084186@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: c0a303b60b8c - stable/13 - issignal(): ignore signals when process is single-threading for exit 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: c0a303b60b8c40c9fd27ec26b6a05d60dbe54547 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656099417; 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=D6CnjpX0lHOXVMZVM4lFbQCt+9kyykuwNhVGyE8Ndg4=; b=DLAwXa94MSRrth9TFkUDw8I6dlOmooe1t1zfLtc9rOwMDPn0XjQdrNFKCxC9F1Qdl1Agha iIv4WZog20aeH6D5/k7suMW4cu88t1HMzwuqGmEulYVbsc7VWVNl4RMyJGWB9v4M5tkzxn yWbVXot24ldkSSi5KeLqlC+XfX3nQEn4OCC5k3nwlsrjSgTGzWwpT9PORMCYvpGL3jHOYE YKGfob+QrADtLISwa22+ULNNtxIAQctZaj+m5rxBLZwG/nWYb/xfzdb2yYQOrmXBLn9te0 BsQktBsVmB05RfTVmZWozv5+ez9+qVP+/aKysew0AKzs8hZBelH4xXsBCy3W7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656099417; a=rsa-sha256; cv=none; b=ykVKY5fMee2IPUXHs4yTBQweyL3jedjCKugOmyvGILd+CNoCT7OA+heVuiPSrRjyI5+p+Y SOogCLFcTXi1DbrcTuvBctJjnyG4h+UMtgBaUP3CMMY9kxHa0HFUq5TmGGl9uNcwAMC6th Fs49WUMGBVm8F6F9bm+GLuI82j7C1yFMbMqQL2sQqCsoL+3fa0Pmv44M/De502yvhUSRZs Gj0h/+aXcZ8j+HXbRi+OZSF86A7BIfeZhMWIfOyiuhS/K5IZKd+6zE+sH1zjxUrUM+9pZ4 qmCPtFHvJambChyequrUfLThYmQ6SNW+3ixixVrFIIMbNdOHVmvJE7KIqdKSqw== 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=c0a303b60b8c40c9fd27ec26b6a05d60dbe54547 commit c0a303b60b8c40c9fd27ec26b6a05d60dbe54547 Author: Konstantin Belousov AuthorDate: 2022-05-26 19:18:57 +0000 Commit: Konstantin Belousov CommitDate: 2022-06-24 14:45:45 +0000 issignal(): ignore signals when process is single-threading for exit (cherry picked from commit 02a2aacbe2c81be455811fa9d4200101f70a86d2) --- sys/kern/kern_sig.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index a178193d3d1d..b132eaa8de98 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -2948,7 +2948,7 @@ sigprocess(struct thread *td, int sig) /* * We should allow pending but ignored signals below - * only if there is sigwait() active, or P_TRACED was + * if there is sigwait() active, or P_TRACED was * on when they were posted. */ if (SIGISMEMBER(ps->ps_sigignore, sig) && @@ -2957,6 +2957,16 @@ sigprocess(struct thread *td, int sig) return (SIGSTATUS_IGNORE); } + /* + * If the process is going to single-thread mode to prepare + * for exit, there is no sense in delivering any signal + * to usermode. Another important consequence is that + * msleep(..., PCATCH, ...) now is only interruptible by a + * suspend request. + */ + if ((p->p_flag2 & P2_WEXIT) != 0) + return (SIGSTATUS_IGNORE); + if ((p->p_flag & (P_TRACED | P_PPTRACE)) == P_TRACED) { /* * If traced, always stop.