From owner-dev-commits-src-branches@freebsd.org Tue Jun 22 01:46:09 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0FBD56537EB; Tue, 22 Jun 2021 01:46:09 +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 4G88PX73d4z4T6K; Tue, 22 Jun 2021 01:46:08 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 DA1AE27979; Tue, 22 Jun 2021 01:46:08 +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 15M1k8md065976; Tue, 22 Jun 2021 01:46:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15M1k8V7065975; Tue, 22 Jun 2021 01:46:08 GMT (envelope-from git) Date: Tue, 22 Jun 2021 01:46:08 GMT Message-Id: <202106220146.15M1k8V7065975@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: fc13cbaf6942 - stable/13 - sigwait: add comment explaining EINTR/ERESTART details 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: fc13cbaf6942af73d50659e4728b6b1299a0d028 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2021 01:46:09 -0000 The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fc13cbaf6942af73d50659e4728b6b1299a0d028 commit fc13cbaf6942af73d50659e4728b6b1299a0d028 Author: Konstantin Belousov AuthorDate: 2021-06-07 14:59:41 +0000 Commit: Konstantin Belousov CommitDate: 2021-06-22 01:45:31 +0000 sigwait: add comment explaining EINTR/ERESTART details (cherry picked from commit acced8b043c5df0ebd51934bca6dcae3322cf890) --- sys/kern/kern_sig.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index a2709f38c5cb..1cab25aa5a40 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -1167,6 +1167,13 @@ sys_sigwait(struct thread *td, struct sigwait_args *uap) error = kern_sigtimedwait(td, set, &ksi, NULL); if (error) { + /* + * sigwait() function shall not return EINTR, but + * the syscall does. Non-ancient libc provides the + * wrapper which hides EINTR. Otherwise, EINTR return + * is used by libthr to handle required cancellation + * point in the sigwait(). + */ if (error == EINTR && td->td_proc->p_osrel < P_OSREL_SIGWAIT) return (ERESTART); td->td_retval[0] = error;