From nobody Mon Aug 7 00:59:51 2023 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 4RJydz3hJGz4pk4x; Mon, 7 Aug 2023 00:59:51 +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 4RJydz2cZcz3X0Y; Mon, 7 Aug 2023 00:59:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691369991; 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=KMbRQHzOAYAjHFwElg11+Gp0tQK+AJsjeYGJQn7A3NQ=; b=oV041il/eirria9c/2ihoQu+a58EWDyNYzhOH20nR8GcVOTRKfhe9tS7LEUrR8IJe9w4nI 7YvExkUiyk4i2rgDxd+kyq3nO9d3d4HYg8Ge6/u869wH+h7XNXrukp0sHJlRWxKegEDs1A WsRqzxafM82EUrfFlMDlgQbT7zPnhX5GogoC6IKSNBPaIVntioIBRb6G2tRbX3+7jFmTRS 1/dwxAVKQ8Gi0F+RVA3BnwGExOj5WH6t+q1NNVxSTv0gTDJYXHJanjzEeRnEQHtbZ06buy gr/0vH2s0MpWmZ8ihH5F7GInXi/zNszFJ0lalF5tGE4Fc6xIL8+UPYUdyHpQ5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691369991; 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=KMbRQHzOAYAjHFwElg11+Gp0tQK+AJsjeYGJQn7A3NQ=; b=JsFzjImSeurYTEQLkSoAABITMBN+orcK5y+sdda2cooE/pbvaMUaZ5RPj34Nb8rBh4Qhx1 4990yH6nwzhSMZ8njhOCYOccRoS+A9+BIf4+PE4cJek6H8MJtI3qLU07Yiar/d1eJTF2RC oWy37JelrrYO6oTmpAayvEkd6GSG3JGqoXdIjuLOSPMfnSxfI2R4VLgyikSfpHt4rggg0q jqdtQ98w2y/QMTXK0dDMqElGyzRhWSbtWH/ZRdtMcG08mTAc8rvRdnnFwkvKqZLxO33pC2 gixWnIArWdB6i2mb0a1VdGRKtdtMhdiZ/YhZKtukJWk9Y1J0d5/qjIgVQSzQBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691369991; a=rsa-sha256; cv=none; b=q6FnA1de5LLItfc5PJZ0YEIR1N65Q2AVTov7YUrEo/Rll76BaquXcENTL4Dv7i7ikiDxaN tIvErQAXFDJVYTOXc5PlgTj2iq4rSMj7TPF8kF6ZtV1eFV+4MyQyYGPXDJl2kIXC8DZDUv h/L/lQ2pWb0gf3O8i3KyumfpFlpvQpsk4GTKlsf1/6pNQ0HTCjURYMZxqTtuBzFrU0mzlf 6KBgzwSsdHYdoRqDdl3KE7azFA97d0GLn3J6cHSpTAIMAw0XSJPcNa8TNWCsfkb9WEFsYN u1suDNN+ZER9RUEn93xGr4RG6HG5hw56/UeJKeEDm8KyVNmWCMpw+xXQXlsn4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RJydz17kmzY1q; Mon, 7 Aug 2023 00:59:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3770xpmw077207; Mon, 7 Aug 2023 00:59:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3770xpF2077206; Mon, 7 Aug 2023 00:59:51 GMT (envelope-from git) Date: Mon, 7 Aug 2023 00:59:51 GMT Message-Id: <202308070059.3770xpF2077206@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: 54747740ccc6 - stable/13 - sigtd(): prefer non-stopped thread as a target for signal queue 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: 54747740ccc6a717c54f23324639bedff5f64211 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=54747740ccc6a717c54f23324639bedff5f64211 commit 54747740ccc6a717c54f23324639bedff5f64211 Author: Konstantin Belousov AuthorDate: 2023-07-21 09:41:39 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-07 00:48:45 +0000 sigtd(): prefer non-stopped thread as a target for signal queue (cherry picked from commit dfe172484d0e1de0bb32bcab8775eb83e15031c0) --- sys/kern/kern_sig.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 77f63252454a..e002d7d0e5fa 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -2100,14 +2100,18 @@ sigtd(struct proc *p, int sig, bool fast_sigblock) if (curproc == p && !SIGISMEMBER(curthread->td_sigmask, sig) && (!fast_sigblock || curthread->td_sigblock_val == 0)) return (curthread); + + /* Find a non-stopped thread that does not mask the signal. */ signal_td = NULL; FOREACH_THREAD_IN_PROC(p, td) { if (!SIGISMEMBER(td->td_sigmask, sig) && (!fast_sigblock || - td != curthread || td->td_sigblock_val == 0)) { + td != curthread || td->td_sigblock_val == 0) && + (td->td_flags & TDF_BOUNDARY) == 0) { signal_td = td; break; } } + /* Select random (first) thread if no better match was found. */ if (signal_td == NULL) signal_td = FIRST_THREAD_IN_PROC(p); return (signal_td);