From nobody Tue Apr 30 00:48:58 2024 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 4VT1mC2LSrz5Hk7q; Tue, 30 Apr 2024 00:48:59 +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 4VT1mB3Gbyz4KfB; Tue, 30 Apr 2024 00:48:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714438138; 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=S1WFAbYaeR/f6U6kRKETiBYppOJFHEtcy4k+8hvdsAg=; b=Kf9N8gwLPmvL341/vfSomTFt0Q3FWvQ7ThASs/6ZPtRV+DJJOwLgqp6OCNouNj7qAhplK1 KBBt405L3MOigOPeCuYGbQAJgzA6ZJcoswLRJAHMd4RNQCQWClpKg5V/ws+V+EeOwH7vTl F+ED8vPQVKrZUor+Rg+46R1o7NrwxsDwgBEi4Bz+RwErc+Cq2TNQP0eVsrBsnecDKLlKXj TxsXZ+FhrXPw3nhIypMJAJxvhfQ4RLICR3ggZjihYc5HYDauLa/A/WC2TH3AjYiFBJp7ur YnIFwqenDtPMfNo1wh90j3lP4Vo3S+FrZxpcquPDY9zqvSZ7d9M7/iQnsS1CBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714438138; a=rsa-sha256; cv=none; b=xBTJciNaFPGlPhMT9tTtKxftHDz18Yu9w7SsJLd9F7dJnacnIIldx16HPfCRjoa9rppHel sMTLjm4ItPG3vf0nKKkpgD/JVbkk0gnIy7PB8HN1sZWMEIqWXFLj36LPsTHz8wL+uOKn+b JnzlTZsbwnNBpX3QQ86ZLZCaVwISZOFTyLSN0I0y5wB01kBlwnYD5gk0Hv1KqtszFW9oOs 3GzGeRRpI0WmHNhxQ1BcOeRq63KzoG+OPmg2uwEt7rkBDwXY5N6dgPiRDbLSqmJEM875tZ 6CADjDZOunzdI/oPJvfZ50MKA/VLZQ4MyBk23O4eUH7VR/HWmNBxo3JTdHWklA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714438138; 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=S1WFAbYaeR/f6U6kRKETiBYppOJFHEtcy4k+8hvdsAg=; b=g3yayQY1a3HyKSZ2GljhSFHB0rN108sy0AZRztuzDzEF1I5UPRpZD00FmhBQvlSTddT3JN W3CupyK5PHBmHNu4UGnT8ti+xb2R43kX6tG6T9FmXEIsnruRg499opGqrHGN2T1jJJnzNk MG+K6nTMtc1bU+5p/BmjLNu0KQR3CgSYjwjZRWtTlq00yWNaC1Vq80cDMlXdOE9vHPKH6o h5EEnf00agLVSs/u61FWWj89IAEIiyDSRX3Tc8qhs9M4avexMB627mK11UXJRQN35+DMty 8zRNdhppnyd9GE378+L1OEwExI4YYpqKNTQ8+n/FWASSz4PsATTD1H8bJsj0Bw== 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 4VT1mB2Zr3z1SCF; Tue, 30 Apr 2024 00:48:58 +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 43U0mwG6012777; Tue, 30 Apr 2024 00:48:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43U0mwUj012774; Tue, 30 Apr 2024 00:48:58 GMT (envelope-from git) Date: Tue, 30 Apr 2024 00:48:58 GMT Message-Id: <202404300048.43U0mwUj012774@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: ed9e2991c2da - stable/14 - sigqueue(2): add impl-specific flag __SIGQUEUE_TID 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: ed9e2991c2da5924a1876383dbe9a51e1015b69e Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ed9e2991c2da5924a1876383dbe9a51e1015b69e commit ed9e2991c2da5924a1876383dbe9a51e1015b69e Author: Konstantin Belousov AuthorDate: 2024-04-19 14:29:05 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-30 00:48:09 +0000 sigqueue(2): add impl-specific flag __SIGQUEUE_TID (cherry picked from commit 53186bc1435e2c3ccf9c2124c066a08c6a80c504) --- sys/kern/kern_sig.c | 22 +++++++++++++++++----- sys/sys/signal.h | 4 ++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 54e39d2cd310..2f2ec7edfb12 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -2010,13 +2010,16 @@ sys_sigqueue(struct thread *td, struct sigqueue_args *uap) } int -kern_sigqueue(struct thread *td, pid_t pid, int signum, union sigval *value) +kern_sigqueue(struct thread *td, pid_t pid, int signumf, union sigval *value) { ksiginfo_t ksi; struct proc *p; + struct thread *td2; + u_int signum; int error; - if ((u_int)signum > _SIG_MAXSIG) + signum = signumf & ~__SIGQUEUE_TID; + if (signum > _SIG_MAXSIG) return (EINVAL); /* @@ -2026,8 +2029,17 @@ kern_sigqueue(struct thread *td, pid_t pid, int signum, union sigval *value) if (pid <= 0) return (EINVAL); - if ((p = pfind_any(pid)) == NULL) - return (ESRCH); + if ((signumf & __SIGQUEUE_TID) == 0) { + if ((p = pfind_any(pid)) == NULL) + return (ESRCH); + td2 = NULL; + } else { + p = td->td_proc; + td2 = tdfind((lwpid_t)pid, p->p_pid); + if (td2 == NULL) + return (ESRCH); + } + error = p_cansignal(td, p, signum); if (error == 0 && signum != 0) { ksiginfo_init(&ksi); @@ -2037,7 +2049,7 @@ kern_sigqueue(struct thread *td, pid_t pid, int signum, union sigval *value) ksi.ksi_pid = td->td_proc->p_pid; ksi.ksi_uid = td->td_ucred->cr_ruid; ksi.ksi_value = *value; - error = pksignal(p, ksi.ksi_signo, &ksi); + error = tdsendsignal(p, td2, ksi.ksi_signo, &ksi); } PROC_UNLOCK(p); return (error); diff --git a/sys/sys/signal.h b/sys/sys/signal.h index 4007c6968eae..2165a9655a10 100644 --- a/sys/sys/signal.h +++ b/sys/sys/signal.h @@ -499,6 +499,10 @@ struct sigstack { #if __BSD_VISIBLE #define BADSIG SIG_ERR + +/* sigqueue(2) signo high-bits flags */ +#define __SIGQUEUE_TID 0x80000000 /* queue for tid, instead of pid */ +#define __SIGQUEUE_RSRV 0x40000000 /* reserved */ #endif #if __POSIX_VISIBLE || __XSI_VISIBLE