From nobody Wed Dec 13 20:06:24 2023 X-Original-To: dev-commits-src-branches@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 4Sr61s0z8gz54Fkg; Wed, 13 Dec 2023 20:06:25 +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 4Sr61r5hcTz4YvD; Wed, 13 Dec 2023 20:06:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702497984; 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=/ywwi/U4iT5mjcDkoPniASoH0GjEl74GVWTeIwV+b8I=; b=XfbKZMHfTLg6anGVszTW3Dvy2tDpVnL/AvqFs2QKseDn+dsFKfmtyM8vsbzq9e80GLnuq9 7CA6mMHCOWisxCHiSCnME6AOFh2/94nX77F/gRQUiUCFjkdDlCmKSNoRPi7GPbuKDC9tD0 uykN5g6C1plhs9oeKdRovaZxlJeaDfInm8JtE35jLVZYzNtt2W4qQe8pVMTFDQYPZ6pDog eIL/dd/8/d+RdvzCrijpSGm8FYYaCbrcuTMk8Quc5R1ezjM0g+Vc5yesm8OHYV1GUCzRYp Yv6w6ipCXCs9S5ScxHMlLUmkoVVWcmvq/9oOkvVSwVryhrd17sll1zkmmZFPmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702497984; a=rsa-sha256; cv=none; b=crJCygDxg29widsgnmPck56xsyMBCBrlh5XO6GrZXS4aseoDRwAu1XJYtLhOT9ZG1rItX8 7Qgsv2D5+qBw0Tiw2sR9CjD/Klyk+m28g7+u+xAaddrfJvcaG9P1qfZNYhbbGHI0O+AZRw EjEPsRpMXAn7/BSkClqSg9ZQaazHPLeaR8qUsLyzZS1W14QIIszVAmlXCdW07gLD8u+UOR I1ah0n9so3Il21dxMrbPb04CRgMwIFaGjQWhPRspGY5Bkt5WuYeeXc27tfBmk0n2JkXywU zOO2hDkpDrit9SnfUD3/6aUdr3SXCeP7QEU1Cy44zcYEBJNJqGW+7IoChNwviA== 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=1702497984; 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=/ywwi/U4iT5mjcDkoPniASoH0GjEl74GVWTeIwV+b8I=; b=fuESXmBY8mGvvvakBKNAgGozKX0XET/wis2FHSq9Y6HC297JIBf84PfMwwi4U09BxTZ534 51YyLjMcN+h7WiSJZZ+/WbjYDjCbRsYsk9sYU4PFi7OP+liTRsGFz/pnNfGAd4ZgPaP34i 6BU9JjDx/MVTZCl9yqAJiXmLEbfllSmGbV9eivwon7r9miB7Fk7/8FzmDMcMxBEY36a712 lilP8/FAzaHqtZN8UXsKp/7ICtsmqwcdWxTXvpW62KOg65MKY/9s0SnaX2Fng0VgattySX FclMpXzk/Nh/gEeJhtjRUyTYkJ5URI/hMYDS8ANnTit5Sg4ccDh3Pe7akCV1Jg== 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 4Sr61r4VVDz1Blk; Wed, 13 Dec 2023 20:06:24 +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 3BDK6Obn087168; Wed, 13 Dec 2023 20:06:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BDK6OIx087165; Wed, 13 Dec 2023 20:06:24 GMT (envelope-from git) Date: Wed, 13 Dec 2023 20:06:24 GMT Message-Id: <202312132006.3BDK6OIx087165@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 0147143008ec - stable/13 - daemon: EINTR from kevent(2) is not a fatal error List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0147143008ec5a8246a22a2b27e2a7a67e8b26a0 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0147143008ec5a8246a22a2b27e2a7a67e8b26a0 commit 0147143008ec5a8246a22a2b27e2a7a67e8b26a0 Author: Kyle Evans AuthorDate: 2023-05-05 15:12:13 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-12-13 16:21:09 +0000 daemon: EINTR from kevent(2) is not a fatal error Simply resume waiting for events rather than exiting if we took a signal here. This at least fixes running programs under daemon(8) in the face of suspend/resume, which I suspect hits us with a spurious EINTR rather than a signal anyways. Reported and tested by: manu Fixes: 8935a3993219b ("daemon: use kqueue for all events") (cherry picked from commit 494e7dfdbe6ecfe572228ed39f5c794954da068c) --- usr.sbin/daemon/daemon.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index 48609ad03d68..dfbb609ce10d 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -425,6 +425,8 @@ daemon_eventloop(struct daemon_state *state) ret = kevent(kq, NULL, 0, &event, 1, NULL); switch (ret) { case -1: + if (errno == EINTR) + continue; err(EXIT_FAILURE, "kevent wait"); case 0: continue;